SVN: toys/rsget.pl/Get/ZippyShare

[sparky]

Author: sparky
Date: Sat Feb 27 15:25:38 2010
New Revision: 11193

Modified:
   toys/rsget.pl/Get/ZippyShare
Log:
- rsget-ized


Modified: toys/rsget.pl/Get/ZippyShare
==============================================================================
--- toys/rsget.pl/Get/ZippyShare	(original)
+++ toys/rsget.pl/Get/ZippyShare	Sat Feb 27 15:25:38 2010
@@ -9,34 +9,33 @@
 short: ZipS
 web: "http://zippyshare.com/"
 tos: "http://www.zippyshare.com/terms.html"
-uri: qr{www[0-9]*\.zippyshare\.com/v/[0-9]+/file\.htm}
+uri: qr{www\d*\.zippyshare\.com/v/\d+/file\.}
 cookie: zips
 slots: max
 status: OK 2010-02-27
 
 unify:
-    return "http://www.zippyshare.com/$1" if
-        m{www[0-9]*\.zippyshare\.com/(.*)};
+	return "$1/file.html" if m{^(.*?)/file};
 
 start:
 	GET( $-{_uri} );
 
 	ERROR( "file not found" ) if /The requsted file does not exist on this server/;
 
-	m#<strong>Name: </strong>([^<]+)<#s;
+	! m#<strong>Name: </strong>(.+?)<#;
 	my $name = $1;
-	m#<strong>Size: </strong>($STDSIZE)<#s;
+	! m#<strong>Size: </strong>($STDSIZE)<#;
 	INFO( name => $name, asize => $1 );
 
-	m#var ziptime = ([0-9]+); tuw\(\);#s;
+	! m#var ziptime = (\d+); tuw\(\);#s;
 	my $wait = $1;
 
-	m#var pong = '(.*?)';#;
-	$-{uri} = uri_unescape($1);
-	$-{uri} =~ s/\.[^.]+\./.zippyshare./g;
+	! m#var pong = '(.*?)';#;
+	$-{file_uri} = uri_unescape( $1 );
+	$-{file_uri} =~ s/\.\S+?\./.zippyshare./g;
 
 	WAIT( $wait, "starting download" );
 
-	CLICK_DOWNLOAD( $-{uri} );
+	CLICK_DOWNLOAD( $-{file_uri} );
 
 # vim: filetype=perl:ts=4:sw=4