diff -Nru libquvi-scripts-0.4.8/ChangeLog libquvi-scripts-0.4.10/ChangeLog --- libquvi-scripts-0.4.8/ChangeLog 2012-08-21 07:56:44.000000000 +0000 +++ libquvi-scripts-0.4.10/ChangeLog 2012-11-22 08:58:16.000000000 +0000 @@ -1,3 +1,402 @@ +commit 4d12ffd +Author: Toni Gundogdu +Date: 2012-11-22 + + Bump version to 0.4.10 + + Signed-off-by: Toni Gundogdu + +m4/version.m4 + +commit b0e9f1d +Author: Toni Gundogdu +Date: 2012-11-22 + + Update NEWS for v0.4.10 + + Signed-off-by: Toni Gundogdu + +NEWS + +commit e1d1731 +Author: Toni Gundogdu +Date: 2012-11-21 + + tests: other/spiegel_*.json: Remove + + Save some bandwidth. If one stream (the default) checks out OK + with this site, that's all we need. + + Signed-off-by: Toni Gundogdu + +tests/data/format/other/spiegel_best.json +tests/data/format/other/spiegel_flv_vp6_388k_135p.json +tests/data/format/other/spiegel_flv_vp6_576k_315p.json +tests/data/format/other/spiegel_flv_vp6_64k_135p.json +tests/data/format/other/spiegel_flv_vp6_928k_544p.json +tests/data/format/other/spiegel_mp4_h264_1400k_544p.json + +commit 5fef6dc +Author: Toni Gundogdu +Date: 2012-11-21 + + tests: default/spiegel.json: Use a more recent test URL + + The previously used test URL defaulted to media stream that is listed + in the returned XML data but appears to be missing (HTTP/404). The + XML does not seem to indicate the stream availability, either. + + Signed-off-by: Toni Gundogdu + +tests/data/format/default/spiegel.json + +commit b182505 +Author: Toni Gundogdu +Date: 2012-11-21 + + FIX: audioboo.lua: multiple patterns + + Fix {title,id,thumbnail,stream} patterns. Parse from the + contents of the media URL instead of oembed which no longer + appears to provide the media stream URL. + + Signed-off-by: Toni Gundogdu + +share/lua/website/audioboo.lua + +commit bc35f74 +Author: Toni Gundogdu +Date: 2012-11-21 + + FIX: dailymotion.lua: title pattern + + Signed-off-by: Toni Gundogdu + +share/lua/website/dailymotion.lua + +commit 6357cd1 +Author: Toni Gundogdu +Date: 2012-11-21 + + FIX: break.lua: multiple patterns + + Fix {title,id,filepath,filehash} patterns. Add thumbnail_url. + + Signed-off-by: Toni Gundogdu + +share/lua/website/break.lua + +commit 3630a39 +Author: Toni Gundogdu +Date: 2012-10-01 + + Bump version to 0.4.9 + +m4/version.m4 + +commit b0effb8 +Author: Toni Gundogdu +Date: 2012-10-01 + + Update NEWS for 0.4.9 + +NEWS + +commit 63024cb +Merge: 5a9928a 57722d1 +Author: Toni Gundogdu +Date: 2012-10-01 + + Merge branch 'tg/next/0.4_fixme_arte' into next + +commit 57722d1 +Author: Toni Gundogdu +Date: 2012-10-01 + + expire.t: Skip all tests + + Both pluzz.lua and arte.lua need to be fixed now. + +tests/t/expire.t + +commit e815821 +Author: Toni Gundogdu +Date: 2012-10-01 + + website/arte.lua: Mark as FIXME + +share/Makefile.am + +commit 5a9928a +Merge: 3bdcec9 6a7dada +Author: Toni Gundogdu +Date: 2012-10-01 + + Merge branch 'tg/next/0.4_fix_youjizz' into next + +commit 6a7dada +Author: Toni Gundogdu +Date: 2012-10-01 + + tests: nsfw/youjizz.json: Update for thumbnail_url + +tests/data/format/default/nsfw/youjizz.json + +commit ebc42da +Author: Toni Gundogdu +Date: 2012-10-01 + + FIX: website/youjizz.lua + + Fix media {ID,media stream URL} parsing. Parse thumbnail URL. + + Signed-off-by: anon + +share/lua/website/youjizz.lua + +commit 3bdcec9 +Merge: c623218 e6f6aa2 +Author: Toni Gundogdu +Date: 2012-10-01 + + Merge branch 'tg/next/0.4_fixme_collegehumor' into next + +commit e6f6aa2 +Author: Toni Gundogdu +Date: 2012-10-01 + + tests: {default,other}/collegehumor*.json: Mark as FIXME + +tests/data/format/default/collegehumor.json +tests/data/format/default/fixme/collegehumor.json +tests/data/format/other/collegehumor_best.json +tests/data/format/other/collegehumor_mp4_hq.json +tests/data/format/other/collegehumor_mp4_sd.json +tests/data/format/other/fixme/collegehumor_best.json +tests/data/format/other/fixme/collegehumor_mp4_hq.json +tests/data/format/other/fixme/collegehumor_mp4_sd.json + +commit 4f65343 +Author: Toni Gundogdu +Date: 2012-10-01 + + collegehumor.lua: Mark as FIXME + +share/Makefile.am + +commit c623218 +Merge: c681d03 dbd90b8 +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw' into next + +commit dbd90b8 +Merge: 9696d55 7fb3790 +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw__xnxx' into tg/next/0.4_anon_contrib_nsfw + +commit 7fb3790 +Author: Toni Gundogdu +Date: 2012-09-27 + + Add tests:/nsfw/xnxx.json + +tests/data/format/default/nsfw/xnxx.json + +commit ac72d16 +Author: Toni Gundogdu +Date: 2012-09-27 + + Add website/xnxx.lua (NSFW) + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/xnxx.lua + +commit 9696d55 +Merge: ca7b0e2 1a800a3 +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw__jizzhut' into tg/next/0.4_anon_contrib_nsfw + +commit 1a800a3 +Author: Toni Gundogdu +Date: 2012-09-27 + + Add tests:/nsfw/jizzhut.json + +tests/data/format/default/nsfw/jizzhut.json + +commit d509b1b +Author: Toni Gundogdu +Date: 2012-09-27 + + Add website/jizzhut.lua (NSFW) + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/jizzhut.lua + +commit ca7b0e2 +Merge: 6dd21a8 dc37f8a +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw__fastjizz' into tg/next/0.4_anon_contrib_nsfw + +commit dc37f8a +Author: Toni Gundogdu +Date: 2012-09-27 + + Add tests:/nsfw/fastjizz.json + +tests/data/format/default/nsfw/fastjizz.json + +commit 9f1ce8b +Author: Toni Gundogdu +Date: 2012-09-27 + + Add website/fastjizz.lua (NSFW) + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/fastjizz.lua + +commit 6dd21a8 +Merge: 871b840 0d8a3ce +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw__deviantclip' into tg/next/0.4_anon_contrib_nsfw + +commit 0d8a3ce +Author: Toni Gundogdu +Date: 2012-09-27 + + Add tests:/nsfw/deviantclip.json + +tests/data/format/default/nsfw/deviantclip.json + +commit 1b12bc4 +Author: Toni Gundogdu +Date: 2012-09-27 + + Add website/deviantclip.lua (NSFW) + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/deviantclip.lua + +commit 871b840 +Merge: 9498be7 972fd55 +Author: Toni Gundogdu +Date: 2012-09-27 + + Merge branch 'tg/next/0.4_anon_contrib_nsfw__beeg' into tg/next/0.4_anon_contrib_nsfw + +commit 972fd55 +Author: Toni Gundogdu +Date: 2012-09-27 + + Add tests:/nsfw/beeg.json + +tests/data/format/default/nsfw/beeg.json + +commit 5d7233f +Author: Toni Gundogdu +Date: 2012-09-27 + + Add website/beeg.lua (NSFW) + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/beeg.lua + +commit 9498be7 +Author: Toni Gundogdu +Date: 2012-09-27 + + website/keezmovies.lua: Detect encrypted streams + + Check for encrypted streams. Move website/keezmovies.lua + from WITH_FIXME to WITH_NSFW. + + Signed-off-by: anon + +share/Makefile.am +share/lua/website/keezmovies.lua + +commit c681d03 +Author: Toni Gundogdu +Date: 2012-09-27 + + FIX: Add quvi/html.lua to DIST_lua + + Distribute libquvi-scripts with the quvi/html.lua file. + +share/Makefile.am + +commit 5b1c002 +Author: Martin Herkt +Date: 2012-09-27 + + Fix youtube.lua + + YouTube has added a new "signature" parameter to their playback URLs. + Append this parameter to the URL if url_encoded_fmt_stream_map contains + "sig". + +share/lua/website/youtube.lua + +commit ef333de +Merge: e657f45 424f9f1 +Author: Toni Gundogdu +Date: 2012-09-03 + + Merge branch 'tg/next/0.4_add_tapuz' into next + +commit 424f9f1 +Author: Toni Gundogdu +Date: 2012-09-03 + + tests: format/default: Add tapuz.json + +tests/data/format/default/tapuz.json + +commit bc24554 +Author: Toni Gundogdu +Date: 2012-09-03 + + website/tapuz.lua: Add tapuz flix support + + ref: http://article.gmane.org/gmane.comp.web.flash.quvi/97 + +share/Makefile.am +share/lua/website/tapuz.lua + +commit e657f45 +Author: Toni Gundogdu +Date: 2012-08-21 + + website/xvideos.lua: Improve title parsing (#109) + + The page could be a truncated version of a longer description + or a title. Grab the media title elsewhere. + + exu: http://www.xvideos.com/video2389960 + ref: http://sourceforge.net/apps/trac/quvi/ticket/109 + +share/lua/website/xvideos.lua + commit 94ac387 Author: Toni Gundogdu <legatvs@gmail.com> Date: 2012-08-19 diff -Nru libquvi-scripts-0.4.8/Makefile.in libquvi-scripts-0.4.10/Makefile.in --- libquvi-scripts-0.4.8/Makefile.in 2012-08-21 07:56:33.000000000 +0000 +++ libquvi-scripts-0.4.10/Makefile.in 2012-11-22 08:58:08.000000000 +0000 @@ -530,7 +530,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -Nru libquvi-scripts-0.4.8/NEWS libquvi-scripts-0.4.10/NEWS --- libquvi-scripts-0.4.8/NEWS 2012-08-21 07:54:54.000000000 +0000 +++ libquvi-scripts-0.4.10/NEWS 2012-11-22 08:58:04.000000000 +0000 @@ -1,3 +1,36 @@ +v0.4.10 (2012-11-22) / Toni Gundogdu + +Toni Gundogdu: + - FIX: audioboo.lua: multiple patterns [b182505] + - FIX: break.lua: multiple patterns [6357cd1] + - FIX: dailymotion.lua: title pattern [bc35f74] + + 10 files changed, 28 insertions(+), 127 deletions(-) + + +v0.4.9 (2012-10-01) / Toni Gundogdu + +anon: + - Add website/beeg.lua (NSFW) [5d7233f] + - Add website/deviantclip.lua (NSFW) [1b12bc4] + - Add website/fastjizz.lua (NSFW) [9f1ce8b] + - Add website/jizzhut.lua (NSFW) [d509b1b] + - Add website/xnxx.lua (NSFW) [ac72d16] + - FIX: website/youjizz.lua [ebc42da] + - website/keezmovies.lua: Detect encrypted streams [9498be7] +Martin Herkt: + - FIX: youtube.lua [5b1c002] (aka. server response code 403 (conncode=0)) +Toni Gundogdu: + - FIX: Add quvi/html.lua to DIST_lua [c681d03] + - website/arte.lua: Mark as FIXME [e815821] + - website/collegehumor.lua: Mark as FIXME [4f65343] + - website/xvideos.lua: Improve title parsing (#109) [e657f45] +Tzafrir Cohen: + - website/tapuz.lua: Add tapuz flix support [bc24554] + + 27 files changed, 622 insertions(+), 86 deletions(-) + + v0.4.8 (2012-08-21) / Toni Gundogdu anon: diff -Nru libquvi-scripts-0.4.8/VERSION libquvi-scripts-0.4.10/VERSION --- libquvi-scripts-0.4.8/VERSION 2012-08-21 07:56:44.000000000 +0000 +++ libquvi-scripts-0.4.10/VERSION 2012-11-22 08:58:16.000000000 +0000 @@ -1 +1 @@ -v0.4.8 +v0.4.10 diff -Nru libquvi-scripts-0.4.8/configure libquvi-scripts-0.4.10/configure --- libquvi-scripts-0.4.8/configure 2012-08-21 07:56:32.000000000 +0000 +++ libquvi-scripts-0.4.10/configure 2012-11-22 08:58:07.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for libquvi-scripts 0.4.8. +# Generated by GNU Autoconf 2.67 for libquvi-scripts 0.4.10. # # Report bugs to <http://sourceforge.net/apps/trac/quvi/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='libquvi-scripts' PACKAGE_TARNAME='libquvi-scripts' -PACKAGE_VERSION='0.4.8' -PACKAGE_STRING='libquvi-scripts 0.4.8' +PACKAGE_VERSION='0.4.10' +PACKAGE_STRING='libquvi-scripts 0.4.10' PACKAGE_BUGREPORT='http://sourceforge.net/apps/trac/quvi/' PACKAGE_URL='http://quvi.sourceforge.net/' @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libquvi-scripts 0.4.8 to adapt to many kinds of systems. +\`configure' configures libquvi-scripts 0.4.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1263,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libquvi-scripts 0.4.8:";; + short | recursive ) echo "Configuration of libquvi-scripts 0.4.10:";; esac cat <<\_ACEOF @@ -1347,7 +1347,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libquvi-scripts configure 0.4.8 +libquvi-scripts configure 0.4.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1364,7 +1364,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libquvi-scripts $as_me 0.4.8, which was +It was created by libquvi-scripts $as_me 0.4.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2182,7 +2182,7 @@ # Define the identity of the package. PACKAGE='libquvi-scripts' - VERSION='0.4.8' + VERSION='0.4.10' cat >>confdefs.h <<_ACEOF @@ -3080,7 +3080,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libquvi-scripts $as_me 0.4.8, which was +This file was extended by libquvi-scripts $as_me 0.4.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3134,7 +3134,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libquvi-scripts config.status 0.4.8 +libquvi-scripts config.status 0.4.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -Nru libquvi-scripts-0.4.8/debian/changelog libquvi-scripts-0.4.10/debian/changelog --- libquvi-scripts-0.4.8/debian/changelog 2012-09-28 08:16:13.000000000 +0000 +++ libquvi-scripts-0.4.10/debian/changelog 2013-01-14 18:14:54.000000000 +0000 @@ -1,3 +1,9 @@ +libquvi-scripts (0.4.10-0~webupd8~raring) raring; urgency=medium + + * new upstream release + + -- Alin Andrei <webupd8@gmail.com> Mon, 14 Jan 2013 10:14:26 +0200 + libquvi-scripts (0.4.8-3) unstable; urgency=low * Backport upstream patch for new signature parameter on YouTube. diff -Nru libquvi-scripts-0.4.8/debian/patches/series libquvi-scripts-0.4.10/debian/patches/series --- libquvi-scripts-0.4.8/debian/patches/series 2012-09-28 08:12:39.000000000 +0000 +++ libquvi-scripts-0.4.10/debian/patches/series 2013-01-14 18:15:26.000000000 +0000 @@ -1 +1 @@ -688972-youtube.diff +#688972-youtube.diff diff -Nru libquvi-scripts-0.4.8/doc/man7/libquvi-scripts.7 libquvi-scripts-0.4.10/doc/man7/libquvi-scripts.7 --- libquvi-scripts-0.4.8/doc/man7/libquvi-scripts.7 2012-08-21 07:56:33.000000000 +0000 +++ libquvi-scripts-0.4.10/doc/man7/libquvi-scripts.7 2012-11-22 08:58:08.000000000 +0000 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "libquvi-scripts 7" -.TH libquvi-scripts 7 "2012-08-01" "v0.4.8" "libquvi-scripts manual" +.TH libquvi-scripts 7 "2012-11-21" "v0.4.10" "libquvi-scripts manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nru libquvi-scripts-0.4.8/m4/version.m4 libquvi-scripts-0.4.10/m4/version.m4 --- libquvi-scripts-0.4.8/m4/version.m4 2012-08-21 07:55:41.000000000 +0000 +++ libquvi-scripts-0.4.10/m4/version.m4 2012-11-22 08:58:04.000000000 +0000 @@ -1 +1 @@ -m4_define([_LIBQUVI_SCRIPTS_VERSION], [0.4.8]) +m4_define([_LIBQUVI_SCRIPTS_VERSION], [0.4.10]) diff -Nru libquvi-scripts-0.4.8/share/Makefile.am libquvi-scripts-0.4.10/share/Makefile.am --- libquvi-scripts-0.4.8/share/Makefile.am 2012-08-21 07:46:36.000000000 +0000 +++ libquvi-scripts-0.4.10/share/Makefile.am 2012-11-21 21:59:12.000000000 +0000 @@ -9,12 +9,12 @@ lua/website/README \ lua/website/quvi/bit.lua \ lua/website/quvi/const.lua \ + lua/website/quvi/html.lua \ lua/website/quvi/url.lua \ lua/website/quvi/util.lua \ lua/website/101greatgoals.lua \ lua/website/1tvru.lua \ lua/website/academicearth.lua \ - lua/website/arte.lua \ lua/website/audioboo.lua \ lua/website/bbc.lua \ lua/website/break.lua \ @@ -22,7 +22,6 @@ lua/website/cbsnews.lua \ lua/website/charlierose.lua \ lua/website/clipfish.lua \ - lua/website/collegehumor.lua \ lua/website/dailymotion.lua \ lua/website/foxnews.lua \ lua/website/funnyordie.lua \ @@ -42,6 +41,7 @@ lua/website/soundcloud.lua \ lua/website/spiegel.lua \ lua/website/tagtele.lua \ + lua/website/tapuz.lua \ lua/website/ted.lua \ lua/website/tvlux.lua \ lua/website/tvrain.lua \ @@ -55,7 +55,12 @@ if WITH_NSFW DIST_lua+=\ + lua/website/beeg.lua \ + lua/website/deviantclip.lua \ lua/website/empflix.lua \ + lua/website/fastjizz.lua \ + lua/website/jizzhut.lua \ + lua/website/keezmovies.lua \ lua/website/pornhub.lua \ lua/website/redtube.lua \ lua/website/spankwire.lua \ @@ -63,22 +68,24 @@ lua/website/tnaflix.lua \ lua/website/totallynsfw.lua \ lua/website/xhamster.lua \ + lua/website/xnxx.lua \ lua/website/xvideos.lua \ lua/website/youjizz.lua endif if WITH_FIXME DIST_lua+=\ + lua/website/arte.lua \ lua/website/bikeradar.lua \ lua/website/blip.lua \ lua/website/bloomberg.lua \ + lua/website/collegehumor.lua \ lua/website/francetelevisions.lua \ lua/website/globo.lua \ lua/website/pluzz.lua if WITH_NSFW DIST_lua+=\ - lua/website/tube8.lua \ - lua/website/keezmovies.lua + lua/website/tube8.lua endif endif # WITH_FIXME diff -Nru libquvi-scripts-0.4.8/share/Makefile.in libquvi-scripts-0.4.10/share/Makefile.in --- libquvi-scripts-0.4.8/share/Makefile.in 2012-08-21 07:56:33.000000000 +0000 +++ libquvi-scripts-0.4.10/share/Makefile.in 2012-11-22 08:58:08.000000000 +0000 @@ -33,7 +33,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : @WITH_NSFW_TRUE@am__append_1 = \ +@WITH_NSFW_TRUE@ lua/website/beeg.lua \ +@WITH_NSFW_TRUE@ lua/website/deviantclip.lua \ @WITH_NSFW_TRUE@ lua/website/empflix.lua \ +@WITH_NSFW_TRUE@ lua/website/fastjizz.lua \ +@WITH_NSFW_TRUE@ lua/website/jizzhut.lua \ +@WITH_NSFW_TRUE@ lua/website/keezmovies.lua \ @WITH_NSFW_TRUE@ lua/website/pornhub.lua \ @WITH_NSFW_TRUE@ lua/website/redtube.lua \ @WITH_NSFW_TRUE@ lua/website/spankwire.lua \ @@ -41,20 +46,22 @@ @WITH_NSFW_TRUE@ lua/website/tnaflix.lua \ @WITH_NSFW_TRUE@ lua/website/totallynsfw.lua \ @WITH_NSFW_TRUE@ lua/website/xhamster.lua \ +@WITH_NSFW_TRUE@ lua/website/xnxx.lua \ @WITH_NSFW_TRUE@ lua/website/xvideos.lua \ @WITH_NSFW_TRUE@ lua/website/youjizz.lua @WITH_FIXME_TRUE@am__append_2 = \ +@WITH_FIXME_TRUE@ lua/website/arte.lua \ @WITH_FIXME_TRUE@ lua/website/bikeradar.lua \ @WITH_FIXME_TRUE@ lua/website/blip.lua \ @WITH_FIXME_TRUE@ lua/website/bloomberg.lua \ +@WITH_FIXME_TRUE@ lua/website/collegehumor.lua \ @WITH_FIXME_TRUE@ lua/website/francetelevisions.lua \ @WITH_FIXME_TRUE@ lua/website/globo.lua \ @WITH_FIXME_TRUE@ lua/website/pluzz.lua @WITH_FIXME_TRUE@@WITH_NSFW_TRUE@am__append_3 = \ -@WITH_FIXME_TRUE@@WITH_NSFW_TRUE@ lua/website/tube8.lua \ -@WITH_FIXME_TRUE@@WITH_NSFW_TRUE@ lua/website/keezmovies.lua +@WITH_FIXME_TRUE@@WITH_NSFW_TRUE@ lua/website/tube8.lua subdir = share DIST_COMMON = $(am__nobase_dist_pkgdata_DATA_DIST) \ @@ -85,37 +92,41 @@ am__nobase_dist_pkgdata_DATA_DIST = 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 \ - lua/website/arte.lua lua/website/audioboo.lua \ + lua/website/quvi/const.lua lua/website/quvi/html.lua \ + lua/website/quvi/url.lua lua/website/quvi/util.lua \ + lua/website/101greatgoals.lua lua/website/1tvru.lua \ + lua/website/academicearth.lua lua/website/audioboo.lua \ lua/website/bbc.lua lua/website/break.lua \ lua/website/canalplus.lua lua/website/cbsnews.lua \ lua/website/charlierose.lua lua/website/clipfish.lua \ - lua/website/collegehumor.lua lua/website/dailymotion.lua \ - lua/website/foxnews.lua lua/website/funnyordie.lua \ - lua/website/gaskrank.lua lua/website/golem.lua \ - lua/website/guardian.lua lua/website/imdb.lua \ - lua/website/justintv.lua lua/website/lego.lua \ - lua/website/liveleak.lua lua/website/mgnetwork.lua \ - lua/website/metacafe.lua lua/website/publicsenat.lua \ - lua/website/sapo.lua lua/website/senat.lua \ - lua/website/sevenload.lua lua/website/soundcloud.lua \ - lua/website/spiegel.lua lua/website/tagtele.lua \ + lua/website/dailymotion.lua lua/website/foxnews.lua \ + lua/website/funnyordie.lua lua/website/gaskrank.lua \ + lua/website/golem.lua lua/website/guardian.lua \ + lua/website/imdb.lua lua/website/justintv.lua \ + lua/website/lego.lua lua/website/liveleak.lua \ + lua/website/mgnetwork.lua lua/website/metacafe.lua \ + lua/website/publicsenat.lua lua/website/sapo.lua \ + lua/website/senat.lua lua/website/sevenload.lua \ + lua/website/soundcloud.lua lua/website/spiegel.lua \ + lua/website/tagtele.lua lua/website/tapuz.lua \ lua/website/ted.lua lua/website/tvlux.lua \ lua/website/tvrain.lua lua/website/tmunderground.lua \ lua/website/theonion.lua lua/website/videa.lua \ lua/website/videobash.lua lua/website/vimeo.lua \ lua/website/yfrog.lua lua/website/youtube.lua \ - lua/website/empflix.lua lua/website/pornhub.lua \ - lua/website/redtube.lua lua/website/spankwire.lua \ - lua/website/tcmag.lua lua/website/tnaflix.lua \ - lua/website/totallynsfw.lua lua/website/xhamster.lua \ + lua/website/beeg.lua lua/website/deviantclip.lua \ + lua/website/empflix.lua lua/website/fastjizz.lua \ + lua/website/jizzhut.lua lua/website/keezmovies.lua \ + lua/website/pornhub.lua lua/website/redtube.lua \ + lua/website/spankwire.lua lua/website/tcmag.lua \ + lua/website/tnaflix.lua lua/website/totallynsfw.lua \ + lua/website/xhamster.lua lua/website/xnxx.lua \ lua/website/xvideos.lua lua/website/youjizz.lua \ - lua/website/bikeradar.lua lua/website/blip.lua \ - lua/website/bloomberg.lua lua/website/francetelevisions.lua \ + lua/website/arte.lua lua/website/bikeradar.lua \ + lua/website/blip.lua lua/website/bloomberg.lua \ + lua/website/collegehumor.lua lua/website/francetelevisions.lua \ lua/website/globo.lua lua/website/pluzz.lua \ - lua/website/tube8.lua lua/website/keezmovies.lua + lua/website/tube8.lua am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -252,23 +263,23 @@ SUBDIRS = 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 \ - lua/website/arte.lua lua/website/audioboo.lua \ + lua/website/quvi/const.lua lua/website/quvi/html.lua \ + lua/website/quvi/url.lua lua/website/quvi/util.lua \ + lua/website/101greatgoals.lua lua/website/1tvru.lua \ + lua/website/academicearth.lua lua/website/audioboo.lua \ lua/website/bbc.lua lua/website/break.lua \ lua/website/canalplus.lua lua/website/cbsnews.lua \ lua/website/charlierose.lua lua/website/clipfish.lua \ - lua/website/collegehumor.lua lua/website/dailymotion.lua \ - lua/website/foxnews.lua lua/website/funnyordie.lua \ - lua/website/gaskrank.lua lua/website/golem.lua \ - lua/website/guardian.lua lua/website/imdb.lua \ - lua/website/justintv.lua lua/website/lego.lua \ - lua/website/liveleak.lua lua/website/mgnetwork.lua \ - lua/website/metacafe.lua lua/website/publicsenat.lua \ - lua/website/sapo.lua lua/website/senat.lua \ - lua/website/sevenload.lua lua/website/soundcloud.lua \ - lua/website/spiegel.lua lua/website/tagtele.lua \ + lua/website/dailymotion.lua lua/website/foxnews.lua \ + lua/website/funnyordie.lua lua/website/gaskrank.lua \ + lua/website/golem.lua lua/website/guardian.lua \ + lua/website/imdb.lua lua/website/justintv.lua \ + lua/website/lego.lua lua/website/liveleak.lua \ + lua/website/mgnetwork.lua lua/website/metacafe.lua \ + lua/website/publicsenat.lua lua/website/sapo.lua \ + lua/website/senat.lua lua/website/sevenload.lua \ + lua/website/soundcloud.lua lua/website/spiegel.lua \ + lua/website/tagtele.lua lua/website/tapuz.lua \ lua/website/ted.lua lua/website/tvlux.lua \ lua/website/tvrain.lua lua/website/tmunderground.lua \ lua/website/theonion.lua lua/website/videa.lua \ diff -Nru libquvi-scripts-0.4.8/share/lua/util/charset.lua libquvi-scripts-0.4.10/share/lua/util/charset.lua --- libquvi-scripts-0.4.8/share/lua/util/charset.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/util/charset.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010,2012 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/util/content_type.lua libquvi-scripts-0.4.10/share/lua/util/content_type.lua --- libquvi-scripts-0.4.8/share/lua/util/content_type.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/util/content_type.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,4 +1,4 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/util/trim.lua libquvi-scripts-0.4.10/share/lua/util/trim.lua --- libquvi-scripts-0.4.8/share/lua/util/trim.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/util/trim.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/version libquvi-scripts-0.4.10/share/lua/version --- libquvi-scripts-0.4.8/share/lua/version 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/version 2012-11-22 08:58:17.000000000 +0000 @@ -1 +1 @@ -v0.4.8 +v0.4.10 diff -Nru libquvi-scripts-0.4.8/share/lua/website/101greatgoals.lua libquvi-scripts-0.4.10/share/lua/website/101greatgoals.lua --- libquvi-scripts-0.4.8/share/lua/website/101greatgoals.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/101greatgoals.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 quvi project -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/website/1tvru.lua libquvi-scripts-0.4.10/share/lua/website/1tvru.lua --- libquvi-scripts-0.4.8/share/lua/website/1tvru.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/1tvru.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Mikhail Gusarov <dottedmag@dottedmag.net> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/website/academicearth.lua libquvi-scripts-0.4.10/share/lua/website/academicearth.lua --- libquvi-scripts-0.4.8/share/lua/website/academicearth.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/academicearth.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2011 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/website/arte.lua libquvi-scripts-0.4.10/share/lua/website/arte.lua --- libquvi-scripts-0.4.8/share/lua/website/arte.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/arte.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu <legatvs@gmail.com> -- Copyright (C) 2011 Raphaël Droz <raphael.droz+floss@gmail.com> -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/audioboo.lua libquvi-scripts-0.4.10/share/lua/website/audioboo.lua --- libquvi-scripts-0.4.8/share/lua/website/audioboo.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/audioboo.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,6 +1,6 @@ --- libquvi-scripts v0.4.8 --- Copyright (C) 2011 Toni Gundogdu <legatvs@gmail.com> +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2011-2012 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. -- @@ -43,22 +43,23 @@ function parse (self) self.host_id = "audioboo" - local oe_url = - "http://audioboo.fm/publishing/oembed.json?url=" .. self.page_url + self.id = self.page_url:match('/boos/(%d+)%-') + or error('no match: media ID') - local oe = quvi.fetch(oe_url, {fetch_type='config'}) - - self.title = oe:match('"title":"(.-)"') - or error('no match: media title') - - self.thumbnail_url = oe:match('"thumbnail_url":"(.-)"') or '' - - self.id = oe:match('id=."boo_embed_(.-)."') - or error('no match: media id') - - self.url = {oe:match('a href=."(.-)."') - or error('no match: media url')} + local p = quvi.fetch(self.page_url) + self.title = + p:match('.+content=[\'"](.-)[\'"]%s+property=[\'"]og:title[\'"]') + or error('no match: media title') + + self.thumbnail_url = + p:match('.+content=[\'"](.-)[\'"]%s+property=[\'"]og:image[\'"]') + or '' + + self.url = { + p:match('.+content=[\'"](.-)[\'"]%s+property=[\'"]og:audio[\'"]') + or error('no match: media stream URL') + } return self end diff -Nru libquvi-scripts-0.4.8/share/lua/website/beeg.lua libquvi-scripts-0.4.10/share/lua/website/beeg.lua --- libquvi-scripts-0.4.8/share/lua/website/beeg.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/beeg.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,60 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 quvi project +-- +-- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + r.domain = "beeg%.com" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, {"/%d+"}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = "beeg" + + self.id = self.page_url:match('/(%d+)') + or error("no match: media ID") + + local p = quvi.fetch(self.page_url) + + self.title = p:match('<title>(.-)') + or error("no match: media title") + + self.url = {p:match("'file': '(http://.-)'") + or error("no match: media stream URL")} + + return self +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/bikeradar.lua libquvi-scripts-0.4.10/share/lua/website/bikeradar.lua --- libquvi-scripts-0.4.8/share/lua/website/bikeradar.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/bikeradar.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/blip.lua libquvi-scripts-0.4.10/share/lua/website/blip.lua --- libquvi-scripts-0.4.8/share/lua/website/blip.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/blip.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/bloomberg.lua libquvi-scripts-0.4.10/share/lua/website/bloomberg.lua --- libquvi-scripts-0.4.8/share/lua/website/bloomberg.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/bloomberg.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/break.lua libquvi-scripts-0.4.10/share/lua/website/break.lua --- libquvi-scripts-0.4.8/share/lua/website/break.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/break.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . @@ -45,19 +45,21 @@ local p = quvi.fetch(self.page_url) - self.title = p:match('id="vid_title" content="(.-)"') + self.title = p:match("sVidTitle:%s+['\"](.-)['\"]") or error("no match: media title") - self.id = p:match("ContentID='(.-)'") + self.id = p:match("iContentID:%s+'(.-)'") or error("no match: media ID") - local fn = p:match("FileName='(.-)'") - or error("no match: file name") + self.thumbnail_url = p:match('"og:image" content="(.-)"') or '' - local fh = p:match('flashVars.icon = "(.-)"') + local n = p:match("videoPath:%s+['\"](.-)['\"]") + or error("no match: file path") + + local h = p:match("icon:%s+['\"](.-)['\"]") or error("no match: file hash") - self.url = {string.format("%s.flv?%s", fn, fh)} + self.url = {string.format("%s?%s", n, h)} return self end diff -Nru libquvi-scripts-0.4.8/share/lua/website/canalplus.lua libquvi-scripts-0.4.10/share/lua/website/canalplus.lua --- libquvi-scripts-0.4.8/share/lua/website/canalplus.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/canalplus.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Paul Kocialkowski -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/cbsnews.lua libquvi-scripts-0.4.10/share/lua/website/cbsnews.lua --- libquvi-scripts-0.4.8/share/lua/website/cbsnews.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/cbsnews.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/charlierose.lua libquvi-scripts-0.4.10/share/lua/website/charlierose.lua --- libquvi-scripts-0.4.8/share/lua/website/charlierose.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/charlierose.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/clipfish.lua libquvi-scripts-0.4.10/share/lua/website/clipfish.lua --- libquvi-scripts-0.4.8/share/lua/website/clipfish.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/clipfish.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/collegehumor.lua libquvi-scripts-0.4.10/share/lua/website/collegehumor.lua --- libquvi-scripts-0.4.8/share/lua/website/collegehumor.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/collegehumor.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- Copyright (C) 2010-2011 Lionel Elie Mamane -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/dailymotion.lua libquvi-scripts-0.4.10/share/lua/website/dailymotion.lua --- libquvi-scripts-0.4.8/share/lua/website/dailymotion.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/dailymotion.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . @@ -63,7 +63,7 @@ local U = require 'quvi/util' local p = Dailymotion.fetch_page(self, U) - self.title = p:match('title="(.-)"') + self.title = p:match('"og:title" content="(.-)"') or error("no match: media title") self.id = p:match("video/([^%?_]+)") diff -Nru libquvi-scripts-0.4.8/share/lua/website/deviantclip.lua libquvi-scripts-0.4.10/share/lua/website/deviantclip.lua --- libquvi-scripts-0.4.8/share/lua/website/deviantclip.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/deviantclip.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,73 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 quvi project +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +local Deviantclip = {} -- Utility functions unique to this script + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + r.domain = "deviantclip%.com" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, {"/watch/.+"}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = "deviantclip" + + self.id = self.page_url:match('/watch/(.+)') + or error("no match: media ID") + + local p = quvi.fetch(self.page_url) + + self.title = p:match('DC%.title" content="(.-)" ') + or error("no match: media title") + self.title = self.title:gsub('&#x(%d+);', Deviantclip.to_utf8) + + local U = require 'quvi/util' + self.url = {U.unescape (p:match('%[{"file":"(.-)",')) + or error("no match: media stream URL")} + + return self +end + +-- +-- Utility functions +-- + +function Deviantclip.to_utf8(a) -- Unescape � to UTF-8 + local H = require 'quvi/html' + return H.to_utf8("0x" .. a) +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/empflix.lua libquvi-scripts-0.4.10/share/lua/website/empflix.lua --- libquvi-scripts-0.4.8/share/lua/website/empflix.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/empflix.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Paul Kocialkowski -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/fastjizz.lua libquvi-scripts-0.4.10/share/lua/website/fastjizz.lua --- libquvi-scripts-0.4.8/share/lua/website/fastjizz.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/fastjizz.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,72 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 quvi project +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + r.domain = "fastjizz%.com" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, {"/video/%d+/.*"}) + if r.handles then return r end + -- Handle embedded URLs here + r.handles = U.handles(self.page_url, {r.domain}, + {"/embed%.php"}, {"id=%d+"}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = "fastjizz" + + self.id = self.page_url:match('/video/(%d+).*') + if not self.id then + self.id = self.page_url:match('/embed%.php%?id=(%d+)') + or error("no match: media ID") + end + + local p = + quvi.fetch("http://www.fastjizz.com/media/nuevo/playlist.php?key=" + .. self.id) + + self.title = p:match('(.+)') + or error("no match: media title") + + self.thumbnail_url = + p:match('(.+)') or '' + + self.url = {p:match('(.+)') + or error("no match: media stream URL")} + + return self +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/foxnews.lua libquvi-scripts-0.4.10/share/lua/website/foxnews.lua --- libquvi-scripts-0.4.8/share/lua/website/foxnews.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/foxnews.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Lionel Elie Mamane -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/francetelevisions.lua libquvi-scripts-0.4.10/share/lua/website/francetelevisions.lua --- libquvi-scripts-0.4.8/share/lua/website/francetelevisions.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/francetelevisions.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/funnyordie.lua libquvi-scripts-0.4.10/share/lua/website/funnyordie.lua --- libquvi-scripts-0.4.8/share/lua/website/funnyordie.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/funnyordie.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Toni Gundogdu -- Copyright (C) 2010 quvi project -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/gaskrank.lua libquvi-scripts-0.4.10/share/lua/website/gaskrank.lua --- libquvi-scripts-0.4.8/share/lua/website/gaskrank.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/gaskrank.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010,2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/globo.lua libquvi-scripts-0.4.10/share/lua/website/globo.lua --- libquvi-scripts-0.4.8/share/lua/website/globo.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/globo.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/golem.lua libquvi-scripts-0.4.10/share/lua/website/golem.lua --- libquvi-scripts-0.4.8/share/lua/website/golem.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/golem.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/guardian.lua libquvi-scripts-0.4.10/share/lua/website/guardian.lua --- libquvi-scripts-0.4.8/share/lua/website/guardian.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/guardian.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/imdb.lua libquvi-scripts-0.4.10/share/lua/website/imdb.lua --- libquvi-scripts-0.4.8/share/lua/website/imdb.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/imdb.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ -- --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/jizzhut.lua libquvi-scripts-0.4.10/share/lua/website/jizzhut.lua --- libquvi-scripts-0.4.8/share/lua/website/jizzhut.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/jizzhut.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,68 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 quvi project +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + r.domain = "jizzhut%.com" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, + {"/videos/.*-%d-%.html", "/videos/embed/%d."}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = "jizzhut" + + self.id = self.page_url:match('/videos/.*%-(%d-)%.html') + if not self.id then + self.id = self.page_url:match('/videos/embed/(%d+)') + or error("no match: media ID") + end + + local p = quvi.fetch("http://www.jizzhut.com/videos/-" + .. self.id .. ".html") + + self.title = p:match('(.-)') + or error("no match: media title") + + local p = quvi.fetch("http://www.jizzhut.com/videos/embed/" + .. self.id, "config") + + self.url = {p:match('encodeURIComponent%("(http://.-)"%)') + or error("no match: media stream URL")} + + return self +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/justintv.lua libquvi-scripts-0.4.10/share/lua/website/justintv.lua --- libquvi-scripts-0.4.8/share/lua/website/justintv.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/justintv.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/keezmovies.lua libquvi-scripts-0.4.10/share/lua/website/keezmovies.lua --- libquvi-scripts-0.4.8/share/lua/website/keezmovies.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/keezmovies.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010 Paul Kocialkowski -- -- This file is part of libquvi-scripts . @@ -51,12 +51,23 @@ self.id = p:match("id%%3D(.-)&") or error("no match: media id") - local s = p:match("video_url=(.-)&") + local flashvars = p:match('flashvars" value="(.-)"/>') + or error("no match: flashvars") + + local s = flashvars:match("video_url=(.-)&") or error("no match: flv url") local U = require 'quvi/util' self.url = {U.unescape(s)} + local encrypted = flashvars:match('encrypted=true') + if encrypted ~= nil then + local key = flashvars:match("video_title=(-.)&") + -- XXX No support for AES encrypted URLs + -- AESCounterModeDecrypt(self.url, key, 256) + error("No support for encrypted streams") + end + return self end diff -Nru libquvi-scripts-0.4.8/share/lua/website/lego.lua libquvi-scripts-0.4.10/share/lua/website/lego.lua --- libquvi-scripts-0.4.8/share/lua/website/lego.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/lego.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Ross Burton -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/liveleak.lua libquvi-scripts-0.4.10/share/lua/website/liveleak.lua --- libquvi-scripts-0.4.8/share/lua/website/liveleak.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/liveleak.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/metacafe.lua libquvi-scripts-0.4.10/share/lua/website/metacafe.lua --- libquvi-scripts-0.4.8/share/lua/website/metacafe.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/metacafe.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Lionel Elie Mamane -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/mgnetwork.lua libquvi-scripts-0.4.10/share/lua/website/mgnetwork.lua --- libquvi-scripts-0.4.8/share/lua/website/mgnetwork.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/mgnetwork.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ -- --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/pluzz.lua libquvi-scripts-0.4.10/share/lua/website/pluzz.lua --- libquvi-scripts-0.4.8/share/lua/website/pluzz.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/pluzz.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/pornhub.lua libquvi-scripts-0.4.10/share/lua/website/pornhub.lua --- libquvi-scripts-0.4.8/share/lua/website/pornhub.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/pornhub.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Paul Kocialkowski -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/publicsenat.lua libquvi-scripts-0.4.10/share/lua/website/publicsenat.lua --- libquvi-scripts-0.4.8/share/lua/website/publicsenat.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/publicsenat.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010,2012 Raphaël Droz. -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/quvi/bit.lua libquvi-scripts-0.4.10/share/lua/website/quvi/bit.lua --- libquvi-scripts-0.4.8/share/lua/website/quvi/bit.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/quvi/bit.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/quvi/const.lua libquvi-scripts-0.4.10/share/lua/website/quvi/const.lua --- libquvi-scripts-0.4.8/share/lua/website/quvi/const.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/quvi/const.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/quvi/html.lua libquvi-scripts-0.4.10/share/lua/website/quvi/html.lua --- libquvi-scripts-0.4.8/share/lua/website/quvi/html.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/quvi/html.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,73 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2011 Toni Gundogdu +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- +-- A modularized revision of +-- +-- convert numeric html entities to utf8 +-- example: € -> € +-- + +local M = {} +local char = string.char + +function M.tail(n, k) + local u, r='' + for i=1,k do + n,r = math.floor(n/0x40), n%0x40 + u = char(r+0x80) .. u + end + return u, n +end + +function M.to_utf8(a) + local n, r, u = tonumber(a) + if n<0x80 then -- 1 byte + return char(n) + elseif n<0x800 then -- 2 byte + u, n = M.tail(n, 1) + return char(n+0xc0) .. u + elseif n<0x10000 then -- 3 byte + u, n = M.tail(n, 2) + return char(n+0xe0) .. u + elseif n<0x200000 then -- 4 byte + u, n = M.tail(n, 3) + return char(n+0xf0) .. u + elseif n<0x4000000 then -- 5 byte + u, n = M.tail(n, 4) + return char(n+0xf8) .. u + else -- 6 byte + u, n = M.tail(n, 5) + return char(n+0xfc) .. u + end +end + +-- +--for line in io.lines() do +-- out = string.gsub(line, '&#(%d+);', to_utf8) +-- print(out) +--end +-- + +return M + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/quvi/url.lua libquvi-scripts-0.4.10/share/lua/website/quvi/url.lua --- libquvi-scripts-0.4.8/share/lua/website/quvi/url.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/quvi/url.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- A slightly modified copy of: -- URI parsing, composition and relative URL resolution diff -Nru libquvi-scripts-0.4.8/share/lua/website/quvi/util.lua libquvi-scripts-0.4.10/share/lua/website/quvi/util.lua --- libquvi-scripts-0.4.8/share/lua/website/quvi/util.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/quvi/util.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/redtube.lua libquvi-scripts-0.4.10/share/lua/website/redtube.lua --- libquvi-scripts-0.4.8/share/lua/website/redtube.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/redtube.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/sapo.lua libquvi-scripts-0.4.10/share/lua/website/sapo.lua --- libquvi-scripts-0.4.8/share/lua/website/sapo.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/sapo.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/senat.lua libquvi-scripts-0.4.10/share/lua/website/senat.lua --- libquvi-scripts-0.4.8/share/lua/website/senat.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/senat.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Raphaël Droz. -- -- This file is part of quvi . diff -Nru libquvi-scripts-0.4.8/share/lua/website/sevenload.lua libquvi-scripts-0.4.10/share/lua/website/sevenload.lua --- libquvi-scripts-0.4.8/share/lua/website/sevenload.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/sevenload.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/soundcloud.lua libquvi-scripts-0.4.10/share/lua/website/soundcloud.lua --- libquvi-scripts-0.4.8/share/lua/website/soundcloud.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/soundcloud.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Bastien Nocera -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/spankwire.lua libquvi-scripts-0.4.10/share/lua/website/spankwire.lua --- libquvi-scripts-0.4.8/share/lua/website/spankwire.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/spankwire.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/spiegel.lua libquvi-scripts-0.4.10/share/lua/website/spiegel.lua --- libquvi-scripts-0.4.8/share/lua/website/spiegel.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/spiegel.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tagtele.lua libquvi-scripts-0.4.10/share/lua/website/tagtele.lua --- libquvi-scripts-0.4.8/share/lua/website/tagtele.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tagtele.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- Copyright (C) 2010 Paul Kocialkowski -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/tapuz.lua libquvi-scripts-0.4.10/share/lua/website/tapuz.lua --- libquvi-scripts-0.4.8/share/lua/website/tapuz.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tapuz.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,74 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 Tzafrir Cohen +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + --- http://flix.tapuz.co.il/v/watch-4158845-.html + r.domain = "flix%.tapuz%.co%.il" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, + {"/v/watch-.*.html", "/showVideo%.asp"}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = 'tapuz-flix' + + self.id = self.page_url:match('/v/watch%-(%d+)%-.*%.html') + if not self.id then + self.id = self.page_url:match('/showVideo%.asp%?m=(%d+)') + or error("no match: media ID") + end + + local xml_url_base = 'v/Handlers/XmlForPlayer.ashx' -- Variable? + local mako = 0 -- Does it matter? + local playerOptions = '0|1|grey|large|0' -- Does it matter? Format? + + local p = quvi.fetch(self.page_url) + self.title = p:match('') + + local s_fmt = + 'http://flix.tapuz.co.il/%s?mediaid=%d&autoplay=0&mako=%d' + .. '&playerOptions=%s' + + local xml_url = + string.format(s_fmt, xml_url_base, self.id, mako, playerOptions) + + local xml_page = quvi.fetch(xml_url) + self.url = { xml_page:match('.*(http://.*%.flv).*') } + + return self +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/tcmag.lua libquvi-scripts-0.4.10/share/lua/website/tcmag.lua --- libquvi-scripts-0.4.8/share/lua/website/tcmag.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tcmag.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/ted.lua libquvi-scripts-0.4.10/share/lua/website/ted.lua --- libquvi-scripts-0.4.8/share/lua/website/ted.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/ted.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- Copyright (C) 2011 Bastien Nocera -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/theonion.lua libquvi-scripts-0.4.10/share/lua/website/theonion.lua --- libquvi-scripts-0.4.8/share/lua/website/theonion.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/theonion.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tmunderground.lua libquvi-scripts-0.4.10/share/lua/website/tmunderground.lua --- libquvi-scripts-0.4.8/share/lua/website/tmunderground.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tmunderground.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tnaflix.lua libquvi-scripts-0.4.10/share/lua/website/tnaflix.lua --- libquvi-scripts-0.4.8/share/lua/website/tnaflix.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tnaflix.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Paul Kocialkowski -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/totallynsfw.lua libquvi-scripts-0.4.10/share/lua/website/totallynsfw.lua --- libquvi-scripts-0.4.8/share/lua/website/totallynsfw.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/totallynsfw.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tube8.lua libquvi-scripts-0.4.10/share/lua/website/tube8.lua --- libquvi-scripts-0.4.8/share/lua/website/tube8.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tube8.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tvlux.lua libquvi-scripts-0.4.10/share/lua/website/tvlux.lua --- libquvi-scripts-0.4.8/share/lua/website/tvlux.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tvlux.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/tvrain.lua libquvi-scripts-0.4.10/share/lua/website/tvrain.lua --- libquvi-scripts-0.4.8/share/lua/website/tvrain.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/tvrain.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Mikhail Gusarov -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/videa.lua libquvi-scripts-0.4.10/share/lua/website/videa.lua --- libquvi-scripts-0.4.8/share/lua/website/videa.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/videa.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Bastien Nocera -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/videobash.lua libquvi-scripts-0.4.10/share/lua/website/videobash.lua --- libquvi-scripts-0.4.8/share/lua/website/videobash.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/videobash.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- Copyright (C) 2011 Thomas Preud'homme -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/vimeo.lua libquvi-scripts-0.4.10/share/lua/website/vimeo.lua --- libquvi-scripts-0.4.8/share/lua/website/vimeo.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/vimeo.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu -- -- This file is part of libquvi-scripts . diff -Nru libquvi-scripts-0.4.8/share/lua/website/xhamster.lua libquvi-scripts-0.4.10/share/lua/website/xhamster.lua --- libquvi-scripts-0.4.8/share/lua/website/xhamster.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/xhamster.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2012 Toni Gundogdu -- Copyright (C) 2010 Paul Kocialkowski -- diff -Nru libquvi-scripts-0.4.8/share/lua/website/xnxx.lua libquvi-scripts-0.4.10/share/lua/website/xnxx.lua --- libquvi-scripts-0.4.8/share/lua/website/xnxx.lua 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/xnxx.lua 2012-11-22 08:58:17.000000000 +0000 @@ -0,0 +1,64 @@ + +-- libquvi-scripts v0.4.10 +-- Copyright (C) 2012 quvi project +-- +-- This file is part of libquvi-scripts . +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public +-- License as published by the Free Software Foundation; either +-- version 2.1 of the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02110-1301 USA +-- + +-- Identify the script. +function ident(self) + package.path = self.script_dir .. '/?.lua' + local C = require 'quvi/const' + local r = {} + r.domain = "xnxx%.com" + r.formats = "default" + r.categories = C.proto_http + local U = require 'quvi/util' + r.handles = U.handles(self.page_url, {r.domain}, {"/video%d+.+"}) + return r +end + +-- Query available formats. +function query_formats(self) + self.formats = 'default' + return self +end + +-- Parse media URL. +function parse(self) + self.host_id = "xnxx" + + self.id = self.page_url:match('/video(%d+)') + or error("no match: media ID") + + local p = quvi.fetch(self.page_url) + + self.title = p:match('(.-)') + or error("no match: media title") + + self.thumbnail_url = + p:match('url_bigthumb=(http://.-)&') or '' + + local U = require 'quvi/util' + self.url = {U.unescape (p:match('flv_url=(http.-)&')) + or error("no match: media stream URL")} + + return self +end + +-- vim: set ts=4 sw=4 tw=72 expandtab: diff -Nru libquvi-scripts-0.4.8/share/lua/website/xvideos.lua libquvi-scripts-0.4.10/share/lua/website/xvideos.lua --- libquvi-scripts-0.4.8/share/lua/website/xvideos.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/xvideos.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts . @@ -50,7 +50,7 @@ local p = quvi.fetch(self.page_url) - self.title = p:match("(.-)%s+-%s+XVID") + self.title = p:match('<div id="main">.-<h2>(.-)<') or error("no match: media title") self.id = self.page_url:match("/video(%d+)/") diff -Nru libquvi-scripts-0.4.8/share/lua/website/yfrog.lua libquvi-scripts-0.4.10/share/lua/website/yfrog.lua --- libquvi-scripts-0.4.8/share/lua/website/yfrog.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/yfrog.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2011 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. diff -Nru libquvi-scripts-0.4.8/share/lua/website/youjizz.lua libquvi-scripts-0.4.10/share/lua/website/youjizz.lua --- libquvi-scripts-0.4.8/share/lua/website/youjizz.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/youjizz.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 quvi project -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. @@ -44,16 +44,21 @@ function parse(self) self.host_id = "youjizz" + self.id = self.page_url:match('%-(%d+)%.html') + or error ("no match: media ID") + local p = quvi.fetch(self.page_url) self.title = p:match("<title>(.-)</") or error ("no match: media title") - self.id = p:match("%?id=(%d+)") - or error ("no match: media ID") + self.thumbnail_url = p:match('data%-original="(.-)"') or '' + + local c = quvi.fetch('http://youjizz.com/videos/embed/' .. self.id, + {fetch_type='config'}) - self.url = {p:match('addVariable%("file",encodeURIComponent%("(.-)"') - or error ("no match: media URL")} + self.url = {c:match('addVariable%("file",encodeURIComponent%("(.-)"') + or error ("no match: media stream URL")} return self end diff -Nru libquvi-scripts-0.4.8/share/lua/website/youtube.lua libquvi-scripts-0.4.10/share/lua/website/youtube.lua --- libquvi-scripts-0.4.8/share/lua/website/youtube.lua 2012-08-21 07:56:45.000000000 +0000 +++ libquvi-scripts-0.4.10/share/lua/website/youtube.lua 2012-11-22 08:58:17.000000000 +0000 @@ -1,5 +1,5 @@ --- libquvi-scripts v0.4.8 +-- libquvi-scripts v0.4.10 -- Copyright (C) 2010-2012 Toni Gundogdu <legatvs@gmail.com> -- -- This file is part of libquvi-scripts <http://quvi.sourceforge.net/>. @@ -125,7 +125,11 @@ 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']) + local uurl = U.unescape(d['url']) + if d['sig'] then + uurl = uurl .. "&signature=" .. U.unescape(d['sig']) + end + urls[U.unescape(d['itag'])] = uurl end end diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/collegehumor.json libquvi-scripts-0.4.10/tests/data/format/default/collegehumor.json --- libquvi-scripts-0.4.8/tests/data/format/default/collegehumor.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/collegehumor.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "collegehumor", - "page_title": "Porn Tech Support (with Kunal Nayyar)", - "page_url": "http://www.collegehumor.com/video:1942317", - "id": "1942317", - "format_requested": "default", - "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", - "link": [ - { - "id": "1", - "length_bytes": "11679239", - "content_type": "video/mp4", - "file_suffix": "mp4", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/fixme/collegehumor.json libquvi-scripts-0.4.10/tests/data/format/default/fixme/collegehumor.json --- libquvi-scripts-0.4.8/tests/data/format/default/fixme/collegehumor.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/fixme/collegehumor.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "collegehumor", + "page_title": "Porn Tech Support (with Kunal Nayyar)", + "page_url": "http://www.collegehumor.com/video:1942317", + "id": "1942317", + "format_requested": "default", + "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", + "link": [ + { + "id": "1", + "length_bytes": "11679239", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/beeg.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/beeg.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/beeg.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/beeg.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,16 @@ +{ + "host": "beeg", + "page_title": "Secretary (Saboom)", + "page_url": "http://beeg.com/9462174", + "id": "9462174", + "format_requested": "default", + "link": [ + { + "id": "1", + "length_bytes": "61162882", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/deviantclip.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/deviantclip.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/deviantclip.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/deviantclip.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,16 @@ +{ + "host": "deviantclip", + "page_title": "Salma Hayek in After The Sunset", + "page_url": "http://www.deviantclip.com/watch/salma-hayek-in-after-the-sunset-fitt", + "id": "salma-hayek-in-after-the-sunset-fitt", + "format_requested": "default", + "link": [ + { + "id": "1", + "length_bytes": "37530865", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/fastjizz.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/fastjizz.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/fastjizz.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/fastjizz.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "fastjizz", + "page_title": "HomegrownWives Giving Her All To Make The Sale", + "page_url": "http://www.fastjizz.com/video/129975/homegrownwives-giving-her-all-to-make-the-sale", + "id": "129975", + "format_requested": "default", + "thumbnail_url": "http://www.fastjizz.com/media/videos/tmb/129975/1.jpg", + "link": [ + { + "id": "1", + "length_bytes": "65073253", + "content_type": "application/octet-stream", + "file_suffix": "flv", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/jizzhut.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/jizzhut.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/jizzhut.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/jizzhut.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,16 @@ +{ + "host": "jizzhut", + "page_title": "Nuru Massage", + "page_url": "http://www.jizzhut.com/videos/nuru-massage-2204193.html", + "id": "2204193", + "format_requested": "default", + "link": [ + { + "id": "1", + "length_bytes": "66513830", + "content_type": "video/x-flv", + "file_suffix": "flv", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/xnxx.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/xnxx.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/xnxx.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/xnxx.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "xnxx", + "page_title": "Brooke Haven", + "page_url": "http://video.xnxx.com/video197853/0/brooke_haven", + "id": "197853", + "format_requested": "default", + "thumbnail_url": "http://img100.xvideos.com/videos/thumbslll/9c/bd/45/9cbd45765b5e946b4ad2719211cd37b4/9cbd45765b5e946b4ad2719211cd37b4.17.jpg", + "link": [ + { + "id": "1", + "length_bytes": "143206521", + "content_type": "video/x-flv", + "file_suffix": "flv", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/nsfw/youjizz.json libquvi-scripts-0.4.10/tests/data/format/default/nsfw/youjizz.json --- libquvi-scripts-0.4.8/tests/data/format/default/nsfw/youjizz.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/nsfw/youjizz.json 2012-11-21 21:12:07.000000000 +0000 @@ -1,13 +1,14 @@ { "host": "youjizz", - "page_title": "Glamour Girls - Melissa", - "page_url": "http://www.youjizz.com/videos/glamour-girls---melissa-125602.html", - "id": "125602", + "page_title": "Hot brunette", + "page_url": "http://www.youjizz.com/videos/hot-brunette-2872521.html", + "id": "2872521", "format_requested": "default", + "thumbnail_url": "http://cdna.pics.youjizz.com/media24/SC3360554.flv-1.jpg", "link": [ { "id": "1", - "length_bytes": "34241200", + "length_bytes": "45808834", "content_type": "video/x-flv", "file_suffix": "flv", "url": "" diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/spiegel.json libquvi-scripts-0.4.10/tests/data/format/default/spiegel.json --- libquvi-scripts-0.4.8/tests/data/format/default/spiegel.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/spiegel.json 2012-11-22 08:58:04.000000000 +0000 @@ -1,14 +1,14 @@ { "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", + "page_title": "Lage im Nahen Osten spitzt sich zu", + "page_url": "http://www.spiegel.de/video/kein-waffenstillstand-zwischen-israel-und-palaestinensern-video-1235307.html", + "id": "1235307", "format_requested": "default", - "duration": "52000", + "duration": "102000", "link": [ { "id": "1", - "length_bytes": "2462477", + "length_bytes": "4875897", "content_type": "video/x-flv", "file_suffix": "flv", "url": "" diff -Nru libquvi-scripts-0.4.8/tests/data/format/default/tapuz.json libquvi-scripts-0.4.10/tests/data/format/default/tapuz.json --- libquvi-scripts-0.4.8/tests/data/format/default/tapuz.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/default/tapuz.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,16 @@ +{ + "host": "tapuz-flix", + "page_title": "תאונת שייט כואבת!", + "page_url": "http://flix.tapuz.co.il/v/watch-4166028-%D7%AA%D7%90%D7%95%D7%A0%D7%AA%20%D7%A9%D7%99%D7%99%D7%98%20%D7%9B%D7%95%D7%90%D7%91%D7%AA!.html", + "id": "4166028", + "format_requested": "default", + "link": [ + { + "id": "1", + "length_bytes": "970729", + "content_type": "video/flv", + "file_suffix": "flv", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_best.json libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_best.json --- libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_best.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_best.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "collegehumor", - "page_title": "Porn Tech Support (with Kunal Nayyar)", - "page_url": "http://www.collegehumor.com/video:1942317", - "id": "1942317", - "format_requested": "best", - "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", - "link": [ - { - "id": "1", - "length_bytes": "27114061", - "content_type": "video/mp4", - "file_suffix": "mp4", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_mp4_hq.json libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_mp4_hq.json --- libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_mp4_hq.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_mp4_hq.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "collegehumor", - "page_title": "Porn Tech Support (with Kunal Nayyar)", - "page_url": "http://www.collegehumor.com/video:1942317", - "id": "1942317", - "format_requested": "mp4_hq", - "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", - "link": [ - { - "id": "1", - "length_bytes": "27114061", - "content_type": "video/mp4", - "file_suffix": "mp4", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_mp4_sd.json libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_mp4_sd.json --- libquvi-scripts-0.4.8/tests/data/format/other/collegehumor_mp4_sd.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/collegehumor_mp4_sd.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "collegehumor", - "page_title": "Porn Tech Support (with Kunal Nayyar)", - "page_url": "http://www.collegehumor.com/video:1942317", - "id": "1942317", - "format_requested": "mp4_sd", - "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", - "link": [ - { - "id": "1", - "length_bytes": "11679239", - "content_type": "video/mp4", - "file_suffix": "mp4", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_best.json libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_best.json --- libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_best.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_best.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "collegehumor", + "page_title": "Porn Tech Support (with Kunal Nayyar)", + "page_url": "http://www.collegehumor.com/video:1942317", + "id": "1942317", + "format_requested": "best", + "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", + "link": [ + { + "id": "1", + "length_bytes": "27114061", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_mp4_hq.json libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_mp4_hq.json --- libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_mp4_hq.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_mp4_hq.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "collegehumor", + "page_title": "Porn Tech Support (with Kunal Nayyar)", + "page_url": "http://www.collegehumor.com/video:1942317", + "id": "1942317", + "format_requested": "mp4_hq", + "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", + "link": [ + { + "id": "1", + "length_bytes": "27114061", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_mp4_sd.json libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_mp4_sd.json --- libquvi-scripts-0.4.8/tests/data/format/other/fixme/collegehumor_mp4_sd.json 1970-01-01 00:00:00.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/fixme/collegehumor_mp4_sd.json 2012-11-21 21:12:07.000000000 +0000 @@ -0,0 +1,17 @@ +{ + "host": "collegehumor", + "page_title": "Porn Tech Support (with Kunal Nayyar)", + "page_url": "http://www.collegehumor.com/video:1942317", + "id": "1942317", + "format_requested": "mp4_sd", + "thumbnail_url": "http://9.media.collegehumor.cvcdn.com/36/45/24755184b1d36ab5dda4153df1d88377.jpg", + "link": [ + { + "id": "1", + "length_bytes": "11679239", + "content_type": "video/mp4", + "file_suffix": "mp4", + "url": "" + } + ] +} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_best.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_best.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_best.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_best.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "best", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "5197155", - "content_type": "video/x-flv", - "file_suffix": "flv", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_388k_135p.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_388k_135p.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_388k_135p.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_388k_135p.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "flv_vp6_388k_135p", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "2462477", - "content_type": "video/x-flv", - "file_suffix": "flv", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_576k_315p.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_576k_315p.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_576k_315p.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_576k_315p.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "flv_vp6_576k_315p", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "3668544", - "content_type": "video/x-flv", - "file_suffix": "flv", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_64k_135p.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_64k_135p.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_64k_135p.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_64k_135p.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "flv_vp6_64k_135p", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "448997", - "content_type": "video/x-flv", - "file_suffix": "flv", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_928k_544p.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_928k_544p.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_flv_vp6_928k_544p.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_flv_vp6_928k_544p.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "flv_vp6_928k_544p", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "5197155", - "content_type": "video/x-flv", - "file_suffix": "flv", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/data/format/other/spiegel_mp4_h264_1400k_544p.json libquvi-scripts-0.4.10/tests/data/format/other/spiegel_mp4_h264_1400k_544p.json --- libquvi-scripts-0.4.8/tests/data/format/other/spiegel_mp4_h264_1400k_544p.json 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/data/format/other/spiegel_mp4_h264_1400k_544p.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -{ - "host": "spiegel", - "page_title": "Wiedeking-Nachfolger gefunden", - "page_url": "http://www.spiegel.de/video/video-1012582.html", - "id": "1012582", - "format_requested": "mp4_h264_1400k_544p", - "duration": "52000", - "link": [ - { - "id": "1", - "length_bytes": "8477540", - "content_type": "video/mp4", - "file_suffix": "mp4", - "url": "" - } - ] -} diff -Nru libquvi-scripts-0.4.8/tests/t/expire.t libquvi-scripts-0.4.10/tests/t/expire.t --- libquvi-scripts-0.4.8/tests/t/expire.t 2012-08-21 07:34:12.000000000 +0000 +++ libquvi-scripts-0.4.10/tests/t/expire.t 2012-11-21 21:12:08.000000000 +0000 @@ -27,6 +27,7 @@ use Test::Quvi; my $q = Test::Quvi->new; +plan skip_all => "FIXME"; # Both website/{arte,pluzz}.lua need to be fixed. plan skip_all => "TEST_SKIP rule" if $q->test_skip("expire"); my $ua = new LWP::UserAgent; @@ -38,8 +39,6 @@ my ($page) = @_; "http://videos.arte.tv/$1/videos/$2" if $page =~ /$qr/; }, -); -=for comment FIXME: pluzz.lua "http://www.pluzz.fr/" => sub { my ($page, $url) = @_; my $rx_href = qr|class=""\s+href="(.*?)"|i; @@ -49,7 +48,7 @@ return $c if $c =~ /$rx_url/; } } -=cut +); plan tests => scalar(keys %h) * 2;