[Debtorrent-commits] r52 - /debtorrent/trunk/DebTorrent/parsedir.py

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Fri May 18 18:25:40 2007
New Revision: 52

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=52
Log:
Modify parsedir so btlaunchmany works with Packages files directly (tracker still only serves dtorrent files)

Modified:
    debtorrent/trunk/DebTorrent/parsedir.py

Modified: debtorrent/trunk/DebTorrent/parsedir.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/parsedir.py?rev=52&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/parsedir.py (original)
+++ debtorrent/trunk/DebTorrent/parsedir.py Fri May 18 18:25:40 2007
@@ -5,7 +5,7 @@
 # $Id$
 
 from bencode import bencode, bdecode
-from BT1.btformats import check_info
+from download_bt1 import get_response
 from os.path import exists, isfile
 from sha import sha
 import sys, os
@@ -22,7 +22,8 @@
     print ":: "+x
 
 def parsedir(directory, parsed, files, blocked,
-             exts = ['.dtorrent'], return_metainfo = False, errfunc = _errfunc):
+             exts = ['dtorrent','Packages'], 
+             return_metainfo = False, errfunc = _errfunc):
     if NOISY:
         errfunc('checking dir')
     dirs_to_check = [directory]
@@ -36,7 +37,7 @@
             newtorrent = None
             for ext in exts:
                 if f.endswith(ext):
-                    newtorrent = ext[1:]
+                    newtorrent = ext[:]
                     break
             if newtorrent:
                 newtorrents = True
@@ -91,9 +92,7 @@
         if NOISY:
             errfunc('adding '+p)
         try:
-            ff = open(p, 'rb')
-            d = bdecode(ff.read())
-            check_info(d['info'])
+            d = get_response(p, '', errfunc)
             h = sha(bencode(d['info'])).digest()
             new_file[1] = h
             if new_parsed.has_key(h):
@@ -133,10 +132,6 @@
             errfunc('**warning** '+p+' has errors')
             new_blocked[p] = 1
             continue
-        try:
-            ff.close()
-        except:
-            pass
         if NOISY:
             errfunc('... successful')
         new_parsed[h] = a