Author: glen
Date: Sun Apr 13 19:35:45 2014
New Revision: 12746

Modified:
   toys/rsget.pl/Video/Err
Log:
Err: merge one alternative content

Modified: toys/rsget.pl/Video/Err
==============================================================================
--- toys/rsget.pl/Video/Err     (original)
+++ toys/rsget.pl/Video/Err     Sun Apr 13 19:35:45 2014
@@ -16,11 +16,17 @@
 start:
        GET( $-{_uri} );
 
-       ! m{loadFlow\('flow_player', '(rtmp://[^']+)','(mp4|flv):([^']+)'.*?\)};
+       my ($rtmp, $fname, $q);
 
-       my $rtmp = de_ml($1);
-       my $fname = de_ml($3);
-       my $q = $2;
+       if (m{loadFlow\('flow_player', 
'(rtmp://[^']+)','(mp4|flv):([^']+)'.*?\)}) {
+               $rtmp = de_ml($1);
+               $fname = de_ml($3);
+               $q = $2;
+       } elsif (m{loadFlowRTMP\('[^']+','([^']+)','([^']+)'}) {
+               $rtmp = $2;
+               $fname = $1;
+               ($q) = $fname =~ /\.(.+)$/;
+       }
 
        INFO(name => $fname, quality => $q);
 
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to