===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/MakeTorrents.pl,v
retrieving revision 1.14
retrieving revision 1.24
diff -u -r1.14 -r1.24
--- openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/05/05 22:45:03	1.14
+++ openbsd/OpenBSDTorrents/MakeTorrents.pl	2010/03/08 20:19:37	1.24
@@ -1,5 +1,6 @@
-#!/usr/bin/perl -T
-#$Id: MakeTorrents.pl,v 1.14 2005/05/05 21:45:03 andrew Exp $
+#!/usr/bin/perl
+# -T
+#$RedRiver: MakeTorrents.pl,v 1.23 2010/02/25 17:54:13 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
@@ -40,8 +41,7 @@
 	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")
 	}
 }
@@ -50,8 +50,15 @@
 {
         my $basedir = shift;
         my $files   = shift;
+        my $ignore_too_few = shift || 0;
 
-        if ($#{ $files } < $OBT->{MIN_FILES}) {
+	my $torrent_base = $basedir;
+        my $comment = "Files from $torrent_base\n";
+	if ($ignore_too_few && $files->[0] =~ /$INSTALL_ISO_REGEX/) {
+		$torrent_base = "$basedir/$files->[0]";
+		$comment = "$torrent_base\n";
+	}
+        elsif ($#{ $files } < $OBT->{MIN_FILES}) {
                 print "Too few files in $basedir, skipping . . .\n";
                 return undef;
         }
@@ -62,23 +69,33 @@
                 die "Invalid characters in dir '$basedir'";
         }
 
-        foreach (@$files) {
-                if (/^([^\/]+)$/) {
-                        $_ = "$basedir/$1";
-                } else {
-                        die "Invalid characters in file '$_' in '$basedir'";
+	my @good_files;
+        foreach my $file (@$files) {
+		if ((!$ignore_too_few) && $file =~ /$INSTALL_ISO_REGEX/) {
+			my @f = ($file);
+			#foreach my $f (@$files) {
+			#	if ($f =~ /INSTALL|MD5/) {
+			#		push @f, $f;
+			#	}
+			#}
+			Make_Torrent($basedir, \@f, 1)
+		}
+                elsif ($file =~ /^([^\/]+)$/) {
+                       	push @good_files, "$basedir/$1";
+                } 
+		else {
+                        die "Invalid characters in file '$file' in '$basedir'";
                 }
         }
 
-        my $torrent = Name_Torrent($basedir);
+        my $torrent = Name_Torrent($torrent_base);
 
         print "Creating $torrent\n";
 
-        my $comment = "Files from $basedir\n" .
-                      "Created by andrew fresh (andrew\@mad-techies.org)\n" .
+	$comment .= "Created by andrew fresh (andrew\@afresh1.com)\n" .
                       "http://OpenBSD.somedomain.net/";
 
-	eval { btmake($torrent, $comment, $files); };
+	eval { btmake($torrent, $comment, \@good_files); };
 	if ($@) {
 		print "Error creating $torrent\n$@\n";
 	}
@@ -110,7 +127,16 @@
 
     my $torrent_with_path = $OBT->{DIR_NEW_TORRENT} . "/$torrent";
 
-    my $t = BT::MetaInfo::Cached->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,8 +150,25 @@
     #}
     $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";