tag rc2

libtorrent/include/libtorrent/asio/error_code.hpp

@@ -41,10 +41,10 @@ namespace error
     system_category = ASIO_WIN_OR_POSIX(0, 0),
 
     /// Error codes from NetDB functions.
-    netdb_category = ASIO_WIN_OR_POSIX(_system_category, 1),
+    netdb_category = ASIO_WIN_OR_POSIX(system_category, 1),
 
     /// Error codes from getaddrinfo.
-    addrinfo_category = ASIO_WIN_OR_POSIX(_system_category, 2),
+    addrinfo_category = ASIO_WIN_OR_POSIX(system_category, 2),
 
     /// Miscellaneous error codes.
     misc_category = ASIO_WIN_OR_POSIX(3, 3),

plugins/WebUi/scripts/extract_template_strings.py

@@ -1,13 +1,18 @@
 from __future__ import with_statement
 import os
 import re
-template_dir = '~/prj/WebUi/templates/deluge'
+template_dirs = ['~/prj/WebUi/templates/deluge',
-template_dir  = os.path.expanduser(template_dir )
+    '~/prj/WebUi/templates/advanced']
+
+template_dirs  = [os.path.expanduser(template_dir ) for template_dir in template_dirs]
 
 
-files = [os.path.join(template_dir,fname)
+files = []
-    for fname in os.listdir(template_dir)
+for template_dir in template_dirs:
-    if fname.endswith('.html')]
+    files += [os.path.join(template_dir,fname)
+        for fname in os.listdir(template_dir)
+        if fname.endswith('.html')]
+
 
 all_strings = []
 for filename in files:

plugins/WebUi/scripts/template_strings.py

@@ -1,5 +1,6 @@
 _('# Of Files')
 _('About')
+_('Add')
 _('Add Torrent')
 _('Add torrent')
 _('Apply')
@@ -13,6 +14,7 @@ _('Delete .torrent file')
 _('Delete downloaded files.')
 _('Details')
 _('Disable')
+_('Down')
 _('Down Speed')
 _('Download')
 _('Downloaded')
@@ -27,19 +29,20 @@ _('Next Announce')
 _('Off')
 _('Password')
 _('Password is invalid,try again')
+_('Pause')
 _('Pause all')
 _('Peers')
 _('Pieces')
 _('Progress')
 _('Queue Down')
+_('Queue Position')
 _('Queue Up')
-_('Queue pos:')
 _('Ratio')
 _('Reannounce')
 _('Refresh page every:')
 _('Remove')
-_('Remove %s ')
+_('Remove torrent')
-_('Remove %s?')
+_('Resume')
 _('Resume all')
 _('Seeders')
 _('Set')
@@ -47,11 +50,13 @@ _('Set Timeout')
 _('Share Ratio')
 _('Size')
 _('Speed')
+_('Start')
 _('Submit')
 _('Torrent list')
 _('Total Size')
 _('Tracker')
 _('Tracker Status')
+_('Up')
 _('Up Speed')
 _('Upload')
 _('Upload torrent')

plugins/WebUi/webserver_framework.py

@@ -221,7 +221,7 @@ def get_torrent_status(torrent_id):
 
     url = urlparse(status.tracker)
     if hasattr(url,'hostname'):
-        status.category = url.hostname
+        status.category = url.hostname or 'unknown'
     else:
         status.category = 'No-tracker'
 
@@ -265,7 +265,7 @@ def get_torrent_status(torrent_id):
     return status
 
 def get_categories(torrent_list):
-    trackers = [torrent['category'] for torrent in torrent_list]
+    trackers = [(torrent['category'] or 'unknown') for torrent in torrent_list]
     categories = {}
     for tracker in trackers:
         categories[tracker] = categories.get(tracker,0) + 1

setup.py

@@ -28,7 +28,7 @@
 
 NAME = "deluge"
 FULLNAME = "Deluge BitTorrent Client"
-VERSION    = "0.5.6.95"
+VERSION    = "0.5.6.96"
 AUTHOR = "Zach Tibbitts, Alon Zakai, Marcos Pinto, Andrew Resch, Alex Dedul"
 EMAIL = "zach@collegegeek.org, kripkensteiner@gmail.com, marcospinto@dipconsultants.com, alonzakai@gmail.com, rotmer@gmail.com"
 DESCRIPTION    = "A GTK BitTorrent client written in Python and C++"

src/common.py

@@ -32,7 +32,7 @@ import os
 import xdg.BaseDirectory
 
 PROGRAM_NAME = "Deluge"
-PROGRAM_VERSION = "0.5.6.95"
+PROGRAM_VERSION = "0.5.6.96"
 
 CLIENT_CODE = "DE"
 CLIENT_VERSION = "".join(PROGRAM_VERSION.split('.'))+"0"*(4 - len(PROGRAM_VERSION.split('.')))

src/dialogs.py

@@ -516,7 +516,7 @@ def show_file_open_dialog(parent, title=None):
     chooser.set_select_multiple(True)
     if not common.windows_check():
         chooser.set_icon(common.get_logo(32))
-    chooser.set_property("skip-taskbar-hint", True)
+        chooser.set_property("skip-taskbar-hint", True)
         
     response = chooser.run()
     if response == gtk.RESPONSE_OK:
@@ -532,7 +532,7 @@ def show_directory_chooser_dialog(parent, title):
                 buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK))
     if not common.windows_check():
         chooser.set_icon(common.get_logo(32))
-    chooser.set_property("skip-taskbar-hint", True)
+        chooser.set_property("skip-taskbar-hint", True)
     config = pref.Preferences()
     chooser.set_current_folder(config.get("choose_directory_dialog_path"))
     if chooser.run() == gtk.RESPONSE_OK:

src/interface.py

@@ -168,23 +168,9 @@ class DelugeGTK:
                 if self.manager.unique_IDs[unique_ID].uploaded_memory:
                     self.manager.unique_IDs[unique_ID].initial_uploaded_memory = \
                         self.manager.unique_IDs[unique_ID].uploaded_memory
-                try:
+                if self.manager.unique_IDs[unique_ID].trackers_changed:
-                    if self.manager.unique_IDs[unique_ID].trackers_changed:
+                    self.manager.replace_trackers(unique_ID, \
-                        try:
+                        self.manager.unique_IDs[unique_ID].trackers)
-                            self.manager.replace_trackers(unique_ID, \
-                                self.manager.unique_IDs[unique_ID].trackers)
-                        except:
-                            pass
-                except AttributeError:
-                    try:
-                        if self.manager.unique_IDs[unique_ID].trackers:
-                            try:
-                                self.manager.replace_trackers(unique_ID, \
-                                self.manager.unique_IDs[unique_ID].trackers)
-                            except:
-                                pass
-                    except AttributeError:
-                        pass
             except AttributeError:
                 pass
 

src/plugins.py

@@ -61,9 +61,13 @@ class PluginManager:
                     mod = __import__(modname, globals(), locals(), [''])
                     if 'deluge_init' in dir(mod):
                         if modname != "TorrentPieces":
-                            print "Initialising plugin",modname
+                            print "Initialising plugin", modname
-                            mod.deluge_init(path)
+                            try:
-                            self.available_plugins[mod.plugin_name] = mod
+                                mod.deluge_init(path)
+                            except:
+                                print "Cant init plugin", modname
+                            else:
+                                self.available_plugins[mod.plugin_name] = mod
     
     def get_available_plugins(self):
         return self.available_plugins.keys()