SVN: toys/rsget.pl: Get/RapidShare Get/StorageTo RSGet/Curl.pm

[sparky]

Author: sparky
Date: Sat Oct  3 01:24:00 2009
New Revision: 10656

Modified:
   toys/rsget.pl/Get/RapidShare
   toys/rsget.pl/Get/StorageTo
   toys/rsget.pl/RSGet/Curl.pm
Log:
- fixes


Modified: toys/rsget.pl/Get/RapidShare
==============================================================================
--- toys/rsget.pl/Get/RapidShare	(original)
+++ toys/rsget.pl/Get/RapidShare	Sat Oct  3 01:24:00 2009
@@ -28,7 +28,8 @@
 		if /Instant download access! Or try again in about ([0-9]+) minutes\./;
 
 	RESTART( $1 * 60, "servers overloaded" )
-		if /Unfortunately you will have to wait ([0-9]+) minutes,/;
+		if /Unfortunately you will have to wait (\d+) minutes,/
+			or /Please try again in (\d+) minutes/;
 
 	! /form name="dlf" action="(.*?)"/;
 	$-{file_uri} = $1;

Modified: toys/rsget.pl/Get/StorageTo
==============================================================================
--- toys/rsget.pl/Get/StorageTo	(original)
+++ toys/rsget.pl/Get/StorageTo	Sat Oct  3 01:24:00 2009
@@ -18,6 +18,8 @@
 	! s/^.*?{\s+//;
 	! s/\s+}.*?$//;
 
+	ERROR( "download failed" ) if /'state'\s*:\s*'failed'/;
+
 	! /'countdown'\s*:\s*(\d+)/;
 	my $wait = $1;
 	RESTART( $wait, "free limit reached" )

Modified: toys/rsget.pl/RSGet/Curl.pm
==============================================================================
--- toys/rsget.pl/RSGet/Curl.pm	(original)
+++ toys/rsget.pl/RSGet/Curl.pm	Sat Oct  3 01:24:00 2009
@@ -14,12 +14,12 @@
 
 def_settings(
 	backup => [ "Make backups if downloaded file exists.",
-	"copy,move", qr/copy,move|copy|move|no/ ],
+	"copy,move", qr/copy,move|copy|move|no(ne)/ ],
 	backup_suf => [ "Rename backup files with specified suffix. " .
 		"If none defined -N will be added to file name, without disrupting file extension.",
 		undef, qr/.+/ ],
-	outdir => [ "Output directory; where finished files are moved to.", '.', undef ],
-	workdir => [ "Work directory; where unfinished files are stored.", '.', undef ],
+	outdir => [ "Output directory; where finished files are moved to.", '.', qr/.+/ ],
+	workdir => [ "Work directory; where unfinished files are stored.", '.', qr/.+/ ],
 );