Tag 1.1.3 release

Remove ui/webui/ssl from package_data since it doesn't exist

ChangeLog

@@ -1,4 +1,98 @@
-Deluge 1.1.0 - "" (In Development)
+Deluge 1.1.3 - (15 February 2009)
+ Core:
+  * Fix issue where checking queue would stop
+  * Fix announcing to SSL trackers
+
+ Misc:
+  * Fix issue when initializing gettext that would prevent deluge from starting
+  * Fix logging exceptions when starting the daemon
+  * Fix displaying errors when a torrent is Checking
+  * Fix #790 tracker hosts not correct for some 3rd-level domain names
+
+Deluge 1.1.2 - (31 January 2009)
+ Core:
+  * Fix issue where torrents get stuck Checking
+
+ GtkUI:
+  * Fix #761 use proper theme colours in sidebar
+  * Fix saving files/peers tab state when no column is sorted
+
+Deluge 1.1.1 - (24 January 2009)
+ Core:
+  * Fix oldstateupgrader for those upgrading from 0.5.x
+  * Fix setting Peer TOS byte
+  * Fix setting outgoing ports
+
+ GtkUI:
+  * Fix opening links from Help menu and others
+  * Fix remembering sorted column in the torrent list
+  * Fix saving Files tab and Peers tab state
+  * Disable popup notification in preferences on Windows
+  * Fix crashing in AddTorrentDialog when removing torrents from the list
+  * Do not allow duplicate torrents in the AddTorrentDialog
+  * Fix translating speed units in status tab when a per-torrent limit is set
+  * Fix torrents not displaying properly after disconnecting and reconnecting to the daemon
+  * Fix when sorting # column, downloads should be on top
+
+ Misc:
+  * Fix bdecoding some torrent files
+  * Fix the -l, --logfile option
+  * Fix #729 tracker icons not being saved in the correct location
+  * Add support for more tracker icons
+  * Fix being able to connect to a local daemon from another user account
+
+Deluge 1.1.0 - "Time gas!" (10 January 2009)
+ Core:
+  * Fix issue in get_tracker_host when the torrent has no tracker
+  * Fix crash while trying to convert very old 0.5 config files
+
+ GtkUI:
+  * Fix translation setting in remove torrent dialog
+  * Fix notification bug on startup for already finished torrents
+
+ Ajaxui:
+  * Fix loading on iPods.
+  * Fix sorting on the name column.
+  * Add "Not Implemented" alerts to some functions.
+  * Improve the options tab on the Add Torrent dialog
+
+ ConsoleUI:
+  * Fix auto-complete feature for torrents.
+
+ Misc:
+  * Added '-s', '--set-default-ui' option to deluge
+
+Deluge 1.1.0_RC3 (05 January 2009)
+ Core:
+  * Fix applying proxy settings
+  * Fix the display of the tracker host when it's an IP address and not a hostname
+
+ GtkUI:
+  * Fix folder renaming to display the change properly
+  * Fix seeding torrents from moving around when sorting the '#' column
+
+ Plugins:
+  * Label: Fix move on completed
+  * Add 'PeerGuardian Text (GZip)' reader to the Blocklist plugin
+  * Apply Blocklist preferences when clicking on the buttons
+
+Deluge 1.1.0_RC2 (29 December 2008)
+ Core:
+  * Fix new version check
+  * Fix issue that prevented torrents from being added
+
+ GtkUI:
+  * Fix tooltip for 'Show session speed in titlebar' option
+
+ Plugins:
+  * Remove Stats plugin since it wasn't intended to be in this release
+  * Fix never-ending import in Blocklist on Windows
+
+ Windows:
+  * Fix double-click association on Windows
+  * Fix Pidgin icon interference
+
+Deluge 1.1.0_RC1 (23 December 2008)
  Core:
   * Implement #79 ability to change outgoing port range
   * Implement #296 ability to change peer TOS byte
@@ -12,6 +106,7 @@ Deluge 1.1.0 - "" (In Development)
   * Fix #47 the state and config files are no longer invalidated when there is no diskspace
   * Fix #619 return "" instead of "Infinity" if seconds == 0 in ftime
   * Add -P, --pidfile option to deluged
+  * Basic authentication for remote access to daemon, see: http://dev.deluge-torrent.org/wiki/Authentication
 
  GtkUI:
   * Add peer progress to the peers tab
@@ -58,3 +153,252 @@ Deluge 1.1.0 - "" (In Development)
   * Implement #478 display UI options in usage help
   * Fix #547 add description to name field per HIG entry 2.1.1.1
   * Fix #531 set default log level to ERROR and add 2 command-line options, "-L, --loglevel" and "-q, --quiet".
+
+Deluge 1.0.7 (10 December 2008)
+ GtkUI:
+  * Fix #636 not setting the daemon's config directory when using --config= with the UI in classic mode.
+  * Fix some minor bugs in ConnectionManager
+
+ Debian:
+  * Fix #571 notification-daemon-xfce dependency circle
+
+ Misc:
+  * Fix #547 add description to name field per HIG entry 2.1.1.1
+  * libtorrent updates
+
+ Plugins:
+  * Point default blocklist url to our server and up interval to 4 days
+
+Deluge 1.0.6 (01 December 2008)
+ Core:
+  * Fix #475 catch unicode decoding errors
+  * Add an option to not include IP overhead in rate limiting (this is equivalent
+    to how 0.5.x behaves)
+  * Have default blocklist url point to our server
+
+ GtkUI:
+  * Display the proper downloaded value in the statistics tab
+
+ Windows:
+  * Fix broken graphic in new release dialog
+
+Deluge 1.0.5 (09 November 2008)
+ GtkUI:
+  * Increase the per-torrent stop share ratio max to 99999.0
+  * Fix #528 make sure gtkui config file is written before exiting
+  * Fix UDP tracker support
+
+ WebUi:
+  * Javascript auto refresh for both templates.
+
+ Windows:
+  * Fix #577 adding torrents by drag n' drop
+  * Fix association in Vista
+  * Fix WebUI launch
+
+ Debian:
+  * SID packages now requires Boost 1.36
+
+ Ubuntu:
+  * Jaunty packages are now provided
+
+Deluge 1.0.4 (31 October 2008)
+ Core:
+  * Fix #560 force an int value for global max connections
+  * Fix #545 use proper values in ratio calculation
+  * Fix UPnP again..
+
+ GtkUI:
+  * Fix #565 wait for the deluged process to start to prevent defunct processes
+
+ OS X:
+  * Fix issues with gettext
+
+ Windows:
+  * Fix starting on non-English versions of Windows
+
+Deluge 1.0.3 (18 October 2008)
+ Core:
+  * Fix upnp - it should work on more routers now too
+  * Fix issue where Deluge would send improper stats to the tracker after a
+    pause/resume.
+  * Fix issue where fastresume files would be rejected when using FAT32.  This
+    would cause the torrent to be rechecked on every startup.
+  * Fix ip filtering
+
+ GtkUI:
+  * Re-add the "Max Connections Per Second" option with a default setting of 20
+
+ WebUI:
+  * Fix White template for Opera
+
+ Misc:
+  * Deluge will now use a system libtorrent library if available.
+  * The build system will no longer build libtorrent if a system library is
+    detected.
+
+Deluge 1.0.2 (10 October 2008)
+ Core:
+  * Fix issue where torrents will not be properly added to the session
+
+Deluge 1.0.1 (10 October 2008)
+ Core:
+  * Change the default max global upload slots to 4 instead of -1 since libtorrent
+    will automatically open more slots to meet the upload speed limit.
+  * Fix display of tracker error messages
+  * Fix add_torrent_url() to download the torrent file in a thread to prevent
+    the main thread from blocking and causing the daemon to freeze.
+  * Removed the 'Maximum Connections Per Second' setting and replaced it with a
+    default setting of 20.  This should alleviate speed issues some are experiencing.
+  * Changed max half-open connections default limit to 8 on XP/2000 and 4 on Vista
+  * Prevent being able to set file priorities for compactly allocated torrents as
+    it is not intended to work.
+  * Fix freezing on start-up issues on systems that do not have a properly
+    configured localhost entry.
+  * Change max connections default setting to 200
+  * Fix issue with invalid bencoding from some trackers
+  * Plenty of libtorrent updates that should improve core stability
+
+ GtkUI:
+  * Improve performance of files tab by only updating when values change
+
+ Misc:
+  * Fix #187 set a 5 second timer to save the config file after a config value
+    has been changed.
+  * Fix #503 change the boost lib detection logic to first look for -mt and
+    if not available, fall back to regular boost lib (non-multithreaded)
+
+ WebUI:
+  * Add enable "Auto Add" checkbox
+
+Deluge 1.0.0 - "Sharks Are Bulletproof" (21 September 2008)
+ Core:
+  * Include GeoIP database for country look-ups
+  * Fix upgrading from 0.5.x state where torrents would have no trackers
+
+Deluge 0.9.09 - "1.0.0_RC9" (15 September 2008)
+ Core:
+  * Bug fixes in libtorrent including a crash when the tracker doesn't
+    have 'announce' in it's url.
+  * Fix fastresume issue causing loss of data by deleting the fastresume file
+    before writing a new one
+  * Fix #475 the use of unicode paths when adding torrents
+
+ GtkUI:
+  * Fix add torrent dialog closing preventing another dialog from being shown
+  * Fix various issues when not using English
+  * Fix setting file priorities on folders
+
+Deluge 0.9.08 - "1.0.0_RC8" (27 August 2008)
+ Core:
+  * Attempt to automatically upgrade a 0.5.x state file to new format
+  * Tracker errors now change the tracker status
+
+ Plugins:
+  * Fix bug in Blocklist that prevented downloading a new file every X days
+
+ GtkUI:
+  * Sort filenames alphabetically in add torrent dialog
+  * Fix setting file priorities on folders
+  * Fix #453 allow showing of text in the toolbar buttons
+
+Deluge 0.9.07 - "1.0.0_RC7" (18 August 2008)
+ Core:
+  * Fix loading torrents from state when fastresume file is missing
+  * Fix UPnP
+  * Fix to prevent Deluge from segfaulting when trying to autoadd an incomplete torrent file
+  * Fix #407 possible negative ETA
+
+ GtkUI:
+  * Add 'edit' to edit trackers dialog
+  * Improve performance of initial torrent list load
+  * Fix hiding the bottom pane when disabling all the tabs
+  * Fix not showing new torrents if you don't use the All label first
+  * Fix size units to be more accurate
+  * Fix torrentview sorting to be persistent
+  * Fix not displaying file list when state changes
+  * Expand root folder in files tab by default
+
+ Null:
+  * Fix #415 crash when using 'config-set' with no parameters
+
+ Windows:
+  * Fix Vista slowness issue
+  * Fix properly shutting Deluge down when system shuts down
+  * Fix opening folders/files
+
+Deluge 0.9.06 - "1.0.0_RC6" (13 August 2008)
+ Core:
+  * Fix CPU spikes
+
+ GtkUI:
+  * Fix move storage dialog when connected to a remote daemon
+
+Deluge 0.9.05 - "1.0.0_RC5" (04 August 2008)
+ Core:
+  * Fix deluged running with ssh X forwarding by removing the Gnome lib import
+  * Save resume data periodically to help prevent data loss
+  * Fix queue order shuffling on restart
+
+ GtkUI:
+  * Handle shutting down more cleanly
+  * Add translators to credits
+
+ Plugins:
+  * Improve the Blocklist plugin preferences page.
+
+ Windows:
+  * Fix drag n' drop support
+
+Deluge 0.9.04 - "1.0.0_RC4" (29 July 2008)
+ Core:
+  * Fix building with gcc 4.3
+  * Fix do not create torrentfiles folder unless 'copy_torrent_file' is True
+
+ GtkUI:
+  * Add drag n' drop support for adding .torrent files
+  * Double-clicking on host in ConnectionManager now will connect to that host
+  * Fix selecting torrents when right-clicking on them in torrentview and filestab
+  * Fix new release check
+  * Display 'total_wanted' instead of 'total_size' in Size column
+  * Fix displaying of torrents when language is not English
+  * Fix the view options to be persistent between sessions
+  * Fix signalreceiver when switching between daemons
+
+Deluge 0.9.03 - "1.0.0_RC3" (21 July 2008)
+ Core:
+  * File progress fixes from libtorrent
+  * Fix building on FreeBSD
+  * Fix #350 stop seeds when stop ratio is reached
+  * Fix #358 properly emit torrent_removed signal when remove_at_ratio happens
+
+ UI:
+  * Default to gtkui when running 'deluge' instead of defaulting to last used.
+
+ GtkUI:
+  * Fix open folder
+  * Fix #349 tab ordering when hiding/showing
+
+ Windows:
+  * Fix torrent file association and adding files from command line
+
+ Plugins:
+  * Blocklist plugin has been rewritten
+
+ Misc:
+  * Some changes for python 2.6 compatibility
+
+Deluge 0.9.02 - "1.0.0_RC2" (15 July 2008)
+ Core:
+  * Fix displaying of file progress
+  * Fix files to have proper read/write permissions
+
+ WebUI:
+  * Include missing 'classic' template
+  * Update options tab to include queue settings
+
+ Windows:
+  * Fix displaying of tray icon
+  * Fix scrolling of tray menu
+  * Fix hiding of tray icon when shutting down
+  * Fix tray icon tool tip length to show properly

debian/changelog

@@ -1,5 +1,5 @@
-deluge-torrent (0.9.08-1) unstable; urgency=low
+deluge-torrent (1.1.2-1) unstable; urgency=low
 
-  * R8 release
+  * 1.1.2 final
 
- -- Andrew Resch (andar) <andrewresch@gmail.com>  Tue, 26 Aug 2008 16:31:14 -0800
+ -- Andrew Resch (andar) <andrewresch@gmail.com>  Sat, 31 Jan 2008 16:31:14 -0800

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: deluge-torrent
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon | notification-daemon-xfce, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools
+Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, python-xdg, python-notify, notification-daemon | notification-daemon-xfce, python-dbus, librsvg2-common, python-pyopenssl, python-setuptools, python-pkg-resources
 Conflicts: deluge-torrent-common
 Replaces: deluge-torrent-common
 Description: A Bittorrent client written in Python/PyGTK

deluge/bencode.py

@@ -1,7 +1,7 @@
-# The contents of this file are subject to the BitTorrent Open Source License
-# Version 1.1 (the License).  You may not copy or use this file, in either
-# source code or executable form, except in compliance with the License.  You
-# may obtain a copy of the License at http://www.bittorrent.com/license/.
+# The contents of this file are subject to the Python Software Foundation
+# License Version 2.3 (the License).  You may not copy or use this file, in
+# either source code or executable form, except in compliance with the License.
+# You may obtain a copy of the License at http://www.python.org/license.
 #
 # Software distributed under the License is distributed on an AS IS basis,
 # WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
@@ -10,6 +10,8 @@
 
 # Written by Petru Paler
 
+# Minor modifications made by Andrew Resch to replace the BTFailure errors with Exceptions
+
 def decode_int(x, f):
     f += 1
     newf = x.index('e', f)
@@ -63,8 +65,7 @@ def bdecode(x):
         r, l = decode_func[x[0]](x, 0)
     except (IndexError, KeyError, ValueError):
         raise Exception("not a valid bencoded string")
-    if l != len(x):
-        raise Exception("invalid bencoded value (data after valid prefix)")
+
     return r
 
 from types import StringType, IntType, LongType, DictType, ListType, TupleType

deluge/common.py

@@ -79,7 +79,7 @@ def get_version():
     :rtype: string
 
     """
-    return pkg_resources.require("Deluge")[0].version.split("r")[0]
+    return pkg_resources.require("Deluge")[0].version
 
 def get_revision():
     """
@@ -188,17 +188,15 @@ def open_url_in_browser(url):
 
     :param url: the url to open
     """
-    def start_browser():
-        import threading
-        import webbrowser
-        class BrowserThread(threading.Thread):
-            def __init__(self, url):
-                threading.Thread.__init__(self)
-                self.url = url
-            def run(self):
-                webbrowser.open(self.url)
-        BrowserThread(url).start()
-        return False
+    import threading
+    import webbrowser
+    class BrowserThread(threading.Thread):
+        def __init__(self, url):
+            threading.Thread.__init__(self)
+            self.url = url
+        def run(self):
+            webbrowser.open(self.url)
+    BrowserThread(url).start()
 
 ## Formatting text functions
 

deluge/core/authmanager.py

@@ -74,7 +74,7 @@ class AuthManager(component.Component):
                 from hashlib import sha1 as sha_hash
             except ImportError:
                 from sha import new as sha_hash
-            open(auth_file, "w").write("localclient:" + sha_hash(str(random.random())).hexdigest())
+            open(auth_file, "w").write("localclient:" + sha_hash(str(random.random())).hexdigest() + "\n")
             # Change the permissions on the file so only this user can read/write it
             os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE)
 

deluge/core/core.py

@@ -317,7 +317,36 @@ class Core(
     def check_new_release(self):
         if self.new_release:
             log.debug("new_release: %s", self.new_release)
-            if self.new_release > deluge.common.get_version():
+            class VersionSplit(object):
+                def __init__(self, ver):
+                    ver = ver.lower()
+                    vs = ver.split("_") if "_" in ver else ver.split("-")
+                    self.version = vs[0]
+                    self.suffix = None
+                    if len(vs) > 1:
+                        for s in ("rc", "alpha", "beta", "dev"):
+                            if s in vs[1][:len(s)]:
+                                self.suffix = vs[1]
+
+                def __cmp__(self, ver):
+                    if self.version > ver.version or (self.suffix and self.suffix[:3] == "dev"):
+                        return 1
+                    if self.version < ver.version:
+                        return -1
+
+                    if self.version == ver.version:
+                        if self.suffix == ver.suffix:
+                            return 0
+                        if self.suffix is None:
+                            return 1
+                        if ver.suffix is None:
+                            return -1
+                        if self.suffix < ver.suffix:
+                            return -1
+                        if self.suffix > ver.suffix:
+                            return 1
+
+            if VersionSplit(self.new_release) > VersionSplit(deluge.common.get_version()):
                 self.signals.emit("new_version_available", self.new_release)
                 return self.new_release
         return False

deluge/core/oldstateupgrader.py

@@ -76,6 +76,11 @@ class OldStateUpgrader:
             log.debug("Unable to open 0.5 state file: %s", e)
             return
 
+        # Check to see if we can upgrade this file
+        if type(state).__name__ == 'list':
+            log.warning("0.5 state file is too old to upgrade")
+            return
+
         new_state = deluge.core.torrentmanager.TorrentManagerState()
         for ti, uid in state.torrents.items():
             torrent_path = os.path.join(self.config["config_location"], "torrentfiles", ti.filename)

deluge/core/preferencesmanager.py

@@ -68,7 +68,7 @@ DEFAULT_PREFS = {
     "max_download_speed": -1.0,
     "max_upload_slots_global": 4,
     "max_half_open_connections": (lambda: deluge.common.windows_check() and
-        (lambda: deluge.common.vista_check() and 4 or 8)() or -1)(),
+        (lambda: deluge.common.vista_check() and 4 or 8)() or 50)(),
     "max_connections_per_second": 20,
     "ignore_limits_on_local_network": True,
     "max_connections_per_torrent": -1,
@@ -256,7 +256,8 @@ class PreferencesManager(component.Component):
     def _on_set_outgoing_ports(self, key, value):
         if not self.config["random_outgoing_ports"]:
             log.debug("outgoing port range set to %s-%s", value[0], value[1])
-            self.session.outgoing_ports(value[0], value[1])
+            self.settings.outgoing_ports = value[0], value[1]
+            self.session.set_settings(self.settings)
 
     def _on_set_random_outgoing_ports(self, key, value):
         if value:
@@ -265,7 +266,7 @@ class PreferencesManager(component.Component):
     def _on_set_peer_tos(self, key, value):
         log.debug("setting peer_tos to: %s", value)
         try:
-            self.settings.peer_tos = str(int(value, 16))
+            self.settings.peer_tos = chr(int(value, 16))
         except ValueError, e:
             log.debug("Invalid tos byte: %s", e)
             return
@@ -461,7 +462,7 @@ class PreferencesManager(component.Component):
         for k, v in value.items():
             if v["type"]:
                 proxy_settings = lt.proxy_settings()
-                proxy_settings.proxy_type = lt.proxy_type(v["type"])
+                proxy_settings.type = lt.proxy_type(v["type"])
                 proxy_settings.username = v["username"]
                 proxy_settings.password = v["password"]
                 proxy_settings.hostname = v["hostname"]

deluge/core/torrent.py

@@ -82,14 +82,10 @@ class TorrentOptions(dict):
         return k
 
     def iteritems(self):
-        return self.items().itermitems()
+        return self.items().iteritems()
 
     def has_key(self, key):
-        if super(TorrentOptions, self).has_key(key):
-            return True
-        elif self.default_keys.has_key(key):
-            return True
-        return False
+        return super(TorrentOptions, self).has_key(key) or key in self.default_keys
 
     def __setitem__(self, key, value):
         super(TorrentOptions, self).__setitem__(key, value)
@@ -97,11 +93,14 @@ class TorrentOptions(dict):
     def __getitem__(self, key):
         if super(TorrentOptions, self).has_key(key):
             return super(TorrentOptions, self).__getitem__(key)
-        else:
-            if self.default_keys[key]:
+        elif key in self.default_keys:
+            if self.default_keys[key] and self.default_keys[key] in self.config.config:
                 return self.config[self.default_keys[key]]
             else:
                 return self.default_keys[key]
+        else:
+            raise KeyError
+
 
 class Torrent:
     """Torrent holds information about torrents added to the libtorrent session.
@@ -355,6 +354,16 @@ class Torrent:
 
         log.debug("set_state_based_on_ltstate: %s", deluge.common.LT_TORRENT_STATE[ltstate])
         log.debug("session.is_paused: %s", component.get("Core").session.is_paused())
+
+        # First we check for an error from libtorrent, and set the state to that
+        # if any occurred.
+        if self.handle.is_paused() and len(self.handle.status().error) > 0:
+            # This is an error'd torrent
+            self.state = "Error"
+            self.set_status_message(self.handle.status().error)
+            self.handle.auto_managed(False)
+            return
+
         if ltstate == LTSTATE["Queued"] or ltstate == LTSTATE["Checking"]:
             self.state = "Checking"
             return
@@ -365,12 +374,7 @@ class Torrent:
         elif ltstate == LTSTATE["Allocating"]:
             self.state = "Allocating"
 
-        if self.handle.is_paused() and len(self.handle.status().error) > 0:
-            # This is an error'd torrent
-            self.state = "Error"
-            self.set_status_message(self.handle.status().error)
-            self.handle.auto_managed(False)
-        elif self.handle.is_paused() and self.handle.is_auto_managed() and not component.get("Core").session.is_paused():
+        if self.handle.is_paused() and self.handle.is_auto_managed() and not component.get("Core").session.is_paused():
             self.state = "Queued"
         elif component.get("Core").session.is_paused() or (self.handle.is_paused() and not self.handle.is_auto_managed()):
             self.state = "Paused"
@@ -520,9 +524,22 @@ class Torrent:
             url = urlparse(tracker)
             if hasattr(url, "hostname"):
                 host = (url.hostname or 'DHT')
+                # Check if hostname is an IP address and just return it if that's the case
+                import socket
+                try:
+                    socket.inet_aton(host)
+                except socket.error:
+                    pass
+                else:
+                    # This is an IP address because an exception wasn't raised
+                    return url.hostname
+
                 parts = host.split(".")
                 if len(parts) > 2:
-                    host = ".".join(parts[-2:])
+                    if parts[-2] in ("co", "com", "net", "org"):
+                        host = ".".join(parts[-3:])
+                    else:
+                        host = ".".join(parts[-2:])
                 return host
         return ""
 

deluge/docs/man/deluge.1

@@ -1,4 +1,4 @@
-.TH DELUGE 1 "November 2008" "1.0.6"
+.TH DELUGE 1 "January 2009" "1.1.2"
 
 .SH NAME
 deluge - a bittorrent client
@@ -38,15 +38,17 @@ Output to designated logfile instead of stdout
 Set the log level (default is error): none, info, warning, error, critical, debug
 .TP
 .I -q --quiet
-Sets the log level to 'none', this is the same as `-L none`
-
+Sets the log level to 'none', this is the same as `\-L none`
+.TP
+.I -s DEFAULT_UI, --set-default-ui=DEFAULT_UI
+Sets the default UI to be run when no UI is specified
 
 .SH SEE ALSO
 .B Homepage:
 http://www.deluge-torrent.org/
 
 .SH AUTHOR
-This manual page was written by Andrew Resch <andrew.resch@gmail.com>.
+This manual page was written by Andrew Resch <andrewresch@gmail.com>.
 .br
 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation
 .br

deluge/docs/man/deluged.1

@@ -1,4 +1,4 @@
-.TH DELUGED 1 "November 2008" "1.0.6"
+.TH DELUGED 1 "January 2009" "1.1.2"
 
 .SH NAME
 deluged - a bittorrent client daemon
@@ -41,7 +41,7 @@ Use pidfile to store process id
 Set the log level (default is error): none, info, warning, error, critical, debug
 .TP
 .I -q --quiet
-Sets the log level to 'none', this is the same as `-L none`
+Sets the log level to 'none', this is the same as `\-L none`
 
 .SH SEE ALSO
 .B Homepage:

deluge/i18n/POTFILES.in

@@ -1,14 +1,5 @@
 deluge/plugins/label/label/data/label_pref.glade
 deluge/plugins/label/label/data/label_options.glade
-deluge/plugins/label/build/lib/label/data/label_pref.glade
-deluge/plugins/label/build/lib/label/data/label_options.glade
-deluge/plugins/graph/build/lib/graph/data/config.glade
-deluge/plugins/blocklist/build/lib/blocklist/data/blocklist_pref.glade
-deluge/plugins/blocklist/blocklist/data/blocklist_pref.glade
-deluge/plugins/stats/build/lib/stats/data/config.glade
-deluge/plugins/stats/build/lib/stats/data/tabs.glade
-deluge/plugins/stats/stats/data/config.glade
-deluge/plugins/stats/stats/data/tabs.glade
 deluge/ui/gtkui/glade/add_torrent_dialog.glade
 deluge/ui/gtkui/glade/filtertree_menu.glade
 deluge/ui/gtkui/glade/torrent_menu.glade
@@ -18,7 +9,6 @@ deluge/ui/gtkui/glade/edit_trackers.glade
 deluge/ui/gtkui/glade/queuedtorrents.glade
 deluge/ui/gtkui/glade/move_storage_dialog.glade
 deluge/ui/gtkui/glade/connection_manager.glade
-deluge/ui/gtkui/glade/wizard.glade
 deluge/ui/gtkui/glade/create_torrent_dialog.glade
 deluge/ui/gtkui/glade/dgtkpopups.glade
 deluge/ui/gtkui/glade/tray_menu.glade
@@ -65,14 +55,6 @@ deluge/plugins/blocklist/blocklist/core.py
 deluge/plugins/coreclient.py
 deluge/plugins/__init__.py
 deluge/plugins/webuipluginbase.py
-deluge/plugins/stats/setup.py
-deluge/plugins/stats/stats/webui.py
-deluge/plugins/stats/stats/gtkui.py
-deluge/plugins/stats/stats/test.py
-deluge/plugins/stats/stats/graph.py
-deluge/plugins/stats/stats/test_total.py
-deluge/plugins/stats/stats/__init__.py
-deluge/plugins/stats/stats/core.py
 deluge/configmanager.py
 deluge/ui/tracker_icons.py
 deluge/ui/client.py
@@ -96,7 +78,7 @@ deluge/ui/console/__init__.py
 deluge/ui/gtkui/listview.py
 deluge/ui/gtkui/options_tab.py
 deluge/ui/gtkui/statusbar.py
-deluge/ui/gtkui/statistics_tab.py
+deluge/ui/gtkui/status_tab.py
 deluge/ui/gtkui/addtorrentdialog.py
 deluge/ui/gtkui/coreconfig.py
 deluge/ui/gtkui/sidebar.py
@@ -156,7 +138,6 @@ deluge/ui/webui/lib/webpy022/webapi.py
 deluge/ui/webui/lib/webpy022/form.py
 deluge/ui/webui/lib/json.py
 deluge/ui/webui/lib/newforms_plus.py
-deluge/ui/webui/lib/pythonize.py
 deluge/ui/webui/lib/egg_render.py
 deluge/ui/webui/lib/static_handler.py
 deluge/ui/webui/lib/__init__.py
@@ -193,8 +174,6 @@ deluge/ui/webui/scripts/template_strings.py
 deluge/ui/webui/scripts/extract_ajax_strings.py
 deluge/ui/webui/scripts/copy_icons.py
 deluge/ui/webui/scripts/extract_template_strings.py
-deluge/ui/null/deluge_shell.py
-deluge/ui/null/__init__.py
 deluge/common.py
 deluge/component.py
 deluge/main.py
@@ -211,4 +190,3 @@ deluge/xmlrpclib.py
 deluge/scripts/deluge_remote.py
 deluge/scripts/wiki_docgen.py
 deluge/scripts/create_plugin.py
-deluge/scripts/state_upgrade.py

deluge/log.py

@@ -27,12 +27,32 @@
 
 import logging
 
-# Setup the logger
-logging.basicConfig(
-    level=logging.ERROR,
-    format="[%(levelname)-8s] %(asctime)s %(module)s:%(lineno)d %(message)s",
-    datefmt="%H:%M:%S"
-)
+levels = {
+    "info": logging.INFO,
+    "warning": logging.WARNING,
+    "error": logging.ERROR,
+    "none": logging.CRITICAL,
+    "debug": logging.DEBUG
+}
+def setupLogger(level="error", filename=None):
+    """
+    Sets up the basic logger and if `:param:filename` is set, then it will log
+    to that file instead of stdout.
+
+    :param level: str, the level to log
+    :param filename: str, the file to log to
+    """
+
+    if not level or level not in levels:
+        level = "error"
+
+    logging.basicConfig(
+        level=levels[level],
+        format="[%(levelname)-8s] %(asctime)s %(module)s:%(lineno)d %(message)s",
+        datefmt="%H:%M:%S",
+        filename=filename,
+        filemode="w"
+    )
 
 def setLoggerLevel(level):
     """
@@ -41,14 +61,6 @@ def setLoggerLevel(level):
     :param level: str, a string representing the desired level
 
     """
-    levels = {
-        "info": logging.INFO,
-        "warning": logging.WARNING,
-        "error": logging.ERROR,
-        "none": logging.CRITICAL,
-        "debug": logging.DEBUG
-    }
-
     if level not in levels:
         return
 

deluge/main.py

@@ -33,7 +33,9 @@ import os.path
 import sys
 from optparse import OptionParser
 
+import deluge.log
 import deluge.common
+import deluge.configmanager
 
 def start_ui():
     """Entry point for ui script"""
@@ -58,10 +60,22 @@ def start_ui():
         help="Set the log level: none, info, warning, error, critical, debug", action="store", type="str")
     parser.add_option("-q", "--quiet", dest="quiet",
         help="Sets the log level to 'none', this is the same as `-L none`", action="store_true", default=False)
+    parser.add_option("-s", "--set-default-ui", dest="default_ui",
+        help="Sets the default UI to be run when no UI is specified", action="store", type="str")
 
     # Get the options and args from the OptionParser
     (options, args) = parser.parse_args()
 
+    if options.default_ui:
+        if options.config:
+            deluge.configmanager.set_config_dir(options.config)
+
+        config = deluge.configmanager.ConfigManager("ui.conf")
+        config["default_ui"] = options.default_ui
+        config.save()
+        print "The default UI has been changed to", options.default_ui
+        sys.exit(0)
+
     if options.quiet:
         options.loglevel = "none"
 
@@ -78,28 +92,24 @@ def start_ui():
 
     # Always log to a file in Windows
     if deluge.common.windows_check() and not options.logfile:
-        options.logfile = "deluge.log"
-
-    if options.logfile:
         if options.config:
-            logfile = os.path.join(options.config, options.logfile)
+            options.logfile = os.path.join(options.config, "deluge.log")
         else:
             config_dir = deluge.common.get_default_config_dir()
-            logfile = os.path.join(config_dir, options.logfile)
-        sys.stdout = open(logfile, "wb")
-        sys.stderr = sys.stdout
-        sys.stdin = None
+            options.logfile = os.path.join(config_dir, "deluge.log")
 
-    from deluge.log import LOG as log
-    # Set the log level if necessary
-    if options.loglevel:
-        import deluge.log
-        deluge.log.setLoggerLevel(options.loglevel)
+    # Setup the logger
+    deluge.log.setupLogger(level=options.loglevel, filename=options.logfile)
+    if options.logfile:
+        sys.stdout = None
+        sys.stderr = None
+        sys.stdin = None
 
     version = deluge.common.get_version()
     if deluge.common.get_revision() != "":
         version = version + "r" + deluge.common.get_revision()
 
+    from deluge.log import LOG as log
     log.info("Deluge ui %s", version)
     log.debug("options: %s", options)
     log.debug("args: %s", args)
@@ -148,23 +158,14 @@ def start_daemon():
         if not os.path.exists(deluge.common.get_default_config_dir()):
             os.makedirs(deluge.common.get_default_config_dir())
 
-    # Opens a log file and redirects stdout to it
+    # Sets the options.logfile to point to the default location
     def open_logfile():
-        path = None
-        if options.logfile:
-            path = options.logfile
-        else:
+        if not options.logfile:
             if options.config:
-                path = os.path.join(options.config, "deluged.log")
+                options.logfile = os.path.join(options.config, "deluged.log")
             else:
                 config_dir = deluge.common.get_default_config_dir()
-                path = os.path.join(config_dir, "deluged.log")
-
-        # Open a logfile
-        if path:
-            sys.stdout = open(path, "wb")
-        sys.stderr = sys.stdout
-        sys.stdin = None
+                options.logfile = os.path.join(config_dir, "deluged.log")
 
     # Writes out a pidfile if necessary
     def write_pidfile():
@@ -174,7 +175,7 @@ def start_daemon():
     # If the donot daemonize is set, then we just skip the forking
     if not options.donot:
         # Windows check, we log to the config folder by default
-        if deluge.common.windows_check():
+        if deluge.common.windows_check() or deluge.common.osx_check():
             open_logfile()
             write_pidfile()
         else:
@@ -191,10 +192,16 @@ def start_daemon():
         # Do not daemonize
         write_pidfile()
 
-    # Set the log level if necessary
-    if options.loglevel:
-        import deluge.log
-        deluge.log.setLoggerLevel(options.loglevel)
+    # Setup the logger
+    deluge.log.setupLogger(level=options.loglevel, filename=options.logfile)
+    if options.logfile:
+        sys.stdout = None
+        sys.stderr = None
+        sys.stdin = None
 
-    from deluge.core.daemon import Daemon
-    Daemon(options, args)
+    try:
+        from deluge.core.daemon import Daemon
+        Daemon(options, args)
+    except Exception, e:
+        from deluge.log import LOG as log
+        log.exception(e)

deluge/metafile.py

@@ -1,14 +1,20 @@
-# The contents of this file are subject to the BitTorrent Open Source License
-# Version 1.1 (the License).  You may not copy or use this file, in either
-# source code or executable form, except in compliance with the License.  You
-# may obtain a copy of the License at http://www.bittorrent.com/license/.
+# Taken from http://download.bittorrent.com/dl/BitTorrent-5.3-GPL.tar.gz
 #
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
-# for the specific language governing rights and limitations under the
-# License.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Written by Bram Cohen
+# Modifications for use in Deluge by Andrew Resch 2008
 
 import os
 import os.path
@@ -125,11 +131,10 @@ def makeinfo(path, piece_length, progress, name = None,
             try:
                 u = decode_from_filesystem(name)
             except Exception, e:
-                s = str_exc(e)
                 raise Exception('Could not convert file/directory name %r to '
-                                  'Unicode (%s). Either the assumed filesystem '
+                                  'Unicode. Either the assumed filesystem '
                                   'encoding "%s" is wrong or the filename contains '
-                                  'illegal bytes.') % (name, s, get_filesystem_encoding())
+                                  'illegal bytes.') % (name, get_filesystem_encoding())
 
         if u.translate(noncharacter_translate) != u:
             raise Exception('File/directory name "%s" contains reserved '

deluge/plugins/blocklist/blocklist/core.py

@@ -37,10 +37,10 @@ import deluge.component as component
 import deluge.configmanager
 
 from peerguardian import PGReader, PGException
-from text import TextReader, GZMuleReader, PGZip
+from text import TextReader, GZMuleReader, PGZip, PGTextReaderGzip
 
 DEFAULT_PREFS = {
-    "url": "http://www.deluge-torrent.org/blocklist/pipfilter.dat.gz",
+    "url": "http://deluge-torrent.org/blocklist/nipfilter.dat.gz",
     "load_on_start": False,
     "check_after_days": 4,
     "listtype": "gzmule",
@@ -56,7 +56,8 @@ FORMATS =  {
     'gzmule': ["Emule IP list (GZip)", GZMuleReader],
     'spzip': ["SafePeer Text (Zipped)", PGZip],
     'pgtext': ["PeerGuardian Text (Uncompressed)", TextReader],
-    'p2bgz': ["PeerGuardian P2B (GZip)", PGReader]
+    'p2bgz': ["PeerGuardian P2B (GZip)", PGReader],
+    'pgtextgz': ["PeerGuardian Text (GZip)",  PGTextReaderGzip]
 }
 
 class Core(CorePluginBase):
@@ -164,6 +165,7 @@ class Core(CorePluginBase):
             read_list = FORMATS[self.config["listtype"]][1](bl_file)
         except Exception, e:
             log.debug("Unable to read blocklist file: %s", e)
+            self.is_importing = False
             return
 
         try:
@@ -173,6 +175,7 @@ class Core(CorePluginBase):
                 self.core.export_block_ip_range(ips)
                 self.num_blocked += 1
                 ips = read_list.next()
+            read_list.close()
         except Exception, e:
             log.debug("Exception during import: %s", e)
         else:

deluge/plugins/blocklist/blocklist/gtkui.py

@@ -138,9 +138,11 @@ class GtkUI(ui.UI):
         client.blocklist_set_config(None, config)
 
     def _on_button_check_download_clicked(self, widget):
+        self._on_apply_prefs()
         client.blocklist_import(None, True, False)
 
     def _on_button_force_download_clicked(self, widget):
+        self._on_apply_prefs()
         client.blocklist_import(None, True, True)
 
     def _on_status_item_clicked(self, widget, event):

deluge/plugins/blocklist/blocklist/text.py

@@ -59,6 +59,13 @@ class PGTextReader(TextBase):
         regexp = ':(\d+)\.(\d+)\.(\d+)\.(\d+)-(\d+)\.(\d+)\.(\d+)\.(\d+)\s*$'
         TextBase.__init__(self, fd, regexp)
 
+class PGTextReaderGzip(PGTextReader):
+    def __init__(self, filename):
+        log.debug("PGTextReaderGzip loading")
+        try:
+            PGTextReader.__init__(self, gzip.open(filename, "r"))
+        except:
+            log.debug("Wrong file type or corrupted blocklist file.")
 
 # This reads uncompressed PG text list
 class TextReader(PGTextReader):

deluge/plugins/label/label/core.py

@@ -219,8 +219,12 @@ class Core(CorePluginBase):
             torrent.set_remove_at_ratio(options['remove_at_ratio'])
 
         if options["apply_move_completed"]:
-            torrent.set_move_on_completed(options["move_completed"])
-            torrent.set_move_on_completed_path(options["move_completed_path"])
+            torrent.set_options(
+                {
+                    "move_completed": options["move_completed"],
+                    "move_completed_path": options["move_completed_path"]
+                }
+            )
 
     def _has_auto_match(self, torrent ,label_options):
         "match for auto_add fields"
@@ -297,11 +301,12 @@ class Core(CorePluginBase):
 
     def export_set_config(self, options):
         """global_options:"""
-        for key, value in options.items:
-            if key in CORE_OPTIONS:
-                self.config[key] = value
+        if options:
+            for key, value in options.items:
+                if key in CORE_OPTIONS:
+                    self.config[key] = value
 
-        self.config.save()
+            self.config.save()
 
     def _status_get_label(self, torrent_id):
         return self.torrent_labels.get(torrent_id) or ""

deluge/plugins/label/label/data/label.js

@@ -1,6 +1,22 @@
 /*
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-# License : GPL v3.
+# Copyright (C) Martijn Voncken 2008 <mvoncken@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, write to:
+#     The Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor
+#     Boston, MA  02110-1301, USA.
+#
 */
 
 
@@ -77,4 +93,3 @@ Plugins.Label = {
 window.addEvent('domready', function(e) {
 	Plugins.Label.initialize();
 });
-

deluge/plugins/label/label/gtkui/__init__.py

@@ -1,5 +1,5 @@
 #
-# blocklist/gtkui.py
+# __init__.py
 #
 # Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
 #

deluge/plugins/label/label/gtkui/ui.py

@@ -1,5 +1,5 @@
 #
-# blocklist/ui.py
+# ui.py
 #
 # Copyright (C) 2007 Andrew Resch <andrewresch@gmail.com>
 # Copyright (C) 2008 Mark Stahler ('kramed') <markstahler@gmail.com>
@@ -41,4 +41,3 @@ class UI:
 
     def disable(self):
         pass
-

deluge/plugins/label/label/webui.py

@@ -25,14 +25,6 @@
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA    02110-1301, USA.
 #
-#    In addition, as a special exception, the copyright holders give
-#    permission to link the code of portions of this program with the OpenSSL
-#    library.
-#    You must obey the GNU General Public License in all respects for all of
-#    the code used other than OpenSSL. If you modify file(s) with this
-#    exception, you may extend this exception to your version of the file(s),
-#    but you are not obligated to do so. If you do not wish to do so, delete
-#    this exception statement from your version. If you delete this exception
 
 import os
 from deluge.common import fspeed

deluge/plugins/stats/create_dev_link.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-mkdir temp
-export PYTHONPATH=./temp
-python setup.py develop --install-dir ./temp
-cp ./temp/Stats.egg-link ~/.config/deluge/plugins
-rm -fr ./temp

deluge/plugins/stats/setup.py

@@ -1,70 +0,0 @@
-#
-# setup.py
-#
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-#
-# Basic plugin template created by:
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com>
-#
-# Deluge is free software.
-#
-# You may redistribute it and/or modify it under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option)
-# any later version.
-#
-# deluge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with deluge.    If not, write to:
-# 	The Free Software Foundation, Inc.,
-# 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
-#
-#    In addition, as a special exception, the copyright holders give
-#    permission to link the code of portions of this program with the OpenSSL
-#    library.
-#    You must obey the GNU General Public License in all respects for all of
-#    the code used other than OpenSSL. If you modify file(s) with this
-#    exception, you may extend this exception to your version of the file(s),
-#    but you are not obligated to do so. If you do not wish to do so, delete
-#    this exception statement from your version. If you delete this exception
-
-from setuptools import setup
-
-__plugin_name__ = "Stats"
-__author__ = "Martijn Voncken"
-__author_email__ = "mvoncken@gmail.com"
-__version__ = "0.1"
-__url__ = "http://deluge-torrent.org"
-__license__ = "GPLv3"
-__description__ = ""
-__long_description__ = """"""
-__pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
-
-setup(
-    name=__plugin_name__,
-    version=__version__,
-    description=__description__,
-    author=__author__,
-    author_email=__author_email__,
-    url=__url__,
-    license=__license__,
-    long_description=__long_description__,
-
-    packages=[__plugin_name__.lower()],
-    package_data = __pkg_data__,
-
-    entry_points="""
-    [deluge.plugin.core]
-    %s = %s:CorePlugin
-    [deluge.plugin.gtkui]
-    %s = %s:GtkUIPlugin
-    [deluge.plugin.webui]
-    %s = %s:WebUIPlugin
-    """ % ((__plugin_name__, __plugin_name__.lower())*3)
-)

deluge/plugins/stats/stats/__init__.py

@@ -1,65 +0,0 @@
-#
-# __init__.py
-#
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-#
-# Basic plugin template created by:
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-# Copyright (C) 2007, 2008 Andrew Resch <andrewresch@gmail.com>
-#
-# Deluge is free software.
-#
-# You may redistribute it and/or modify it under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option)
-# any later version.
-#
-# deluge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with deluge.    If not, write to:
-# 	The Free Software Foundation, Inc.,
-# 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
-#
-#    In addition, as a special exception, the copyright holders give
-#    permission to link the code of portions of this program with the OpenSSL
-#    library.
-#    You must obey the GNU General Public License in all respects for all of
-#    the code used other than OpenSSL. If you modify file(s) with this
-#    exception, you may extend this exception to your version of the file(s),
-#    but you are not obligated to do so. If you do not wish to do so, delete
-#    this exception statement from your version. If you delete this exception
-
-from deluge.log import LOG as log
-
-from deluge.plugins.init import PluginBase
-
-class CorePlugin(PluginBase):
-    def __init__(self, plugin_api, plugin_name):
-        # Load the Core portion of the plugin
-        try:
-            from core import Core
-            self.plugin = Core(plugin_api, plugin_name)
-        except Exception, e:
-            log.debug("Did not load a Core plugin: %s", e)
-
-class WebUIPlugin(PluginBase):
-    def __init__(self, plugin_api, plugin_name):
-        try:
-            from webui import WebUI
-            self.plugin = WebUI(plugin_api, plugin_name)
-        except Exception, e:
-            log.debug("Did not load a WebUI plugin: %s", e)
-
-class GtkUIPlugin(PluginBase):
-    def __init__(self, plugin_api, plugin_name):
-        # Load the GtkUI portion of the plugin
-        try:
-            from gtkui import GtkUI
-            self.plugin = GtkUI(plugin_api, plugin_name)
-        except Exception, e:
-            log.debug("Did not load a GtkUI plugin: %s", e)

deluge/plugins/stats/stats/core.py

@@ -1,156 +0,0 @@
-#
-# core.py
-#
-# Copyright (C) 2008 Damien Churchill <damoxc@gmail.com>
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
-#
-# Deluge is free software.
-#
-# You may redistribute it and/or modify it under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option)
-# any later version.
-#
-# deluge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with deluge.    If not, write to:
-# 	The Free Software Foundation, Inc.,
-# 	51 Franklin Street, Fifth Floor
-# 	Boston, MA    02110-1301, USA.
-#
-#    In addition, as a special exception, the copyright holders give
-#    permission to link the code of portions of this program with the OpenSSL
-#    library.
-#    You must obey the GNU General Public License in all respects for all of
-#    the code used other than OpenSSL. If you modify file(s) with this
-#    exception, you may extend this exception to your version of the file(s),
-#    but you are not obligated to do so. If you do not wish to do so, delete
-#    this exception statement from your version. If you delete this exception
-
-import deluge
-from deluge.log import LOG as log
-from deluge.plugins.corepluginbase import CorePluginBase
-from deluge import component
-from deluge import configmanager
-import gobject
-#from deluge.plugins.coreclient import client #1.1 and later only
-#client: see http://dev.deluge-torrent.org/wiki/Development/UiClient#Remoteapi
-
-DEFAULT_PREFS = {
-    "test":"NiNiNi",
-    "update_interval":2000, #2 seconds.
-    "length":150, # 2 seconds * 150 --> 5 minutes.
-}
-
-DEFAULT_TOTALS = {
-    "total_upload":0,
-    "total_download":0,
-    "total_payload_upload":0,
-    "total_payload_download":0,
-    "stats":{}
-}
-
-class Core(CorePluginBase):
-    totals = {} #class var to catch only updating this once per session in enable.
-
-    def enable(self):
-        self.core = component.get("Core")
-        self.stats ={}
-
-        self.config = configmanager.ConfigManager("stats.conf", DEFAULT_PREFS)
-        self.saved_stats = configmanager.ConfigManager("stats.totals", DEFAULT_TOTALS)
-        if self.totals == {}:
-            self.totals.update(self.saved_stats.config)
-
-        self.stats = self.saved_stats.get("stats") or {}
-        self.add_stats(
-            'upload_rate',
-            'download_rate',
-            'num_connections',
-            'dht_nodes',
-            'dht_cache_nodes',
-            'dht_torrents',
-        )
-
-        self.update_timer = gobject.timeout_add(
-            self.config.get("update_interval"), self.update_stats)
-        self.save_timer = gobject.timeout_add(60 * 1000, self.save_stats)
-        self.length = self.config.get("length")
-
-    def disable(self):
-        self.save_stats()
-        gobject.source_remove(self.update_timer)
-        gobject.source_remove(self.save_timer)
-
-    def add_stats(self, *stats):
-        for stat in stats:
-            if stat not in self.stats:
-                self.stats[stat] = []
-
-    def update_stats(self):
-        try:
-            stats = self.core.export_get_stats()
-            status = self.core.session.status()
-            for stat in dir(status):
-                if not stat.startswith('_') and stat not in stats:
-                    stats[stat] = getattr(status, stat, None)
-
-            for stat, stat_list in self.stats.iteritems():
-                if stat in stats:
-                    stat_list.insert(0, int(stats[stat]))
-
-                if len(stat_list) > self.length:
-                    stat_list.pop()
-        except Exception,e:
-            log.error(e.message)
-        return True
-
-    def save_stats(self):
-        try:
-            self.saved_stats.set("stats", self.stats)
-            self.saved_stats.config.update(self.export_get_totals())
-            self.saved_stats.save()
-        except Exception,e:
-            log.error(e.message)
-        return True
-
-
-    # export:
-    def export_get_stats(self, keys):
-        stats_dict = {}
-        for stat in self.stats:
-            if stat not in keys:
-                continue
-            stats_dict[stat] = self.stats[stat]
-        return stats_dict
-
-    def export_get_totals(self):
-        result = {}
-        session_totals = self.export_get_session_totals()
-        for key in session_totals:
-            result[key] = self.totals[key] + session_totals[key]
-        return result
-
-    def export_get_session_totals(self):
-        status = self.core.session.status()
-        return {
-            "total_upload":status.total_upload,
-            "total_download":status.total_download,
-            "total_payload_upload":status.total_payload_upload,
-            "total_payload_download":status.total_payload_download
-        }
-
-    def export_set_config(self, config):
-        "sets the config dictionary"
-        for key in config.keys():
-            self.config[key] = config[key]
-        self.config.save()
-
-    def export_get_config(self):
-        "returns the config dictionary"
-        return self.config.config

deluge/plugins/stats/stats/data/config.glade

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Aug  8 23:34:44 2008 -->
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <child>
-      <widget class="GtkHBox" id="prefs_box">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Test config value:</property>
-          </widget>
-        </child>
-        <child>
-          <widget class="GtkEntry" id="txt_test">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>