From 5b029b012cf600eecb35d9c0edb99f7fd9d9003e Mon Sep 17 00:00:00 2001 From: Toni Gundogdu Date: Sat, 17 Mar 2012 19:35:20 +0200 Subject: [PATCH] tube8.lua: Use "foo:match" instead --- share/lua/website/tube8.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/share/lua/website/tube8.lua b/share/lua/website/tube8.lua index abf9c30..b9c5e04 100644 --- a/share/lua/website/tube8.lua +++ b/share/lua/website/tube8.lua @@ -1,6 +1,6 @@ -- libquvi-scripts --- Copyright (C) 2010 quvi project +-- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . -- @@ -42,17 +42,20 @@ end -- Parse media URL. function parse (self) self.host_id = "tube8" - local page = quvi.fetch(self.page_url .. "?processdisclaimer") - local _,_,s = page:find("(.-)%s+-") - self.title = s or error ("no match: media title") + local p = quvi.fetch(self.page_url .. "?processdisclaimer") - local _,_,s = page:find('name="vidId" value="(%d+)"') - self.id = s or error ("no match: media id") + self.title = p:match("<title>(.-)%s+-") + or error ("no match: media title") + + self.id = p:match('name="vidId" value="(%d+)"') + or error ("no match: media ID") + + local s = p:match('"video_url":"(.-)"') + or error("no match: media URL") local U = require 'quvi/util' - local _,_,s = page:find('"video_url":"(.-)"') - self.url = { U.unescape( s or error ("no match: file") ) } + self.url = {U.unescape(s)} return self end -- 2.11.4.GIT