Author: sparky
Date: Fri Oct  9 18:38:50 2009
New Revision: 10740

Modified:
   toys/rsget.pl/Video/Vimeo
   toys/rsget.pl/Video/YouTube
Log:
- unify links


Modified: toys/rsget.pl/Video/Vimeo
==============================================================================
--- toys/rsget.pl/Video/Vimeo   (original)
+++ toys/rsget.pl/Video/Vimeo   Fri Oct  9 18:38:50 2009
@@ -2,10 +2,14 @@
 
 name: Vimeo
 short: V:Vimeo
-uri: qr{vimeo\.com/}
-slots: 8
+uri: qr{vimeo\.com/\d+([/#].*)?$}
+slots: max
 status: OK 2009-10-05
 
+unify:
+       s/#.*//;
+       return "http://vimeo.com/$1"; if m{/(\d+)(?:/.*)?$};
+
 start:
        GET( $-{_uri} );
 

Modified: toys/rsget.pl/Video/YouTube
==============================================================================
--- toys/rsget.pl/Video/YouTube (original)
+++ toys/rsget.pl/Video/YouTube Fri Oct  9 18:38:50 2009
@@ -3,17 +3,22 @@
 name: YouTube
 short: V:YouTube
 uri: qr{youtube\.com/watch\?v=.*}
-slots: 8
+slots: max
 status: OK 2009-10-03
 
+unify:
+       s/#.*//;
+       m{[\?&]v=([-_a-zA-Z0-9]+)(?:&.*?)?$};
+       return "http://www.youtube.com/watch?v=$1"; if $1;
+
 start:
-       ! $-{_uri} =~ m{[\?&]v=([-_a-zA-Z0-9]+)(?:&.*)?$};
-       $-{v} = $1;
+       GET( $-{_uri} );
 
-       GET( "http://www.youtube.com/watch?v=$-{v}"; );
+       ! m{"video_id": "(.*?)"};
+       my $id = $1;
 
        ! m{<meta name="title" content="(.*?)">};
-       my $name = de_ml( $1 );
+       my $name = de_ml( de_ml( $1 ) );
        $name =~ s{/}{_}g;
 
        ! /"fmt_map"\s*:\s*"(.*?)"/;
@@ -32,7 +37,7 @@
        my $fname = $name . "." . $ext;
        INFO( name => $fname, quality => "fmt$fmt" );
 
-       DOWNLOAD( "http://youtube.com/get_video?video_id=$-{v}&t=$t&fmt=$fmt";,
+       DOWNLOAD( "http://youtube.com/get_video?video_id=$id&t=$t&fmt=$fmt";,
                fname => $fname );
 
 # vim:ts=4:sw=4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to