SVN: toys/rsget.pl/Get: DepositFiles FileFactory

[sparky]

Author: sparky
Date: Sat Sep 12 15:26:43 2009
New Revision: 10588

Modified:
   toys/rsget.pl/Get/DepositFiles
   toys/rsget.pl/Get/FileFactory
Log:
- improvements


Modified: toys/rsget.pl/Get/DepositFiles
==============================================================================
--- toys/rsget.pl/Get/DepositFiles	(original)
+++ toys/rsget.pl/Get/DepositFiles	Sat Sep 12 15:26:43 2009
@@ -3,16 +3,16 @@
 name: DepositFiles
 short: DF
 uri: qr{depositfiles\.com/}
-status: OK 2009-08-24
+status: OK 2009-09-12
 
 start:
 	GET( $-{_uri} );
 
 	ERROR( "file not found" ) if /Such file does not exist /;
-	! m{<div class="info">.*?<b .*?>(.*?)</b>\s*<span .*?>.*?<b>(\d+(\.\d+)?)&nbsp;([KM]B)</b></span>}s;
+
+	! m{<div class="info">.*?<b title="(.*?)">.*?</b>\s*<span .*?>.*?<b>(\d+(\.\d+)?)&nbsp;([KM]B)</b></span>}s;
 	my $name = $1;
-	my $size = "$2 $4";
-	$name =~ s/\.\.\. (\..{1,5})$/\0$1/;
+	my $size = "$2$4";
 	INFO( iname => $name, asize => $size );
 	RESTART( 5 * 60, "servers overloaded" )
 		if /We are sorry, but all downloading slots for your country are busy/;

Modified: toys/rsget.pl/Get/FileFactory
==============================================================================
--- toys/rsget.pl/Get/FileFactory	(original)
+++ toys/rsget.pl/Get/FileFactory	Sat Sep 12 15:26:43 2009
@@ -3,12 +3,12 @@
 name: FileFactory
 short: FF
 uri: qr{filefactory\.com/}
-status: OK 2009-08-24
+status: OK 2009-09-12
 
 start:
 	GET( $-{_uri} );
 
-	ERROR( "file not found" ) if /File Not Found/;
+	ERROR( "file not found" ) if /File Not Found|This file has been deleted/;
 	! m{<h1>(<a.*?</a>|<img .*?/>)&nbsp;(.*?)(<span.*?</span>)?</h1>\s*<div id="info" class="metadata">\s*<span>([\d\.]+ [KM]B) file uploaded}s;
 	my ( $name, $size ) = ( $2, $4 );
 	$name =~ s/&#8203;//g;