===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/MakeTorrents.pl,v
retrieving revision 1.8
retrieving revision 1.18
diff -u -r1.8 -r1.18
--- openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/03/24 19:49:09	1.8
+++ openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/05/20 17:25:35	1.18
@@ -1,41 +1,43 @@
 #!/usr/bin/perl -T
-#$Id: MakeTorrents.pl,v 1.8 2005/03/24 19:49:09 andrew Exp $
+#$Id: MakeTorrents.pl,v 1.18 2005/05/20 16:25:35 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
-use BT::MetaInfo;
-
 use lib 'lib';
+use BT::MetaInfo::Cached;
 use OpenBSDTorrents;
 
 %ENV = ();
 
-use YAML;
+chdir($OBT->{DIR_FTP}) || die "Couldn't change dir to " . $OBT->{DIR_FTP} . ": $!";
 
-my $Piece_Length = 18;
+my $StartDir = '';
+if (@ARGV) {
+	foreach (@ARGV) {
+		s#/$##;
+		Process_Dir($_);
+	}
+} else {
+	$StartDir = $OBT->{BASENAME};
+	Process_Dir($StartDir);
+}
 
-my $MinFiles = 5;
-my $MinSize  = 50 * 1024 * 1024; # 50 MiB
 
-my $StartDir = shift || $BaseName;
-$StartDir =~ s#/$##;
 
-chdir($BaseDir) || die "Couldn't change dir to $BaseDir";
-
-Process_Dir($StartDir);
-
 sub Process_Dir
 {
 	my $basedir = shift;
 
+	#return undef if $basedir =~ /packages/;
+
 	my ($dirs, $files) = Get_Files_and_Dirs($basedir);
 	if (@$files) {
 		my $torrent = Make_Torrent($basedir, $files);
 	}
 
-	# don't recurse if we were called on a specific directory
-	return 1 if $StartDir ne $BaseName;
+	# don't recurse if we were started with a specific directory
+	return 1 if $StartDir ne $OBT->{BASENAME};
 
 	foreach my $subdir (@$dirs) {
 		next if $subdir eq '.';
@@ -49,7 +51,7 @@
         my $basedir = shift;
         my $files   = shift;
 
-        if ($#{ $files } < $MinFiles) {
+        if ($#{ $files } < $OBT->{MIN_FILES}) {
                 print "Too few files in $basedir, skipping . . .\n";
                 return undef;
         }
@@ -78,14 +80,14 @@
 
 	eval { btmake($torrent, $comment, $files); };
 	if ($@) {
-		print "Error creating $torrent\n";
+		print "Error creating $torrent\n$@\n";
 	}
 
 #        system($BTMake,
 #               '-C',
 #               '-c', $comment,
-#               '-n', $BaseName,
-#               '-o', "$TorrentDir/$torrent",
+#               '-n', $OBT->{BASENAME},
+#               '-o', $OBT->{DIR_TORRENT} . "/$torrent",
 #               '-a', $Tracker,
 #               @$files
 #        );# || die "Couldn't system $BTMake $torrent: $!";
@@ -102,13 +104,19 @@
     my $comment = shift;
     my $files = shift;
 
-    my $name = $BaseName;
-    my $announce = $Tracker;
-    my $piece_len = 2 << ($Piece_Length - 1);
+    my $name = $OBT->{BASENAME};
+    my $announce = $OBT->{URL_TRACKER};
+    my $piece_len = 2 << ($OBT->{PIECE_LENGTH} - 1);
 
-    $torrent = "$TorrentDir/$torrent";
+    my $torrent_with_path = $OBT->{DIR_NEW_TORRENT} . "/$torrent";
 
-    my $t = BT::MetaInfo->new();
+    my $t = BT::MetaInfo::Cached->new(
+        {
+            cache_root =>
+            $OBT->{DIR_HOME} . '/FileCache'
+        }
+    );
+
     $t->name($name);
     $t->announce($announce);
     unless ($announce =~ m!^http://[^/]+/!i) {
@@ -122,16 +130,18 @@
     #}
     $t->piece_length($piece_len);
     $t->creation_date(time);
-    warn "Checksumming files. This may take a little while...\n";
+    print "Checksumming files. This may take a little while...\n";
     $t->set_files(@$files);
 
-    if ($t->total_size < $MinSize) {
+    if ($t->total_size < $OBT->{MIN_SIZE}) {
         print "Skipping smaller than minimum size\n";
         return 0;
     }
 
-    $t->save("$torrent");
-    print "Created: $torrent\n";
-    #system("btinfo $torrent") if ($::opt_I);
+    my $hash = $t->info_hash;
+    $hash = unpack("H*", $hash);
+
+    $t->save($torrent_with_path);
+    print "Created: $torrent_with_path\n";
 }