From 05edfb52fdc2b651299d9a6ac25e820ae06070e3 Mon Sep 17 00:00:00 2001
From: Toni Gundogdu <legatvs@gmail.com>
Date: Sat, 17 Mar 2012 21:46:37 +0200
Subject: [PATCH] blip.lua: Use "foo:match" instead

---
 share/lua/website/blip.lua | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/share/lua/website/blip.lua b/share/lua/website/blip.lua
index d5df713..b170845 100644
--- a/share/lua/website/blip.lua
+++ b/share/lua/website/blip.lua
@@ -1,6 +1,6 @@
 
 -- libquvi-scripts
--- Copyright (C) 2011  Toni Gundogdu <legatvs@gmail.com>
+-- Copyright (C) 2011-2012  Toni Gundogdu <legatvs@gmail.com>
 --
 -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>.
 --
@@ -46,8 +46,8 @@ end
 
 -- Query formats.
 function query_formats(self)
-    local config  = Blip.get_config(self)
-    local formats = Blip.iter_formats(config)
+    local c = Blip.get_config(self)
+    local formats = Blip.iter_formats(c)
 
     local t = {}
     for _,v in pairs(formats) do
@@ -62,22 +62,22 @@ end
 
 -- Parse media URL.
 function parse(self)
-    self.host_id   = "blip"
-    local config,U = Blip.get_config(self)
+    self.host_id = "blip"
 
-    local _,_,s = config:find('media:title>(.-)</')
-    self.title  = s or error('no match: media title')
+    local c,U = Blip.get_config(self)
 
-    local _,_,s   = config:find('<blip:smallThumbnail>(.-)<')
-    self.thumbnail_url = s or ''
+    self.title = c:match('media:title>(.-)</')
+                  or error('no match: media title')
 
-    local formats = Blip.iter_formats(config)
+    self.thumbnail_url = c:match('<blip:smallThumbnail>(.-)<') or ''
+
+    local formats = Blip.iter_formats(c)
     local format  = U.choose_format(self, formats,
                                      Blip.choose_best,
                                      Blip.choose_default,
                                      Blip.to_s)
                         or error("unable to choose format")
-    self.url      = {format.url or error("no match: media url")}
+    self.url      = {format.url or error("no match: media URL")}
     return self
 end
 
@@ -89,40 +89,40 @@ function Blip.get_config(self)
     local U       = require 'quvi/util'
     self.page_url = U.unescape(self.page_url)
 
-    local _,_,id = self.page_url:find('/flash/(%d+)')
+    local id = self.page_url:match('/flash/(%d+)')
     if not id then
         local r = quvi.resolve(self.page_url)
         if #r > 0 then
             r = U.unescape(r)
-            _,_,id = r:find('/rss/flash/(%d+)')
+            id = r:match('/rss/flash/(%d+)')
         end
     end
 
     if not id then
-        local page = quvi.fetch(self.page_url)
-        _,_,id = page:find('data%-posts%-id="(.-)"')
+        local p = quvi.fetch(self.page_url)
+        id = p:match('data%-posts%-id="(.-)"')
     end
-    self.id = id or error('no match: media id')
+    self.id = id or error('no match: media ID')
 
-    local config_url = 'http://blip.tv/rss/flash/' .. self.id
+    local c_url = 'http://blip.tv/rss/flash/' .. self.id
 
-    return quvi.fetch(config_url, {fetch_type = 'config'}), U
+    return quvi.fetch(c_url, {fetch_type='config'}), U
 end
 
-function Blip.iter_formats(config)
+function Blip.iter_formats(c)
     local p = '<media:content url="(.-)"'
            .. '.-blip:role="(.-)"'
            .. '.-height="(.-)"'
            .. '.-isDefault="(.-)"'
            .. '.-width="(.-)"'
     local t = {}
-    for u,r,h,d,w in config:gfind(p) do
+    for u,r,h,d,w in c:gfind(p) do
         r = string.lower(r)
         r = r:gsub(' ','_')
         r = r:gsub('[()]','')
         w = (w ~= nil) and tonumber(w) or 0 -- Some media do not have 'width'
         h = (h ~= nil) and tonumber(h) or 0 -- or 'height', e.g. audio
-        local _,_,s = u:find('%.(%w+)$')
+        local s = u:match('%.(%w+)$')
         table.insert(t, {width=w, height=h, url=u, default=d,
                          role=r,  container=s})
     end
-- 
2.11.4.GIT