SVN: toys/rsget.pl/Video/RedTube

[sparky]

Author: sparky
Date: Thu Apr  8 17:16:20 2010
New Revision: 11321

Modified:
   toys/rsget.pl/Video/RedTube
Log:
- fixed, status: OK


Modified: toys/rsget.pl/Video/RedTube
==============================================================================
--- toys/rsget.pl/Video/RedTube	(original)
+++ toys/rsget.pl/Video/RedTube	Thu Apr  8 17:16:20 2010
@@ -10,7 +10,7 @@
 web: "http://redtube.com/"
 uri: qr{redtube\.com/}
 slots: max
-status: BROKEN 2010-04-08
+status: OK 2010-04-08
 
 start:
 	GET( $-{_uri} );
@@ -25,33 +25,8 @@
 
 	INFO( name => $fname, quality => "$o{width}x$o{height}" );
 
-	my $file_uri = "http://dl.redtube.com/467f9bca32b1989277b48582944f325afa3374/"
-		. id_to_file( $o{id} ) . $o{hash_flv};
+	my $file_uri = uri_unescape( $o{hashlink} );
 
 	DOWNLOAD( $file_uri, fname => $fname );
 
-perl:
-
-	# simplified version of what may be found in clive
-sub id_to_file
-{
-	my $id = shift;
-	my @id = split //, sprintf '%08d', $id;
-
-	my $hash = 0;
-	$hash += $id[ $_ ] * $_ foreach (1..7);
-
-	my $add = 0;
-	$add += $_ foreach split //, "$hash";
-
-	my @map = unpack( 'C*', 'R15342O7K9HBCDXFGAIJ8LMZ6PQ0STUVWEYN' );
-	my @add = (3, 0, 2, 1, 6, 5, 0, 7, 4);
-	my @d_at = (4, 0, 1, 3, 6, 2, 0, 5, 7);
-	my @chars = map { $map[ $id[ $d_at[ $_ ] ] + $add + $add[ $_ ] ] } (0..8);
-	$chars[ 1 ] = 48 + $add % 10;
-	$chars[ 6 ] = 48 + $add / 10;
-
-	return sprintf( '%07d/%s.flv', $id / 1000, pack( 'C*', @chars ) );
-}
-
 # vim: filetype=perl:ts=4:sw=4