===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/MakeTorrents.pl,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/03/24 00:21:43	1.7
+++ openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/04/07 00:10:06	1.11
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-#$Id: MakeTorrents.pl,v 1.7 2005/03/24 00:21:43 andrew Exp $
+#$Id: MakeTorrents.pl,v 1.11 2005/04/06 23:10:06 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -11,18 +11,21 @@
 
 %ENV = ();
 
-use YAML;
+chdir($OBT->{DIR_FTP}) || die "Couldn't change dir to " . $OBT->{DIR_FTP} . ": $!";
 
-my $Piece_Length = 18;
-my $MinFiles = 5;
+my $StartDir = '';
+if (@ARGV) {
+	foreach (@ARGV) {
+		s#/$##;
+		Process_Dir($_);
+	}
+} else {
+	$StartDir = $OBT->{BASENAME};
+	Process_Dir($StartDir);
+}
 
-my $StartDir = shift || $BaseName;
-$StartDir =~ s#/$##;
 
-chdir($BaseDir) || die "Couldn't change dir to $BaseDir";
 
-Process_Dir($StartDir);
-
 sub Process_Dir
 {
 	my $basedir = shift;
@@ -33,7 +36,7 @@
 	}
 
 	# don't recurse if we were called on a specific directory
-	return 1 if $StartDir ne $BaseName;
+	return 1 if $StartDir ne $OBT->{BASENAME};
 
 	foreach my $subdir (@$dirs) {
 		next if $subdir eq '.';
@@ -47,7 +50,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;
         }
@@ -82,8 +85,8 @@
 #        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: $!";
@@ -100,11 +103,11 @@
     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";
+    $torrent = $OBT->{DIR_TORRENT} . "/$torrent";
 
     my $t = BT::MetaInfo->new();
     $t->name($name);
@@ -120,8 +123,14 @@
     #}
     $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 < $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);