SVN: toys/rsget.pl/Get: EasyShare HotFile MegaShares MegaUpload RapidShare TurboBit UploadedTo

[sparky]

Author: sparky
Date: Thu Sep 17 23:49:40 2009
New Revision: 10621

Modified:
   toys/rsget.pl/Get/EasyShare
   toys/rsget.pl/Get/HotFile
   toys/rsget.pl/Get/MegaShares
   toys/rsget.pl/Get/MegaUpload
   toys/rsget.pl/Get/RapidShare
   toys/rsget.pl/Get/TurboBit
   toys/rsget.pl/Get/UploadedTo
Log:
- updates


Modified: toys/rsget.pl/Get/EasyShare
==============================================================================
--- toys/rsget.pl/Get/EasyShare	(original)
+++ toys/rsget.pl/Get/EasyShare	Thu Sep 17 23:49:40 2009
@@ -13,6 +13,7 @@
 	$-{page} = $-{_referer};
 
 	ERROR( "file not found" ) if /File not found/;
+	ERROR( "file removed" ) if /Requested file is deleted/;
 
 	! m{<p class="pt15 pb0 px18 txtgray family2 c">You are requesting\s+(.*?) \(([\d\.]+ [MkKH]B)\)</p>};
 	INFO( name => $1, asize => $2 );

Modified: toys/rsget.pl/Get/HotFile
==============================================================================
--- toys/rsget.pl/Get/HotFile	(original)
+++ toys/rsget.pl/Get/HotFile	Thu Sep 17 23:49:40 2009
@@ -64,7 +64,7 @@
 	GET( $-{form_uri}, post => $-{post} );
 stage_download:
 
-	! m#<a href="(.*?)">Click here to download</a>#;
+	RESTART( 0, "invalid captcha ?" ) unless m#<a href="(.*?)">Click here to download</a>#;
 
 	DOWNLOAD( $1 );
 

Modified: toys/rsget.pl/Get/MegaShares
==============================================================================
--- toys/rsget.pl/Get/MegaShares	(original)
+++ toys/rsget.pl/Get/MegaShares	Thu Sep 17 23:49:40 2009
@@ -17,13 +17,7 @@
 start:
 	# create fake cookie to skip first page
 	my $stime = time() - 10000;
-	my @line = (qw(.megashares.com TRUE / FALSE), $stime + 43200, 'freest', $stime . "%3A" );
-
-	unless ( -r $-{_cookie} ) {
-		open my $c, ">", $-{_cookie};
-		print $c join( "\t", @line ), "\n";
-		close $c;
-	}
+	COOKIE( [ (qw(.megashares.com TRUE / FALSE), $stime + 43200, 'freest', $stime . "%3A" ) ] );
 
 	GET( $-{_uri} );
 

Modified: toys/rsget.pl/Get/MegaUpload
==============================================================================
--- toys/rsget.pl/Get/MegaUpload	(original)
+++ toys/rsget.pl/Get/MegaUpload	Thu Sep 17 23:49:40 2009
@@ -2,7 +2,10 @@
 
 name: MegaUpload
 short: MU
-uri: qr{mega(upload|porn|rotic)\.com/(../)?\?d=}
+uri: qw{megaupload\.com/(../)?\?d=}
+uri: qw{megaporn\.com/(../)?\?d=}
+uri: qw{megarotic\.com/(../)?\?d=}
+uri: qw{sexuploader\.com/(../)?\?d=}
 status: OK 2009-08-24
 
 pre:
@@ -12,7 +15,7 @@
 	die "Font DB '$mu_font_db' does not exist\n" unless -r $mu_font_db;
 
 start:
-	( my $uri = $-{_uri} ) =~ s/megarotic/megaporn/;
+	( my $uri = $-{_uri} ) =~ s#^(http://(?:www\.)?)(?:megarotic|sexuploader)#$1megaporn#;
 	GET( $uri );
 stage_first:
 	$-{first_page} = $-{_referer};
@@ -28,10 +31,10 @@
 	INFO( iname => $name, asize => $f[5] );
 
 	if ( /The file you're trying to download is password protected/ ) {
-		ERROR( "password required" ) unless exists $-{_opts}->{mu_pass};
+		ERROR( "password required" ) unless exists $-{_opts}->{pass};
 
 		GET_NEXT( stage_last, "",
-			post => { filepassword => $-{_opts}->{mu_pass} } );
+			post => { filepassword => $-{_opts}->{pass} } );
 	}
 
 	SEARCH(

Modified: toys/rsget.pl/Get/RapidShare
==============================================================================
--- toys/rsget.pl/Get/RapidShare	(original)
+++ toys/rsget.pl/Get/RapidShare	Thu Sep 17 23:49:40 2009
@@ -38,4 +38,6 @@
 
 	DOWNLOAD( $-{file_uri}, post => { mirror => "on" } );
 
+	MULTI() if /Please wait until the download is completed/;
+
 # vim:ts=4:sw=4

Modified: toys/rsget.pl/Get/TurboBit
==============================================================================
--- toys/rsget.pl/Get/TurboBit	(original)
+++ toys/rsget.pl/Get/TurboBit	Thu Sep 17 23:49:40 2009
@@ -2,7 +2,8 @@
 
 name: TurboBit
 short: TB
-uri: qr{turbobit\.(net|ru)/}
+uri: qr{turbobit\.net/}
+uri: qr{turbobit\.ru/}
 cookie: tb
 slots: 8
 status: OK 2009-09-13

Modified: toys/rsget.pl/Get/UploadedTo
==============================================================================
--- toys/rsget.pl/Get/UploadedTo	(original)
+++ toys/rsget.pl/Get/UploadedTo	Thu Sep 17 23:49:40 2009
@@ -2,7 +2,8 @@
 
 name: UploadedTo
 short: UT
-uri: qr{(uploaded|ul)\.to/}
+uri: qr{uploaded\.to/}
+uri: qr{ul\.to/}
 status: OK 2009-08-24
 
 start: