From b5ae4e170434f4fb114e84abd39a9c33dbda5834 Mon Sep 17 00:00:00 2001
From: Toni Gundogdu <legatvs@gmail.com>
Date: Sun, 18 Mar 2012 12:42:45 +0200
Subject: [PATCH] FIX: Lua-5.2: Use gmatch instead of gfind (#89)

 * http://sourceforge.net/apps/trac/quvi/ticket/89
---
 share/lua/website/arte.lua        | 4 ++--
 share/lua/website/blip.lua        | 2 +-
 share/lua/website/cbsnews.lua     | 2 +-
 share/lua/website/dailymotion.lua | 2 +-
 share/lua/website/foxnews.lua     | 8 ++++----
 share/lua/website/funnyordie.lua  | 2 +-
 share/lua/website/golem.lua       | 2 +-
 share/lua/website/guardian.lua    | 2 +-
 share/lua/website/imdb.lua        | 2 +-
 share/lua/website/mgnetwork.lua   | 2 +-
 share/lua/website/quvi/util.lua   | 2 +-
 share/lua/website/soundcloud.lua  | 2 +-
 share/lua/website/spiegel.lua     | 2 +-
 share/lua/website/youtube.lua     | 4 ++--
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/share/lua/website/arte.lua b/share/lua/website/arte.lua
index 2550063..a454307 100644
--- a/share/lua/website/arte.lua
+++ b/share/lua/website/arte.lua
@@ -88,7 +88,7 @@ end
 
 function Arte.get_lang_config(config)
     local t = {}
-    for lang,url in config:gfind('<video lang="(%w+)" ref="(.-)"') do
+    for lang,url in config:gmatch('<video lang="(%w+)" ref="(.-)"') do
         table.insert(t, {lang=lang,
                          config=quvi.fetch(url, {fetch_type = 'config'})})
     end
@@ -119,7 +119,7 @@ function Arte.iter_lang_formats(lang_config, t, U)
     local urls = config:match('<urls>(.-)</urls>')
                   or error('no match: urls')
 
-    for q,u in urls:gfind('<url quality="(%w+)">(.-)<') do
+    for q,u in urls:gmatch('<url quality="(%w+)">(.-)<') do
 --        print(q,u)
         table.insert(t, {lang=lang,   quality=q,   url=u,
                          thumb=thumb, title=title, id=id})
diff --git a/share/lua/website/blip.lua b/share/lua/website/blip.lua
index b170845..d252e91 100644
--- a/share/lua/website/blip.lua
+++ b/share/lua/website/blip.lua
@@ -116,7 +116,7 @@ function Blip.iter_formats(c)
            .. '.-isDefault="(.-)"'
            .. '.-width="(.-)"'
     local t = {}
-    for u,r,h,d,w in c:gfind(p) do
+    for u,r,h,d,w in c:gmatch(p) do
         r = string.lower(r)
         r = r:gsub(' ','_')
         r = r:gsub('[()]','')
diff --git a/share/lua/website/cbsnews.lua b/share/lua/website/cbsnews.lua
index 59e5316..bad66e3 100644
--- a/share/lua/website/cbsnews.lua
+++ b/share/lua/website/cbsnews.lua
@@ -99,7 +99,7 @@ function CBSNews.iter_formats(config) -- Iterate available formats
            .. '.-<DeliveryUrl>.-'
            .. 'CDATA%[(.-)%]'
     local t = {}
-    for w,h,b,u in config:gfind(p) do
+    for w,h,b,u in config:gmatch(p) do
         local s = u:match('%.(%w+)$')
 --        print(w,h,b,s,u)
         table.insert(t,
diff --git a/share/lua/website/dailymotion.lua b/share/lua/website/dailymotion.lua
index 6534f7e..917a670 100644
--- a/share/lua/website/dailymotion.lua
+++ b/share/lua/website/dailymotion.lua
@@ -119,7 +119,7 @@ function Dailymotion.iter_formats(page, U)
     seq = U.unescape(seq)
 
     local t = {}
-    for url in seq:gfind('%w+URL":"(.-)"') do
+    for url in seq:gmatch('%w+URL":"(.-)"') do
         local c,w,h,cn = url:match('(%w+)%-(%d+)x(%d+).-%.(%w+)')
         if c then
             table.insert(t, {width=tonumber(w), height=tonumber(h),
diff --git a/share/lua/website/foxnews.lua b/share/lua/website/foxnews.lua
index dd7f03e..b8e891d 100644
--- a/share/lua/website/foxnews.lua
+++ b/share/lua/website/foxnews.lua
@@ -124,9 +124,9 @@ function Foxnews.iter_formats_js(page, U)
     end
 
     local t = {}
-    for attrs in formats:gfind('"@attributes":(%b{})') do
+    for attrs in formats:gmatch('"@attributes":(%b{})') do
         local format = {}
-        for key,value in attrs:gfind('"(.-)":"(.-)"') do
+        for key,value in attrs:gmatch('"(.-)":"(.-)"') do
             format[key]=value
 	    end
         if format.rel == "stream" then
@@ -154,9 +154,9 @@ function Foxnews.iter_thumbnails_js(page, U)
     end
 
     local t = {}
-    for attrs in thumbs:gfind('"@attributes":(%b{})') do
+    for attrs in thumbs:gmatch('"@attributes":(%b{})') do
         local thumb = {}
-        for key,value in attrs:gfind('"(.-)":"(.-)"') do
+        for key,value in attrs:gmatch('"(.-)":"(.-)"') do
             thumb[key]=value
 	    end
         table.insert(t, thumb)
diff --git a/share/lua/website/funnyordie.lua b/share/lua/website/funnyordie.lua
index e0cce10..e46e6e7 100644
--- a/share/lua/website/funnyordie.lua
+++ b/share/lua/website/funnyordie.lua
@@ -82,7 +82,7 @@ end
 
 function FunnyOrDie.iter_formats(page)
     local t = {}
-    for u in page:gfind("'src',%s+'(.-)'") do
+    for u in page:gmatch("'src',%s+'(.-)'") do
         local q,c = u:match('(%w+)%.(%w+)$')
         table.insert(t, {url=u, quality=q, container=c})
 --        print(u,c)
diff --git a/share/lua/website/golem.lua b/share/lua/website/golem.lua
index 8e5181d..fc78a4b 100644
--- a/share/lua/website/golem.lua
+++ b/share/lua/website/golem.lua
@@ -94,7 +94,7 @@ function Golem.iter_formats(config)
            .. '.-<url>(.-)<'
            .. '.-</teaser>'
     local t = {}
-    for id,w,h,c,u in config:gfind(p) do
+    for id,w,h,c,u in config:gmatch(p) do
             u = 'http://video.golem.de' .. u
 --            print(id,w,h,c,u)
             table.insert(t, {width=tonumber(w), height=tonumber(h),
diff --git a/share/lua/website/guardian.lua b/share/lua/website/guardian.lua
index 2123210..9661f55 100644
--- a/share/lua/website/guardian.lua
+++ b/share/lua/website/guardian.lua
@@ -104,7 +104,7 @@ end
 function Guardian.iter_formats(config)
     local p = '"format":%s+"(.-)".-"video%-file%-url":%s+"(.-)"'
     local t = {}
-    for c,u in config:gfind(p) do
+    for c,u in config:gmatch(p) do
 --        print(f,u)
         c = c:gsub("video/", "")
         c = c:gsub(":", "_")
diff --git a/share/lua/website/imdb.lua b/share/lua/website/imdb.lua
index fd44e4c..0a932ab 100644
--- a/share/lua/website/imdb.lua
+++ b/share/lua/website/imdb.lua
@@ -108,7 +108,7 @@ end
 function IMDB.iter_formats(page)
     local p = "case '(.-)' :.-url = '(.-)';"
     local t = {}
-    for c,u in page:gfind(p) do
+    for c,u in page:gmatch(p) do
         table.insert(t, {path=u, container=c})
         --print(u,c)
     end
diff --git a/share/lua/website/mgnetwork.lua b/share/lua/website/mgnetwork.lua
index 632ab74..58f93a3 100644
--- a/share/lua/website/mgnetwork.lua
+++ b/share/lua/website/mgnetwork.lua
@@ -123,7 +123,7 @@ end
 function MGNetwork.iter_formats(config)
     local p = 'content url="(.-)" type="%w+/(.-)"'
     local t = {}
-    for u,c in config:gfind(p) do
+    for u,c in config:gmatch(p) do
         table.insert(t, {url=u, container=c})
         --print(u,c)
     end
diff --git a/share/lua/website/quvi/util.lua b/share/lua/website/quvi/util.lua
index 323b69b..5927d1c 100644
--- a/share/lua/website/quvi/util.lua
+++ b/share/lua/website/quvi/util.lua
@@ -25,7 +25,7 @@ local M = {}
 -- http://www.lua.org/pil/20.3.html
 function M.decode (s)
     r = {}
-    for n,v in s:gfind ("([^&=]+)=([^&=]+)") do
+    for n,v in s:gmatch ("([^&=]+)=([^&=]+)") do
         n = M.unescape (n)
         r[n] = v
     end
diff --git a/share/lua/website/soundcloud.lua b/share/lua/website/soundcloud.lua
index be805a7..a653fbd 100644
--- a/share/lua/website/soundcloud.lua
+++ b/share/lua/website/soundcloud.lua
@@ -54,7 +54,7 @@ function parse(self)
 
     self.thumbnail_url = ''
     self.title = nil -- Ugly but works.
-    for c,p in p:gfind('<meta content="(.-)" property="(.-)"') do
+    for c,p in p:gmatch('<meta content="(.-)" property="(.-)"') do
         if p == 'og:title' then
             self.title = c
         elseif p == 'og:image' then
diff --git a/share/lua/website/spiegel.lua b/share/lua/website/spiegel.lua
index 457f476..9724833 100644
--- a/share/lua/website/spiegel.lua
+++ b/share/lua/website/spiegel.lua
@@ -115,7 +115,7 @@ function Spiegel.iter_formats(config)
            .. '.-<height>(%d+)'
            .. '.-<duration>(%d+)'
     local t = {}
-    for fn,c,b,w,h,d in config:gfind(p) do
+    for fn,c,b,w,h,d in config:gmatch(p) do
         local cn = fn:match('%.(%w+)$') or error('no match: container')
         local u = 'http://video.spiegel.de/flash/' .. fn
 --        print(u,c,b,w,h,cn,d)
diff --git a/share/lua/website/youtube.lua b/share/lua/website/youtube.lua
index 79b02ae..3b444dd 100644
--- a/share/lua/website/youtube.lua
+++ b/share/lua/website/youtube.lua
@@ -122,7 +122,7 @@ function YouTube.iter_formats(config, U)
     fmt_stream_map = U.unescape(fmt_stream_map) .. ","
 
     local urls = {}
-    for f in fmt_stream_map:gfind('([^,]*),') do
+    for f in fmt_stream_map:gmatch('([^,]*),') do
         local d = U.decode(f)
         if d['itag'] and d['url'] then
             urls[U.unescape(d['itag'])] = U.unescape(d['url'])
@@ -133,7 +133,7 @@ function YouTube.iter_formats(config, U)
     fmt_map = U.unescape(fmt_map)
 
     local r = {}
-    for f,w,h in fmt_map:gfind('(%d+)/(%d+)x(%d+)') do
+    for f,w,h in fmt_map:gmatch('(%d+)/(%d+)x(%d+)') do
 --        print(f,w,h)
         table.insert(r, {fmt_id=tonumber(f),    url=urls[f],
                           width=tonumber(w), height=tonumber(h)})
-- 
2.11.4.GIT