r232 - in /debtorrent/branches/unique: btcompletedir.py btmakemetafile.py btshowmetainfo.py

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

Author: camrdale-guest
Date: Mon Aug 13 22:12:05 2007
New Revision: 232

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=232
Log:
Add better logging to some of the scripts.

Modified:
    debtorrent/branches/unique/btcompletedir.py
    debtorrent/branches/unique/btmakemetafile.py
    debtorrent/branches/unique/btshowmetainfo.py

Modified: debtorrent/branches/unique/btcompletedir.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/unique/btcompletedir.py?rev=232&op=diff
==============================================================================
--- debtorrent/branches/unique/btcompletedir.py (original)
+++ debtorrent/branches/unique/btcompletedir.py Mon Aug 13 22:12:05 2007
@@ -26,6 +26,10 @@
 from os.path import split
 from DebTorrent.BT1.makemetafile import defaults, completedir, print_announcelist_details
 from DebTorrent.parseargs import parseargs, formatDefinitions
+import logging
+
+logging.basicConfig()
+logger = logging.getLogger()
 
 def prog(amount):
     """Display the current status of the file scan.
@@ -63,5 +67,6 @@
     for dir in args:
         completedir(dir, config, vc = prog, fc = next_file)
 except ValueError, e:
+    logger.exception(str(e))
     print 'error: ' + str(e)
     print 'run with no args for parameter explanations'

Modified: debtorrent/branches/unique/btmakemetafile.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/unique/btmakemetafile.py?rev=232&op=diff
==============================================================================
--- debtorrent/branches/unique/btmakemetafile.py (original)
+++ debtorrent/branches/unique/btmakemetafile.py Mon Aug 13 22:12:05 2007
@@ -28,7 +28,10 @@
 assert version >= '2', "Install Python 2.0 or greater"
 from DebTorrent.BT1.makemetafile import make_meta_file, defaults, print_announcelist_details
 from DebTorrent.parseargs import parseargs, formatDefinitions
+import logging
 
+logging.basicConfig()
+logger = logging.getLogger()
 
 def prog(amount):
     """Display the current status of the file scan.
@@ -56,5 +59,6 @@
         make_meta_file(file, config, progress = prog)
         print ''
 except ValueError, e:
+    logger.exception(str(e))
     print 'error: ' + str(e)
     print 'run with no args for parameter explanations'

Modified: debtorrent/branches/unique/btshowmetainfo.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/branches/unique/btshowmetainfo.py?rev=232&op=diff
==============================================================================
--- debtorrent/branches/unique/btshowmetainfo.py (original)
+++ debtorrent/branches/unique/btshowmetainfo.py Mon Aug 13 22:12:05 2007
@@ -13,8 +13,13 @@
 from os.path import *
 from sha import *
 from binascii import b2a_hex
+from DebTorrent.BT1.btformats import check_message
 from DebTorrent.bencode import *
 from DebTorrent.download_bt1 import get_packages
+import logging
+
+logging.basicConfig()
+logger = logging.getLogger()
 
 NAME, EXT = splitext(basename(argv[0]))
 VERSION = '20030621'
@@ -33,7 +38,13 @@
     else:
         metainfo_file = open(metainfo_name, 'rb')
         metainfo = bdecode(metainfo_file.read())
-        
+    
+    try:
+        check_message(metainfo)
+    except:
+        logger.exception('Error found in metainfo of: %s', metainfo_name)
+        continue
+    
 #    print metainfo
     info = metainfo['info']
     info_hash = sha(bencode(info)).hexdigest()