r129 - in /debtorrent/trunk: DebTorrent/download_bt1.py DebTorrent/launchmanycore.py btlaunchmany.py

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

Author: camrdale-guest
Date: Wed Jun 27 04:05:43 2007
New Revision: 129

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=129
Log:
Create an option to siable the HTTP downloading.

Modified:
    debtorrent/trunk/DebTorrent/download_bt1.py
    debtorrent/trunk/DebTorrent/launchmanycore.py
    debtorrent/trunk/btlaunchmany.py

Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=129&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Wed Jun 27 04:05:43 2007
@@ -213,7 +213,8 @@
     ('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'),
     ('default_tracker', 'http://dttracker.debian.net:6969/announce', 'the default tracker address to use for new torrents'),
     ('config_dir', '', 'the directory to use to get/store configuration and cache files, if not ' + 
-             'specified then a .DebTorrent directory in the user\'s home directory will be used')
+             'specified then a .DebTorrent directory in the user\'s home directory will be used'),
+    ('disable_http_downloader', 0, '(for testing purposes only) whether to disable the backup HTTP downloader'),
     ]
 
 argslistheader = 'Arguments are:\n\n'
@@ -1193,8 +1194,9 @@
             self.config['max_rate_period'], self.infohash, self._received_http_data,
             self.connecter.got_piece, self.getFilename)
         if self.response.has_key('deb_mirrors') and not self.finflag.isSet():
-            for u in self.response['deb_mirrors']:
-                self.httpdownloader.make_download(u)
+            if not self.config['disable_http_downloader']:
+                for u in self.response['deb_mirrors']:
+                    self.httpdownloader.make_download(u)
 
         if self.selector_enabled:
             self.fileselector.tie_in(self._cancelfunc, self._reqmorefunc, 

Modified: debtorrent/trunk/DebTorrent/launchmanycore.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/launchmanycore.py?rev=129&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/launchmanycore.py (original)
+++ debtorrent/trunk/DebTorrent/launchmanycore.py Wed Jun 27 04:05:43 2007
@@ -533,8 +533,9 @@
             self.configdir.writeTorrent(self.torrent_cache[hash]['metainfo'], hash)
 
         if hash in self.torrent_list:
-            for u in new_debmirrors:
-                self.downloads[hash].d.httpdownloader.make_download(u)
+            if not self.config['disable_http_downloader']:
+                for u in new_debmirrors:
+                    self.downloads[hash].d.httpdownloader.make_download(u)
         else:
             c = self.counter
             self.counter += 1

Modified: debtorrent/trunk/btlaunchmany.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/btlaunchmany.py?rev=129&op=diff
==============================================================================
--- debtorrent/trunk/btlaunchmany.py (original)
+++ debtorrent/trunk/btlaunchmany.py Wed Jun 27 04:05:43 2007
@@ -138,7 +138,7 @@
         ( 'saveas_style', 1,
           "How to name torrent download directory " + 
           "(1 = <mirror>_dists_<suite>_<section>_binary-<arch>, " +
-          "2 = <mirror>)" ),
+          "2 = <mirror> (caution: experimental))" ),
         ( 'display_path', 0,
           "whether to display the full path or the torrent contents for each torrent" ),
         ('separate_all',0, 'whether to separate the architecture:all packages, ' +