From 6c51b8a392821f0f2b47bd1622f825d0b201d174 Mon Sep 17 00:00:00 2001
From: Toni Gundogdu <legatvs@gmail.com>
Date: Mon, 30 Jul 2012 20:32:14 +0300
Subject: [PATCH] Move quvi/*.lua files to common/ subdir

These importable modules are now located in the common/ subdir. Unlike
in 0.4, these may be imported in other scripts, e.g. playlist and scan.
---
 share/Makefile.am                            | 16 +++++++++++-----
 share/lua/{website => common}/quvi/bit.lua   |  0
 share/lua/{website => common}/quvi/const.lua |  0
 share/lua/{website => common}/quvi/html.lua  |  6 +++---
 share/lua/{website => common}/quvi/url.lua   |  2 +-
 share/lua/{website => common}/quvi/util.lua  |  0
 6 files changed, 15 insertions(+), 9 deletions(-)
 rename share/lua/{website => common}/quvi/bit.lua (100%)
 rename share/lua/{website => common}/quvi/const.lua (100%)
 rename share/lua/{website => common}/quvi/html.lua (99%)
 rename share/lua/{website => common}/quvi/url.lua (99%)
 rename share/lua/{website => common}/quvi/util.lua (100%)

diff --git a/share/Makefile.am b/share/Makefile.am
index 7030977..8505e23 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,16 +1,22 @@
 
 SUBDIRS=	lua
 
-DIST_lua=\
+DIST_lua=
+
+# Common scripts.
+DIST_lua+=\
+  lua/common/quvi/bit.lua\
+  lua/common/quvi/const.lua\
+  lua/common/quvi/html.lua\
+  lua/common/quvi/url.lua\
+  lua/common/quvi/util.lua
+
+DIST_lua+=\
  lua/README \
  lua/util/content_type.lua \
  lua/util/charset.lua \
  lua/util/trim.lua \
  lua/website/README \
- lua/website/quvi/bit.lua \
- lua/website/quvi/const.lua \
- lua/website/quvi/url.lua \
- lua/website/quvi/util.lua \
  lua/website/101greatgoals.lua \
  lua/website/1tvru.lua \
  lua/website/academicearth.lua \
diff --git a/share/lua/website/quvi/bit.lua b/share/lua/common/quvi/bit.lua
similarity index 100%
rename from share/lua/website/quvi/bit.lua
rename to share/lua/common/quvi/bit.lua
diff --git a/share/lua/website/quvi/const.lua b/share/lua/common/quvi/const.lua
similarity index 100%
rename from share/lua/website/quvi/const.lua
rename to share/lua/common/quvi/const.lua
diff --git a/share/lua/website/quvi/html.lua b/share/lua/common/quvi/html.lua
similarity index 99%
rename from share/lua/website/quvi/html.lua
rename to share/lua/common/quvi/html.lua
index 497fa42..cb5d580 100644
--- a/share/lua/website/quvi/html.lua
+++ b/share/lua/common/quvi/html.lua
@@ -29,7 +29,7 @@
 
 local M    = {}
 local char = string.char
- 
+
 function M.tail(n, k)
     local u, r=''
     for i=1,k do
@@ -38,7 +38,7 @@ function M.tail(n, k)
     end
     return u, n
 end
- 
+
 function M.to_utf8(a)
     local n, r, u = tonumber(a)
     if n<0x80 then                        -- 1 byte
@@ -60,7 +60,7 @@ function M.to_utf8(a)
         return char(n+0xfc) .. u
     end
 end
- 
+
 --
 --for line in io.lines() do
 --    out =  string.gsub(line, '&#(%d+);', to_utf8)
diff --git a/share/lua/website/quvi/url.lua b/share/lua/common/quvi/url.lua
similarity index 99%
rename from share/lua/website/quvi/url.lua
rename to share/lua/common/quvi/url.lua
index 98e1b20..3f15f56 100644
--- a/share/lua/website/quvi/url.lua
+++ b/share/lua/common/quvi/url.lua
@@ -227,7 +227,7 @@ function M.absolute(base_url, relative_url)
                         relative_parsed.query = base_parsed.query
                     end
                 end
-            else    
+            else
                 relative_parsed.path = absolute_path(base_parsed.path or "",
                     relative_parsed.path)
             end
diff --git a/share/lua/website/quvi/util.lua b/share/lua/common/quvi/util.lua
similarity index 100%
rename from share/lua/website/quvi/util.lua
rename to share/lua/common/quvi/util.lua
-- 
2.11.4.GIT