Package: release.debian.org Severity: normal User: [email protected] Usertags: pu
A new upstream version of libquvi-scripts was released today and uploaded to unstable. It includes fixes for liveleak.com and funnyordie.com. I'm not entirely sure if it is a good idea to try to include it in 7.2 or if we should wait a bit longer. On the other hand the code changes are quite small (*.lua: +8 -6) and it cannot really break anything: without the update trying to retrieve videos from the mentioned sites will just return an error. I also added PGP signature checking in d/watch for the unstable release. This option is ignored by uscan in wheezy. Ansgar
diff --git a/ChangeLog b/ChangeLog index 038e73f..ac173f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +commit 092c59b +Author: Toni Gundogdu <[email protected]> +Date: 2013-10-04 + + Bump version to 0.4.19 + + Signed-off-by: Toni Gundogdu <[email protected]> + +m4/version.m4 + +commit f093d87 +Author: Toni Gundogdu <[email protected]> +Date: 2013-10-04 + + Update NEWS for v0.4.19 + + Signed-off-by: Toni Gundogdu <[email protected]> + +NEWS + +commit bba8e1f +Author: Toni Gundogdu <[email protected]> +Date: 2013-09-30 + + FIX: website/liveleak.lua: media stream URL pattern + + Look up "file:" instead of "config:" which no longer appears to exist in + the page HTML. This value is the media stream URL. + + Signed-off-by: Toni Gundogdu <[email protected]> + +share/lua/website/liveleak.lua + +commit 3160719 +Author: Toni Gundogdu <[email protected]> +Date: 2013-09-29 + + FIX: website/funnyordie.lua: Media stream pattern (PORTpt9) + + Backported from the 0.9 series [364ad53]. + + Signed-off-by: Toni Gundogdu <[email protected]> + +share/lua/website/funnyordie.lua + commit ee0fd4e Author: Toni Gundogdu <[email protected]> Date: 2013-09-03 diff --git a/NEWS b/NEWS index a9be3d0..65403ae 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +v0.4.19 (2013-10-04) / Toni Gundogdu + +Toni Gundogdu: + - FIX: website/funnyordie.lua: Media stream pattern (PORTpt9) [3160719] + - FIX: website/liveleak.lua: media stream URL pattern [bba8e1f] + + 2 files changed, 8 insertions(+), 6 deletions(-) + + v0.4.18 (2013-09-03) / Toni Gundogdu Tobias Gruetzmacher: diff --git a/debian/changelog b/debian/changelog index 4f3814b..db10436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libquvi-scripts (0.4.19-1~deb7u1) wheezy; urgency=low + + * Upload to wheezy. + + -- Ansgar Burchardt <[email protected]> Sat, 05 Oct 2013 10:35:08 +0200 + +libquvi-scripts (0.4.19-1) unstable; urgency=low + + * New upstream release. + * debian/watch: Add pgpsigurlmangle option to verify upstream signature. + The PGP key used is the one from the last releases. It was not verified + further. + + -- Ansgar Burchardt <[email protected]> Sat, 05 Oct 2013 10:23:29 +0200 + libquvi-scripts (0.4.18-1~deb7u1) wheezy; urgency=low * Upload to wheezy. diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..95a390b --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +debian/upstream-signing-key.pgp diff --git a/debian/upstream-signing-key.pgp b/debian/upstream-signing-key.pgp new file mode 100644 index 0000000..3a3070a Binary files /dev/null and b/debian/upstream-signing-key.pgp differ diff --git a/debian/watch b/debian/watch index 2c41f9f..62a44e1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ version=3 + +options=pgpsigurlmangle=s/$/.sig/ \ http://sf.net/quvi/libquvi-scripts-(0\.4\..*).tar.(?:xz|gz|bz2) diff --git a/share/lua/website/funnyordie.lua b/share/lua/website/funnyordie.lua index 52d4de2..6714dbe 100644 --- a/share/lua/website/funnyordie.lua +++ b/share/lua/website/funnyordie.lua @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.18 +-- libquvi-scripts v0.4.19 -- Copyright (C) 2011,2013 Toni Gundogdu <[email protected]> -- Copyright (C) 2010 quvi project -- @@ -85,11 +85,14 @@ function FunnyOrDie.iter_formats(page) for u in page:gmatch('type: "video/mp4", src: "(.-)"') do table.insert(t, u) end + for u in page:gmatch('source src="(.-)"') do table.insert(t,u) end if #t ==0 then error('no match: media stream URL') end local r = {} for _,u in pairs(t) do local q,c = u:match('/(%w+)%.(%w+)$') - table.insert(r, {url=u, quality=q, container=c}) + if q and c then + table.insert(r, {url=u, quality=q, container=c}) + end end return r end diff --git a/share/lua/website/liveleak.lua b/share/lua/website/liveleak.lua index 3702cb8..806609d 100644 --- a/share/lua/website/liveleak.lua +++ b/share/lua/website/liveleak.lua @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.18 +-- libquvi-scripts v0.4.19 -- Copyright (C) 2010-2012 Toni Gundogdu <[email protected]> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. @@ -56,14 +56,13 @@ function parse(self) self.id = self.page_url:match('view%?i=([%w_]+)') or error("no match: media ID") - local c_url = p:match('config: "(.-)"') - if not c_url then -- Try the first iframe. + local u = p:match('file: "(.-)"') + if not u then -- Try the first iframe. self.redirect_url = p:match('<iframe.-src="(.-)"') - or error("no match: config") + or error("no match: file or iframe") else local U = require 'quvi/util' - local c = quvi.fetch(U.unescape(c_url), {fetch_type='config'}) - self.url = {c:match("<file>(.-)</") or error("no match: media URL")} + self.url = {U.unescape(u)} end return self diff --git a/tests/data/format/default/spiegel.diff b/tests/data/format/default/spiegel.diff deleted file mode 100644 index 2bde988..0000000 --- a/tests/data/format/default/spiegel.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- spiegel.json 2013-06-16 14:07:48.261762106 +0300 -+++ spiegel-1.json 2013-06-16 14:07:48.261762106 +0300 -@@ -1,17 +1,17 @@ - { - "host": "spiegel", -- "page_title": "Insektenroboter \"Robo-Bee\": Auf der Spur des Bienentanzes", -- "page_url": "http://www.spiegel.de/video/bienen-forschung-roboter-biene-soll-bienentanz-entschluesseln-video-1231965.html";, -- "id": "1231965", -+ "page_title": "Matthias Sammer: Bayerns mahnender Zeigefinger", -+ "page_url": "http://www.spiegel.de/video/matthias-sammer-ermahnt-den-fc-bayern-video-1242333.html";, -+ "id": "1242333", - "format_requested": "default", -- "thumbnail_url": "http://cdn2.spiegel.de/images/image-420265-videothumb-ffop.jpg";, -- "duration": "203000", -+ "thumbnail_url": "http://cdn1.spiegel.de/images/image-439218-videothumb-iywa.jpg";, -+ "duration": "123000", - "link": [ - { - "id": "1", -- "length_bytes": "10245896", -- "content_type": "video/x-flv", -- "file_suffix": "flv", -+ "length_bytes": "8476612", -+ "content_type": "video/mp4", -+ "file_suffix": "mp4", - "url": "" - } - ]
![http://cdn2.spiegel.de/images/image-420265-videothumb-ffop.jpg"](http://cdn2.spiegel.de/images/image-420265-videothumb-ffop.jpg"){kind=link}
![http://cdn1.spiegel.de/images/image-439218-videothumb-iywa.jpg"](http://cdn1.spiegel.de/images/image-439218-videothumb-iywa.jpg"){kind=link}