===================================================================
RCS file: /cvs/openbsd/OpenBSDTorrents/MakeTorrents.pl,v
retrieving revision 1.12
retrieving revision 1.21
diff -u -r1.12 -r1.21
--- openbsd/OpenBSDTorrents/MakeTorrents.pl	2005/05/02 22:49:54	1.12
+++ openbsd/OpenBSDTorrents/MakeTorrents.pl	2006/11/06 23:17:59	1.21
@@ -1,11 +1,12 @@
-#!/usr/bin/perl -T
-#$Id: MakeTorrents.pl,v 1.12 2005/05/02 21:49:54 andrew Exp $
+#!/usr/bin/perl
+# -T
+#$RedRiver: MakeTorrents.pl,v 1.20 2006/07/24 18:03:53 andrew Exp $
 use strict;
 use warnings;
 use diagnostics;
 
 use lib 'lib';
-use BT::OBTMetaInfo;
+use BT::MetaInfo::Cached;
 use OpenBSDTorrents;
 
 %ENV = ();
@@ -29,7 +30,7 @@
 {
 	my $basedir = shift;
 
-	return undef if $basedir =~ /packages/;
+	#return undef if $basedir =~ /packages/;
 
 	my ($dirs, $files) = Get_Files_and_Dirs($basedir);
 	if (@$files) {
@@ -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")
 	}
 }
@@ -110,7 +110,12 @@
 
     my $torrent_with_path = $OBT->{DIR_NEW_TORRENT} . "/$torrent";
 
-    my $t = BT::OBTMetaInfo->new();
+    my $t = BT::MetaInfo::Cached->new(
+        {
+		cache_root => '/tmp/OBTFileCache'
+        }
+    );
+
     $t->name($name);
     $t->announce($announce);
     unless ($announce =~ m!^http://[^/]+/!i) {
@@ -132,7 +137,7 @@
         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);