r156 - /debtorrent/trunk/DebTorrent/download_bt1.py

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

Author: camrdale-guest
Date: Fri Jul 13 19:28:52 2007
New Revision: 156

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=156
Log:
Remove the selector_enabled option as it is required for debtorrent.

Modified:
    debtorrent/trunk/DebTorrent/download_bt1.py

Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=156&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Fri Jul 13 19:28:52 2007
@@ -219,8 +219,6 @@
     ('dedicated_seed_id', '',
         'code to send to tracker identifying as a dedicated seed'),
 
-    ('selector_enabled', 1,
-        'whether to enable the file selector and fast resume function'),
     ('priority', '',
         'a list of file priorities separated by commas, must be one per file, ' +
         '0 = highest, 1 = normal, 2 = lowest, -1 = download disabled'),
@@ -627,8 +625,6 @@
     @type tcp_ack_fudge: C{float}
     @ivar tcp_ack_fudge: the fraction of TCP ACK download overhead to add to 
         upload rate calculations
-    @type selector_enabled: C{boolean}
-    @ivar selector_enabled: whether to enable the file selector and fast resume function
     @type appdataobj: L{ConfigDir.ConfigDir}
     @ivar appdataobj: the configuration and cache directory manager
     @type excflag: C{threading.Event}
@@ -740,7 +736,6 @@
         self.rerequest = None
         self.tcp_ack_fudge = config['tcp_ack_fudge']
 
-        self.selector_enabled = config['selector_enabled']
         self.appdataobj = appdataobj
 
         self.excflag = self.rawserver.get_exception_flag()
@@ -950,30 +945,29 @@
             statusfunc = self.statusfunc
 
         disabled_files = None
-        if self.selector_enabled:
-            self.priority = self.config['priority']
-            if self.priority:
-                try:
-                    self.priority = self.priority.split(',')
-                    assert len(self.priority) == len(self.files)
-                    self.priority = [int(p) for p in self.priority]
-                    for p in self.priority:
-                        assert p >= -1
-                        assert p <= 2
-                except:
-                    self.errorfunc('bad priority list given, ignored')
-                    self.priority = None
-
-            data = self.appdataobj.getTorrentData(self.infohash)
+        self.priority = self.config['priority']
+        if self.priority:
             try:
-                d = data['resume data']['priority']
-                assert len(d) == len(self.files)
-                disabled_files = [x == -1 for x in d]
+                self.priority = self.priority.split(',')
+                assert len(self.priority) == len(self.files)
+                self.priority = [int(p) for p in self.priority]
+                for p in self.priority:
+                    assert p >= -1
+                    assert p <= 2
             except:
-                try:
-                    disabled_files = [x == -1 for x in self.priority]
-                except:
-                    pass
+                self.errorfunc('bad priority list given, ignored')
+                self.priority = None
+
+        data = self.appdataobj.getTorrentData(self.infohash)
+        try:
+            d = data['resume data']['priority']
+            assert len(d) == len(self.files)
+            disabled_files = [x == -1 for x in d]
+        except:
+            try:
+                disabled_files = [x == -1 for x in self.priority]
+            except:
+                pass
 
         try:
             try:
@@ -998,19 +992,18 @@
         if self.doneflag.isSet():
             return None
 
-        if self.selector_enabled:
-            self.fileselector = FileSelector(self.files, self.piece_lengths,
-                                             self.appdataobj.getPieceDir(self.infohash),
-                                             self.storage, self.storagewrapper,
-                                             self.rawserver.add_task, self.picker,
-                                             self._failed)
+        self.fileselector = FileSelector(self.files, self.piece_lengths,
+                                         self.appdataobj.getPieceDir(self.infohash),
+                                         self.storage, self.storagewrapper,
+                                         self.rawserver.add_task, self.picker,
+                                         self._failed)
+        if data:
+            data = data.get('resume data')
             if data:
-                data = data.get('resume data')
-                if data:
-                    self.fileselector.unpickle(data)
-
-            if self.priority:
-                self.fileselector.initialize_priorities_now(self.priority)
+                self.fileselector.unpickle(data)
+
+        if self.priority:
+            self.fileselector.initialize_priorities_now(self.priority)
                 
         self.checking = True
         if old_style:
@@ -1209,13 +1202,12 @@
                 for u in self.response['deb_mirrors']:
                     self.httpdownloader.make_download(u)
 
-        if self.selector_enabled:
-            self.fileselector.tie_in(self._cancelfunc, self._reqmorefunc, 
-                                     self.rerequest_ondownloadmore)
-            if self.priority:
-                self.fileselector.set_priorities_now(self.priority)
-            self.appdataobj.deleteTorrentData(self.infohash)
-                                # erase old data once you've started modifying it
+        self.fileselector.tie_in(self._cancelfunc, self._reqmorefunc, 
+                                 self.rerequest_ondownloadmore)
+        if self.priority:
+            self.fileselector.set_priorities_now(self.priority)
+        self.appdataobj.deleteTorrentData(self.infohash)
+                            # erase old data once you've started modifying it
 
         if self.config['super_seeder']:
             self.set_super_seed()