===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/MakeTorrents.pl,v
retrieving revision 1.13
retrieving revision 1.25
diff -u -r1.13 -r1.25
--- openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/05/03 05:33:15	1.13
+++ openbsd/OpenBSDTorrents/MakeTorrents.pl	2010/03/22 21:15:06	1.25
@@ -1,11 +1,12 @@
-#!/usr/bin/perl -T
-#$Id: MakeTorrents.pl,v 1.13 2005/05/03 04:33:15 andrew Exp $
+#!/usr/bin/perl
+# -T
+#$RedRiver: MakeTorrents.pl,v 1.24 2010/03/08 20:19:37 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
 use lib 'lib';
-use BT::OBTMetaInfo;
+use BT::MetaInfo::Cached;
 use OpenBSDTorrents;
 
 %ENV = ();
@@ -33,15 +34,14 @@
 
 	my ($dirs, $files) = Get_Files_and_Dirs($basedir);
 	if (@$files) {
-		my $torrent = Make_Torrent($basedir, $files);
+		Make_Torrent($basedir, $files);
 	}
 
 	# 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 '.';
-		next if $subdir eq '..';
+		next if $subdir =~ /^\./;
 		Process_Dir("$basedir/$subdir")
 	}
 }
@@ -51,48 +51,71 @@
         my $basedir = shift;
         my $files   = shift;
 
-        if ($#{ $files } < $OBT->{MIN_FILES}) {
-                print "Too few files in $basedir, skipping . . .\n";
-                return undef;
-        }
-
         if ($basedir !~ /\.\./ && $basedir =~ /^([\w\/\.-]+)$/) {
                 $basedir = $1;
         } else {
                 die "Invalid characters in dir '$basedir'";
         }
 
-        foreach (@$files) {
-                if (/^([^\/]+)$/) {
-                        $_ = "$basedir/$1";
-                } else {
-                        die "Invalid characters in file '$_' in '$basedir'";
+        if ($#{ $files } < $OBT->{MIN_FILES}) {
+                print "Too few files in $basedir, skipping . . .\n";
+                return undef;
+        }
+
+	my $torrent = Name_Torrent($basedir);
+	my $comment = "Files from $basedir";
+
+	my %torrents;
+        foreach my $file (@$files) {
+		if ($file =~ /^([^\/]+)$/) {
+			$file = $1;
+
+			my $t = $torrent;
+			my $c = $comment;
+
+			if ($file =~ /$INSTALL_ISO_REGEX/xms) {
+				$t = Name_Torrent("$basedir/$file");
+				$c = "$basedir/$file";
+			}
+			elsif (my ($ext) = $file =~ /$SONG_REGEX/xms) {
+				$t = Name_Torrent("$basedir/$ext");
+				$c = "$ext files from $basedir";
+			}
+
+			$torrents{$t}{comment} = $c;
+                       	push @{ $torrents{$t}{files} }, "$basedir/$file";
+                } 
+		else {
+                        die "Invalid characters in file '$file' in '$basedir'";
                 }
         }
 
-        my $torrent = Name_Torrent($basedir);
 
-        print "Creating $torrent\n";
+	foreach my $t (keys %torrents) {
 
-        my $comment = "Files from $basedir\n" .
-                      "Created by andrew fresh (andrew\@mad-techies.org)\n" .
-                      "http://OpenBSD.somedomain.net/";
+        	print "Creating $t (" 
+			. (scalar @{ $torrents{$t}{files} }) . " files)\n";
 
-	eval { btmake($torrent, $comment, $files); };
-	if ($@) {
-		print "Error creating $torrent\n$@\n";
-	}
+		my $c = $torrents{$t}{comment};
+		$c .= "\nCreated by andrew fresh (andrew\@afresh1.com)\n" .
+                      	"http://OpenBSD.somedomain.net/";
 
+		eval { btmake($t, $c, $torrents{$t}{files}); };
+		if ($@) {
+			print "Error creating $t\n$@\n";
+		}
+
 #        system($BTMake,
 #               '-C',
 #               '-c', $comment,
 #               '-n', $OBT->{BASENAME},
-#               '-o', $OBT->{DIR_TORRENT} . "/$torrent",
+#               '-o', $OBT->{DIR_TORRENT} . "/$t",
 #               '-a', $Tracker,
 #               @$files
-#        );# || die "Couldn't system $BTMake $torrent: $!";
+#        );# || die "Couldn't system $BTMake $t: $!";
+	}
 
-        return $torrent;
+        return [ keys %torrents ];
 }
 
 
@@ -110,7 +133,16 @@
 
     my $torrent_with_path = $OBT->{DIR_NEW_TORRENT} . "/$torrent";
 
-    my $t = BT::OBTMetaInfo->new();
+    #if (@$files == 1) {
+        #$name = $files->[0];
+    #}
+
+    my $t = BT::MetaInfo::Cached->new(
+        {
+		cache_root => '/tmp/OBTFileCache'
+        }
+    );
+
     $t->name($name);
     $t->announce($announce);
     unless ($announce =~ m!^http://[^/]+/!i) {
@@ -124,15 +156,32 @@
     #}
     $t->piece_length($piece_len);
     $t->creation_date(time);
-    print "Checksumming files. This may take a little while...\n";
-    $t->set_files(@$files);
+    #print "Checksumming files. This may take a little while...\n";
 
+    # Can't use this,  have to do this manually because 
+    # we need to have the multi-file type of torrent
+    # even when we have only one file.
+    #$t->set_files(@$files);
+
+    my @file_list;
+    foreach my $f (@$files) {
+    	my $l = (stat("$OBT->{DIR_FTP}/$f"))[7];
+        my @p = split /\//, $f;
+	shift @p;
+	push @file_list, {
+            length => $l,
+            path   => \@p,
+        }
+    }
+    $t->files(\@file_list);
+    $t->make_pieces(@$files);
+
     if ($t->total_size < $OBT->{MIN_SIZE}) {
         print "Skipping smaller than minimum size\n";
         return 0;
     }
 
-    my $hash = $t->info_hash_cached($torrent_with_path);
+    my $hash = $t->info_hash;
     $hash = unpack("H*", $hash);
 
     $t->save($torrent_with_path);