From d1b452373371d83bfce85a43c6de8f4b58fbfa5c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Dec 2010 01:58:38 +0000 Subject: [PATCH 001/329] Let log files be a little bigger, 50Mb is not that much anyway. --- deluge/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/log.py b/deluge/log.py index b014fa9c7..af610e00a 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -149,7 +149,7 @@ def setupLogger(level="error", filename=None, filemode="w"): import logging.handlers handler = logging.handlers.RotatingFileHandler( filename, filemode, - maxBytes=5*1024*1024, # 5 Mb + maxBytes=50*1024*1024, # 50 Mb backupCount=3, encoding='utf-8', delay=0 From 1f800bf49a4cf5ce93765dc6b7d1b102003f25ec Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 1 Jan 2011 18:33:41 +0000 Subject: [PATCH 002/329] On a 64bit platform with old plugins, the deprecation code was unable to find out which was the caller module. This might also happen on other platforms although I was unable to reproduce it on x86. Anyway, handle it cleanly. --- deluge/log.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/deluge/log.py b/deluge/log.py index af610e00a..a5e8f64e1 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -263,21 +263,30 @@ class __BackwardsCompatibleLOG(object): import warnings logger_name = 'deluge' stack = inspect.stack() - module_stack = stack.pop(1) + stack.pop(0) # The logging call from this module + module_stack = stack.pop(0) # The module that called the log function caller_module = inspect.getmodule(module_stack[0]) + # In some weird cases caller_module might be None, try to continue + caller_module_name = getattr(caller_module, '__name__', '') warnings.warn_explicit(DEPRECATION_WARNING, DeprecationWarning, module_stack[1], module_stack[2], - caller_module.__name__) - for member in stack: - module = inspect.getmodule(member[0]) - if not module: - continue - if module.__name__ in ('deluge.plugins.pluginbase', - 'deluge.plugins.init'): - logger_name += '.plugin.%s' % caller_module.__name__ - # Monkey Patch The Plugin Module - caller_module.log = logging.getLogger(logger_name) - break + caller_module_name) + if caller_module: + for member in stack: + module = inspect.getmodule(member[0]) + if not module: + continue + if module.__name__ in ('deluge.plugins.pluginbase', + 'deluge.plugins.init'): + logger_name += '.plugin.%s' % caller_module_name + # Monkey Patch The Plugin Module + caller_module.log = logging.getLogger(logger_name) + break + else: + logging.getLogger(logger_name).warning( + "Unable to monkey-patch the calling module's `log` attribute! " + "You should really update and rebuild your plugins..." + ) return getattr(logging.getLogger(logger_name), name) LOG = __BackwardsCompatibleLOG() From 356808b02c5326e54accb2726df409f1542fdc89 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 2 Jan 2011 16:03:00 +0000 Subject: [PATCH 003/329] Fix #1470. --- deluge/log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/log.py b/deluge/log.py index a5e8f64e1..2528d1581 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -141,7 +141,7 @@ def setupLogger(level="error", filename=None, filemode="w"): if logging.getLoggerClass() is not Logging: logging.setLoggerClass(Logging) - level = levels.get(level, "error") + level = levels.get(level, logging.ERROR) rootLogger = logging.getLogger() @@ -162,6 +162,7 @@ def setupLogger(level="error", filename=None, filemode="w"): ) else: handler = logging.StreamHandler() + handler.setLevel(level) formatter = logging.Formatter( From 8c12c47d3eb1b5c99d5d86ce238776b3ab904ef8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 2 Jan 2011 16:06:28 +0000 Subject: [PATCH 004/329] Add "none" as a log level to support quieting the logging messages. Refs #1470. --- deluge/log.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/log.py b/deluge/log.py index 2528d1581..390010c0e 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -117,6 +117,7 @@ class Logging(LoggingLoggerClass): return rv levels = { + "none": logging.NOTSET, "info": logging.INFO, "warn": logging.WARNING, "warning": logging.WARNING, From b30499c6ac9ffc1a728cc741bc0e897abe329913 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sun, 16 Jan 2011 15:58:50 -0800 Subject: [PATCH 005/329] Fix #1484: trying to access the screen object when not using interactive mode --- deluge/ui/console/commands/info.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deluge/ui/console/commands/info.py b/deluge/ui/console/commands/info.py index 8a478a87d..d42a80eeb 100644 --- a/deluge/ui/console/commands/info.py +++ b/deluge/ui/console/commands/info.py @@ -189,10 +189,11 @@ class Command(BaseCommand): s += " %s" % (fp) # Check if this is too long for the screen and reduce the path # if necessary - cols = self.console.screen.cols - slen = colors.get_line_length(s, self.console.screen.encoding) - if slen > cols: - s = s.replace(f["path"], f["path"][slen - cols + 1:]) + if hasattr(self.console, "screen"): + cols = self.console.screen.cols + slen = colors.get_line_length(s, self.console.screen.encoding) + if slen > cols: + s = s.replace(f["path"], f["path"][slen - cols + 1:]) self.console.write(s) self.console.write(" {!info!}::Peers") From 2f6283ea39b7d12f93530519b74f61b17ff0224b Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 26 Jan 2011 22:18:18 +0100 Subject: [PATCH 006/329] initial checkin of new console ui pretty alpha code, but it works and gives an idea of the direction the ui might go --- deluge/ui/console/colors.py | 7 +- deluge/ui/console/main.py | 6 +- deluge/ui/console/modes/__init__.py | 0 deluge/ui/console/modes/add_util.py | 71 +++ deluge/ui/console/modes/alltorrents.py | 602 +++++++++++++++++++++++++ deluge/ui/console/modes/basemode.py | 224 +++++++++ deluge/ui/console/modes/input_popup.py | 244 ++++++++++ deluge/ui/console/modes/popup.py | 254 +++++++++++ 8 files changed, 1405 insertions(+), 3 deletions(-) create mode 100644 deluge/ui/console/modes/__init__.py create mode 100644 deluge/ui/console/modes/add_util.py create mode 100644 deluge/ui/console/modes/alltorrents.py create mode 100644 deluge/ui/console/modes/basemode.py create mode 100644 deluge/ui/console/modes/input_popup.py create mode 100644 deluge/ui/console/modes/popup.py diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index 83465737d..7d7944b3c 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -61,7 +61,12 @@ schemes = { "info": ("white", "black", "bold"), "error": ("red", "black", "bold"), "success": ("green", "black", "bold"), - "event": ("magenta", "black", "bold") + "event": ("magenta", "black", "bold"), + "selected": ("black", "white", "bold"), + "marked": ("white","blue","bold"), + "selectedmarked": ("blue","white","bold"), + "header": ("green","black","bold"), + "filterstatus": ("green", "blue", "bold") } # Colors for various torrent states diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 6ea3adb79..a0090ef15 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -213,7 +213,8 @@ class ConsoleUI(component.Component): # We want to do an interactive session, so start up the curses screen and # pass it the function that handles commands colors.init_colors() - self.screen = screen.Screen(stdscr, self.do_command, self.tab_completer, self.encoding) + from modes.alltorrents import AllTorrents + self.screen = AllTorrents(stdscr, self.coreconfig, self.encoding) self.statusbars = StatusBars() self.eventlog = EventLog() @@ -271,7 +272,8 @@ class ConsoleUI(component.Component): """ if self.interactive: - self.screen.add_line(line, not self.batch_write) + #self.screen.add_line(line, not self.batch_write) + pass else: print(colors.strip_colors(line)) diff --git a/deluge/ui/console/modes/__init__.py b/deluge/ui/console/modes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py new file mode 100644 index 000000000..d9ced794b --- /dev/null +++ b/deluge/ui/console/modes/add_util.py @@ -0,0 +1,71 @@ +# +# add_util.py +# +# Copyright (C) 2011 Nick Lanham +# +# Modified function from commands/add.py: +# Copyright (C) 2008-2009 Ido Abramovich +# Copyright (C) 2009 Andrew Resch +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# +from twisted.internet import defer + +from deluge.ui.client import client +import deluge.component as component + +from optparse import make_option +import os +import base64 + +def add_torrent(t_file, options, success_cb, fail_cb): + t_options = {} + if options["path"]: + t_options["download_location"] = os.path.expanduser(options["path"]) + + # Keep a list of deferreds to make a DeferredList + if not os.path.exists(t_file): + fail_cb("{!error!}%s doesn't exist!" % t_file) + return + if not os.path.isfile(t_file): + fail_cb("{!error!}%s is a directory!" % t_file) + return + + + filename = os.path.split(t_file)[-1] + filedump = base64.encodestring(open(t_file).read()) + + def on_success(result): + success_cb("{!success!}Torrent added!") + def on_fail(result): + fail_cb("{!error!}Torrent was not added! %s" % result) + + client.core.add_torrent_file(filename, filedump, t_options).addCallback(on_success).addErrback(on_fail) + diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py new file mode 100644 index 000000000..dbd50676e --- /dev/null +++ b/deluge/ui/console/modes/alltorrents.py @@ -0,0 +1,602 @@ +# -*- coding: utf-8 -*- +# +# alltorrens.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.component as component +from basemode import BaseMode +import deluge.common +from deluge.ui.client import client + +from collections import deque + +from deluge.ui.sessionproxy import SessionProxy + +from popup import Popup,SelectablePopup,MessagePopup +from add_util import add_torrent +from input_popup import InputPopup + + +try: + import curses +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + + +# Big help string that gets displayed when the user hits 'h' +HELP_STR = \ +"""This screen shows an overview of the current torrents Deluge is managing. +The currently selected torrent is indicated by having a white background. +You can change the selected torrent using the up/down arrows or the +PgUp/Pg keys. + +Operations can be performed on multiple torrents by marking them and +then hitting Enter. See below for the keys used to mark torrents. + +You can scroll a popup window that doesn't fit its content (like +this one) using the up/down arrows. + +All popup windows can be closed/canceled by hitting the Esc key +(you might need to wait a second for an Esc to register) + +The actions you can perform and the keys to perform them are as follows: + +'a' - Add a torrent + +'h' - Show this help + +'f' - Show only torrents in a certain state + (Will open a popup where you can select the state you want to see) + +'i' - Show more detailed information about the current selected torrent + +'Q' - quit + +'m' - Mark a torrent +'M' - Mark all torrents between currently selected torrent + and last marked torrent +'c' - Un-mark all torrents + +Enter - Show torrent actions popup. Here you can do things like + pause/resume, remove, recheck and so one. These actions + apply to all currently marked torrents. The currently + selected torrent is automatically marked when you press enter. + +'q'/Esc - Close a popup +""" +HELP_LINES = HELP_STR.split('\n') + +class ACTION: + PAUSE=0 + RESUME=1 + REANNOUNCE=2 + EDIT_TRACKERS=3 + RECHECK=4 + REMOVE=5 + +class FILTER: + ALL=0 + ACTIVE=1 + DOWNLOADING=2 + SEEDING=3 + PAUSED=4 + CHECKING=5 + ERROR=6 + QUEUED=7 + +class StateUpdater(component.Component): + def __init__(self, cb, sf,tcb): + component.Component.__init__(self, "AllTorrentsStateUpdater", 1, depend=["SessionProxy"]) + self._status_cb = cb + self._status_fields = sf + self.status_dict = {} + self._torrent_cb = tcb + self._torrent_to_update = None + + def set_torrent_to_update(self, tid, keys): + self._torrent_to_update = tid + self._torrent_keys = keys + + def start(self): + component.get("SessionProxy").get_torrents_status(self.status_dict, self._status_fields).addCallback(self._on_torrents_status,False) + + def update(self): + component.get("SessionProxy").get_torrents_status(self.status_dict, self._status_fields).addCallback(self._on_torrents_status,True) + if self._torrent_to_update: + component.get("SessionProxy").get_torrent_status(self._torrent_to_update, self._torrent_keys).addCallback(self._torrent_cb) + + def _on_torrents_status(self, state, refresh): + self._status_cb(state,refresh) + + +class AllTorrents(BaseMode, component.Component): + def __init__(self, stdscr, coreconfig, encoding=None): + self.curstate = None + self.cursel = 1 + self.curoff = 1 + self.column_string = "" + self.popup = None + self.messages = deque() + self.marked = [] + self.last_mark = -1 + self._sorted_ids = None + self._go_top = False + + self._curr_filter = None + + self.coreconfig = coreconfig + + BaseMode.__init__(self, stdscr, encoding) + curses.curs_set(0) + self.stdscr.notimeout(0) + self.sessionproxy = SessionProxy() + + self._status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", + "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] + + self.updater = StateUpdater(self.set_state,self._status_fields,self._on_torrent_status) + + self.column_names = ["#", "Name","Size","State","Progress","Seeders","Peers","Down Speed","Up Speed"] + self._update_columns() + + + self._info_fields = [ + ("Name",None,("name",)), + ("State", None, ("state",)), + ("Down Speed", self._format_speed, ("download_payload_rate",)), + ("Up Speed", self._format_speed, ("upload_payload_rate",)), + ("Progress", self._format_progress, ("progress",)), + ("ETA", deluge.common.ftime, ("eta",)), + ("Path", None, ("save_path",)), + ("Downloaded",deluge.common.fsize,("all_time_download",)), + ("Uploaded", deluge.common.fsize,("total_uploaded",)), + ("Share Ratio", lambda x:x < 0 and "∞" or "%.3f"%x, ("ratio",)), + ("Seeders",self._format_seeds_peers,("num_seeds","total_seeds")), + ("Peers",self._format_seeds_peers,("num_peers","total_peers")), + ("Active Time",deluge.common.ftime,("active_time",)), + ("Seeding Time",deluge.common.ftime,("seeding_time",)), + ("Date Added",deluge.common.fdate,("time_added",)), + ("Availability", lambda x:x < 0 and "∞" or "%.3f"%x, ("distributed_copies",)), + ("Pieces", self._format_pieces, ("num_pieces","piece_length")), + ] + + self._status_keys = ["name","state","download_payload_rate","upload_payload_rate", + "progress","eta","all_time_download","total_uploaded", "ratio", + "num_seeds","total_seeds","num_peers","total_peers", "active_time", + "seeding_time","time_added","distributed_copies", "num_pieces", + "piece_length","save_path"] + + def _update_columns(self): + self.column_widths = [5,-1,15,13,10,10,10,15,15] + req = sum(filter(lambda x:x >= 0,self.column_widths)) + if (req > self.cols): # can't satisfy requests, just spread out evenly + cw = int(self.cols/len(self.column_names)) + for i in range(0,len(self.column_widths)): + self.column_widths[i] = cw + else: + rem = self.cols - req + var_cols = len(filter(lambda x: x < 0,self.column_widths)) + vw = int(rem/var_cols) + for i in range(0, len(self.column_widths)): + if (self.column_widths[i] < 0): + self.column_widths[i] = vw + + self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) + + def _trim_string(self, string, w): + return "%s... "%(string[0:w-4]) + + def _format_column(self, col, lim): + size = len(col) + if (size >= lim - 1): + return self._trim_string(col,lim) + else: + return "%s%s"%(col," "*(lim-size)) + + def _format_row(self, row): + return "".join([self._format_column(row[i],self.column_widths[i]) for i in range(0,len(row))]) + + def set_state(self, state, refresh): + self.curstate = state + self.numtorrents = len(state) + if refresh: + self.refresh() + + def _scroll_up(self, by): + self.cursel = max(self.cursel - by,1) + if ((self.cursel - 1) < self.curoff): + self.curoff = max(self.cursel - 1,1) + + def _scroll_down(self, by): + self.cursel = min(self.cursel + by,self.numtorrents) + if ((self.curoff + self.rows - 5) < self.cursel): + self.curoff = self.cursel - self.rows + 5 + + def _current_torrent_id(self): + if self._sorted_ids: + return self._sorted_ids[self.cursel-1] + else: + return None + + def _selected_torrent_ids(self): + ret = [] + for i in self.marked: + ret.append(self._sorted_ids[i-1]) + return ret + + def _on_torrent_status(self, state): + if (self.popup): + self.popup.clear() + name = state["name"] + off = int((self.cols/4)-(len(name)/2)) + self.popup.set_title(name) + for i,f in enumerate(self._info_fields): + if f[1] != None: + args = [] + try: + for key in f[2]: + args.append(state[key]) + except: + log.debug("Could not get info field: %s",e) + continue + info = f[1](*args) + else: + info = state[f[2][0]] + + self.popup.add_line("{!info!}%s: {!input!}%s"%(f[0],info)) + self.refresh() + else: + self.updater.set_torrent_to_update(None,None) + + + def on_resize(self, *args): + BaseMode.on_resize_norefresh(self, *args) + self._update_columns() + if self.popup: + self.popup.handle_resize() + self.refresh() + + def _queue_sort(self, v1, v2): + if v1 == v2: + return 0 + if v2 < 0: + return -1 + if v1 < 0: + return 1 + if v1 > v2: + return 1 + if v2 > v1: + return -1 + + def _sort_torrents(self, state): + "sorts by queue #" + return sorted(state,cmp=self._queue_sort,key=lambda s:state.get(s)["queue"]) + + def _format_speed(self, speed): + if (speed > 0): + return deluge.common.fspeed(speed) + else: + return "-" + + def _format_queue(self, qnum): + if (qnum >= 0): + return "%d"%(qnum+1) + else: + return "" + + def _format_seeds_peers(self, num, total): + return "%d (%d)"%(num,total) + + def _format_pieces(self, num, size): + return "%d (%s)"%(num,deluge.common.fsize(size)) + + def _format_progress(self, perc): + return "%.2f%%"%perc + + def _action_error(self, error): + rerr = error.value + self.report_message("An Error Occurred","%s got error %s: %s"%(rerr.method,rerr.exception_type,rerr.exception_msg)) + self.refresh() + + def _torrent_action(self, idx, data): + ids = self._selected_torrent_ids() + if ids: + if data==ACTION.PAUSE: + log.debug("Pausing torrents: %s",ids) + client.core.pause_torrent(ids).addErrback(self._action_error) + elif data==ACTION.RESUME: + log.debug("Resuming torrents: %s", ids) + client.core.resume_torrent(ids).addErrback(self._action_error) + elif data==ACTION.REMOVE: + log.error("Can't remove just yet") + elif data==ACTION.RECHECK: + log.debug("Rechecking torrents: %s", ids) + client.core.force_recheck(ids).addErrback(self._action_error) + elif data==ACTION.REANNOUNCE: + log.debug("Reannouncing torrents: %s",ids) + client.core.force_reannounce(ids).addErrback(self._action_error) + if len(ids) == 1: + self.marked = [] + self.last_mark = -1 + + def _show_torrent_actions_popup(self): + #cid = self._current_torrent_id() + if len(self.marked): + self.popup = SelectablePopup(self,"Torrent Actions",self._torrent_action) + self.popup.add_line("Pause",data=ACTION.PAUSE) + self.popup.add_line("Resume",data=ACTION.RESUME) + self.popup.add_divider() + self.popup.add_line("Update Tracker",data=ACTION.REANNOUNCE) + self.popup.add_divider() + self.popup.add_line("Remove Torrent",data=ACTION.REMOVE) + self.popup.add_line("Force Recheck",data=ACTION.RECHECK) + + def _torrent_filter(self, idx, data): + if data==FILTER.ALL: + self.updater.status_dict = {} + self._curr_filter = None + elif data==FILTER.ACTIVE: + self.updater.status_dict = {"state":"Active"} + self._curr_filter = "Active" + elif data==FILTER.DOWNLOADING: + self.updater.status_dict = {"state":"Downloading"} + self._curr_filter = "Downloading" + elif data==FILTER.SEEDING: + self.updater.status_dict = {"state":"Seeding"} + self._curr_filter = "Seeding" + elif data==FILTER.PAUSED: + self.updater.status_dict = {"state":"Paused"} + self._curr_filter = "Paused" + elif data==FILTER.CHECKING: + self.updater.status_dict = {"state":"Checking"} + self._curr_filter = "Checking" + elif data==FILTER.ERROR: + self.updater.status_dict = {"state":"Error"} + self._curr_filter = "Error" + elif data==FILTER.QUEUED: + self.updater.status_dict = {"state":"Queued"} + self._curr_filter = "Queued" + self._go_top = True + + def _show_torrent_filter_popup(self): + self.popup = SelectablePopup(self,"Filter Torrents",self._torrent_filter) + self.popup.add_line("All",data=FILTER.ALL) + self.popup.add_line("Active",data=FILTER.ACTIVE) + self.popup.add_line("Downloading",data=FILTER.DOWNLOADING,foreground="green") + self.popup.add_line("Seeding",data=FILTER.SEEDING,foreground="blue") + self.popup.add_line("Paused",data=FILTER.PAUSED) + self.popup.add_line("Error",data=FILTER.ERROR,foreground="red") + self.popup.add_line("Checking",data=FILTER.CHECKING,foreground="cyan") + self.popup.add_line("Queued",data=FILTER.QUEUED,foreground="yellow") + + def _do_add(self, result): + log.debug("Doing adding %s (dl to %s)",result["file"],result["path"]) + def suc_cb(msg): + self.report_message("Torrent Added",msg) + def fail_cb(msg): + self.report_message("Failed To Add Torrent",msg) + add_torrent(result["file"],result,suc_cb,fail_cb) + + def _show_torrent_add_popup(self): + dl = "" + try: + dl = self.coreconfig["download_location"] + except KeyError: + pass + self.popup = InputPopup(self,"Add Torrent (Esc to cancel)",close_cb=self._do_add) + self.popup.add_text_input("Enter path to torrent file:","file") + self.popup.add_text_input("Enter save path:","path",dl) + + def report_message(self,title,message): + self.messages.append((title,message)) + + def refresh(self): + # Something has requested we scroll to the top of the list + if self._go_top: + self.cursel = 1 + self.curoff = 1 + self._go_top = False + + # show a message popup if there's anything queued + if self.popup == None and self.messages: + title,msg = self.messages.popleft() + self.popup = MessagePopup(self,title,msg) + + self.stdscr.clear() + + # Update the status bars + if self._curr_filter == None: + self.add_string(0,self.topbar) + else: + self.add_string(0,"%s {!filterstatus!}Current filter: %s"%(self.topbar,self._curr_filter)) + self.add_string(1,self.column_string) + self.add_string(self.rows - 1, self.bottombar) + + # add all the torrents + if self.curstate == {}: + msg = "No torrents match filter".center(self.cols) + self.add_string(3, "{!info!}%s"%msg) + elif self.curstate != None: + tidx = 1 + currow = 2 + self._sorted_ids = self._sort_torrents(self.curstate) + for torrent_id in self._sorted_ids: + if (tidx < self.curoff): + tidx += 1 + continue + ts = self.curstate[torrent_id] + s = self._format_row([self._format_queue(ts["queue"]), + ts["name"], + "%s"%deluge.common.fsize(ts["total_wanted"]), + ts["state"], + self._format_progress(ts["progress"]), + self._format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), + self._format_seeds_peers(ts["num_peers"],ts["total_peers"]), + self._format_speed(ts["download_payload_rate"]), + self._format_speed(ts["upload_payload_rate"]) + ]) + + # default style + fg = "white" + bg = "black" + attr = None + + if tidx in self.marked: + bg = "blue" + attr = "bold" + + if tidx == self.cursel: + bg = "white" + attr = "bold" + if tidx in self.marked: + fg = "blue" + else: + fg = "black" + + if ts["state"] == "Downloading": + fg = "green" + elif ts["state"] == "Seeding": + fg = "blue" + elif ts["state"] == "Error": + fg = "red" + elif ts["state"] == "Queued": + fg = "yellow" + elif ts["state"] == "Checking": + fg = "cyan" + + if attr: + colorstr = "{!%s,%s,%s!}"%(fg,bg,attr) + else: + colorstr = "{!%s,%s!}"%(fg,bg) + self.add_string(currow,"%s%s"%(colorstr,s)) + tidx += 1 + currow += 1 + if (currow > (self.rows - 2)): + break + else: + self.add_string(1, "Waiting for torrents from core...") + + self.stdscr.redrawwin() + self.stdscr.noutrefresh() + + if self.popup: + self.popup.refresh() + + curses.doupdate() + + + def _mark_unmark(self,idx): + if idx in self.marked: + self.marked.remove(idx) + self.last_mark = -1 + else: + self.marked.append(idx) + self.last_mark = idx + + + def _doRead(self): + # Read the character + c = self.stdscr.getch() + + if self.popup: + if self.popup.handle_read(c): + self.popup = None + self.refresh() + return + + if c > 31 and c < 256: + if chr(c) == 'Q': + from twisted.internet import reactor + if client.connected(): + def on_disconnect(result): + reactor.stop() + client.disconnect().addCallback(on_disconnect) + else: + reactor.stop() + return + + if self.curstate==None or self.popup: + return + + #log.error("pressed key: %d\n",c) + #if c == 27: # handle escape + # log.error("CANCEL") + + # Navigate the torrent list + if c == curses.KEY_UP: + self._scroll_up(1) + elif c == curses.KEY_PPAGE: + self._scroll_up(int(self.rows/2)) + elif c == curses.KEY_DOWN: + self._scroll_down(1) + elif c == curses.KEY_NPAGE: + self._scroll_down(int(self.rows/2)) + + # Enter Key + elif c == curses.KEY_ENTER or c == 10: + self.marked.append(self.cursel) + self.last_mark = self.cursel + self._show_torrent_actions_popup() + + else: + if c > 31 and c < 256: + if chr(c) == 'i': + cid = self._current_torrent_id() + if cid: + self.popup = Popup(self,"Info",close_cb=lambda:self.updater.set_torrent_to_update(None,None)) + self.popup.add_line("Getting torrent info...") + self.updater.set_torrent_to_update(cid,self._status_keys) + elif chr(c) == 'm': + self._mark_unmark(self.cursel) + elif chr(c) == 'M': + if self.last_mark >= 0: + self.marked.extend(range(self.last_mark,self.cursel+1)) + else: + self._mark_unmark(self.cursel) + elif chr(c) == 'c': + self.marked = [] + self.last_mark = -1 + elif chr(c) == 'a': + self._show_torrent_add_popup() + elif chr(c) == 'f': + self._show_torrent_filter_popup() + elif chr(c) == 'h': + self.popup = Popup(self,"Help") + for l in HELP_LINES: + self.popup.add_line(l) + + self.refresh() diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py new file mode 100644 index 000000000..d02b2d25d --- /dev/null +++ b/deluge/ui/console/modes/basemode.py @@ -0,0 +1,224 @@ +# +# basemode.py +# +# Copyright (C) 2011 Nick Lanham +# +# Most code in this file taken from screen.py: +# Copyright (C) 2009 Andrew Resch +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import sys +import logging +try: + import curses +except ImportError: + pass + +import deluge.ui.console.colors as colors +try: + import signal + from fcntl import ioctl + import termios + import struct +except: + pass + +from twisted.internet import reactor + +log = logging.getLogger(__name__) + +class CursesStdIO(object): + """fake fd to be registered as a reader with the twisted reactor. + Curses classes needing input should extend this""" + + def fileno(self): + """ We want to select on FD 0 """ + return 0 + + def doRead(self): + """called when input is ready""" + pass + def logPrefix(self): return 'CursesClient' + + +class BaseMode(CursesStdIO): + def __init__(self, stdscr, encoding=None): + """ + A mode that provides a curses screen designed to run as a reader in a twisted reactor. + This mode doesn't do much, just shows status bars and "Base Mode" on the screen + + Modes should subclass this and provide overrides for: + + _doRead(self) - Handle user input + refresh(self) - draw the mode to the screen + add_string(self, row, string) - add a string of text to be displayed. + see method for detailed info + + The init method of a subclass *must* call BaseMode.__init__ + + Useful fields after calling BaseMode.__init__: + self.stdscr - the curses screen + self.rows - # of rows on the curses screen + self.cols - # of cols on the curses screen + self.topbar - top statusbar + self.bottombar - bottom statusbar + """ + log.debug("BaseMode init!") + self.stdscr = stdscr + # Make the input calls non-blocking + self.stdscr.nodelay(1) + + # Strings for the 2 status bars + self.topbar = "" + self.bottombar = "" + + # Keep track of the screen size + self.rows, self.cols = self.stdscr.getmaxyx() + try: + signal.signal(signal.SIGWINCH, self.on_resize) + except Exception, e: + log.debug("Unable to catch SIGWINCH signal!") + + if not encoding: + self.encoding = sys.getdefaultencoding() + else: + self.encoding = encoding + + colors.init_colors() + + # Do a refresh right away to draw the screen + self.refresh() + + def on_resize_norefresh(self, *args): + log.debug("on_resize_from_signal") + # Get the new rows and cols value + self.rows, self.cols = struct.unpack("hhhh", ioctl(0, termios.TIOCGWINSZ ,"\000"*8))[0:2] + curses.resizeterm(self.rows, self.cols) + + def on_resize(self, *args): + self.on_resize_norefresh(args) + self.refresh() + + def connectionLost(self, reason): + self.close() + + def add_string(self, row, string, scr=None, col = 0, pad=True, trim=True): + """ + Adds a string to the desired `:param:row`. + + :param row: int, the row number to write the string + :param string: string, the string of text to add + :param scr: curses.window, optional window to add string to instead of self.stdscr + :param col: int, optional starting column offset + :param pad: bool, optional bool if the string should be padded out to the width of the screen + :param trim: bool, optional bool if the string should be trimmed if it is too wide for the screen + + The text can be formatted with color using the following format: + + "{!fg, bg, attributes, ...!}" + + See: http://docs.python.org/library/curses.html#constants for attributes. + + Alternatively, it can use some built-in scheme for coloring. + See colors.py for built-in schemes. + + "{!scheme!}" + + Examples: + + "{!blue, black, bold!}My Text is {!white, black!}cool" + "{!info!}I am some info text!" + "{!error!}Uh oh!" + + + """ + if scr: + screen = scr + else: + screen = self.stdscr + try: + parsed = colors.parse_color_string(string, self.encoding) + except colors.BadColorString, e: + log.error("Cannot add bad color string %s: %s", string, e) + return + + for index, (color, s) in enumerate(parsed): + if index + 1 == len(parsed) and pad: + # This is the last string so lets append some " " to it + s += " " * (self.cols - (col + len(s)) - 1) + if trim: + y,x = screen.getmaxyx() + if (col+len(s)) > x: + s = "%s..."%s[0:x-4-col] + screen.addstr(row, col, s, color) + col += len(s) + + def refresh(self): + """ + Refreshes the screen. + Updates the lines based on the`:attr:lines` based on the `:attr:display_lines_offset` + attribute and the status bars. + """ + self.stdscr.clear() + + # Update the status bars + self.add_string(0, self.topbar) + self.add_string(self.rows - 1, self.bottombar) + self.add_string(1,"{!info!}Base Mode (or subclass hasn't overridden refresh)") + + self.stdscr.redrawwin() + self.stdscr.refresh() + + def doRead(self): + """ + Called when there is data to be read, ie, input from the keyboard. + """ + # We wrap this function to catch exceptions and shutdown the mainloop + try: + self._doRead() + except Exception, e: + log.exception(e) + reactor.stop() + + def _doRead(self): + # Read the character + c = self.stdscr.getch() + self.stdscr.refresh() + + def close(self): + """ + Clean up the curses stuff on exit. + """ + curses.nocbreak() + self.stdscr.keypad(0) + curses.echo() + curses.endwin() diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py new file mode 100644 index 000000000..84b542d85 --- /dev/null +++ b/deluge/ui/console/modes/input_popup.py @@ -0,0 +1,244 @@ +# +# input_popup.py +# +# Copyright (C) 2011 Nick Lanham +# +# Complete function from commands/add.py: +# Copyright (C) 2008-2009 Ido Abramovich +# Copyright (C) 2009 Andrew Resch +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +try: + import curses +except ImportError: + pass + +import logging,os.path + +from popup import Popup + +log = logging.getLogger(__name__) + +def complete(line): + line = os.path.abspath(os.path.expanduser(line)) + ret = [] + if os.path.exists(line): + # This is a correct path, check to see if it's a directory + if os.path.isdir(line): + # Directory, so we need to show contents of directory + #ret.extend(os.listdir(line)) + for f in os.listdir(line): + # Skip hidden + if f.startswith("."): + continue + f = os.path.join(line, f) + if os.path.isdir(f): + f += "/" + ret.append(f) + else: + # This is a file, but we could be looking for another file that + # shares a common prefix. + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + ret.append(os.path.join( os.path.dirname(line), f)) + else: + # This path does not exist, so lets do a listdir on it's parent + # and find any matches. + ret = [] + if os.path.isdir(os.path.dirname(line)): + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + p = os.path.join(os.path.dirname(line), f) + + if os.path.isdir(p): + p += "/" + ret.append(p) + + return ret + + +class InputPopup(Popup): + def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): + Popup.__init__(self,parent_mode,title,width_req,height_req,close_cb) + self.input_list = [] + self.input_states = {} + self.current_input = 0 + self.tab_count = 0 + self.opts = None + self.opt_off = 0 + curses.curs_set(2) + + def add_text_input(self, message, name, value="", complete=True): + """ + Add a text input field to the popup. + + :param message: string to display above the input field + :param name: name of the field, for the return callback + :param value: initial value of the field + :param complete: should completion be run when tab is hit and this field is active + """ + self.input_list.append(name) + self.input_states[name] = [message,value,0,complete] + + def _refresh_lines(self): + crow = 1 + for i,ipt in enumerate(self.input_list): + msg,txt,curs,comp = self.input_states[ipt] + if i == self.current_input: + curs_row = crow+1 + curs_col = curs + if self.opts: + self.parent.add_string(crow+2,self.opts[self.opt_off:],self.screen,1,False,True) + self.parent.add_string(crow,msg,self.screen,1,False,True) + self.parent.add_string(crow+1,"{!selected!}%s"%txt.ljust(self.width-2),self.screen,1,False,False) + crow += 3 + + self.screen.move(curs_row,curs_col+1) + + def _get_current_input_value(self): + return self.input_states[self.input_list[self.current_input]][1] + + def _set_current_input_value(self, val): + self.input_states[self.input_list[self.current_input]][1] = val + + def _get_current_cursor(self): + return self.input_states[self.input_list[self.current_input]][2] + + def _move_current_cursor(self, amt): + self.input_states[self.input_list[self.current_input]][2] += amt + + def _set_current_cursor(self, pos): + self.input_states[self.input_list[self.current_input]][2] = pos + + # most of the cursor,input stuff here taken from ui/console/screen.py + def handle_read(self, c): + if c == curses.KEY_UP: + self.current_input = max(0,self.current_input-1) + elif c == curses.KEY_DOWN: + self.current_input = min(len(self.input_list)-1,self.current_input+1) + + elif c == curses.KEY_ENTER or c == 10: + if self._close_cb: + vals = {} + for ipt in self.input_list: + vals[ipt] = self.input_states[ipt][1] + curses.curs_set(0) + self._close_cb(vals) + return True # close the popup + + elif c == 9: + # Keep track of tab hit count to know when it's double-hit + self.tab_count += 1 + if self.tab_count > 1: + second_hit = True + self.tab_count = 0 + else: + second_hit = False + + # We only call the tab completer function if we're at the end of + # the input string on the cursor is on a space + cur_input = self._get_current_input_value() + cur_cursor = self._get_current_cursor() + if cur_cursor == len(cur_input) or cur_input[cur_cursor] == " ": + if self.opts: + prev = self.opt_off + self.opt_off += self.width-3 + # now find previous double space, best guess at a split point + # in future could keep opts unjoined to get this really right + self.opt_off = self.opts.rfind(" ",0,self.opt_off)+2 + if second_hit and self.opt_off == prev: # double tap and we're at the end + self.opt_off = 0 + else: + opts = complete(cur_input) + if len(opts) == 1: # only one option, just complete it + self._set_current_input_value(opts[0]) + self._set_current_cursor(len(opts[0])) + self.tab_count = 0 + elif len(opts) > 1 and second_hit: # display multiple options on second tab hit + self.opts = " ".join(opts) + + elif c == 27: # close on esc, no action + return True + + # Cursor movement + elif c == curses.KEY_LEFT: + if self._get_current_cursor(): + self._move_current_cursor(-1) + elif c == curses.KEY_RIGHT: + if self._get_current_cursor() < len(self._get_current_input_value()): + self._move_current_cursor(1) + elif c == curses.KEY_HOME: + self._set_current_cursor(0) + elif c == curses.KEY_END: + self._set_current_cursor(len(self._get_current_input_value())) + + if c != 9: + self.opts = None + self.opt_off = 0 + self.tab_count = 0 + + # Delete a character in the input string based on cursor position + if c == curses.KEY_BACKSPACE or c == 127: + cur_input = self._get_current_input_value() + cur_cursor = self._get_current_cursor() + if cur_input and cur_cursor > 0: + self._set_current_input_value(cur_input[:cur_cursor - 1] + cur_input[cur_cursor:]) + self._move_current_cursor(-1) + elif c == curses.KEY_DC: + cur_input = self._get_current_input_value() + cur_cursor = self._get_current_cursor() + if cur_input and cur_cursor < len(cur_input): + self._set_current_input_value(cur_input[:cur_cursor] + cur_input[cur_cursor+1:]) + elif c > 31 and c < 256: + cur_input = self._get_current_input_value() + cur_cursor = self._get_current_cursor() + # Emulate getwch + stroke = chr(c) + uchar = "" + while not uchar: + try: + uchar = stroke.decode(self.parent.encoding) + except UnicodeDecodeError: + c = self.parent.stdscr.getch() + stroke += chr(c) + if uchar: + if cur_cursor == len(cur_input): + self._set_current_input_value(cur_input+uchar) + else: + # Insert into string + self._set_current_input_value(cur_input[:cur_cursor] + uchar + cur_input[cur_cursor:]) + # Move the cursor forward + self._move_current_cursor(1) + + self.refresh() + return False + diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py new file mode 100644 index 000000000..93df9f6f8 --- /dev/null +++ b/deluge/ui/console/modes/popup.py @@ -0,0 +1,254 @@ +# -*- coding: utf-8 -*- +# +# popup.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +try: + import curses + import signal +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + +class Popup: + def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): + """ + Init a new popup. The default constructor will handle sizing and borders and the like. + + NB: The parent mode is responsible for calling refresh on any popups it wants to show. + This should be called as the last thing in the parents refresh method. + + The parent *must* also call _doRead on the popup instead of/in addition to + running its own _doRead code if it wants to have the popup handle user input. + + :param parent_mode: must be a basemode (or subclass) which the popup will be drawn over + :parem title: string, the title of the popup window + + Popups have two methods that must be implemented: + + refresh(self) - draw the popup window to screen. this default mode simply draws a bordered window + with the supplied title to the screen + + add_string(self, row, string) - add string at row. handles triming/ignoring if the string won't fit in the popup + + _doRead(self) - handle user input to the popup. + """ + self.parent = parent_mode + + if (height_req <= 0): + height_req = int(self.parent.rows/2) + if (width_req <= 0): + width_req = int(self.parent.cols/2) + by = (self.parent.rows/2)-(height_req/2) + bx = (self.parent.cols/2)-(width_req/2) + self.screen = curses.newwin(height_req,width_req,by,bx) + + self.title = title + self._close_cb = close_cb + self.height,self.width = self.screen.getmaxyx() + self._divider = None + self._lineoff = 0 + self._lines = [] + + def _refresh_lines(self): + crow = 1 + for row,line in enumerate(self._lines): + if (crow >= self.height-1): + break + if (row < self._lineoff): + continue + self.parent.add_string(crow,line,self.screen,1,False,True) + crow+=1 + + def handle_resize(self): + log.debug("Resizing popup window (actually, just creating a new one)") + self.screen = curses.newwin((self.parent.rows/2),(self.parent.cols/2),(self.parent.rows/4),(self.parent.cols/4)) + self.height,self.width = self.screen.getmaxyx() + + + def refresh(self): + self.screen.clear() + self.screen.border(0,0,0,0) + toff = max(1,int((self.parent.cols/4)-(len(self.title)/2))) + self.parent.add_string(0,"{!white,black,bold!}%s"%self.title,self.screen,toff,False,True) + + self._refresh_lines() + + self.screen.redrawwin() + self.screen.noutrefresh() + + def clear(self): + self._lines = [] + + def handle_read(self, c): + if c == curses.KEY_UP: + self._lineoff = max(0,self._lineoff -1) + elif c == curses.KEY_DOWN: + if len(self._lines)-self._lineoff > (self.height-2): + self._lineoff += 1 + + elif c == curses.KEY_ENTER or c == 10 or c == 27: # close on enter/esc + if self._close_cb: + self._close_cb() + return True # close the popup + + if c > 31 and c < 256 and chr(c) == 'q': + if self._close_cb: + self._close_cb() + return True # close the popup + + self.refresh() + + return False + + def set_title(self, title): + self.title = title + + def add_line(self, string): + self._lines.append(string) + + def add_divider(self): + if not self._divider: + self._divider = "-"*(self.width-2) + self._lines.append(self._divider) + + +class SelectablePopup(Popup): + """ + A popup which will let the user select from some of the lines that + are added. + """ + def __init__(self,parent_mode,title,selection_callback,*args): + Popup.__init__(self,parent_mode,title) + self._selection_callback = selection_callback + self._selection_args = args + self._selectable_lines = [] + self._select_data = [] + self._line_foregrounds = [] + self._selected = -1 + + def add_line(self, string, selectable=True, data=None, foreground=None): + Popup.add_line(self,string) + self._line_foregrounds.append(foreground) + if selectable: + self._selectable_lines.append(len(self._lines)-1) + self._select_data.append(data) + if self._selected < 0: + self._selected = (len(self._lines)-1) + + def _refresh_lines(self): + crow = 1 + for row,line in enumerate(self._lines): + if (crow >= self.height-1): + break + if (row < self._lineoff): + continue + fg = self._line_foregrounds[row] + if row == self._selected: + if fg == None: fg = "black" + colorstr = "{!%s,white,bold!}"%fg + else: + if fg == None: fg = "white" + colorstr = "{!%s,black!}"%fg + self.parent.add_string(crow,"- %s%s"%(colorstr,line),self.screen,1,False,True) + crow+=1 + + def add_divider(self,color="white"): + if not self._divider: + self._divider = "-"*(self.width-6)+" -" + self._lines.append(self._divider) + self._line_foregrounds.append(color) + + def handle_read(self, c): + if c == curses.KEY_UP: + #self._lineoff = max(0,self._lineoff -1) + if (self._selected != self._selectable_lines[0] and + len(self._selectable_lines) > 1): + idx = self._selectable_lines.index(self._selected) + self._selected = self._selectable_lines[idx-1] + elif c == curses.KEY_DOWN: + #if len(self._lines)-self._lineoff > (self.height-2): + # self._lineoff += 1 + idx = self._selectable_lines.index(self._selected) + if (idx < len(self._selectable_lines)-1): + self._selected = self._selectable_lines[idx+1] + elif c == 27: # close on esc, no action + return True + elif c == curses.KEY_ENTER or c == 10: + idx = self._selectable_lines.index(self._selected) + self._selection_callback(idx,self._select_data[idx],*self._selection_args) + return True + if c > 31 and c < 256 and chr(c) == 'q': + return True # close the popup + + self.refresh() + + return False + + +class MessagePopup(Popup): + """ + Popup that just displays a message + """ + import re + _strip_re = re.compile("\{!.*?!\}") + _min_height = 3 + + def __init__(self, parent_mode, title, message): + self.message = message + self.width= int(parent_mode.cols/2) + lns = self._split_message(self.message) + height = max(len(lns),self._min_height) + Popup.__init__(self,parent_mode,title,height_req=(height+2)) + lft = height - len(lns) + if lft: + for i in range(0,int(lft/2)): + lns.insert(0,"") + self._lines = lns + + def _split_message(self,message): + ret = [] + wl = (self.width-2) + for i in range(0,len(self.message),wl): + l = self.message[i:i+wl] + lp = (wl-len(self._strip_re.sub('',l)))/2 + ret.append("%s%s"%(lp*" ",l)) + return ret + + def handle_resize(self): + Popup.handle_resize(self) + self.clear() + self._lines = self._split_message(self.message) From ac18ecd1f021af9366aa6730000bf5a22c793708 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Thu, 27 Jan 2011 11:11:28 -0800 Subject: [PATCH 007/329] Fix #1498: Use os.path.normpath on new_folder to remove any double slashes or other problems that could be in the string --- deluge/core/torrent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 7651b6e5b..735ffa802 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -903,8 +903,8 @@ class Torrent(object): log.error("Attempting to rename a folder with an invalid folder name: %s", new_folder) return - if new_folder[-1:] != "/": - new_folder += "/" + # Make sure the new folder path is nice and has a trailing slash + new_folder = os.path.norm(new_folder) + "/" wait_on_folder = (folder, new_folder, []) for f in self.get_files(): From b7e7a4bc493d2e6a9131fda3163000d8d88f69d8 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Thu, 27 Jan 2011 11:18:40 -0800 Subject: [PATCH 008/329] Fix typo --- deluge/core/torrent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 735ffa802..9c09f5231 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -904,7 +904,7 @@ class Torrent(object): return # Make sure the new folder path is nice and has a trailing slash - new_folder = os.path.norm(new_folder) + "/" + new_folder = os.path.normpath(new_folder) + "/" wait_on_folder = (folder, new_folder, []) for f in self.get_files(): From ba3a093746a51fd46b9b0bcaf72847549e0c94b3 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 28 Jan 2011 17:04:28 +0100 Subject: [PATCH 009/329] remove special case white/black pair. doesn't seem needed and breaks white,black,attrs --- deluge/ui/console/colors.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index 7d7944b3c..9988ab882 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -50,9 +50,7 @@ colors = [ ] # {(fg, bg): pair_number, ...} -color_pairs = { - ("white", "black"): 0 # Special case, can't be changed -} +color_pairs = {} # Some default color schemes schemes = { @@ -93,8 +91,6 @@ def init_colors(): counter = 1 for fg in colors: for bg in colors: - if fg == "COLOR_WHITE" and bg == "COLOR_BLACK": - continue color_pairs[(fg[6:].lower(), bg[6:].lower())] = counter curses.init_pair(counter, getattr(curses, fg), getattr(curses, bg)) counter += 1 From 6f0b1fd7f25613b2b31721d62c431d21826136c3 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 28 Jan 2011 17:33:51 +0100 Subject: [PATCH 010/329] support hotkeys in selectable popup --- deluge/ui/console/modes/popup.py | 36 +++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 93df9f6f8..8b0d911eb 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -158,9 +158,18 @@ class SelectablePopup(Popup): self._selectable_lines = [] self._select_data = [] self._line_foregrounds = [] + self._udxs = {} + self._hotkeys = {} self._selected = -1 - def add_line(self, string, selectable=True, data=None, foreground=None): + def add_line(self, string, selectable=True, use_underline=True, data=None, foreground=None): + if use_underline: + udx = string.find('_') + if udx >= 0: + string = string[:udx]+string[udx+1:] + self._udxs[len(self._lines)+1] = udx + c = string[udx].lower() + self._hotkeys[c] = len(self._lines) Popup.add_line(self,string) self._line_foregrounds.append(foreground) if selectable: @@ -177,13 +186,24 @@ class SelectablePopup(Popup): if (row < self._lineoff): continue fg = self._line_foregrounds[row] + udx = self._udxs.get(crow) if row == self._selected: if fg == None: fg = "black" colorstr = "{!%s,white,bold!}"%fg + if udx >= 0: + ustr = "{!%s,white,bold,underline!}"%fg else: if fg == None: fg = "white" colorstr = "{!%s,black!}"%fg - self.parent.add_string(crow,"- %s%s"%(colorstr,line),self.screen,1,False,True) + if udx >= 0: + ustr = "{!%s,black,underline!}"%fg + if udx == 0: + self.parent.add_string(crow,"- %s%c%s%s"%(ustr,line[0],colorstr,line[1:]),self.screen,1,False,True) + elif udx > 0: + # well, this is a litte gross + self.parent.add_string(crow,"- %s%s%s%c%s%s"%(colorstr,line[:udx],ustr,line[udx],colorstr,line[udx+1:]),self.screen,1,False,True) + else: + self.parent.add_string(crow,"- %s%s"%(colorstr,line),self.screen,1,False,True) crow+=1 def add_divider(self,color="white"): @@ -211,9 +231,15 @@ class SelectablePopup(Popup): idx = self._selectable_lines.index(self._selected) self._selection_callback(idx,self._select_data[idx],*self._selection_args) return True - if c > 31 and c < 256 and chr(c) == 'q': - return True # close the popup - + if c > 31 and c < 256: + if chr(c) == 'q': + return True # close the popup + uc = chr(c).lower() + if uc in self._hotkeys: + # exec hotkey action + idx = self._selectable_lines.index(self._hotkeys[uc]) + self._selection_callback(idx,self._select_data[idx],*self._selection_args) + return True self.refresh() return False From 182ec0cd97708b62e8cfd133b7d2b3f42a442303 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 28 Jan 2011 17:34:03 +0100 Subject: [PATCH 011/329] specify hotkeys for filter/action popups --- deluge/ui/console/modes/alltorrents.py | 39 +++++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index dbd50676e..dbb6da645 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -357,13 +357,13 @@ class AllTorrents(BaseMode, component.Component): #cid = self._current_torrent_id() if len(self.marked): self.popup = SelectablePopup(self,"Torrent Actions",self._torrent_action) - self.popup.add_line("Pause",data=ACTION.PAUSE) - self.popup.add_line("Resume",data=ACTION.RESUME) + self.popup.add_line("_Pause",data=ACTION.PAUSE) + self.popup.add_line("_Resume",data=ACTION.RESUME) self.popup.add_divider() - self.popup.add_line("Update Tracker",data=ACTION.REANNOUNCE) + self.popup.add_line("_Update Tracker",data=ACTION.REANNOUNCE) self.popup.add_divider() - self.popup.add_line("Remove Torrent",data=ACTION.REMOVE) - self.popup.add_line("Force Recheck",data=ACTION.RECHECK) + self.popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) + self.popup.add_line("_Force Recheck",data=ACTION.RECHECK) def _torrent_filter(self, idx, data): if data==FILTER.ALL: @@ -394,14 +394,14 @@ class AllTorrents(BaseMode, component.Component): def _show_torrent_filter_popup(self): self.popup = SelectablePopup(self,"Filter Torrents",self._torrent_filter) - self.popup.add_line("All",data=FILTER.ALL) - self.popup.add_line("Active",data=FILTER.ACTIVE) - self.popup.add_line("Downloading",data=FILTER.DOWNLOADING,foreground="green") - self.popup.add_line("Seeding",data=FILTER.SEEDING,foreground="blue") - self.popup.add_line("Paused",data=FILTER.PAUSED) - self.popup.add_line("Error",data=FILTER.ERROR,foreground="red") - self.popup.add_line("Checking",data=FILTER.CHECKING,foreground="cyan") - self.popup.add_line("Queued",data=FILTER.QUEUED,foreground="yellow") + self.popup.add_line("_All",data=FILTER.ALL) + self.popup.add_line("Ac_tive",data=FILTER.ACTIVE) + self.popup.add_line("_Downloading",data=FILTER.DOWNLOADING,foreground="green") + self.popup.add_line("_Seeding",data=FILTER.SEEDING,foreground="cyan") + self.popup.add_line("_Paused",data=FILTER.PAUSED) + self.popup.add_line("_Error",data=FILTER.ERROR,foreground="red") + self.popup.add_line("_Checking",data=FILTER.CHECKING,foreground="blue") + self.popup.add_line("Q_ueued",data=FILTER.QUEUED,foreground="yellow") def _do_add(self, result): log.debug("Doing adding %s (dl to %s)",result["file"],result["path"]) @@ -444,7 +444,8 @@ class AllTorrents(BaseMode, component.Component): else: self.add_string(0,"%s {!filterstatus!}Current filter: %s"%(self.topbar,self._curr_filter)) self.add_string(1,self.column_string) - self.add_string(self.rows - 1, self.bottombar) + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.bottombar,hstr)) # add all the torrents if self.curstate == {}: @@ -490,13 +491,13 @@ class AllTorrents(BaseMode, component.Component): if ts["state"] == "Downloading": fg = "green" elif ts["state"] == "Seeding": - fg = "blue" + fg = "cyan" elif ts["state"] == "Error": fg = "red" elif ts["state"] == "Queued": fg = "yellow" elif ts["state"] == "Checking": - fg = "cyan" + fg = "blue" if attr: colorstr = "{!%s,%s,%s!}"%(fg,bg,attr) @@ -574,7 +575,11 @@ class AllTorrents(BaseMode, component.Component): else: if c > 31 and c < 256: - if chr(c) == 'i': + if chr(c) == 'j': + self._scroll_up(1) + elif chr(c) == 'k': + self._scroll_down(1) + elif chr(c) == 'i': cid = self._current_torrent_id() if cid: self.popup = Popup(self,"Info",close_cb=lambda:self.updater.set_torrent_to_update(None,None)) From 44676f282ae8a8acdb14eb61588aaca923c5416d Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 28 Jan 2011 17:54:36 +0100 Subject: [PATCH 012/329] use some caching to speed up row drawing. still some flicker unfortunatly. seems to be related to the length of the row line, not sure if there's much i can do there --- deluge/ui/console/modes/alltorrents.py | 57 +++++++++++++------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index dbb6da645..244fbe37b 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -145,7 +145,7 @@ class StateUpdater(component.Component): class AllTorrents(BaseMode, component.Component): def __init__(self, stdscr, coreconfig, encoding=None): - self.curstate = None + self.formatted_rows = None self.cursel = 1 self.curoff = 1 self.column_string = "" @@ -231,8 +231,23 @@ class AllTorrents(BaseMode, component.Component): return "".join([self._format_column(row[i],self.column_widths[i]) for i in range(0,len(row))]) def set_state(self, state, refresh): - self.curstate = state + self.curstate = state # cache in case we change sort order + newrows = [] + self._sorted_ids = self._sort_torrents(self.curstate) + for torrent_id in self._sorted_ids: + ts = self.curstate[torrent_id] + newrows.append((self._format_row([self._format_queue(ts["queue"]), + ts["name"], + "%s"%deluge.common.fsize(ts["total_wanted"]), + ts["state"], + self._format_progress(ts["progress"]), + self._format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), + self._format_seeds_peers(ts["num_peers"],ts["total_peers"]), + self._format_speed(ts["download_payload_rate"]), + self._format_speed(ts["upload_payload_rate"]) + ]),ts["state"])) self.numtorrents = len(state) + self.formatted_rows = newrows if refresh: self.refresh() @@ -243,6 +258,7 @@ class AllTorrents(BaseMode, component.Component): def _scroll_down(self, by): self.cursel = min(self.cursel + by,self.numtorrents) + log.error("cursel: %d",self.cursel) if ((self.curoff + self.rows - 5) < self.cursel): self.curoff = self.cursel - self.rows + 5 @@ -448,29 +464,14 @@ class AllTorrents(BaseMode, component.Component): self.add_string(self.rows - 1, "%s%s"%(self.bottombar,hstr)) # add all the torrents - if self.curstate == {}: + if self.formatted_rows == []: msg = "No torrents match filter".center(self.cols) self.add_string(3, "{!info!}%s"%msg) - elif self.curstate != None: - tidx = 1 + elif self.formatted_rows: + tidx = self.curoff currow = 2 - self._sorted_ids = self._sort_torrents(self.curstate) - for torrent_id in self._sorted_ids: - if (tidx < self.curoff): - tidx += 1 - continue - ts = self.curstate[torrent_id] - s = self._format_row([self._format_queue(ts["queue"]), - ts["name"], - "%s"%deluge.common.fsize(ts["total_wanted"]), - ts["state"], - self._format_progress(ts["progress"]), - self._format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), - self._format_seeds_peers(ts["num_peers"],ts["total_peers"]), - self._format_speed(ts["download_payload_rate"]), - self._format_speed(ts["upload_payload_rate"]) - ]) + for row in self.formatted_rows[tidx-1:]: # default style fg = "white" bg = "black" @@ -488,22 +489,22 @@ class AllTorrents(BaseMode, component.Component): else: fg = "black" - if ts["state"] == "Downloading": + if row[1] == "Downloading": fg = "green" - elif ts["state"] == "Seeding": + elif row[1] == "Seeding": fg = "cyan" - elif ts["state"] == "Error": + elif row[1] == "Error": fg = "red" - elif ts["state"] == "Queued": + elif row[1] == "Queued": fg = "yellow" - elif ts["state"] == "Checking": + elif row[1] == "Checking": fg = "blue" if attr: colorstr = "{!%s,%s,%s!}"%(fg,bg,attr) else: colorstr = "{!%s,%s!}"%(fg,bg) - self.add_string(currow,"%s%s"%(colorstr,s)) + self.add_string(currow,"%s%s"%(colorstr,row[0])) tidx += 1 currow += 1 if (currow > (self.rows - 2)): @@ -550,7 +551,7 @@ class AllTorrents(BaseMode, component.Component): reactor.stop() return - if self.curstate==None or self.popup: + if self.formatted_rows==None or self.popup: return #log.error("pressed key: %d\n",c) From 68c04acf5014f10756c07eb7f18413f71c10eb87 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 28 Jan 2011 22:42:04 +0100 Subject: [PATCH 013/329] refactor + support selectinput --- deluge/ui/console/modes/input_popup.py | 298 ++++++++++++++----------- 1 file changed, 172 insertions(+), 126 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 84b542d85..da6139b13 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -48,114 +48,79 @@ from popup import Popup log = logging.getLogger(__name__) -def complete(line): - line = os.path.abspath(os.path.expanduser(line)) - ret = [] - if os.path.exists(line): - # This is a correct path, check to see if it's a directory - if os.path.isdir(line): - # Directory, so we need to show contents of directory - #ret.extend(os.listdir(line)) - for f in os.listdir(line): - # Skip hidden - if f.startswith("."): - continue - f = os.path.join(line, f) - if os.path.isdir(f): - f += "/" - ret.append(f) - else: - # This is a file, but we could be looking for another file that - # shares a common prefix. - for f in os.listdir(os.path.dirname(line)): - if f.startswith(os.path.split(line)[1]): - ret.append(os.path.join( os.path.dirname(line), f)) - else: - # This path does not exist, so lets do a listdir on it's parent - # and find any matches. - ret = [] - if os.path.isdir(os.path.dirname(line)): - for f in os.listdir(os.path.dirname(line)): - if f.startswith(os.path.split(line)[1]): - p = os.path.join(os.path.dirname(line), f) +class InputField: + # render the input. return number of rows taken up + def render(self,screen,row,width,selected): + return 0 + def handle_read(self, c): + if c in [curses.KEY_ENTER, 10, 127, 113]: + return True + return False + def get_value(self): + return None - if os.path.isdir(p): - p += "/" - ret.append(p) +class SelectInput(InputField): + def __init__(self, parent, message, name, opts, selidx): + self.parent = parent + self.message = message + self.name = name + self.opts = opts + self.selidx = selidx - return ret + def render(self, screen, row, width, selected): + self.parent.add_string(row,self.message,screen,1,False,True) + off = 2 + for i,opt in enumerate(self.opts): + if selected and i == self.selidx: + self.parent.add_string(row+1,"{!black,white,bold!}[%s]"%opt,screen,off,False,True) + elif i == self.selidx: + self.parent.add_string(row+1,"[{!white,black,underline!}%s{!white,black!}]"%opt,screen,off,False,True) + else: + self.parent.add_string(row+1,"[%s]"%opt,screen,off,False,True) + off += len(opt)+3 + return 2 + def handle_read(self, c): + if c == curses.KEY_LEFT: + self.selidx = max(0,self.selidx-1) + if c == curses.KEY_RIGHT: + self.selidx = min(len(self.opts)-1,self.selidx+1) + + def get_value(self): + return self.opts[self.selidx] + +class TextInput(InputField): + def __init__(self, parent, move_func, width, message, name, value, docmp): + self.parent = parent + self.move_func = move_func + self.width = width + + self.message = message + self.name = name + self.value = value + self.docmp = docmp -class InputPopup(Popup): - def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): - Popup.__init__(self,parent_mode,title,width_req,height_req,close_cb) - self.input_list = [] - self.input_states = {} - self.current_input = 0 self.tab_count = 0 + self.cursor = 0 self.opts = None self.opt_off = 0 - curses.curs_set(2) - def add_text_input(self, message, name, value="", complete=True): - """ - Add a text input field to the popup. - - :param message: string to display above the input field - :param name: name of the field, for the return callback - :param value: initial value of the field - :param complete: should completion be run when tab is hit and this field is active - """ - self.input_list.append(name) - self.input_states[name] = [message,value,0,complete] + def render(self,screen,row,width,selected): + if selected: + if self.opts: + self.parent.add_string(row+2,self.opts[self.opt_off:],screen,1,False,True) + self.move_func(row+1,self.cursor+1) + self.parent.add_string(row,self.message,screen,1,False,True) + self.parent.add_string(row+1,"{!black,white,bold!}%s"%self.value.ljust(width-2),screen,1,False,False) - def _refresh_lines(self): - crow = 1 - for i,ipt in enumerate(self.input_list): - msg,txt,curs,comp = self.input_states[ipt] - if i == self.current_input: - curs_row = crow+1 - curs_col = curs - if self.opts: - self.parent.add_string(crow+2,self.opts[self.opt_off:],self.screen,1,False,True) - self.parent.add_string(crow,msg,self.screen,1,False,True) - self.parent.add_string(crow+1,"{!selected!}%s"%txt.ljust(self.width-2),self.screen,1,False,False) - crow += 3 + return 3 - self.screen.move(curs_row,curs_col+1) - - def _get_current_input_value(self): - return self.input_states[self.input_list[self.current_input]][1] - - def _set_current_input_value(self, val): - self.input_states[self.input_list[self.current_input]][1] = val - - def _get_current_cursor(self): - return self.input_states[self.input_list[self.current_input]][2] - - def _move_current_cursor(self, amt): - self.input_states[self.input_list[self.current_input]][2] += amt - - def _set_current_cursor(self, pos): - self.input_states[self.input_list[self.current_input]][2] = pos + def get_value(self): + return self.value # most of the cursor,input stuff here taken from ui/console/screen.py - def handle_read(self, c): - if c == curses.KEY_UP: - self.current_input = max(0,self.current_input-1) - elif c == curses.KEY_DOWN: - self.current_input = min(len(self.input_list)-1,self.current_input+1) - - elif c == curses.KEY_ENTER or c == 10: - if self._close_cb: - vals = {} - for ipt in self.input_list: - vals[ipt] = self.input_states[ipt][1] - curses.curs_set(0) - self._close_cb(vals) - return True # close the popup - - elif c == 9: + def handle_read(self,c): + if c == 9 and self.docmp: # Keep track of tab hit count to know when it's double-hit self.tab_count += 1 if self.tab_count > 1: @@ -166,9 +131,7 @@ class InputPopup(Popup): # We only call the tab completer function if we're at the end of # the input string on the cursor is on a space - cur_input = self._get_current_input_value() - cur_cursor = self._get_current_cursor() - if cur_cursor == len(cur_input) or cur_input[cur_cursor] == " ": + if self.cursor == len(self.value) or self.value[self.cursor] == " ": if self.opts: prev = self.opt_off self.opt_off += self.width-3 @@ -178,28 +141,23 @@ class InputPopup(Popup): if second_hit and self.opt_off == prev: # double tap and we're at the end self.opt_off = 0 else: - opts = complete(cur_input) + opts = self.complete(self.value) if len(opts) == 1: # only one option, just complete it - self._set_current_input_value(opts[0]) - self._set_current_cursor(len(opts[0])) + self.value = opts[0] + self.cursor = len(opts[0]) self.tab_count = 0 elif len(opts) > 1 and second_hit: # display multiple options on second tab hit self.opts = " ".join(opts) - elif c == 27: # close on esc, no action - return True - # Cursor movement elif c == curses.KEY_LEFT: - if self._get_current_cursor(): - self._move_current_cursor(-1) + self.cursor = max(0,self.cursor-1) elif c == curses.KEY_RIGHT: - if self._get_current_cursor() < len(self._get_current_input_value()): - self._move_current_cursor(1) + self.cursor = min(len(self.value),self.cursor+1) elif c == curses.KEY_HOME: - self._set_current_cursor(0) + self.cursor = 0 elif c == curses.KEY_END: - self._set_current_cursor(len(self._get_current_input_value())) + self.cursor = len(self.value) if c != 9: self.opts = None @@ -208,19 +166,13 @@ class InputPopup(Popup): # Delete a character in the input string based on cursor position if c == curses.KEY_BACKSPACE or c == 127: - cur_input = self._get_current_input_value() - cur_cursor = self._get_current_cursor() - if cur_input and cur_cursor > 0: - self._set_current_input_value(cur_input[:cur_cursor - 1] + cur_input[cur_cursor:]) - self._move_current_cursor(-1) + if self.value and self.cursor > 0: + self.value = self.value[:self.cursor - 1] + self.value[self.cursor:] + self.cursor-=1 elif c == curses.KEY_DC: - cur_input = self._get_current_input_value() - cur_cursor = self._get_current_cursor() - if cur_input and cur_cursor < len(cur_input): - self._set_current_input_value(cur_input[:cur_cursor] + cur_input[cur_cursor+1:]) + if self.value and self.cursor < len(self.value): + self.value = self.value[:self.cursor] + self.value[self.cursor+1:] elif c > 31 and c < 256: - cur_input = self._get_current_input_value() - cur_cursor = self._get_current_cursor() # Emulate getwch stroke = chr(c) uchar = "" @@ -231,13 +183,107 @@ class InputPopup(Popup): c = self.parent.stdscr.getch() stroke += chr(c) if uchar: - if cur_cursor == len(cur_input): - self._set_current_input_value(cur_input+uchar) + if self.cursor == len(self.value): + self.value += uchar else: # Insert into string - self._set_current_input_value(cur_input[:cur_cursor] + uchar + cur_input[cur_cursor:]) + self.value = self.value[:self.cursor] + uchar + self.value[self.cursor:] # Move the cursor forward - self._move_current_cursor(1) + self.cursor+=1 + + def complete(self,line): + line = os.path.abspath(os.path.expanduser(line)) + ret = [] + if os.path.exists(line): + # This is a correct path, check to see if it's a directory + if os.path.isdir(line): + # Directory, so we need to show contents of directory + #ret.extend(os.listdir(line)) + for f in os.listdir(line): + # Skip hidden + if f.startswith("."): + continue + f = os.path.join(line, f) + if os.path.isdir(f): + f += "/" + ret.append(f) + else: + # This is a file, but we could be looking for another file that + # shares a common prefix. + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + ret.append(os.path.join( os.path.dirname(line), f)) + else: + # This path does not exist, so lets do a listdir on it's parent + # and find any matches. + ret = [] + if os.path.isdir(os.path.dirname(line)): + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + p = os.path.join(os.path.dirname(line), f) + + if os.path.isdir(p): + p += "/" + ret.append(p) + + return ret + + +class InputPopup(Popup): + def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): + Popup.__init__(self,parent_mode,title,width_req,height_req,close_cb) + self.inputs = [] + self.current_input = 0 + + def move(self,r,c): + self._cursor_row = r + self._cursor_col = c + + def add_text_input(self, message, name, value="", complete=True): + """ + Add a text input field to the popup. + + :param message: string to display above the input field + :param name: name of the field, for the return callback + :param value: initial value of the field + :param complete: should completion be run when tab is hit and this field is active + """ + self.inputs.append(TextInput(self.parent, self.move, self.width, message, + name, value, complete)) + + def add_select_input(self, message, name, opts, default_index=0): + self.inputs.append(SelectInput(self.parent, message, name, opts, default_index)) + + def _refresh_lines(self): + self._cursor_row = -1 + self._cursor_col = -1 + curses.curs_set(0) + crow = 1 + for i,ipt in enumerate(self.inputs): + crow += ipt.render(self.screen,crow,self.width,i==self.current_input) + + # need to do this last as adding things moves the cursor + if self._cursor_row >= 0: + curses.curs_set(2) + self.screen.move(self._cursor_row,self._cursor_col) + + def handle_read(self, c): + if c == curses.KEY_UP: + self.current_input = max(0,self.current_input-1) + elif c == curses.KEY_DOWN: + self.current_input = min(len(self.inputs)-1,self.current_input+1) + elif c == curses.KEY_ENTER or c == 10: + if self._close_cb: + vals = {} + for ipt in self.inputs: + vals[ipt.name] = ipt.get_value() + curses.curs_set(0) + self._close_cb(vals) + return True # close the popup + elif c == 27: # close on esc, no action + return True + elif self.inputs: + self.inputs[self.current_input].handle_read(c) self.refresh() return False From ff3c3f71483b1e862337827e8314c0d2e8bbcbd2 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Jan 2011 12:29:18 +0100 Subject: [PATCH 014/329] add torrent can add paused. remove torrent works --- deluge/ui/console/modes/add_util.py | 1 + deluge/ui/console/modes/alltorrents.py | 36 +++++++++++++++++++++++--- deluge/ui/console/modes/popup.py | 6 ++--- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index d9ced794b..28372631d 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -49,6 +49,7 @@ def add_torrent(t_file, options, success_cb, fail_cb): t_options = {} if options["path"]: t_options["download_location"] = os.path.expanduser(options["path"]) + t_options["add_paused"] = options["add_paused"] # Keep a list of deferreds to make a DeferredList if not os.path.exists(t_file): diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 244fbe37b..55e12da97 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -108,6 +108,9 @@ class ACTION: RECHECK=4 REMOVE=5 + REMOVE_DATA=6 + REMOVE_NODATA=7 + class FILTER: ALL=0 ACTIVE=1 @@ -258,7 +261,6 @@ class AllTorrents(BaseMode, component.Component): def _scroll_down(self, by): self.cursel = min(self.cursel + by,self.numtorrents) - log.error("cursel: %d",self.cursel) if ((self.curoff + self.rows - 5) < self.cursel): self.curoff = self.cursel - self.rows + 5 @@ -349,6 +351,7 @@ class AllTorrents(BaseMode, component.Component): self.refresh() def _torrent_action(self, idx, data): + log.error("Action %d",data) ids = self._selected_torrent_ids() if ids: if data==ACTION.PAUSE: @@ -358,7 +361,23 @@ class AllTorrents(BaseMode, component.Component): log.debug("Resuming torrents: %s", ids) client.core.resume_torrent(ids).addErrback(self._action_error) elif data==ACTION.REMOVE: - log.error("Can't remove just yet") + def do_remove(tid,data): + ids = self._selected_torrent_ids() + if data: + wd = data==ACTION.REMOVE_DATA + for tid in ids: + log.debug("Removing torrent: %s,%d",tid,wd) + client.core.remove_torrent(tid,wd).addErrback(self._action_error) + if len(ids) == 1: + self.marked = [] + self.last_mark = -1 + return True + self.popup = SelectablePopup(self,"Confirm Remove",do_remove) + self.popup.add_line("Are you sure you want to remove the marked torrents?",selectable=False) + self.popup.add_line("Remove with _data",data=ACTION.REMOVE_DATA) + self.popup.add_line("Remove _torrent",data=ACTION.REMOVE_NODATA) + self.popup.add_line("_Cancel",data=0) + return False elif data==ACTION.RECHECK: log.debug("Rechecking torrents: %s", ids) client.core.force_recheck(ids).addErrback(self._action_error) @@ -368,6 +387,7 @@ class AllTorrents(BaseMode, component.Component): if len(ids) == 1: self.marked = [] self.last_mark = -1 + return True def _show_torrent_actions_popup(self): #cid = self._current_torrent_id() @@ -407,6 +427,7 @@ class AllTorrents(BaseMode, component.Component): self.updater.status_dict = {"state":"Queued"} self._curr_filter = "Queued" self._go_top = True + return True def _show_torrent_filter_popup(self): self.popup = SelectablePopup(self,"Filter Torrents",self._torrent_filter) @@ -420,7 +441,8 @@ class AllTorrents(BaseMode, component.Component): self.popup.add_line("Q_ueued",data=FILTER.QUEUED,foreground="yellow") def _do_add(self, result): - log.debug("Doing adding %s (dl to %s)",result["file"],result["path"]) + result["add_paused"] = (result["add_paused"] == "Yes") + log.debug("Adding Torrent: %s (dl path: %s) (paused: %d)",result["file"],result["path"],result["add_paused"]) def suc_cb(msg): self.report_message("Torrent Added",msg) def fail_cb(msg): @@ -429,13 +451,21 @@ class AllTorrents(BaseMode, component.Component): def _show_torrent_add_popup(self): dl = "" + ap = 1 try: dl = self.coreconfig["download_location"] except KeyError: pass + try: + if self.coreconfig["add_paused"]: + ap = 0 + except KeyError: + pass + self.popup = InputPopup(self,"Add Torrent (Esc to cancel)",close_cb=self._do_add) self.popup.add_text_input("Enter path to torrent file:","file") self.popup.add_text_input("Enter save path:","path",dl) + self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],ap) def report_message(self,title,message): self.messages.append((title,message)) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 8b0d911eb..bd5bf7858 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -229,8 +229,7 @@ class SelectablePopup(Popup): return True elif c == curses.KEY_ENTER or c == 10: idx = self._selectable_lines.index(self._selected) - self._selection_callback(idx,self._select_data[idx],*self._selection_args) - return True + return self._selection_callback(idx,self._select_data[idx],*self._selection_args) if c > 31 and c < 256: if chr(c) == 'q': return True # close the popup @@ -238,8 +237,7 @@ class SelectablePopup(Popup): if uc in self._hotkeys: # exec hotkey action idx = self._selectable_lines.index(self._hotkeys[uc]) - self._selection_callback(idx,self._select_data[idx],*self._selection_args) - return True + return self._selection_callback(idx,self._select_data[idx],*self._selection_args) self.refresh() return False From 007dd67ea166125f7f02517999cae118ea24b14b Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Jan 2011 14:04:32 +0100 Subject: [PATCH 015/329] only redraw effected lines on scroll. seems to get rid of the flickering problem :) --- deluge/ui/console/modes/alltorrents.py | 45 ++++++++++++++++++++------ 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 55e12da97..8e64e436b 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -150,7 +150,7 @@ class AllTorrents(BaseMode, component.Component): def __init__(self, stdscr, coreconfig, encoding=None): self.formatted_rows = None self.cursel = 1 - self.curoff = 1 + self.curoff = 1 # TODO: this should really be 0 indexed self.column_string = "" self.popup = None self.messages = deque() @@ -255,14 +255,18 @@ class AllTorrents(BaseMode, component.Component): self.refresh() def _scroll_up(self, by): + prevoff = self.curoff self.cursel = max(self.cursel - by,1) if ((self.cursel - 1) < self.curoff): self.curoff = max(self.cursel - 1,1) + return prevoff != self.curoff def _scroll_down(self, by): + prevoff = self.curoff self.cursel = min(self.cursel + by,self.numtorrents) if ((self.curoff + self.rows - 5) < self.cursel): self.curoff = self.cursel - self.rows + 5 + return prevoff != self.curoff def _current_torrent_id(self): if self._sorted_ids: @@ -470,7 +474,7 @@ class AllTorrents(BaseMode, component.Component): def report_message(self,title,message): self.messages.append((title,message)) - def refresh(self): + def refresh(self,lines=None): # Something has requested we scroll to the top of the list if self._go_top: self.cursel = 1 @@ -482,7 +486,8 @@ class AllTorrents(BaseMode, component.Component): title,msg = self.messages.popleft() self.popup = MessagePopup(self,title,msg) - self.stdscr.clear() + if not lines: + self.stdscr.clear() # Update the status bars if self._curr_filter == None: @@ -501,11 +506,21 @@ class AllTorrents(BaseMode, component.Component): tidx = self.curoff currow = 2 - for row in self.formatted_rows[tidx-1:]: + if lines: + todraw = [] + for l in lines: + todraw.append(self.formatted_rows[l]) + lines.reverse() + else: + todraw = self.formatted_rows[tidx-1:] + + for row in todraw: # default style fg = "white" bg = "black" attr = None + if lines: + tidx = lines.pop()+1 if tidx in self.marked: bg = "blue" @@ -534,6 +549,10 @@ class AllTorrents(BaseMode, component.Component): colorstr = "{!%s,%s,%s!}"%(fg,bg,attr) else: colorstr = "{!%s,%s!}"%(fg,bg) + + if lines: + currow = tidx-self.curoff+2 + self.add_string(currow,"%s%s"%(colorstr,row[0])) tidx += 1 currow += 1 @@ -542,7 +561,7 @@ class AllTorrents(BaseMode, component.Component): else: self.add_string(1, "Waiting for torrents from core...") - self.stdscr.redrawwin() + #self.stdscr.redrawwin() self.stdscr.noutrefresh() if self.popup: @@ -562,6 +581,8 @@ class AllTorrents(BaseMode, component.Component): def _doRead(self): # Read the character + effected_lines = None + c = self.stdscr.getch() if self.popup: @@ -590,11 +611,13 @@ class AllTorrents(BaseMode, component.Component): # Navigate the torrent list if c == curses.KEY_UP: - self._scroll_up(1) + if not self._scroll_up(1): + effected_lines = [self.cursel-1,self.cursel] elif c == curses.KEY_PPAGE: self._scroll_up(int(self.rows/2)) elif c == curses.KEY_DOWN: - self._scroll_down(1) + if not self._scroll_down(1): + effected_lines = [self.cursel-2,self.cursel-1] elif c == curses.KEY_NPAGE: self._scroll_down(int(self.rows/2)) @@ -607,9 +630,11 @@ class AllTorrents(BaseMode, component.Component): else: if c > 31 and c < 256: if chr(c) == 'j': - self._scroll_up(1) + if not self._scroll_up(1): + effected_lines = [self.cursel-1,self.cursel] elif chr(c) == 'k': - self._scroll_down(1) + if not self._scroll_down(1): + effected_lines = [self.cursel-2,self.cursel-1] elif chr(c) == 'i': cid = self._current_torrent_id() if cid: @@ -635,4 +660,4 @@ class AllTorrents(BaseMode, component.Component): for l in HELP_LINES: self.popup.add_line(l) - self.refresh() + self.refresh(effected_lines) From 5d46d2aee507db12e0827955223409d13c454572 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 1 Feb 2011 17:23:15 +0100 Subject: [PATCH 016/329] add torrentdetails state, allow state switching, move some formating to format_utils --- deluge/ui/console/main.py | 14 +- deluge/ui/console/modes/alltorrents.py | 89 +++--- deluge/ui/console/modes/basemode.py | 13 +- deluge/ui/console/modes/format_utils.py | 70 +++++ deluge/ui/console/modes/torrentdetail.py | 357 +++++++++++++++++++++++ deluge/ui/console/statusbars.py | 27 +- 6 files changed, 501 insertions(+), 69 deletions(-) create mode 100644 deluge/ui/console/modes/format_utils.py create mode 100644 deluge/ui/console/modes/torrentdetail.py diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index a0090ef15..3829e3d8f 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -48,6 +48,7 @@ import deluge.component as component from deluge.ui.client import client import deluge.common from deluge.ui.coreconfig import CoreConfig +from deluge.ui.sessionproxy import SessionProxy from deluge.ui.console.statusbars import StatusBars from deluge.ui.console.eventlog import EventLog import screen @@ -156,7 +157,10 @@ class ConsoleUI(component.Component): log.debug("Using encoding: %s", self.encoding) # Load all the commands - self._commands = load_commands(os.path.join(UI_PATH, 'commands')) + #self._commands = load_commands(os.path.join(UI_PATH, 'commands')) + + # start up the session proxy + self.sessionproxy = SessionProxy() client.set_disconnect_callback(self.on_client_disconnect) @@ -213,9 +217,9 @@ class ConsoleUI(component.Component): # We want to do an interactive session, so start up the curses screen and # pass it the function that handles commands colors.init_colors() + self.statusbars = StatusBars() from modes.alltorrents import AllTorrents self.screen = AllTorrents(stdscr, self.coreconfig, self.encoding) - self.statusbars = StatusBars() self.eventlog = EventLog() self.screen.topbar = "{!status!}Deluge " + deluge.common.get_version() + " Console" @@ -264,6 +268,12 @@ class ConsoleUI(component.Component): if not batch and self.interactive: self.screen.refresh() + def set_mode(self, mode): + reactor.removeReader(self.screen) + self.screen = mode + self.statusbars.screen = self.screen + reactor.addReader(self.screen) + def write(self, line): """ Writes a line out depending on if we're in interactive mode or not. diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 8e64e436b..f2f264225 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -46,7 +46,9 @@ from deluge.ui.sessionproxy import SessionProxy from popup import Popup,SelectablePopup,MessagePopup from add_util import add_torrent from input_popup import InputPopup +from torrentdetail import TorrentDetail +import format_utils try: import curses @@ -146,7 +148,7 @@ class StateUpdater(component.Component): self._status_cb(state,refresh) -class AllTorrents(BaseMode, component.Component): +class AllTorrents(BaseMode): def __init__(self, stdscr, coreconfig, encoding=None): self.formatted_rows = None self.cursel = 1 @@ -166,7 +168,6 @@ class AllTorrents(BaseMode, component.Component): BaseMode.__init__(self, stdscr, encoding) curses.curs_set(0) self.stdscr.notimeout(0) - self.sessionproxy = SessionProxy() self._status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] @@ -180,21 +181,21 @@ class AllTorrents(BaseMode, component.Component): self._info_fields = [ ("Name",None,("name",)), ("State", None, ("state",)), - ("Down Speed", self._format_speed, ("download_payload_rate",)), - ("Up Speed", self._format_speed, ("upload_payload_rate",)), - ("Progress", self._format_progress, ("progress",)), + ("Down Speed", format_utils.format_speed, ("download_payload_rate",)), + ("Up Speed", format_utils.format_speed, ("upload_payload_rate",)), + ("Progress", format_utils.format_progress, ("progress",)), ("ETA", deluge.common.ftime, ("eta",)), ("Path", None, ("save_path",)), ("Downloaded",deluge.common.fsize,("all_time_download",)), ("Uploaded", deluge.common.fsize,("total_uploaded",)), ("Share Ratio", lambda x:x < 0 and "∞" or "%.3f"%x, ("ratio",)), - ("Seeders",self._format_seeds_peers,("num_seeds","total_seeds")), - ("Peers",self._format_seeds_peers,("num_peers","total_peers")), + ("Seeders",format_utils.format_seeds_peers,("num_seeds","total_seeds")), + ("Peers",format_utils.format_seeds_peers,("num_peers","total_peers")), ("Active Time",deluge.common.ftime,("active_time",)), ("Seeding Time",deluge.common.ftime,("seeding_time",)), ("Date Added",deluge.common.fdate,("time_added",)), ("Availability", lambda x:x < 0 and "∞" or "%.3f"%x, ("distributed_copies",)), - ("Pieces", self._format_pieces, ("num_pieces","piece_length")), + ("Pieces", format_utils.format_pieces, ("num_pieces","piece_length")), ] self._status_keys = ["name","state","download_payload_rate","upload_payload_rate", @@ -203,6 +204,11 @@ class AllTorrents(BaseMode, component.Component): "seeding_time","time_added","distributed_copies", "num_pieces", "piece_length","save_path"] + def resume(self): + component.start(["AllTorrentsStateUpdater"]) + self.refresh() + + def _update_columns(self): self.column_widths = [5,-1,15,13,10,10,10,15,15] req = sum(filter(lambda x:x >= 0,self.column_widths)) @@ -220,18 +226,6 @@ class AllTorrents(BaseMode, component.Component): self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) - def _trim_string(self, string, w): - return "%s... "%(string[0:w-4]) - - def _format_column(self, col, lim): - size = len(col) - if (size >= lim - 1): - return self._trim_string(col,lim) - else: - return "%s%s"%(col," "*(lim-size)) - - def _format_row(self, row): - return "".join([self._format_column(row[i],self.column_widths[i]) for i in range(0,len(row))]) def set_state(self, state, refresh): self.curstate = state # cache in case we change sort order @@ -239,16 +233,16 @@ class AllTorrents(BaseMode, component.Component): self._sorted_ids = self._sort_torrents(self.curstate) for torrent_id in self._sorted_ids: ts = self.curstate[torrent_id] - newrows.append((self._format_row([self._format_queue(ts["queue"]), - ts["name"], - "%s"%deluge.common.fsize(ts["total_wanted"]), - ts["state"], - self._format_progress(ts["progress"]), - self._format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), - self._format_seeds_peers(ts["num_peers"],ts["total_peers"]), - self._format_speed(ts["download_payload_rate"]), - self._format_speed(ts["upload_payload_rate"]) - ]),ts["state"])) + newrows.append((format_utils.format_row([self._format_queue(ts["queue"]), + ts["name"], + "%s"%deluge.common.fsize(ts["total_wanted"]), + ts["state"], + format_utils.format_progress(ts["progress"]), + format_utils.format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), + format_utils.format_seeds_peers(ts["num_peers"],ts["total_peers"]), + format_utils.format_speed(ts["download_payload_rate"]), + format_utils.format_speed(ts["upload_payload_rate"]) + ],self.column_widths),ts["state"])) self.numtorrents = len(state) self.formatted_rows = newrows if refresh: @@ -328,27 +322,12 @@ class AllTorrents(BaseMode, component.Component): "sorts by queue #" return sorted(state,cmp=self._queue_sort,key=lambda s:state.get(s)["queue"]) - def _format_speed(self, speed): - if (speed > 0): - return deluge.common.fspeed(speed) - else: - return "-" - def _format_queue(self, qnum): if (qnum >= 0): return "%d"%(qnum+1) else: return "" - def _format_seeds_peers(self, num, total): - return "%d (%d)"%(num,total) - - def _format_pieces(self, num, size): - return "%d (%s)"%(num,deluge.common.fsize(size)) - - def _format_progress(self, perc): - return "%.2f%%"%perc - def _action_error(self, error): rerr = error.value self.report_message("An Error Occurred","%s got error %s: %s"%(rerr.method,rerr.exception_type,rerr.exception_msg)) @@ -475,6 +454,9 @@ class AllTorrents(BaseMode, component.Component): self.messages.append((title,message)) def refresh(self,lines=None): + #log.error("ref") + #import traceback + #traceback.print_stack() # Something has requested we scroll to the top of the list if self._go_top: self.cursel = 1 @@ -491,12 +473,12 @@ class AllTorrents(BaseMode, component.Component): # Update the status bars if self._curr_filter == None: - self.add_string(0,self.topbar) + self.add_string(0,self.statusbars.topbar) else: - self.add_string(0,"%s {!filterstatus!}Current filter: %s"%(self.topbar,self._curr_filter)) + self.add_string(0,"%s {!filterstatus!}Current filter: %s"%(self.statusbars.topbar,self._curr_filter)) self.add_string(1,self.column_string) - hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.bottombar) - 10)) - self.add_string(self.rows - 1, "%s%s"%(self.bottombar,hstr)) + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) # add all the torrents if self.formatted_rows == []: @@ -621,6 +603,15 @@ class AllTorrents(BaseMode, component.Component): elif c == curses.KEY_NPAGE: self._scroll_down(int(self.rows/2)) + elif c == curses.KEY_RIGHT: + # We enter a new mode for the selected torrent here + if not self.marked: + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + td = TorrentDetail(self,self._current_torrent_id(),self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(td) + return + # Enter Key elif c == curses.KEY_ENTER or c == 10: self.marked.append(self.cursel) diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py index d02b2d25d..b32857ae6 100644 --- a/deluge/ui/console/modes/basemode.py +++ b/deluge/ui/console/modes/basemode.py @@ -43,6 +43,7 @@ try: except ImportError: pass +import deluge.component as component import deluge.ui.console.colors as colors try: import signal @@ -98,8 +99,7 @@ class BaseMode(CursesStdIO): self.stdscr.nodelay(1) # Strings for the 2 status bars - self.topbar = "" - self.bottombar = "" + self.statusbars = component.get("StatusBars") # Keep track of the screen size self.rows, self.cols = self.stdscr.getmaxyx() @@ -182,6 +182,10 @@ class BaseMode(CursesStdIO): screen.addstr(row, col, s, color) col += len(s) + def draw_statusbars(self): + self.add_string(0, self.statusbars.topbar) + self.add_string(self.rows - 1, self.statusbars.bottombar) + def refresh(self): """ Refreshes the screen. @@ -189,10 +193,9 @@ class BaseMode(CursesStdIO): attribute and the status bars. """ self.stdscr.clear() - + self.draw_statusbars() # Update the status bars - self.add_string(0, self.topbar) - self.add_string(self.rows - 1, self.bottombar) + self.add_string(1,"{!info!}Base Mode (or subclass hasn't overridden refresh)") self.stdscr.redrawwin() diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py new file mode 100644 index 000000000..f3c49d6a5 --- /dev/null +++ b/deluge/ui/console/modes/format_utils.py @@ -0,0 +1,70 @@ +# format_utils.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.common + +def format_speed(speed): + if (speed > 0): + return deluge.common.fspeed(speed) + else: + return "-" + +def format_seeds_peers(num, total): + return "%d (%d)"%(num,total) + +def format_progress(perc): + return "%.2f%%"%perc + +def format_pieces(num, size): + return "%d (%s)"%(num,deluge.common.fsize(size)) + +def format_priority(prio): + pstring = deluge.common.FILE_PRIORITY[prio] + if prio > 0: + return pstring[:pstring.index("Priority")-1] + else: + return pstring + +def trim_string(string, w): + return "%s... "%(string[0:w-4]) + +def format_column(col, lim): + size = len(col) + if (size >= lim - 1): + return trim_string(col,lim) + else: + return "%s%s"%(col," "*(lim-size)) + +def format_row(row,column_widths): + return "".join([format_column(row[i],column_widths[i]) for i in range(0,len(row))]) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py new file mode 100644 index 000000000..5f144f69d --- /dev/null +++ b/deluge/ui/console/modes/torrentdetail.py @@ -0,0 +1,357 @@ +# -*- coding: utf-8 -*- +# +# torrentdetail.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.component as component +from basemode import BaseMode +import deluge.common +from deluge.ui.client import client + +from sys import maxint + +from deluge.ui.sessionproxy import SessionProxy + +from popup import Popup,SelectablePopup,MessagePopup +from add_util import add_torrent +from input_popup import InputPopup +import format_utils + + +try: + import curses +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + + +class TorrentDetail(BaseMode, component.Component): + def __init__(self, alltorrentmode, torrentid, stdscr, encoding=None): + self.alltorrentmode = alltorrentmode + self.torrentid = torrentid + self.torrent_state = None + self._status_keys = ["files", "name","state","download_payload_rate","upload_payload_rate", + "progress","eta","all_time_download","total_uploaded", "ratio", + "num_seeds","total_seeds","num_peers","total_peers", "active_time", + "seeding_time","time_added","distributed_copies", "num_pieces", + "piece_length","save_path","file_progress","file_priorities"] + self._info_fields = [ + ("Name",None,("name",)), + ("State", None, ("state",)), + ("Down Speed", format_utils.format_speed, ("download_payload_rate",)), + ("Up Speed", format_utils.format_speed, ("upload_payload_rate",)), + ("Progress", format_utils.format_progress, ("progress",)), + ("ETA", deluge.common.ftime, ("eta",)), + ("Path", None, ("save_path",)), + ("Downloaded",deluge.common.fsize,("all_time_download",)), + ("Uploaded", deluge.common.fsize,("total_uploaded",)), + ("Share Ratio", lambda x:x < 0 and "∞" or "%.3f"%x, ("ratio",)), + ("Seeders",format_utils.format_seeds_peers,("num_seeds","total_seeds")), + ("Peers",format_utils.format_seeds_peers,("num_peers","total_peers")), + ("Active Time",deluge.common.ftime,("active_time",)), + ("Seeding Time",deluge.common.ftime,("seeding_time",)), + ("Date Added",deluge.common.fdate,("time_added",)), + ("Availability", lambda x:x < 0 and "∞" or "%.3f"%x, ("distributed_copies",)), + ("Pieces", format_utils.format_pieces, ("num_pieces","piece_length")), + ] + self.file_list = None + self.current_file = None + self.current_file_idx = 0 + self.file_limit = maxint + self.file_off = 0 + self.more_to_draw = False + + self.column_string = "" + + BaseMode.__init__(self, stdscr, encoding) + component.Component.__init__(self, "TorrentDetail", 1, depend=["SessionProxy"]) + + self.column_names = ["Filename", "Size", "Progress", "Priority"] + self._update_columns() + + component.start(["TorrentDetail"]) + curses.curs_set(0) + self.stdscr.notimeout(0) + + # component start/update + def start(self): + component.get("SessionProxy").get_torrent_status(self.torrentid, self._status_keys).addCallback(self.set_state) + def update(self): + component.get("SessionProxy").get_torrent_status(self.torrentid, self._status_keys).addCallback(self.set_state) + + def set_state(self, state): + log.debug("got state") + if not self.file_list: + # don't keep getting the files once we've got them once + self.file_list,self.file_dict = self.build_file_list(state["files"],state["file_progress"],state["file_priorities"]) + self._status_keys.remove("files") + self._fill_progress(self.file_list,state["file_progress"]) + for i,prio in enumerate(state["file_priorities"]): + self.file_dict[i][6] = format_utils.format_priority(prio) + del state["file_progress"] + del state["file_priorities"] + self.torrent_state = state + self.refresh() + + # split file list into directory tree. this function assumes all files in a + # particular directory are returned together. it won't work otherwise. + # returned list is a list of lists of the form: + # [file/dir_name,index,size,children,expanded,progress,priority] + # for directories index will be -1, for files the value returned in the + # state object for use with other libtorrent calls (i.e. setting prio) + # + # Also returns a dictionary that maps index values to the file leaves + # for fast updating of progress and priorities + def build_file_list(self, file_tuples,prog,prio): + ret = [] + retdict = {} + for f in file_tuples: + cur = ret + ps = f["path"].split("/") + fin = ps[-1] + for p in ps: + if not cur or p != cur[-1][0]: + cl = [] + if p == fin: + ent = [p,f["index"],f["size"],cl,False, + format_utils.format_progress(prog[f["index"]]*100), + format_utils.format_priority(prio[f["index"]])] + retdict[f["index"]] = ent + else: + ent = [p,-1,-1,cl,False,"-","-"] + cur.append(ent) + cur = cl + else: + cur = cur[-1][3] + self._build_sizes(ret) + self._fill_progress(ret,prog) + return (ret,retdict) + + # fill in the sizes of the directory entries based on their children + def _build_sizes(self, fs): + ret = 0 + for f in fs: + if f[2] == -1: + val = self._build_sizes(f[3]) + ret += val + f[2] = val + else: + ret += f[2] + return ret + + # fills in progress fields in all entries based on progs + # returns the # of bytes complete in all the children of fs + def _fill_progress(self,fs,progs): + tb = 0 + for f in fs: + if f[3]: # dir, has some children + bd = self._fill_progress(f[3],progs) + f[5] = format_utils.format_progress((bd/f[2])*100) + else: # file, update own prog and add to total + bd = f[2]*progs[f[1]] + f[5] = format_utils.format_progress(progs[f[1]]*100) + tb += bd + return tb + + def _update_columns(self): + self.column_widths = [-1,15,15,20] + req = sum(filter(lambda x:x >= 0,self.column_widths)) + if (req > self.cols): # can't satisfy requests, just spread out evenly + cw = int(self.cols/len(self.column_names)) + for i in range(0,len(self.column_widths)): + self.column_widths[i] = cw + else: + rem = self.cols - req + var_cols = len(filter(lambda x: x < 0,self.column_widths)) + vw = int(rem/var_cols) + for i in range(0, len(self.column_widths)): + if (self.column_widths[i] < 0): + self.column_widths[i] = vw + + self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) + + + def draw_files(self,files,depth,off,idx): + for fl in files: + # kick out if we're going to draw too low on the screen + if (off >= self.rows-1): + self.more_to_draw = True + return -1,-1 + + self.file_limit = idx + + if idx >= self.file_off: + # set fg/bg colors based on if we are selected or not + if idx == self.current_file_idx: + self.current_file = fl + fc = "{!black,white!}" + else: + fc = "{!white,black!}" + + #actually draw the dir/file string + if fl[3] and fl[4]: # this is an expanded directory + xchar = 'v' + elif fl[3]: # collapsed directory + xchar = '>' + else: # file + xchar = '-' + + r = format_utils.format_row(["%s%s %s"%(" "*depth,xchar,fl[0]), + deluge.common.fsize(fl[2]),fl[5],fl[6]], + self.column_widths) + + self.add_string(off,"%s%s"%(fc,r),trim=False) + off += 1 + + if fl[3] and fl[4]: + # recurse if we have children and are expanded + off,idx = self.draw_files(fl[3],depth+1,off,idx+1) + if off < 0: return (off,idx) + else: + idx += 1 + + return (off,idx) + + def refresh(self,lines=None): + # Update the status bars + self.stdscr.clear() + self.add_string(0,self.statusbars.topbar) + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) + + self.stdscr.hline((self.rows/2)-1,0,"_",self.cols) + + off = 1 + if self.torrent_state: + for f in self._info_fields: + if off >= (self.rows/2): break + if f[1] != None: + args = [] + try: + for key in f[2]: + args.append(self.torrent_state[key]) + except: + log.debug("Could not get info field: %s",e) + continue + info = f[1](*args) + else: + info = self.torrent_state[f[2][0]] + + self.add_string(off,"{!info!}%s: {!input!}%s"%(f[0],info)) + off += 1 + else: + self.add_string(1, "Waiting for torrent state") + + off = self.rows/2 + self.add_string(off,self.column_string) + if self.file_list: + off += 1 + self.more_to_draw = False + self.draw_files(self.file_list,0,off,0) + + #self.stdscr.redrawwin() + self.stdscr.noutrefresh() + + curses.doupdate() + + # expand or collapse the current file + def expcol_cur_file(self): + self.current_file[4] = not self.current_file[4] + self.refresh() + + def file_list_down(self): + if (self.current_file_idx + 1) > self.file_limit: + if self.more_to_draw: + self.current_file_idx += 1 + self.file_off += 1 + else: + return + else: + self.current_file_idx += 1 + + self.refresh() + + def file_list_up(self): + self.current_file_idx = max(0,self.current_file_idx-1) + self.file_off = min(self.file_off,self.current_file_idx) + self.refresh() + + def back_to_overview(self): + component.stop(["TorrentDetail"]) + component.deregister("TorrentDetail") + self.stdscr.clear() + component.get("ConsoleUI").set_mode(self.alltorrentmode) + self.alltorrentmode.resume() + + def _doRead(self): + c = self.stdscr.getch() + + if c > 31 and c < 256: + if chr(c) == 'Q': + from twisted.internet import reactor + if client.connected(): + def on_disconnect(result): + reactor.stop() + client.disconnect().addCallback(on_disconnect) + else: + reactor.stop() + return + elif chr(c) == 'q': + self.back_to_overview() + return + + if c == 27: + self.back_to_overview() + return + + # Navigate the torrent list + if c == curses.KEY_UP: + self.file_list_up() + elif c == curses.KEY_PPAGE: + pass + elif c == curses.KEY_DOWN: + self.file_list_down() + elif c == curses.KEY_NPAGE: + pass + # Enter Key + elif c == curses.KEY_ENTER or c == 10: + pass + + # space + elif c == 32: + self.expcol_cur_file() + + self.refresh() diff --git a/deluge/ui/console/statusbars.py b/deluge/ui/console/statusbars.py index 44be33cf0..9d7a09fec 100644 --- a/deluge/ui/console/statusbars.py +++ b/deluge/ui/console/statusbars.py @@ -41,7 +41,6 @@ class StatusBars(component.Component): def __init__(self): component.Component.__init__(self, "StatusBars", 2, depend=["CoreConfig"]) self.config = component.get("CoreConfig") - self.screen = component.get("ConsoleUI").screen # Hold some values we get from the core self.connections = 0 @@ -49,6 +48,10 @@ class StatusBars(component.Component): self.upload = "" self.dht = 0 + # Default values + self.topbar = "{!status!}Deluge %s Console - " % deluge.common.get_version() + self.bottombar = "{!status!}C: %s" % self.connections + def start(self): self.update() @@ -77,30 +80,28 @@ class StatusBars(component.Component): def update_statusbars(self): # Update the topbar string - self.screen.topbar = "{!status!}Deluge %s Console - " % deluge.common.get_version() + self.topbar = "{!status!}Deluge %s Console - " % deluge.common.get_version() if client.connected(): info = client.connection_info() - self.screen.topbar += "%s@%s:%s" % (info[2], info[0], info[1]) + self.topbar += "%s@%s:%s" % (info[2], info[0], info[1]) else: - self.screen.topbar += "Not Connected" + self.topbar += "Not Connected" # Update the bottombar string - self.screen.bottombar = "{!status!}C: %s" % self.connections + self.bottombar = "{!status!}C: %s" % self.connections if self.config["max_connections_global"] > -1: - self.screen.bottombar += " (%s)" % self.config["max_connections_global"] + self.bottombar += " (%s)" % self.config["max_connections_global"] - self.screen.bottombar += " D: %s/s" % self.download + self.bottombar += " D: %s/s" % self.download if self.config["max_download_speed"] > -1: - self.screen.bottombar += " (%s KiB/s)" % self.config["max_download_speed"] + self.bottombar += " (%s KiB/s)" % self.config["max_download_speed"] - self.screen.bottombar += " U: %s/s" % self.upload + self.bottombar += " U: %s/s" % self.upload if self.config["max_upload_speed"] > -1: - self.screen.bottombar += " (%s KiB/s)" % self.config["max_upload_speed"] + self.bottombar += " (%s KiB/s)" % self.config["max_upload_speed"] if self.config["dht"]: - self.screen.bottombar += " DHT: %s" % self.dht - - self.screen.refresh() + self.bottombar += " DHT: %s" % self.dht From 00fa07445263c1672085259a1115fea2f072fb50 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 1 Feb 2011 18:00:25 +0100 Subject: [PATCH 017/329] small fix for scrolling --- deluge/ui/console/modes/alltorrents.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index f2f264225..98ac48e3f 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -593,11 +593,13 @@ class AllTorrents(BaseMode): # Navigate the torrent list if c == curses.KEY_UP: + if self.cursel == 1: return if not self._scroll_up(1): effected_lines = [self.cursel-1,self.cursel] elif c == curses.KEY_PPAGE: self._scroll_up(int(self.rows/2)) elif c == curses.KEY_DOWN: + if self.cursel >= self.numtorrents: return if not self._scroll_down(1): effected_lines = [self.cursel-2,self.cursel-1] elif c == curses.KEY_NPAGE: From eba7c2bf17d7a7a0203029720becb10e550310cb Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 12:44:07 +0100 Subject: [PATCH 018/329] add index value to directories in file_list --- deluge/ui/console/modes/torrentdetail.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 5f144f69d..a39c4ea24 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -130,7 +130,8 @@ class TorrentDetail(BaseMode, component.Component): # particular directory are returned together. it won't work otherwise. # returned list is a list of lists of the form: # [file/dir_name,index,size,children,expanded,progress,priority] - # for directories index will be -1, for files the value returned in the + # for directories index values count down from maxint (for marking usage), + # for files the index is the value returned in the # state object for use with other libtorrent calls (i.e. setting prio) # # Also returns a dictionary that maps index values to the file leaves @@ -138,6 +139,7 @@ class TorrentDetail(BaseMode, component.Component): def build_file_list(self, file_tuples,prog,prio): ret = [] retdict = {} + diridx = maxint for f in file_tuples: cur = ret ps = f["path"].split("/") @@ -151,7 +153,9 @@ class TorrentDetail(BaseMode, component.Component): format_utils.format_priority(prio[f["index"]])] retdict[f["index"]] = ent else: - ent = [p,-1,-1,cl,False,"-","-"] + ent = [p,diridx,-1,cl,False,"-","-"] + retdict[diridx] = ent + diridx-=1 cur.append(ent) cur = cl else: From 5dcc93585224a8b0b5b8733112cdabadf4590c9f Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 12:50:40 +0100 Subject: [PATCH 019/329] fix for only drawing one effected line and only draw effected lines on marking --- deluge/ui/console/modes/alltorrents.py | 7 ++++--- deluge/ui/console/modes/torrentdetail.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 98ac48e3f..1ce09e67e 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -503,6 +503,7 @@ class AllTorrents(BaseMode): attr = None if lines: tidx = lines.pop()+1 + currow = tidx-self.curoff+2 if tidx in self.marked: bg = "blue" @@ -532,9 +533,6 @@ class AllTorrents(BaseMode): else: colorstr = "{!%s,%s!}"%(fg,bg) - if lines: - currow = tidx-self.curoff+2 - self.add_string(currow,"%s%s"%(colorstr,row[0])) tidx += 1 currow += 1 @@ -636,11 +634,14 @@ class AllTorrents(BaseMode): self.updater.set_torrent_to_update(cid,self._status_keys) elif chr(c) == 'm': self._mark_unmark(self.cursel) + effected_lines = [self.cursel-1] elif chr(c) == 'M': if self.last_mark >= 0: self.marked.extend(range(self.last_mark,self.cursel+1)) + effected_lines = range(self.last_mark,self.cursel) else: self._mark_unmark(self.cursel) + effected_lines = [self.cursel-1] elif chr(c) == 'c': self.marked = [] self.last_mark = -1 diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index a39c4ea24..d6d93ac21 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -96,6 +96,8 @@ class TorrentDetail(BaseMode, component.Component): self.column_string = "" + self.marked = {} + BaseMode.__init__(self, stdscr, encoding) component.Component.__init__(self, "TorrentDetail", 1, depend=["SessionProxy"]) From f6f3a8e0841a114b826506425cbe6f224113a2c6 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 13:09:41 +0100 Subject: [PATCH 020/329] allow marking in file view (no actions just yet) --- deluge/ui/console/modes/torrentdetail.py | 33 ++++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index d6d93ac21..06204670b 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -220,12 +220,24 @@ class TorrentDetail(BaseMode, component.Component): self.file_limit = idx if idx >= self.file_off: - # set fg/bg colors based on if we are selected or not + # set fg/bg colors based on if we are selected/marked or not + + # default values + fg = "white" + bg = "black" + + if fl[1] in self.marked: + bg = "blue" + if idx == self.current_file_idx: self.current_file = fl - fc = "{!black,white!}" - else: - fc = "{!white,black!}" + bg = "white" + if fl[1] in self.marked: + fg = "blue" + else: + fg = "black" + + color_string = "{!%s,%s!}"%(fg,bg) #actually draw the dir/file string if fl[3] and fl[4]: # this is an expanded directory @@ -239,7 +251,7 @@ class TorrentDetail(BaseMode, component.Component): deluge.common.fsize(fl[2]),fl[5],fl[6]], self.column_widths) - self.add_string(off,"%s%s"%(fc,r),trim=False) + self.add_string(off,"%s%s"%(color_string,r),trim=False) off += 1 if fl[3] and fl[4]: @@ -322,6 +334,12 @@ class TorrentDetail(BaseMode, component.Component): component.get("ConsoleUI").set_mode(self.alltorrentmode) self.alltorrentmode.resume() + def _mark_unmark(self,idx): + if idx in self.marked: + del self.marked[idx] + else: + self.marked[idx] = True + def _doRead(self): c = self.stdscr.getch() @@ -359,5 +377,10 @@ class TorrentDetail(BaseMode, component.Component): # space elif c == 32: self.expcol_cur_file() + else: + if c > 31 and c < 256: + if chr(c) == 'm': + if self.current_file: + self._mark_unmark(self.current_file[1]) self.refresh() From 5f888facebdc6a7e9d41421b069d97c55d007ddb Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 13:11:15 +0100 Subject: [PATCH 021/329] handle resize in torrentdetail --- deluge/ui/console/modes/torrentdetail.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 06204670b..a337a486c 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -63,6 +63,7 @@ class TorrentDetail(BaseMode, component.Component): self.alltorrentmode = alltorrentmode self.torrentid = torrentid self.torrent_state = None + self.popup = None self._status_keys = ["files", "name","state","download_payload_rate","upload_payload_rate", "progress","eta","all_time_download","total_uploaded", "ratio", "num_seeds","total_seeds","num_peers","total_peers", "active_time", @@ -263,6 +264,13 @@ class TorrentDetail(BaseMode, component.Component): return (off,idx) + def on_resize(self, *args): + BaseMode.on_resize_norefresh(self, *args) + self._update_columns() + if self.popup: + self.popup.handle_resize() + self.refresh() + def refresh(self,lines=None): # Update the status bars self.stdscr.clear() From d0346a104f25a4cef177badb90356dc6a1e9978f Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 13:45:17 +0100 Subject: [PATCH 022/329] don't need len() --- deluge/ui/console/modes/alltorrents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 1ce09e67e..1991b0477 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -374,7 +374,7 @@ class AllTorrents(BaseMode): def _show_torrent_actions_popup(self): #cid = self._current_torrent_id() - if len(self.marked): + if self.marked: self.popup = SelectablePopup(self,"Torrent Actions",self._torrent_action) self.popup.add_line("_Pause",data=ACTION.PAUSE) self.popup.add_line("_Resume",data=ACTION.RESUME) From d1b3aa54ad56a08c6bdb6b131ed8fde08da1530e Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 13:46:05 +0100 Subject: [PATCH 023/329] support setting file priorities in torrentdetails --- deluge/ui/console/modes/format_utils.py | 1 + deluge/ui/console/modes/torrentdetail.py | 67 +++++++++++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index f3c49d6a5..3b73edbad 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -50,6 +50,7 @@ def format_pieces(num, size): return "%d (%s)"%(num,deluge.common.fsize(size)) def format_priority(prio): + if prio < 0: return "-" pstring = deluge.common.FILE_PRIORITY[prio] if prio > 0: return pstring[:pstring.index("Priority")-1] diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index a337a486c..3b784a829 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -57,7 +57,6 @@ except ImportError: import logging log = logging.getLogger(__name__) - class TorrentDetail(BaseMode, component.Component): def __init__(self, alltorrentmode, torrentid, stdscr, encoding=None): self.alltorrentmode = alltorrentmode @@ -123,7 +122,7 @@ class TorrentDetail(BaseMode, component.Component): self._status_keys.remove("files") self._fill_progress(self.file_list,state["file_progress"]) for i,prio in enumerate(state["file_priorities"]): - self.file_dict[i][6] = format_utils.format_priority(prio) + self.file_dict[i][6] = prio del state["file_progress"] del state["file_priorities"] self.torrent_state = state @@ -153,10 +152,10 @@ class TorrentDetail(BaseMode, component.Component): if p == fin: ent = [p,f["index"],f["size"],cl,False, format_utils.format_progress(prog[f["index"]]*100), - format_utils.format_priority(prio[f["index"]])] + prio[f["index"]]] retdict[f["index"]] = ent else: - ent = [p,diridx,-1,cl,False,"-","-"] + ent = [p,diridx,-1,cl,False,0,-1] retdict[diridx] = ent diridx-=1 cur.append(ent) @@ -249,7 +248,8 @@ class TorrentDetail(BaseMode, component.Component): xchar = '-' r = format_utils.format_row(["%s%s %s"%(" "*depth,xchar,fl[0]), - deluge.common.fsize(fl[2]),fl[5],fl[6]], + deluge.common.fsize(fl[2]),fl[5], + format_utils.format_priority(fl[6])], self.column_widths) self.add_string(off,"%s%s"%(color_string,r),trim=False) @@ -311,6 +311,9 @@ class TorrentDetail(BaseMode, component.Component): #self.stdscr.redrawwin() self.stdscr.noutrefresh() + if self.popup: + self.popup.refresh() + curses.doupdate() # expand or collapse the current file @@ -342,6 +345,48 @@ class TorrentDetail(BaseMode, component.Component): component.get("ConsoleUI").set_mode(self.alltorrentmode) self.alltorrentmode.resume() + # build list of priorities for all files in the torrent + # based on what is currently selected and a selected priority. + def build_prio_list(self, files, ret_list, parent_prio, selected_prio): + # has a priority been set on my parent (if so, I inherit it) + for f in files: + if f[3]: # dir, check if i'm setting on whole dir, then recurse + if f[1] in self.marked: # marked, recurse and update all children with new prio + parent_prio = selected_prio + self.build_prio_list(f[3],ret_list,parent_prio,selected_prio) + parent_prio = -1 + else: # not marked, just recurse + self.build_prio_list(f[3],ret_list,parent_prio,selected_prio) + else: # file, need to add to list + if f[1] in self.marked or parent_prio >= 0: + # selected (or parent selected), use requested priority + ret_list.append((f[1],selected_prio)) + else: + # not selected, just keep old priority + ret_list.append((f[1],f[6])) + + def do_priority(self, idx, data): + plist = [] + self.build_prio_list(self.file_list,plist,-1,data) + plist.sort() + priorities = [p[1] for p in plist] + log.debug("priorities: %s", priorities) + + client.core.set_torrent_file_priorities(self.torrentid, priorities) + + if len(self.marked) == 1: + self.marked = {} + return True + + # show popup for priority selections + def show_priority_popup(self): + if self.marked: + self.popup = SelectablePopup(self,"Torrent Actions",self.do_priority) + self.popup.add_line("_Do Not Download",data=deluge.common.FILE_PRIORITY["Do Not Download"]) + self.popup.add_line("_Normal Priority",data=deluge.common.FILE_PRIORITY["Normal Priority"]) + self.popup.add_line("_High Priority",data=deluge.common.FILE_PRIORITY["High Priority"]) + self.popup.add_line("H_ighest Priority",data=deluge.common.FILE_PRIORITY["Highest Priority"]) + def _mark_unmark(self,idx): if idx in self.marked: del self.marked[idx] @@ -351,6 +396,12 @@ class TorrentDetail(BaseMode, component.Component): def _doRead(self): c = self.stdscr.getch() + if self.popup: + if self.popup.handle_read(c): + self.popup = None + self.refresh() + return + if c > 31 and c < 256: if chr(c) == 'Q': from twisted.internet import reactor @@ -378,9 +429,11 @@ class TorrentDetail(BaseMode, component.Component): self.file_list_down() elif c == curses.KEY_NPAGE: pass + # Enter Key elif c == curses.KEY_ENTER or c == 10: - pass + self.marked[self.current_file[1]] = True + self.show_priority_popup() # space elif c == 32: @@ -390,5 +443,7 @@ class TorrentDetail(BaseMode, component.Component): if chr(c) == 'm': if self.current_file: self._mark_unmark(self.current_file[1]) + if chr(c) == 'c': + self.marked = {} self.refresh() From ad498c6e424869f37d9c7125af28efa646e6ff7e Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 13:57:31 +0100 Subject: [PATCH 024/329] Revert "remove special case white/black pair. doesn't seem needed and breaks white,black,attrs" This does actually seem to break some terminals This reverts commit ba3a093746a51fd46b9b0bcaf72847549e0c94b3. --- deluge/ui/console/colors.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index 9988ab882..7d7944b3c 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -50,7 +50,9 @@ colors = [ ] # {(fg, bg): pair_number, ...} -color_pairs = {} +color_pairs = { + ("white", "black"): 0 # Special case, can't be changed +} # Some default color schemes schemes = { @@ -91,6 +93,8 @@ def init_colors(): counter = 1 for fg in colors: for bg in colors: + if fg == "COLOR_WHITE" and bg == "COLOR_BLACK": + continue color_pairs[(fg[6:].lower(), bg[6:].lower())] = counter curses.init_pair(counter, getattr(curses, fg), getattr(curses, bg)) counter += 1 From b35875e300e6938a33080df87119bc22af3bfae8 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 16:21:52 +0100 Subject: [PATCH 025/329] attempted fix of color/underline issue. this is a bit of a hack, and seems to work some places, but not everywhere --- deluge/ui/console/colors.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index 7d7944b3c..bc092373c 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -99,6 +99,14 @@ def init_colors(): curses.init_pair(counter, getattr(curses, fg), getattr(curses, bg)) counter += 1 + # try to redefine white/black as it makes underlining work for some terminals + # but can also fail on others, so we try/except + try: + curses.init_pair(counter, curses.COLOR_WHITE, curses.COLOR_BLACK) + color_pairs[("white","black")] = counter + except: + pass + class BadColorString(Exception): pass From 78ea5c9bd39d9829cae0700b4feb876d633ea702 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 18:32:03 +0100 Subject: [PATCH 026/329] don't enter torrentdetails if nothing is selected --- deluge/ui/console/modes/alltorrents.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 1991b0477..5a201e89c 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -606,11 +606,13 @@ class AllTorrents(BaseMode): elif c == curses.KEY_RIGHT: # We enter a new mode for the selected torrent here if not self.marked: - component.stop(["AllTorrentsStateUpdater"]) - self.stdscr.clear() - td = TorrentDetail(self,self._current_torrent_id(),self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(td) - return + tid = self._current_torrent_id() + if tid: + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + td = TorrentDetail(self,self._current_torrent_id(),self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(td) + return # Enter Key elif c == curses.KEY_ENTER or c == 10: From 6c8529b3ba2b26540d0dda459a8ae3d6aa77485a Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 20:39:57 +0100 Subject: [PATCH 027/329] updated file seperator --- deluge/ui/console/modes/torrentdetail.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 3b784a829..ec8d8adaf 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -95,6 +95,7 @@ class TorrentDetail(BaseMode, component.Component): self.more_to_draw = False self.column_string = "" + self.files_sep = None self.marked = {} @@ -118,6 +119,7 @@ class TorrentDetail(BaseMode, component.Component): log.debug("got state") if not self.file_list: # don't keep getting the files once we've got them once + self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (torrent has %d files)"%len(state["files"])).center(self.cols)) self.file_list,self.file_dict = self.build_file_list(state["files"],state["file_progress"],state["file_priorities"]) self._status_keys.remove("files") self._fill_progress(self.file_list,state["file_progress"]) @@ -207,7 +209,7 @@ class TorrentDetail(BaseMode, component.Component): if (self.column_widths[i] < 0): self.column_widths[i] = vw - self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) + self.column_string = "{!green,black,bold!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) def draw_files(self,files,depth,off,idx): @@ -278,7 +280,8 @@ class TorrentDetail(BaseMode, component.Component): hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) - self.stdscr.hline((self.rows/2)-1,0,"_",self.cols) + if self.files_sep: + self.add_string((self.rows/2)-1,self.files_sep) off = 1 if self.torrent_state: From 1952357f3559e4847a5f7577d45a01c8b70e9c78 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 20:40:15 +0100 Subject: [PATCH 028/329] update help --- deluge/ui/console/modes/alltorrents.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 5a201e89c..934296f26 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -93,6 +93,10 @@ The actions you can perform and the keys to perform them are as follows: and last marked torrent 'c' - Un-mark all torrents +Right Arrow - Show torrent details. This includes more detailed information + about the currently selected torrent, as well as a view of the + files in the torrent and the ability to set file priorities. + Enter - Show torrent actions popup. Here you can do things like pause/resume, remove, recheck and so one. These actions apply to all currently marked torrents. The currently From b41ebe1b89cd54e5b24c596b530f45a1ccab24f3 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 20:49:11 +0100 Subject: [PATCH 029/329] don't show action popup if there are no torrents in the view --- deluge/ui/console/modes/alltorrents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 934296f26..fbf36fd67 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -619,7 +619,7 @@ class AllTorrents(BaseMode): return # Enter Key - elif c == curses.KEY_ENTER or c == 10: + elif (c == curses.KEY_ENTER or c == 10) and self.numtorrents: self.marked.append(self.cursel) self.last_mark = self.cursel self._show_torrent_actions_popup() From 0353a388b3541e35003b5c385948c5d2ea1bf8ef Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 20:49:27 +0100 Subject: [PATCH 030/329] add option to action popup for torrent details --- deluge/ui/console/modes/alltorrents.py | 30 +++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index fbf36fd67..b6f686974 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -117,6 +117,8 @@ class ACTION: REMOVE_DATA=6 REMOVE_NODATA=7 + DETAILS=8 + class FILTER: ALL=0 ACTIVE=1 @@ -332,6 +334,13 @@ class AllTorrents(BaseMode): else: return "" + + def show_torrent_details(self,tid): + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + td = TorrentDetail(self,tid,self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(td) + def _action_error(self, error): rerr = error.value self.report_message("An Error Occurred","%s got error %s: %s"%(rerr.method,rerr.exception_type,rerr.exception_msg)) @@ -371,6 +380,13 @@ class AllTorrents(BaseMode): elif data==ACTION.REANNOUNCE: log.debug("Reannouncing torrents: %s",ids) client.core.force_reannounce(ids).addErrback(self._action_error) + elif data==ACTION.DETAILS: + log.debug("Torrent details") + tid = self._current_torrent_id() + if tid: + self.show_torrent_details(tid) + else: + log.error("No current torrent in _torrent_action, this is a bug") if len(ids) == 1: self.marked = [] self.last_mark = -1 @@ -387,6 +403,8 @@ class AllTorrents(BaseMode): self.popup.add_divider() self.popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) self.popup.add_line("_Force Recheck",data=ACTION.RECHECK) + self.popup.add_divider() + self.popup.add_line("Torrent _Details",data=ACTION.DETAILS) def _torrent_filter(self, idx, data): if data==FILTER.ALL: @@ -609,14 +627,10 @@ class AllTorrents(BaseMode): elif c == curses.KEY_RIGHT: # We enter a new mode for the selected torrent here - if not self.marked: - tid = self._current_torrent_id() - if tid: - component.stop(["AllTorrentsStateUpdater"]) - self.stdscr.clear() - td = TorrentDetail(self,self._current_torrent_id(),self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(td) - return + tid = self._current_torrent_id() + if tid: + self.show_torrent_details(tid) + return # Enter Key elif (c == curses.KEY_ENTER or c == 10) and self.numtorrents: From db6474586255345e6175701a678b2100b480afeb Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 2 Feb 2011 20:50:48 +0100 Subject: [PATCH 031/329] fix priority popup title --- deluge/ui/console/modes/torrentdetail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index ec8d8adaf..fe09d30c3 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -384,7 +384,7 @@ class TorrentDetail(BaseMode, component.Component): # show popup for priority selections def show_priority_popup(self): if self.marked: - self.popup = SelectablePopup(self,"Torrent Actions",self.do_priority) + self.popup = SelectablePopup(self,"Set File Priority",self.do_priority) self.popup.add_line("_Do Not Download",data=deluge.common.FILE_PRIORITY["Do Not Download"]) self.popup.add_line("_Normal Priority",data=deluge.common.FILE_PRIORITY["Normal Priority"]) self.popup.add_line("_High Priority",data=deluge.common.FILE_PRIORITY["High Priority"]) From b0a0574ae092c9587024a933438ad99dbd30a63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <> Date: Fri, 4 Feb 2011 19:37:42 +0000 Subject: [PATCH 032/329] Apply patch from #1194 --- deluge/ui/web/auth.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py index 101bc628a..699133cb0 100644 --- a/deluge/ui/web/auth.py +++ b/deluge/ui/web/auth.py @@ -135,8 +135,9 @@ class Auth(JSONComponent): expires, expires_str = make_expires(config["session_timeout"]) checksum = str(make_checksum(session_id)) + base = str(component.get("Web").get_config()["base"]) request.addCookie('_session_id', session_id + checksum, - path="/json", expires=expires_str) + path=base+"json", expires=expires_str) log.debug("Creating session for %s", login) config = component.get("DelugeWeb").config @@ -232,8 +233,9 @@ class Auth(JSONComponent): session["expires"] = expires _session_id = request.getCookie("_session_id") + base = str(component.get("Web").get_config()["base"]) request.addCookie('_session_id', _session_id, - path="/json", expires=expires_str) + path=base+"json", expires=expires_str) if method: if not hasattr(method, "_json_export"): From 9a54beef78d8fbfc0eb55162541b6ca908879007 Mon Sep 17 00:00:00 2001 From: cinderblock <> Date: Fri, 4 Feb 2011 19:43:27 +0000 Subject: [PATCH 033/329] add patch from #1473 --- deluge/main.py | 52 +++++++++++++++++++++++++++----------------- deluge/ui/web/web.py | 35 ++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 25 deletions(-) diff --git a/deluge/main.py b/deluge/main.py index dfb489d59..b52988da6 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -149,14 +149,20 @@ this should be an IP address", metavar="IFACE", parser.add_option("-u", "--ui-interface", dest="ui_interface", help="Interface daemon will listen for UI connections on, this should be\ an IP address", metavar="IFACE", action="store", type="str") - parser.add_option("-d", "--do-not-daemonize", dest="donot", - help="Do not daemonize", action="store_true", default=False) + if not (deluge.common.windows_check() or deluge.common.osx_check()): + parser.add_option("-d", "--do-not-daemonize", dest="donot", + help="Do not daemonize", action="store_true", default=False) parser.add_option("-c", "--config", dest="config", help="Set the config location", action="store", type="str") parser.add_option("-l", "--logfile", dest="logfile", help="Set the logfile location", action="store", type="str") parser.add_option("-P", "--pidfile", dest="pidfile", help="Use pidfile to store process id", action="store", type="str") + if not deluge.common.windows_check(): + parser.add_option("-U", "--user", dest="user", + help="User to switch to. Only use it when starting as root", action="store", type="str") + parser.add_option("-g", "--group", dest="group", + help="Group to switch to. Only use it when starting as root", action="store", type="str") parser.add_option("-L", "--loglevel", dest="loglevel", help="Set the log level: none, info, warning, error, critical, debug", action="store", type="str") parser.add_option("-q", "--quiet", dest="quiet", @@ -197,24 +203,30 @@ this should be an IP address", metavar="IFACE", open(options.pidfile, "wb").write("%s\n" % os.getpid()) # 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() or deluge.common.osx_check(): - open_logfile() - write_pidfile() - else: - if os.fork() == 0: - os.setsid() - if os.fork() == 0: - open_logfile() - write_pidfile() - else: - os._exit(0) - else: - os._exit(0) - else: - # Do not daemonize - write_pidfile() + if not (deluge.common.windows_check() or deluge.common.osx_check() or options.donot): + if os.fork(): + # We've forked and this is now the parent process, so die! + os._exit(0) + os.setsid() + # Do second fork + if os.fork(): + os._exit(0) + + # Write pid file before chuid + write_pidfile() + + if options.user: + if not options.user.isdigit(): + import pwd + options.user = pwd.getpwnam(options.user)[2] + os.setuid(options.user) + if options.group: + if not options.group.isdigit(): + import grp + options.group = grp.getgrnam(options.group)[2] + os.setuid(options.group) + + open_logfile() # Setup the logger try: diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py index a2b57655a..23cabcdd7 100644 --- a/deluge/ui/web/web.py +++ b/deluge/ui/web/web.py @@ -56,9 +56,20 @@ class Web(_UI): group.add_option("-b", "--base", dest="base", help="Set the base path that the ui is running on (proxying)", action="store", default=None) - group.add_option("-f", "--fork", dest="fork", - help="Fork the web interface process into the background", - action="store_true", default=False) + if not (deluge.common.windows_check() or deluge.common.osx_check()): + group.add_option("-f", "--fork", dest="fork", + help="Fork the web interface process into the background", + action="store_true", default=False) + group.add_option("-P", "--pidfile", dest="pidfile", type="str", + help="Use pidfile to store process id", + action="store", default=None) + if not deluge.common.windows_check(): + group.add_option("-U", "--user", dest="user", type="str", + help="User to switch to. Only use it when starting as root", + action="store", default=None) + group.add_option("-g", "--group", dest="group", type="str", + help="Group to switch to. Only use it when starting as root", + action="store", default=None) group.add_option("-p", "--port", dest="port", type="int", help="Sets the port to be used for the webserver", action="store", default=None) @@ -86,7 +97,7 @@ class Web(_UI): import deluge.common # Steps taken from http://www.faqs.org/faqs/unix-faq/programmer/faq/ # Section 1.7 - if self.options.fork and not deluge.common.windows_check(): + if self.options.fork: # fork() so the parent can exit, returns control to the command line # or shell invoking the program. if os.fork(): @@ -103,7 +114,21 @@ class Web(_UI): # use that may prevent a filesystem unmount. import deluge.configmanager os.chdir(deluge.configmanager.get_config_dir()) - + + if self.options.pidfile: + open(self.options.pidfile, "wb").write("%d\n" % os.getpid()) + + if self.options.group: + if not self.options.group.isdigit(): + import grp + self.options.group = grp.getgrnam(self.options.group)[2] + os.setuid(self.options.group) + if self.options.user: + if not self.options.user.isdigit(): + import pwd + self.options.user = pwd.getpwnam(self.options.user)[2] + os.setuid(self.options.user) + import server self.__server = server.DelugeWeb() From 88039a0edad71efc9549294a75ab41ded62e9e1a Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Fri, 4 Feb 2011 19:57:31 +0000 Subject: [PATCH 034/329] fix patch, missing deluge.common when adding the options --- deluge/ui/web/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py index 23cabcdd7..254468235 100644 --- a/deluge/ui/web/web.py +++ b/deluge/ui/web/web.py @@ -35,6 +35,7 @@ import os +import deluge.common from deluge.ui.ui import _UI, UI from optparse import OptionGroup @@ -94,7 +95,6 @@ class Web(_UI): def start(self): super(Web, self).start() - import deluge.common # Steps taken from http://www.faqs.org/faqs/unix-faq/programmer/faq/ # Section 1.7 if self.options.fork: From 4c54cfedb91baa856b92e53d4ea930f6e6a4cd77 Mon Sep 17 00:00:00 2001 From: geoffk <> Date: Sat, 5 Feb 2011 00:29:10 +0000 Subject: [PATCH 035/329] Fix #1507 - Temporary file race condition in core/core.py:add_torrent_url --- deluge/core/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 14eb00833..9fb5defc6 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -254,7 +254,7 @@ class Core(component.Component): log.error("Reason: %s", failure.getErrorMessage()) return failure - d = download_file(url, tempfile.mkstemp()[1], headers=headers) + d = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True) d.addCallback(on_get_file) d.addErrback(on_get_file_error) return d From e688b4544831f964ec8973bc098d0491d0e2ad52 Mon Sep 17 00:00:00 2001 From: Chad Miller <> Date: Sat, 5 Feb 2011 00:25:14 +0000 Subject: [PATCH 036/329] Fix #1508 - TypeError in cell_data_queue() could not convert argument to correct param type --- deluge/ui/gtkui/torrentview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 52590afae..2fb1e0433 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -131,7 +131,7 @@ def cell_data_queue(column, cell, model, row, data): if value < 0: cell.set_property("text", "") else: - cell.set_property("text", value + 1) + cell.set_property("text", str(value + 1)) def queue_peer_seed_sort_function(v1, v2): if v1 == v2: From 9bca1a72b15affab2310cd28e5c1579d16914d4b Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 4 Feb 2011 23:16:42 +0000 Subject: [PATCH 037/329] Fix for deluge-console adding torrent files in Windows --- deluge/ui/console/commands/add.py | 2 +- deluge/ui/gtkui/createtorrentdialog.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/commands/add.py b/deluge/ui/console/commands/add.py index 8d688187c..7878438d9 100644 --- a/deluge/ui/console/commands/add.py +++ b/deluge/ui/console/commands/add.py @@ -71,7 +71,7 @@ class Command(BaseCommand): continue self.console.write("{!info!}Attempting to add torrent: %s" % arg) filename = os.path.split(arg)[-1] - filedump = base64.encodestring(open(arg).read()) + filedump = base64.encodestring(open(arg, "rb").read()) def on_success(result): self.console.write("{!success!}Torrent added!") diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 2fb7b689a..6ee302132 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -369,7 +369,7 @@ class CreateTorrentDialog: if add_to_session: client.core.add_torrent_file( os.path.split(target)[-1], - base64.encodestring(open(target).read()), + base64.encodestring(open(target, "rb").read()), {"download_location": os.path.split(path)[0]}) def _on_create_torrent_progress(self, value, num_pieces): From ba6389bcac928fa6ea814d22ebb1a94ab19880a0 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 4 Feb 2011 21:55:17 +0000 Subject: [PATCH 038/329] Updated help text for deluge-console on Windows --- deluge/ui/console/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 6ea3adb79..c2c386ac0 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -197,8 +197,13 @@ class ConsoleUI(component.Component): import curses.wrapper curses.wrapper(self.run) elif self.interactive and deluge.common.windows_check(): - print "You cannot run the deluge-console in interactive mode in Windows.\ - Please use commands from the command line, eg: deluge-console config;help;exit" + print """\nDeluge-console does not run in interactive mode on Windows. \n +Please use commands from the command line, eg:\n + deluge-console.exe help + deluge-console.exe info + deluge-console.exe "add --help" + deluge-console.exe "add -p c:\\mytorrents c:\\new.torrent" + """ else: reactor.run() From 417a9f6e63e75e5c8b5c2cd9e922aea1723c50de Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 2 Feb 2011 01:25:17 +0000 Subject: [PATCH 039/329] Fix #1373, #1386 - Creating and moving non-ascii folder names in MS Windows --- deluge/common.py | 2 +- deluge/core/torrent.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index aba2904f9..c3270b14f 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -593,7 +593,7 @@ def utf8_encoded(s): """ if isinstance(s, str): - s = decode_string(s, locale.getpreferredencoding()) + s = decode_string(s) elif isinstance(s, unicode): s = s.encode("utf8", "ignore") return s diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 9c09f5231..a1a2bdd27 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -807,16 +807,20 @@ class Torrent(object): def move_storage(self, dest): """Move a torrent's storage location""" - if not os.path.exists(dest): + + # Convert path from utf8 to unicode + dest_u=unicode(dest,"utf-8") + + if not os.path.exists(dest_u): try: # Try to make the destination path if it doesn't exist - os.makedirs(dest) + os.makedirs(dest_u) except IOError, e: log.exception(e) - log.error("Could not move storage for torrent %s since %s does not exist and could not create the directory.", self.torrent_id, dest) + log.error("Could not move storage for torrent %s since %s does not exist and could not create the directory.", self.torrent_id, dest_u) return False try: - self.handle.move_storage(dest.encode("utf8")) + self.handle.move_storage(dest_u) except: return False From 9f3ac37f25269348f91043760489b127113347ef Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sun, 30 Jan 2011 18:51:00 +0000 Subject: [PATCH 040/329] Fix #1282 - Text for AutoManaged changed to 'On/Off' and localized --- deluge/ui/gtkui/status_tab.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py index 255c303cc..926957a8c 100644 --- a/deluge/ui/gtkui/status_tab.py +++ b/deluge/ui/gtkui/status_tab.py @@ -127,6 +127,11 @@ class StatusTab(Tab): if status is None: return + if status["is_auto_managed"]: + status["is_auto_managed"]=_("On") + else: + status["is_auto_managed"]=_("Off") + # Update all the label widgets for widget in self.label_widgets: if widget[1] != None: From 87f871f40a796072b79b442af51b471bb4e95278 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sat, 29 Jan 2011 12:37:19 +0000 Subject: [PATCH 041/329] Fix #1500 - Console crashes on command longer than terminal width. This error is raised if the cursor is off screen and is supressed with try-except --- deluge/ui/console/screen.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/screen.py b/deluge/ui/console/screen.py index bf6b53190..7ea7cb785 100644 --- a/deluge/ui/console/screen.py +++ b/deluge/ui/console/screen.py @@ -250,7 +250,11 @@ class Screen(CursesStdIO): if index + 1 == len(parsed): # This is the last string so lets append some " " to it s += " " * (self.cols - (col + len(s)) - 1) - self.stdscr.addstr(row, col, s, color) + try: + self.stdscr.addstr(row, col, s, color) + except curses.error: + pass + col += len(s) def refresh(self): @@ -287,7 +291,10 @@ class Screen(CursesStdIO): self.add_string(self.rows - 1, self.input) # Move the cursor - self.stdscr.move(self.rows - 1, self.input_cursor) + try: + self.stdscr.move(self.rows - 1, self.input_cursor) + except curses.error: + pass self.stdscr.redrawwin() self.stdscr.refresh() @@ -426,7 +433,10 @@ class Screen(CursesStdIO): # Update the input string on the screen self.add_string(self.rows - 1, self.input) - self.stdscr.move(self.rows - 1, self.input_cursor) + try: + self.stdscr.move(self.rows - 1, self.input_cursor) + except curses.error: + pass self.stdscr.refresh() def close(self): From 14746bf94da94b6a3ae3fd246cfaf9badacdbb3e Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sat, 29 Jan 2011 07:23:39 +0000 Subject: [PATCH 042/329] Fix #1450 Trailing white space in paths --- deluge/ui/console/commands/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/commands/config.py b/deluge/ui/console/commands/config.py index e74ad344e..e64923c60 100644 --- a/deluge/ui/console/commands/config.py +++ b/deluge/ui/console/commands/config.py @@ -133,7 +133,7 @@ class Command(BaseCommand): deferred = defer.Deferred() config = component.get("CoreConfig") key = options["set"][0] - val = simple_eval(options["set"][1] + " " + " ".join(args)) + val = simple_eval(options["set"][1] + " " .join(args)) if key not in config.keys(): self.console.write("{!error!}The key '%s' is invalid!" % key) From b9ff47e10f1e4f4f489a759e12eca266cb905ce4 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sat, 29 Jan 2011 07:07:46 +0000 Subject: [PATCH 043/329] Fix #755 - Can't set listen_ports through console UI --- deluge/ui/console/commands/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/commands/config.py b/deluge/ui/console/commands/config.py index e64923c60..3c9ddb921 100644 --- a/deluge/ui/console/commands/config.py +++ b/deluge/ui/console/commands/config.py @@ -62,7 +62,10 @@ def atom(next, token): return tuple(out) elif token[0] is tokenize.NUMBER or token[1] == "-": try: - return int(token[-1], 0) + if token[1] == "-": + return int(token[-1], 0) + else: + return int(token[1], 0) except ValueError: return float(token[-1]) elif token[1].lower() == 'true': From cea6c817df67290f4e4e93df410aaa3d71fbf083 Mon Sep 17 00:00:00 2001 From: wyrm <> Date: Tue, 1 Feb 2011 15:59:42 +0000 Subject: [PATCH 044/329] Fix #1506 - max speed not restored on a yellow->green transition --- deluge/plugins/scheduler/scheduler/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py index f810fff71..542746393 100644 --- a/deluge/plugins/scheduler/scheduler/core.py +++ b/deluge/plugins/scheduler/scheduler/core.py @@ -66,7 +66,7 @@ STATES = { CONTROLLED_SETTINGS = [ "max_download_speed", - "max_download_speed", + "max_upload_speed", "max_active_limit", "max_active_downloading", "max_active_seeding" From f748660cac0c48b65885491400fef000275c9e8d Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 7 Feb 2011 15:00:51 +0100 Subject: [PATCH 045/329] show status message --- deluge/ui/console/modes/torrentdetail.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index fe09d30c3..9701d1d6d 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -67,10 +67,11 @@ class TorrentDetail(BaseMode, component.Component): "progress","eta","all_time_download","total_uploaded", "ratio", "num_seeds","total_seeds","num_peers","total_peers", "active_time", "seeding_time","time_added","distributed_copies", "num_pieces", - "piece_length","save_path","file_progress","file_priorities"] + "piece_length","save_path","file_progress","file_priorities","message"] self._info_fields = [ ("Name",None,("name",)), ("State", None, ("state",)), + ("Status",None,("message",)), ("Down Speed", format_utils.format_speed, ("download_payload_rate",)), ("Up Speed", format_utils.format_speed, ("upload_payload_rate",)), ("Progress", format_utils.format_progress, ("progress",)), From 183a97785b2bb7c6d9cacbb67c0a412bd77ba4fa Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 7 Feb 2011 15:01:07 +0100 Subject: [PATCH 046/329] split off torrent actions popup --- deluge/ui/console/modes/alltorrents.py | 95 ++++---------------------- deluge/ui/console/modes/basemode.py | 12 ++++ 2 files changed, 26 insertions(+), 81 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index b6f686974..eeef41a92 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -47,6 +47,7 @@ from popup import Popup,SelectablePopup,MessagePopup from add_util import add_torrent from input_popup import InputPopup from torrentdetail import TorrentDetail +from torrent_actions import torrent_actions_popup import format_utils @@ -106,19 +107,6 @@ Enter - Show torrent actions popup. Here you can do things like """ HELP_LINES = HELP_STR.split('\n') -class ACTION: - PAUSE=0 - RESUME=1 - REANNOUNCE=2 - EDIT_TRACKERS=3 - RECHECK=4 - REMOVE=5 - - REMOVE_DATA=6 - REMOVE_NODATA=7 - - DETAILS=8 - class FILTER: ALL=0 ACTIVE=1 @@ -268,7 +256,7 @@ class AllTorrents(BaseMode): self.curoff = self.cursel - self.rows + 5 return prevoff != self.curoff - def _current_torrent_id(self): + def current_torrent_id(self): if self._sorted_ids: return self._sorted_ids[self.cursel-1] else: @@ -341,70 +329,6 @@ class AllTorrents(BaseMode): td = TorrentDetail(self,tid,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(td) - def _action_error(self, error): - rerr = error.value - self.report_message("An Error Occurred","%s got error %s: %s"%(rerr.method,rerr.exception_type,rerr.exception_msg)) - self.refresh() - - def _torrent_action(self, idx, data): - log.error("Action %d",data) - ids = self._selected_torrent_ids() - if ids: - if data==ACTION.PAUSE: - log.debug("Pausing torrents: %s",ids) - client.core.pause_torrent(ids).addErrback(self._action_error) - elif data==ACTION.RESUME: - log.debug("Resuming torrents: %s", ids) - client.core.resume_torrent(ids).addErrback(self._action_error) - elif data==ACTION.REMOVE: - def do_remove(tid,data): - ids = self._selected_torrent_ids() - if data: - wd = data==ACTION.REMOVE_DATA - for tid in ids: - log.debug("Removing torrent: %s,%d",tid,wd) - client.core.remove_torrent(tid,wd).addErrback(self._action_error) - if len(ids) == 1: - self.marked = [] - self.last_mark = -1 - return True - self.popup = SelectablePopup(self,"Confirm Remove",do_remove) - self.popup.add_line("Are you sure you want to remove the marked torrents?",selectable=False) - self.popup.add_line("Remove with _data",data=ACTION.REMOVE_DATA) - self.popup.add_line("Remove _torrent",data=ACTION.REMOVE_NODATA) - self.popup.add_line("_Cancel",data=0) - return False - elif data==ACTION.RECHECK: - log.debug("Rechecking torrents: %s", ids) - client.core.force_recheck(ids).addErrback(self._action_error) - elif data==ACTION.REANNOUNCE: - log.debug("Reannouncing torrents: %s",ids) - client.core.force_reannounce(ids).addErrback(self._action_error) - elif data==ACTION.DETAILS: - log.debug("Torrent details") - tid = self._current_torrent_id() - if tid: - self.show_torrent_details(tid) - else: - log.error("No current torrent in _torrent_action, this is a bug") - if len(ids) == 1: - self.marked = [] - self.last_mark = -1 - return True - - def _show_torrent_actions_popup(self): - #cid = self._current_torrent_id() - if self.marked: - self.popup = SelectablePopup(self,"Torrent Actions",self._torrent_action) - self.popup.add_line("_Pause",data=ACTION.PAUSE) - self.popup.add_line("_Resume",data=ACTION.RESUME) - self.popup.add_divider() - self.popup.add_line("_Update Tracker",data=ACTION.REANNOUNCE) - self.popup.add_divider() - self.popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) - self.popup.add_line("_Force Recheck",data=ACTION.RECHECK) - self.popup.add_divider() - self.popup.add_line("Torrent _Details",data=ACTION.DETAILS) def _torrent_filter(self, idx, data): if data==FILTER.ALL: @@ -475,6 +399,14 @@ class AllTorrents(BaseMode): def report_message(self,title,message): self.messages.append((title,message)) + def clear_marks(self): + self.marked = [] + self.last_mark = -1 + + def set_popup(self,pu): + self.popup = pu + self.refresh() + def refresh(self,lines=None): #log.error("ref") #import traceback @@ -627,7 +559,7 @@ class AllTorrents(BaseMode): elif c == curses.KEY_RIGHT: # We enter a new mode for the selected torrent here - tid = self._current_torrent_id() + tid = self.current_torrent_id() if tid: self.show_torrent_details(tid) return @@ -636,7 +568,8 @@ class AllTorrents(BaseMode): elif (c == curses.KEY_ENTER or c == 10) and self.numtorrents: self.marked.append(self.cursel) self.last_mark = self.cursel - self._show_torrent_actions_popup() + torrent_actions_popup(self,self._selected_torrent_ids(),details=True) + return else: if c > 31 and c < 256: @@ -647,7 +580,7 @@ class AllTorrents(BaseMode): if not self._scroll_down(1): effected_lines = [self.cursel-2,self.cursel-1] elif chr(c) == 'i': - cid = self._current_torrent_id() + cid = self.current_torrent_id() if cid: self.popup = Popup(self,"Info",close_cb=lambda:self.updater.set_torrent_to_update(None,None)) self.popup.add_line("Getting torrent info...") diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py index b32857ae6..24cb3cca4 100644 --- a/deluge/ui/console/modes/basemode.py +++ b/deluge/ui/console/modes/basemode.py @@ -186,6 +186,18 @@ class BaseMode(CursesStdIO): self.add_string(0, self.statusbars.topbar) self.add_string(self.rows - 1, self.statusbars.bottombar) + # This mode doesn't report errors + def report_message(self): + pass + + # This mode doesn't do anything with popups + def set_popup(self,popup): + pass + + # This mode doesn't support marking + def clear_marks(self): + pass + def refresh(self): """ Refreshes the screen. From e1d8025309eea849e9836fd71e7d7adfa967ed10 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 7 Feb 2011 15:10:18 +0100 Subject: [PATCH 047/329] show torrent actions form details when 'a' pressed --- deluge/ui/console/modes/torrentdetail.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 9701d1d6d..6beaa7ed2 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -40,6 +40,7 @@ import deluge.common from deluge.ui.client import client from sys import maxint +from collections import deque from deluge.ui.sessionproxy import SessionProxy @@ -48,6 +49,7 @@ from add_util import add_torrent from input_popup import InputPopup import format_utils +from torrent_actions import torrent_actions_popup try: import curses @@ -63,6 +65,7 @@ class TorrentDetail(BaseMode, component.Component): self.torrentid = torrentid self.torrent_state = None self.popup = None + self.messages = deque() self._status_keys = ["files", "name","state","download_payload_rate","upload_payload_rate", "progress","eta","all_time_download","total_uploaded", "ratio", "num_seeds","total_seeds","num_peers","total_peers", "active_time", @@ -212,6 +215,17 @@ class TorrentDetail(BaseMode, component.Component): self.column_string = "{!green,black,bold!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) + + def report_message(self,title,message): + self.messages.append((title,message)) + + def clear_marks(self): + self.marked = {} + + def set_popup(self,pu): + self.popup = pu + self.refresh() + def draw_files(self,files,depth,off,idx): for fl in files: @@ -275,6 +289,11 @@ class TorrentDetail(BaseMode, component.Component): self.refresh() def refresh(self,lines=None): + # show a message popup if there's anything queued + if self.popup == None and self.messages: + title,msg = self.messages.popleft() + self.popup = MessagePopup(self,title,msg) + # Update the status bars self.stdscr.clear() self.add_string(0,self.statusbars.topbar) @@ -449,5 +468,8 @@ class TorrentDetail(BaseMode, component.Component): self._mark_unmark(self.current_file[1]) if chr(c) == 'c': self.marked = {} + if chr(c) == 'a': + torrent_actions_popup(self,[self.torrentid],details=False) + return self.refresh() From b77f8929d69a773457828f60c852885fa5314dec Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 7 Feb 2011 15:10:41 +0100 Subject: [PATCH 048/329] oops, add torrent actions new file --- deluge/ui/console/modes/torrent_actions.py | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 deluge/ui/console/modes/torrent_actions.py diff --git a/deluge/ui/console/modes/torrent_actions.py b/deluge/ui/console/modes/torrent_actions.py new file mode 100644 index 000000000..c8501e8a2 --- /dev/null +++ b/deluge/ui/console/modes/torrent_actions.py @@ -0,0 +1,114 @@ +# torrent_actions.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +from deluge.ui.client import client +from popup import SelectablePopup + +import logging +log = logging.getLogger(__name__) + +class ACTION: + PAUSE=0 + RESUME=1 + REANNOUNCE=2 + EDIT_TRACKERS=3 + RECHECK=4 + REMOVE=5 + + REMOVE_DATA=6 + REMOVE_NODATA=7 + + DETAILS=8 + +def action_error(error,mode): + rerr = error.value + mode.report_message("An Error Occurred","%s got error %s: %s"%(rerr.method,rerr.exception_type,rerr.exception_msg)) + mode.refresh() + +def torrent_action(idx, data, mode, ids): + if ids: + if data==ACTION.PAUSE: + log.debug("Pausing torrents: %s",ids) + client.core.pause_torrent(ids).addErrback(action_error,mode) + elif data==ACTION.RESUME: + log.debug("Resuming torrents: %s", ids) + client.core.resume_torrent(ids).addErrback(action_error,mode) + elif data==ACTION.REMOVE: + def do_remove(idx,data,mode,ids): + if data: + wd = data==ACTION.REMOVE_DATA + for tid in ids: + log.debug("Removing torrent: %s,%d",tid,wd) + client.core.remove_torrent(tid,wd).addErrback(action_error,mode) + if len(ids) == 1: + mode.clear_marks() + return True + popup = SelectablePopup(mode,"Confirm Remove",do_remove,mode,ids) + popup.add_line("Are you sure you want to remove the marked torrents?",selectable=False) + popup.add_line("Remove with _data",data=ACTION.REMOVE_DATA) + popup.add_line("Remove _torrent",data=ACTION.REMOVE_NODATA) + popup.add_line("_Cancel",data=0) + mode.set_popup(popup) + return False + elif data==ACTION.RECHECK: + log.debug("Rechecking torrents: %s", ids) + client.core.force_recheck(ids).addErrback(action_error,mode) + elif data==ACTION.REANNOUNCE: + log.debug("Reannouncing torrents: %s",ids) + client.core.force_reannounce(ids).addErrback(action_error,mode) + elif data==ACTION.DETAILS: + log.debug("Torrent details") + tid = mode.current_torrent_id() + if tid: + mode.show_torrent_details(tid) + else: + log.error("No current torrent in _torrent_action, this is a bug") + if len(ids) == 1: + mode.clear_marks() + return True + +# Creates the popup. mode is the calling mode, tids is a list of torrents to take action upon +def torrent_actions_popup(mode,tids,details=False): + popup = SelectablePopup(mode,"Torrent Actions",torrent_action,mode,tids) + popup.add_line("_Pause",data=ACTION.PAUSE) + popup.add_line("_Resume",data=ACTION.RESUME) + popup.add_divider() + popup.add_line("_Update Tracker",data=ACTION.REANNOUNCE) + popup.add_divider() + popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) + popup.add_line("_Force Recheck",data=ACTION.RECHECK) + if details: + popup.add_divider() + popup.add_line("Torrent _Details",data=ACTION.DETAILS) + mode.set_popup(popup) From 79869faa536f7ee8c3b9d22619ba69f87c55571f Mon Sep 17 00:00:00 2001 From: alderz <> Date: Fri, 4 Feb 2011 23:39:25 +0000 Subject: [PATCH 049/329] #1494 - Add Downloaded and Uploaded columns to torrent view --- deluge/ui/gtkui/torrentview.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 2fb1e0433..4f71a8aca 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -211,6 +211,12 @@ class TorrentView(listview.ListView, component.Component): self.add_func_column(_("Size"), listview.cell_data_size, [gobject.TYPE_UINT64], status_field=["total_wanted"]) + self.add_func_column(_("Downloaded"), listview.cell_data_size, + [gobject.TYPE_UINT64], + status_field=["all_time_download"]) + self.add_func_column(_("Uploaded"), listview.cell_data_size, + [gobject.TYPE_UINT64], + status_field=["total_uploaded"]) self.add_progress_column(_("Progress"), status_field=["progress", "state"], col_types=[float, str], From cd7805bfda2f67e7fd9bd9cd4dd55b8d3d8254ad Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 8 Feb 2011 14:43:41 +0100 Subject: [PATCH 050/329] make text input not go over width --- deluge/ui/console/modes/input_popup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index da6139b13..72b9991e8 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -109,9 +109,17 @@ class TextInput(InputField): if selected: if self.opts: self.parent.add_string(row+2,self.opts[self.opt_off:],screen,1,False,True) - self.move_func(row+1,self.cursor+1) + if self.cursor > (width-3): + self.move_func(row+1,width-2) + else: + self.move_func(row+1,self.cursor+1) self.parent.add_string(row,self.message,screen,1,False,True) - self.parent.add_string(row+1,"{!black,white,bold!}%s"%self.value.ljust(width-2),screen,1,False,False) + slen = len(self.value)+3 + if slen > width: + vstr = self.value[(slen-width):] + else: + vstr = self.value.ljust(width-2) + self.parent.add_string(row+1,"{!black,white,bold!}%s"%vstr,screen,1,False,False) return 3 From 053700342a2c76be06fef519fa38191ede09c968 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sun, 6 Feb 2011 03:04:14 +0000 Subject: [PATCH 051/329] Fix #1336 - Uneeded Horizontal Scrollbar shows in Files&Peers Tab --- deluge/ui/gtkui/files_tab.py | 2 ++ deluge/ui/gtkui/peers_tab.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index 1fc0ccba8..b985ff125 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -164,6 +164,8 @@ class FilesTab(Tab): column.set_resizable(True) column.set_expand(False) column.set_min_width(100) + # Bugfix: Last column needs max_width set to stop scrollbar appearing + column.set_max_width(200) column.set_reorderable(True) self.listview.append_column(column) diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index 9ac5a6de9..20cdfbfad 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -164,6 +164,8 @@ class PeersTab(Tab): column.set_resizable(True) column.set_expand(False) column.set_min_width(50) + # Bugfix: Last column needs max_width set to stop scrollbar appearing + column.set_max_width(150) column.set_reorderable(True) self.listview.append_column(column) From ce636ccd57f9e2e330f44429466bc6c1580d2d34 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sun, 6 Feb 2011 01:09:13 +0000 Subject: [PATCH 052/329] Catch a possible DivByZero error when moving folders around in fileview tab --- deluge/ui/gtkui/files_tab.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index b985ff125..2bcb531fa 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -440,7 +440,11 @@ class FilesTab(Tab): row = self.treestore.iter_next(row) - value = (float(bytes) / float(self.treestore[parent][1])) * 100 + try: + value = (float(bytes) / float(self.treestore[parent][1])) * 100 + except ZeroDivisionError: + # Catch the unusal error found when moving folders around + value = 0 self.treestore[parent][3] = value self.treestore[parent][2] = "%.2f%%" % value return bytes From ad2b13eb2c9765f0b18872020cbcefdf1e46ed7a Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Tue, 8 Feb 2011 17:01:37 +0000 Subject: [PATCH 053/329] Fix #1248 - Deluge-console unicode support on redirected stdout --- deluge/ui/console/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index c2c386ac0..6442e61ec 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -278,7 +278,7 @@ Please use commands from the command line, eg:\n if self.interactive: self.screen.add_line(line, not self.batch_write) else: - print(colors.strip_colors(line)) + print(colors.strip_colors(line.encode("utf-8"))) def do_command(self, cmd): """ From 554f34a26197cc4ee6a6b6841695a6fa8b053e29 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Tue, 8 Feb 2011 19:04:35 +0000 Subject: [PATCH 054/329] Fix #690 - Renaming folders does not remove old empty folders --- deluge/core/torrentmanager.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index b02443cb6..9e6b35dcf 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -746,6 +746,36 @@ class TorrentManager(component.Component): fastresume_file.close() except IOError: log.warning("Error trying to save fastresume file") + + def remove_empty_folders(self, torrent_id, folder): + """ + Recursively removes folders but only if they are empty. + Cleans up after libtorrent folder renames. + + """ + if torrent_id not in self.torrents: + raise InvalidTorrentError("torrent_id is not in session") + + info = self.torrents[torrent_id].get_status(['save_path']) + folder_full_path = os.path.join(info['save_path'], folder) + + try: + if not os.listdir(folder_full_path): + os.removedirs(folder_full_path) + log.debug("Removed Empty Folder %s", folder_full_path) + else: + for root, dirs, files in os.walk(folder_full_path, topdown=False): + for name in dirs: + try: + os.removedirs(os.path.join(root, name)) + log.debug("Removed Empty Folder %s", os.path.join(root, name)) + except OSError as (errno, strerror): + if errno == 39: + # Error raised if folder is not empty + log.debug("%s", strerror) + + except OSError as (errno, strerror): + log.debug("Cannot Remove Folder: %s (ErrNo %s)", strerror, errno) def queue_top(self, torrent_id): """Queue torrent to top""" @@ -1008,6 +1038,8 @@ class TorrentManager(component.Component): if len(wait_on_folder[2]) == 1: # This is the last alert we were waiting for, time to send signal component.get("EventManager").emit(TorrentFolderRenamedEvent(torrent_id, wait_on_folder[0], wait_on_folder[1])) + # Empty folders are removed after libtorrent folder renames + self.remove_empty_folders(torrent_id, wait_on_folder[0]) del torrent.waiting_on_folder_rename[i] self.save_resume_data((torrent_id,)) break From ea22bb0b10d52fa311c2a05f6a47d0893bd1bd78 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 9 Feb 2011 15:52:35 +0000 Subject: [PATCH 055/329] #1514 - Indicator Applet Patch --- deluge/ui/gtkui/glade/tray_menu.glade | 4 +- deluge/ui/gtkui/systemtray.py | 122 +++++++++++++++++++------- 2 files changed, 94 insertions(+), 32 deletions(-) diff --git a/deluge/ui/gtkui/glade/tray_menu.glade b/deluge/ui/gtkui/glade/tray_menu.glade index eaca5a191..526ecc40b 100644 --- a/deluge/ui/gtkui/glade/tray_menu.glade +++ b/deluge/ui/gtkui/glade/tray_menu.glade @@ -90,7 +90,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-missing-image + gtk-go-down 1 @@ -106,7 +106,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-missing-image + gtk-go-up 1 diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 5a193358e..265846c3f 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -33,6 +33,10 @@ # # +try: + import appindicator +except ImportError: + appindicator = None import gtk import logging @@ -65,7 +69,7 @@ class SystemTray(component.Component): "separatormenuitem4" ] self.config.register_set_function("enable_system_tray", - self.on_enable_system_tray_set) + self.on_enable_system_tray_set) self.max_download_speed = -1.0 self.download_rate = 0.0 @@ -79,25 +83,10 @@ class SystemTray(component.Component): def enable(self): """Enables the system tray icon.""" - log.debug("Enabling the system tray icon..") self.tray_glade = gtk.glade.XML( pkg_resources.resource_filename("deluge.ui.gtkui", "glade/tray_menu.glade")) - if deluge.common.windows_check() or deluge.common.osx_check(): - self.tray = gtk.status_icon_new_from_pixbuf( - common.get_logo(32)) - else: - try: - self.tray = gtk.status_icon_new_from_icon_name("deluge") - except: - log.warning("Update PyGTK to 2.10 or greater for SystemTray..") - return - - self.tray.connect("activate", self.on_tray_clicked) - self.tray.connect("popup-menu", self.on_tray_popup) - - self.tray_glade.signal_autoconnect({ "on_menuitem_show_deluge_activate": \ self.on_menuitem_show_deluge_activate, @@ -114,20 +103,53 @@ class SystemTray(component.Component): self.tray_menu = self.tray_glade.get_widget("tray_menu") - self.tray_glade.get_widget("download-limit-image").set_from_file( - deluge.common.get_pixmap("downloading16.png")) - self.tray_glade.get_widget("upload-limit-image").set_from_file( - deluge.common.get_pixmap("seeding16.png")) + if appindicator: + log.debug("Enabling the Application Indicator..") + self.indicator = appindicator.Indicator ( + "deluge", "deluge", appindicator.CATEGORY_APPLICATION_STATUS) + # Pass the menu to the Application Indicator + self.indicator.set_menu(self.tray_menu) + + # Make sure the status of the Show Window MenuItem is correct + self._sig_win_hide = self.window.window.connect("hide", self._on_window_hide) + self._sig_win_show = self.window.window.connect("show", self._on_window_show) + if self.window.visible(): + self.tray_glade.get_widget("menuitem_show_deluge").set_active(True) + else: + self.tray_glade.get_widget("menuitem_show_deluge").set_active(False) + + # Show the Application Indicator + self.indicator.set_status(appindicator.STATUS_ACTIVE) + + else: + log.debug("Enabling the system tray icon..") + if deluge.common.windows_check() or deluge.common.osx_check(): + self.tray = gtk.status_icon_new_from_pixbuf( + common.get_logo(32)) + else: + try: + self.tray = gtk.status_icon_new_from_icon_name("deluge") + except: + log.warning("Update PyGTK to 2.10 or greater for SystemTray..") + return + + self.tray.connect("activate", self.on_tray_clicked) + self.tray.connect("popup-menu", self.on_tray_popup) + + # For some reason these icons do not display in appindicator + self.tray_glade.get_widget("download-limit-image").set_from_file( + deluge.common.get_pixmap("downloading16.png")) + self.tray_glade.get_widget("upload-limit-image").set_from_file( + deluge.common.get_pixmap("seeding16.png")) client.register_event_handler("ConfigValueChangedEvent", self.config_value_changed) - if not client.connected(): - # Hide menu widgets because we're not connected to a host. - for widget in self.hide_widget_list: - self.tray_glade.get_widget(widget).hide() - if client.connected(): # We're connected so we need to get some values from the core self.__start() + else: + # Hide menu widgets because we're not connected to a host. + for widget in self.hide_widget_list: + self.tray_glade.get_widget(widget).hide() def __start(self): if self.config["enable_system_tray"]: @@ -138,6 +160,16 @@ class SystemTray(component.Component): self.tray_glade.get_widget("menuitem_quitdaemon").hide() self.tray_glade.get_widget("separatormenuitem4").hide() + # These do not work with appindicator currently and can crash Deluge. + # Related to Launchpad bug #608219 + if appindicator: + self.hide_widget_list.remove("menuitem_download_limit") + self.hide_widget_list.remove("menuitem_upload_limit") + self.hide_widget_list.remove("separatormenuitem3") + self.tray_glade.get_widget("menuitem_download_limit").hide() + self.tray_glade.get_widget("menuitem_upload_limit").hide() + self.tray_glade.get_widget("separatormenuitem3").hide() + # Show widgets in the hide list because we've connected to a host for widget in self.hide_widget_list: self.tray_glade.get_widget(widget).show() @@ -168,7 +200,10 @@ class SystemTray(component.Component): def shutdown(self): if self.config["enable_system_tray"]: - self.tray.set_visible(False) + if appindicator: + self.indicator.set_status(appindicator.STATUS_PASSIVE) + else: + self.tray.set_visible(False) def send_status_request(self): client.core.get_session_status([ @@ -200,6 +235,10 @@ class SystemTray(component.Component): if not self.config["enable_system_tray"]: return + # Tool tip text not available for appindicator + if appindicator: + return + # Set the tool tip text max_download_speed = self.max_download_speed max_upload_speed = self.max_upload_speed @@ -245,12 +284,25 @@ class SystemTray(component.Component): submenu_bwdownset.show_all() submenu_bwupset.show_all() + # Re-set the menu to partly work around Launchpad bug #608219 + if appindicator: + self.indicator.set_menu(self.tray_menu) + def disable(self): - """Disables the system tray icon.""" - log.debug("Disabling the system tray icon..") + """Disables the system tray icon or appindicator.""" try: - self.tray.set_visible(False) - del self.tray + if appindicator: + if hasattr(self, "_sig_win_hide"): + self.window.window.disconnect(self._sig_win_hide) + self.window.window.disconnect(self._sig_win_show) + log.debug("Disabling the application indicator..") + + self.indicator.set_status(appindicator.STATUS_PASSIVE) + del self.indicator + else: + log.debug("Disabling the system tray icon..") + self.tray.set_visible(False) + del self.tray del self.tray_glade del self.tray_menu except Exception, e: @@ -338,6 +390,16 @@ class SystemTray(component.Component): self.setbwlimit(widget, _("Set Maximum Download Speed"), "max_download_speed", "tray_download_speed_list", self.max_download_speed, "downloading.svg") + def _on_window_hide(self, widget, data=None): + """_on_window_hide - update the menuitem's status""" + log.debug("_on_window_hide") + self.tray_glade.get_widget("menuitem_show_deluge").set_active(False) + + def _on_window_show(self, widget, data=None): + """_on_window_show - update the menuitem's status""" + log.debug("_on_window_show") + self.tray_glade.get_widget("menuitem_show_deluge").set_active(True) + def tray_setbwup(self, widget, data=None): self.setbwlimit(widget, _("Set Maximum Upload Speed"), "max_upload_speed", "tray_upload_speed_list", self.max_upload_speed, "seeding.svg") From cdcab320fbf6603fe6b7500918270b94d13f2c1b Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 01:11:31 +0100 Subject: [PATCH 056/329] add current_selection to SelectablePopup --- deluge/ui/console/modes/popup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index bd5bf7858..7cc468a1d 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -206,6 +206,11 @@ class SelectablePopup(Popup): self.parent.add_string(crow,"- %s%s"%(colorstr,line),self.screen,1,False,True) crow+=1 + def current_selection(self): + "Returns a tuple of (selected index, selected data)" + idx = self._selectable_lines.index(self._selected) + return (idx,self._select_data[idx]) + def add_divider(self,color="white"): if not self._divider: self._divider = "-"*(self.width-6)+" -" From 7f6a1db89a4f266ae6bd71c28dcbe50a1d32a656 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 01:12:14 +0100 Subject: [PATCH 057/329] start with a connection manager instead of just alltorrents --- deluge/ui/console/main.py | 40 ++-- deluge/ui/console/modes/alltorrents.py | 4 +- deluge/ui/console/modes/connectionmanager.py | 219 +++++++++++++++++++ 3 files changed, 241 insertions(+), 22 deletions(-) create mode 100644 deluge/ui/console/modes/connectionmanager.py diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 3829e3d8f..0e6dfef28 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -171,28 +171,28 @@ class ConsoleUI(component.Component): self.interactive = False # Try to connect to the localhost daemon - def on_connect(result): - def on_started(result): - if not self.interactive: - def on_started(result): - deferreds = [] - # If we have args, lets process them and quit - # allow multiple commands split by ";" - for arg in args.split(";"): - deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) + # def on_connect(result): + # def on_started(result): + # if not self.interactive: + # def on_started(result): + # deferreds = [] + # # If we have args, lets process them and quit + # # allow multiple commands split by ";" + # for arg in args.split(";"): + # deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) - def on_complete(result): - self.do_command("quit") + # def on_complete(result): + # self.do_command("quit") - dl = defer.DeferredList(deferreds).addCallback(on_complete) + # dl = defer.DeferredList(deferreds).addCallback(on_complete) - # We need to wait for the rpcs in start() to finish before processing - # any of the commands. - self.started_deferred.addCallback(on_started) - component.start().addCallback(on_started) + # # We need to wait for the rpcs in start() to finish before processing + # # any of the commands. + # self.started_deferred.addCallback(on_started) + # component.start().addCallback(on_started) - d = client.connect() - d.addCallback(on_connect) + #d = client.connect() + #d.addCallback(on_connect) self.coreconfig = CoreConfig() if self.interactive and not deluge.common.windows_check(): @@ -218,8 +218,8 @@ class ConsoleUI(component.Component): # pass it the function that handles commands colors.init_colors() self.statusbars = StatusBars() - from modes.alltorrents import AllTorrents - self.screen = AllTorrents(stdscr, self.coreconfig, self.encoding) + from modes.connectionmanager import ConnectionManager + self.screen = ConnectionManager(stdscr, self.encoding) self.eventlog = EventLog() self.screen.topbar = "{!status!}Deluge " + deluge.common.get_version() + " Console" diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index eeef41a92..d75bcf90f 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -143,7 +143,7 @@ class StateUpdater(component.Component): class AllTorrents(BaseMode): - def __init__(self, stdscr, coreconfig, encoding=None): + def __init__(self, stdscr, encoding=None): self.formatted_rows = None self.cursel = 1 self.curoff = 1 # TODO: this should really be 0 indexed @@ -157,7 +157,7 @@ class AllTorrents(BaseMode): self._curr_filter = None - self.coreconfig = coreconfig + self.coreconfig = component.get("ConsoleUI").coreconfig BaseMode.__init__(self, stdscr, encoding) curses.curs_set(0) diff --git a/deluge/ui/console/modes/connectionmanager.py b/deluge/ui/console/modes/connectionmanager.py new file mode 100644 index 000000000..4f9b4686a --- /dev/null +++ b/deluge/ui/console/modes/connectionmanager.py @@ -0,0 +1,219 @@ +# +# connectionmanager.py +# +# Copyright (C) 2007-2009 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +# a mode that show's a popup to select which host to connect to + +import hashlib,time + +from collections import deque + +import deluge.ui.client +from deluge.ui.client import client +from deluge.configmanager import ConfigManager +from deluge.ui.coreconfig import CoreConfig +import deluge.component as component + +from alltorrents import AllTorrents +from basemode import BaseMode +from popup import SelectablePopup,MessagePopup +from input_popup import InputPopup + + +try: + import curses +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + +DEFAULT_HOST = "127.0.0.1" +DEFAULT_PORT = 58846 + +DEFAULT_CONFIG = { + "hosts": [(hashlib.sha1(str(time.time())).hexdigest(), DEFAULT_HOST, DEFAULT_PORT, "", "")] +} + + +class ConnectionManager(BaseMode): + def __init__(self, stdscr, encoding=None): + self.popup = None + self.statuses = {} + self.messages = deque() + self.config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG) + BaseMode.__init__(self, stdscr, encoding) + self.__update_statuses() + self.__update_popup() + + def __update_popup(self): + self.popup = SelectablePopup(self,"Select Host",self.__host_selected) + self.popup.add_line("{!white,black,bold!}'Q'=quit, 'r'=refresh, 'a'=add new host, 'D'=delete host",selectable=False) + for host in self.config["hosts"]: + if host[0] in self.statuses: + self.popup.add_line("%s:%d [Online] (%s)"%(host[1],host[2],self.statuses[host[0]]),data=host[0],foreground="green") + else: + self.popup.add_line("%s:%d [Offline]"%(host[1],host[2]),data=host[0],foreground="red") + self.inlist = True + self.refresh() + + def __update_statuses(self): + """Updates the host status""" + def on_connect(result, c, host_id): + def on_info(info, c): + self.statuses[host_id] = info + self.__update_popup() + c.disconnect() + + def on_info_fail(reason, c): + if host_id in self.statuses: + del self.statuses[host_id] + c.disconnect() + + d = c.daemon.info() + d.addCallback(on_info, c) + d.addErrback(on_info_fail, c) + + def on_connect_failed(reason, host_id): + if host_id in self.statuses: + del self.statuses[host_id] + + for host in self.config["hosts"]: + c = deluge.ui.client.Client() + hadr = host[1] + port = host[2] + user = host[3] + password = host[4] + d = c.connect(hadr, port, user, password) + d.addCallback(on_connect, c, host[0]) + d.addErrback(on_connect_failed, host[0]) + + def __on_connected(self,result): + component.start() + self.stdscr.clear() + at = AllTorrents(self.stdscr, self.encoding) + component.get("ConsoleUI").set_mode(at) + at.resume() + + def __host_selected(self, idx, data): + for host in self.config["hosts"]: + if host[0] == data and host[0] in self.statuses: + client.connect(host[1], host[2], host[3], host[4]).addCallback(self.__on_connected) + return False + + def __do_add(self,result): + hostname = result["hostname"] + try: + port = int(result["port"]) + except ValueError: + self.report_message("Can't add host","Invalid port. Must be an integer") + return + username = result["username"] + password = result["password"] + for host in self.config["hosts"]: + if (host[1],host[2],host[3]) == (hostname, port, username): + self.report_message("Can't add host","Host already in list") + return + newid = hashlib.sha1(str(time.time())).hexdigest() + self.config["hosts"].append((newid, hostname, port, username, password)) + self.config.save() + self.__update_popup() + + def __add_popup(self): + self.inlist = False + self.popup = InputPopup(self,"Add Host (esc to cancel)",close_cb=self.__do_add) + self.popup.add_text_input("Hostname:","hostname") + self.popup.add_text_input("Port:","port") + self.popup.add_text_input("Username:","username") + self.popup.add_text_input("Password:","password") + self.refresh() + + def __delete_current_host(self): + idx,data = self.popup.current_selection() + log.debug("deleting host: %s",data) + for host in self.config["hosts"]: + if host[0] == data: + self.config["hosts"].remove(host) + break + self.config.save() + + def report_message(self,title,message): + self.messages.append((title,message)) + + def refresh(self): + self.stdscr.clear() + self.draw_statusbars() + self.stdscr.noutrefresh() + + if self.popup == None and self.messages: + title,msg = self.messages.popleft() + self.popup = MessagePopup(self,title,msg) + + if not self.popup: + self.__update_popup() + + self.popup.refresh() + curses.doupdate() + + + def _doRead(self): + # Read the character + c = self.stdscr.getch() + + if c > 31 and c < 256: + if chr(c) == 'q' and self.inlist: return + if chr(c) == 'Q': + from twisted.internet import reactor + if client.connected(): + def on_disconnect(result): + reactor.stop() + client.disconnect().addCallback(on_disconnect) + else: + reactor.stop() + return + if chr(c) == 'D' and self.inlist: + self.__delete_current_host() + self.__update_popup() + return + if chr(c) == 'r' and self.inlist: + self.__update_statuses() + if chr(c) == 'a' and self.inlist: + self.__add_popup() + return + + if self.popup: + if self.popup.handle_read(c): + self.popup = None + self.refresh() + return From 9e5455793bb474998bf65a7b73dc649524f032dc Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 16:45:10 +0100 Subject: [PATCH 058/329] remove unused code this breaks command line right now, will put it back in later --- deluge/ui/console/main.py | 310 +------------------------------------- 1 file changed, 2 insertions(+), 308 deletions(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 0e6dfef28..bd2f8c657 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -43,7 +43,6 @@ import locale from twisted.internet import defer, reactor -from deluge.ui.console import UI_PATH import deluge.component as component from deluge.ui.client import client import deluge.common @@ -51,7 +50,7 @@ from deluge.ui.coreconfig import CoreConfig from deluge.ui.sessionproxy import SessionProxy from deluge.ui.console.statusbars import StatusBars from deluge.ui.console.eventlog import EventLog -import screen +#import screen import colors from deluge.ui.ui import _UI @@ -63,11 +62,6 @@ class Console(_UI): def __init__(self): super(Console, self).__init__("console") - cmds = load_commands(os.path.join(UI_PATH, 'commands')) - - group = optparse.OptionGroup(self.parser, "Console Commands", - "\n".join(cmds.keys())) - self.parser.add_option_group(group) def start(self): super(Console, self).start() @@ -93,62 +87,11 @@ class OptionParser(optparse.OptionParser): """ raise Exception(msg) -class BaseCommand(object): - - usage = 'usage' - option_list = tuple() - aliases = [] - - def complete(self, text, *args): - return [] - def handle(self, *args, **options): - pass - - @property - def name(self): - return 'base' - - @property - def epilog(self): - return self.__doc__ - - def split(self, text): - if deluge.common.windows_check(): - text = text.replace('\\', '\\\\') - return shlex.split(text) - - def create_parser(self): - return OptionParser(prog = self.name, - usage = self.usage, - epilog = self.epilog, - option_list = self.option_list) - -def load_commands(command_dir, exclude=[]): - def get_command(name): - return getattr(__import__('deluge.ui.console.commands.%s' % name, {}, {}, ['Command']), 'Command')() - - try: - commands = [] - for filename in os.listdir(command_dir): - if filename.split('.')[0] in exclude or filename.startswith('_'): - continue - if not (filename.endswith('.py') or filename.endswith('.pyc')): - continue - cmd = get_command(filename.split('.')[len(filename.split('.')) - 2]) - aliases = [ filename.split('.')[len(filename.split('.')) - 2] ] - aliases.extend(cmd.aliases) - for a in aliases: - commands.append((a, cmd)) - return dict(commands) - except OSError, e: - return {} class ConsoleUI(component.Component): def __init__(self, args=None): component.Component.__init__(self, "ConsoleUI", 2) - self.batch_write = False - try: locale.setlocale(locale.LC_ALL, '') self.encoding = locale.getpreferredencoding() @@ -156,8 +99,7 @@ class ConsoleUI(component.Component): self.encoding = sys.getdefaultencoding() log.debug("Using encoding: %s", self.encoding) - # Load all the commands - #self._commands = load_commands(os.path.join(UI_PATH, 'commands')) + # start up the session proxy self.sessionproxy = SessionProxy() @@ -170,30 +112,6 @@ class ConsoleUI(component.Component): args = args[0] self.interactive = False - # Try to connect to the localhost daemon - # def on_connect(result): - # def on_started(result): - # if not self.interactive: - # def on_started(result): - # deferreds = [] - # # If we have args, lets process them and quit - # # allow multiple commands split by ";" - # for arg in args.split(";"): - # deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) - - # def on_complete(result): - # self.do_command("quit") - - # dl = defer.DeferredList(deferreds).addCallback(on_complete) - - # # We need to wait for the rpcs in start() to finish before processing - # # any of the commands. - # self.started_deferred.addCallback(on_started) - # component.start().addCallback(on_started) - - #d = client.connect() - #d.addCallback(on_connect) - self.coreconfig = CoreConfig() if self.interactive and not deluge.common.windows_check(): # We use the curses.wrapper function to prevent the console from getting @@ -233,40 +151,6 @@ class ConsoleUI(component.Component): # Start the twisted mainloop reactor.run() - def start(self): - # This gets fired once we have received the torrents list from the core - self.started_deferred = defer.Deferred() - - # Maintain a list of (torrent_id, name) for use in tab completion - self.torrents = [] - def on_session_state(result): - def on_torrents_status(torrents): - for torrent_id, status in torrents.items(): - self.torrents.append((torrent_id, status["name"])) - self.started_deferred.callback(True) - - client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) - client.core.get_session_state().addCallback(on_session_state) - - # Register some event handlers to keep the torrent list up-to-date - client.register_event_handler("TorrentAddedEvent", self.on_torrent_added_event) - client.register_event_handler("TorrentRemovedEvent", self.on_torrent_removed_event) - - def update(self): - pass - - def set_batch_write(self, batch): - """ - When this is set the screen is not refreshed after a `:meth:write` until - this is set to False. - - :param batch: set True to prevent screen refreshes after a `:meth:write` - :type batch: bool - - """ - self.batch_write = batch - if not batch and self.interactive: - self.screen.refresh() def set_mode(self, mode): reactor.removeReader(self.screen) @@ -274,195 +158,5 @@ class ConsoleUI(component.Component): self.statusbars.screen = self.screen reactor.addReader(self.screen) - def write(self, line): - """ - Writes a line out depending on if we're in interactive mode or not. - - :param line: str, the line to print - - """ - if self.interactive: - #self.screen.add_line(line, not self.batch_write) - pass - else: - print(colors.strip_colors(line)) - - def do_command(self, cmd): - """ - Processes a command. - - :param cmd: str, the command string - - """ - if not cmd: - return - cmd, _, line = cmd.partition(' ') - try: - parser = self._commands[cmd].create_parser() - except KeyError: - self.write("{!error!}Unknown command: %s" % cmd) - return - args = self._commands[cmd].split(line) - - # Do a little hack here to print 'command --help' properly - parser._print_help = parser.print_help - def print_help(f=None): - if self.interactive: - self.write(parser.format_help()) - else: - parser._print_help(f) - parser.print_help = print_help - - # Only these commands can be run when not connected to a daemon - not_connected_cmds = ["help", "connect", "quit"] - aliases = [] - for c in not_connected_cmds: - aliases.extend(self._commands[c].aliases) - not_connected_cmds.extend(aliases) - - if not client.connected() and cmd not in not_connected_cmds: - self.write("{!error!}Not connected to a daemon, please use the connect command first.") - return - - try: - options, args = parser.parse_args(args) - except Exception, e: - self.write("{!error!}Error parsing options: %s" % e) - return - - if not getattr(options, '_exit', False): - try: - ret = self._commands[cmd].handle(*args, **options.__dict__) - except Exception, e: - self.write("{!error!}" + str(e)) - log.exception(e) - import traceback - self.write("%s" % traceback.format_exc()) - return defer.succeed(True) - else: - return ret - - def tab_completer(self, line, cursor, second_hit): - """ - Called when the user hits 'tab' and will autocomplete or show options. - If a command is already supplied in the line, this function will call the - complete method of the command. - - :param line: str, the current input string - :param cursor: int, the cursor position in the line - :param second_hit: bool, if this is the second time in a row the tab key - has been pressed - - :returns: 2-tuple (string, cursor position) - - """ - # First check to see if there is no space, this will mean that it's a - # command that needs to be completed. - if " " not in line: - possible_matches = [] - # Iterate through the commands looking for ones that startwith the - # line. - for cmd in self._commands: - if cmd.startswith(line): - possible_matches.append(cmd + " ") - - line_prefix = "" - else: - cmd = line.split(" ")[0] - if cmd in self._commands: - # Call the command's complete method to get 'er done - possible_matches = self._commands[cmd].complete(line.split(" ")[-1]) - line_prefix = " ".join(line.split(" ")[:-1]) + " " - else: - # This is a bogus command - return (line, cursor) - - # No matches, so just return what we got passed - if len(possible_matches) == 0: - return (line, cursor) - # If we only have 1 possible match, then just modify the line and - # return it, else we need to print out the matches without modifying - # the line. - elif len(possible_matches) == 1: - new_line = line_prefix + possible_matches[0] - return (new_line, len(new_line)) - else: - if second_hit: - # Only print these out if it's a second_hit - self.write(" ") - for match in possible_matches: - self.write(match) - else: - p = " ".join(line.split(" ")[:-1]) - new_line = " ".join([p, os.path.commonprefix(possible_matches)]) - if len(new_line) > len(line): - line = new_line - cursor = len(line) - return (line, cursor) - - def tab_complete_torrent(self, line): - """ - Completes torrent_ids or names. - - :param line: str, the string to complete - - :returns: list of matches - - """ - - possible_matches = [] - - # Find all possible matches - for torrent_id, torrent_name in self.torrents: - if torrent_id.startswith(line): - possible_matches.append(torrent_id + " ") - if torrent_name.startswith(line): - possible_matches.append(torrent_name + " ") - - return possible_matches - - def get_torrent_name(self, torrent_id): - """ - Gets a torrent name from the torrents list. - - :param torrent_id: str, the torrent_id - - :returns: the name of the torrent or None - """ - - for tid, name in self.torrents: - if torrent_id == tid: - return name - - return None - - def match_torrent(self, string): - """ - Returns a list of torrent_id matches for the string. It will search both - torrent_ids and torrent names, but will only return torrent_ids. - - :param string: str, the string to match on - - :returns: list of matching torrent_ids. Will return an empty list if - no matches are found. - - """ - ret = [] - for tid, name in self.torrents: - if tid.startswith(string) or name.startswith(string): - ret.append(tid) - - return ret - - def on_torrent_added_event(self, event): - def on_torrent_status(status): - self.torrents.append((event.torrent_id, status["name"])) - client.core.get_torrent_status(event.torrent_id, ["name"]).addCallback(on_torrent_status) - - def on_torrent_removed_event(self, event): - for index, (tid, name) in enumerate(self.torrents): - if event.torrent_id == tid: - del self.torrents[index] - def on_client_disconnect(self): component.stop() From 20302021c4eebe82b12e136bb5964424ac1675d0 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 17:39:42 +0100 Subject: [PATCH 059/329] initial prefs mode. doesn't do anything yet --- deluge/ui/console/modes/alltorrents.py | 9 ++ deluge/ui/console/modes/preferences.py | 191 +++++++++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 deluge/ui/console/modes/preferences.py diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index d75bcf90f..a45ee7875 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -47,6 +47,7 @@ from popup import Popup,SelectablePopup,MessagePopup from add_util import add_torrent from input_popup import InputPopup from torrentdetail import TorrentDetail +from preferences import Preferences from torrent_actions import torrent_actions_popup import format_utils @@ -329,6 +330,11 @@ class AllTorrents(BaseMode): td = TorrentDetail(self,tid,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(td) + def show_prefrences(self): + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + prefs = Preferences(self,self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(prefs) def _torrent_filter(self, idx, data): if data==FILTER.ALL: @@ -606,5 +612,8 @@ class AllTorrents(BaseMode): self.popup = Popup(self,"Help") for l in HELP_LINES: self.popup.add_line(l) + elif chr(c) == 'p': + self.show_prefrences() + return self.refresh(effected_lines) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py new file mode 100644 index 000000000..58d509d95 --- /dev/null +++ b/deluge/ui/console/modes/preferences.py @@ -0,0 +1,191 @@ +# -*- coding: utf-8 -*- +# +# preferences.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.component as component +from basemode import BaseMode + +from collections import deque + +try: + import curses +except ImportError: + pass + + +import logging +log = logging.getLogger(__name__) + +class ZONE: + CATEGORIES = 0 + PREFRENCES = 1 + ACTIONS = 2 + +class Preferences(BaseMode): + def __init__(self, parent_mode, stdscr, encoding=None): + self.parent_mode = parent_mode + self.categories = [_("Downloads"), _("Network"), _("Bandwidth"), + _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), + _("Cache")] # , _("Plugins")] + self.cur_cat = 0 + self.cur_action = 0 + self.popup = None + self.messages = deque() + + self.active_zone = ZONE.CATEGORIES + + # how wide is the left 'pane' with categories + self.div_off = 15 + + BaseMode.__init__(self, stdscr, encoding) + + def __draw_catetories(self): + for i,category in enumerate(self.categories): + if i == self.cur_cat and self.active_zone == ZONE.CATEGORIES: + self.add_string(i+1,"- {!black,white,bold!}%s"%category,pad=False) + elif i == self.cur_cat: + self.add_string(i+1,"- {!black,white!}%s"%category,pad=False) + else: + self.add_string(i+1,"- %s"%category) + self.stdscr.vline(1,self.div_off,'|',self.rows-2) + + def __draw_actions(self): + c = self.cols-22 + self.stdscr.hline(self.rows-3,self.div_off+1,"_",self.cols) + if self.active_zone != ZONE.ACTIONS: + self.add_string(self.rows-2,"[Cancel] [Apply] [OK]",col=c) + else: + if self.cur_action == 0: + self.add_string(self.rows-2,"[{!black,white,bold!}Cancel{!white,black!}] [Apply] [OK]",col=c) + elif self.cur_action == 1: + self.add_string(self.rows-2,"[Cancel] [{!black,white,bold!}Apply{!white,black!}] [OK]",col=c) + elif self.cur_action == 2: + self.add_string(self.rows-2,"[Cancel] [Apply] [{!black,white,bold!}OK{!white,black!}]",col=c) + + + def refresh(self): + if self.popup == None and self.messages: + title,msg = self.messages.popleft() + self.popup = MessagePopup(self,title,msg) + + self.stdscr.clear() + self.add_string(0,self.statusbars.topbar) + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) + + self.__draw_catetories() + self.__draw_actions() + + self.stdscr.noutrefresh() + + if self.popup: + self.popup.refresh() + + curses.doupdate() + + def __category_read(self, c): + # Navigate prefs + if c == curses.KEY_UP: + self.cur_cat = max(0,self.cur_cat-1) + elif c == curses.KEY_DOWN: + self.cur_cat = min(len(self.categories)-1,self.cur_cat+1) + + def __prefs_read(self, c): + pass + + def __actions_read(self, c): + # Navigate actions + if c == curses.KEY_LEFT: + self.cur_action = max(0,self.cur_action-1) + elif c == curses.KEY_RIGHT: + self.cur_action = min(2,self.cur_action+1) + elif c == curses.KEY_ENTER or c == 10: + # take action + if self.cur_action == 0: # cancel + self.back_to_parent() + elif self.cur_action == 1: # apply + # TODO: Actually apply + pass + elif self.cur_action == 2: # OK + # TODO: Actually apply + self.back_to_parent() + + + def back_to_parent(self): + self.stdscr.clear() + component.get("ConsoleUI").set_mode(self.parent_mode) + self.parent_mode.resume() + + def _doRead(self): + c = self.stdscr.getch() + + if self.popup: + if self.popup.handle_read(c): + self.popup = None + self.refresh() + return + + if c > 31 and c < 256: + if chr(c) == 'Q': + from twisted.internet import reactor + if client.connected(): + def on_disconnect(result): + reactor.stop() + client.disconnect().addCallback(on_disconnect) + else: + reactor.stop() + return + + elif c == 9: + self.active_zone += 1 + if self.active_zone > ZONE.ACTIONS: + self.active_zone = ZONE.CATEGORIES + + elif c == curses.KEY_BTAB: + self.active_zone -= 1 + if self.active_zone < ZONE.CATEGORIES: + self.active_zone = ZONE.ACTIONS + + else: + if self.active_zone == ZONE.CATEGORIES: + self.__category_read(c) + elif self.active_zone == ZONE.PREFRENCES: + self.__prefs_read(c) + elif self.active_zone == ZONE.ACTIONS: + self.__actions_read(c) + + self.refresh() + + From 00ab9ff49985c34147884caa47af347af35effbc Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 17:47:50 +0100 Subject: [PATCH 060/329] support offset text/select inputs and select inputs with no message --- deluge/ui/console/modes/input_popup.py | 29 +++++++++++++++----------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 72b9991e8..459637d78 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -50,7 +50,7 @@ log = logging.getLogger(__name__) class InputField: # render the input. return number of rows taken up - def render(self,screen,row,width,selected): + def render(self,screen,row,width,selected,col=1): return 0 def handle_read(self, c): if c in [curses.KEY_ENTER, 10, 127, 113]: @@ -67,18 +67,23 @@ class SelectInput(InputField): self.opts = opts self.selidx = selidx - def render(self, screen, row, width, selected): - self.parent.add_string(row,self.message,screen,1,False,True) - off = 2 + def render(self, screen, row, width, selected, col=1): + if self.message: + self.parent.add_string(row,self.message,screen,col,False,True) + row += 1 + off = col+1 for i,opt in enumerate(self.opts): if selected and i == self.selidx: - self.parent.add_string(row+1,"{!black,white,bold!}[%s]"%opt,screen,off,False,True) + self.parent.add_string(row,"{!black,white,bold!}[%s]"%opt,screen,off,False,True) elif i == self.selidx: - self.parent.add_string(row+1,"[{!white,black,underline!}%s{!white,black!}]"%opt,screen,off,False,True) + self.parent.add_string(row,"[{!white,black,underline!}%s{!white,black!}]"%opt,screen,off,False,True) else: - self.parent.add_string(row+1,"[%s]"%opt,screen,off,False,True) + self.parent.add_string(row,"[%s]"%opt,screen,off,False,True) off += len(opt)+3 - return 2 + if self.message: + return 2 + else: + return 1 def handle_read(self, c): if c == curses.KEY_LEFT: @@ -105,21 +110,21 @@ class TextInput(InputField): self.opts = None self.opt_off = 0 - def render(self,screen,row,width,selected): + def render(self,screen,row,width,selected,col=1): if selected: if self.opts: - self.parent.add_string(row+2,self.opts[self.opt_off:],screen,1,False,True) + self.parent.add_string(row+2,self.opts[self.opt_off:],screen,col,False,True) if self.cursor > (width-3): self.move_func(row+1,width-2) else: self.move_func(row+1,self.cursor+1) - self.parent.add_string(row,self.message,screen,1,False,True) + self.parent.add_string(row,self.message,screen,col,False,True) slen = len(self.value)+3 if slen > width: vstr = self.value[(slen-width):] else: vstr = self.value.ljust(width-2) - self.parent.add_string(row+1,"{!black,white,bold!}%s"%vstr,screen,1,False,False) + self.parent.add_string(row+1,"{!black,white,bold!}%s"%vstr,screen,col,False,False) return 3 From 077f35ec5c8733fd214ecb4ebcb1a71717dbaee1 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Feb 2011 17:54:59 +0100 Subject: [PATCH 061/329] use selection input for cancel/apply/ok --- deluge/ui/console/modes/preferences.py | 36 ++++++++++---------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index 58d509d95..32b3c4c4f 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -36,6 +36,8 @@ import deluge.component as component from basemode import BaseMode +from input_popup import SelectInput + from collections import deque @@ -60,9 +62,9 @@ class Preferences(BaseMode): _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), _("Cache")] # , _("Plugins")] self.cur_cat = 0 - self.cur_action = 0 self.popup = None self.messages = deque() + self.action_input = None self.active_zone = ZONE.CATEGORIES @@ -70,6 +72,8 @@ class Preferences(BaseMode): self.div_off = 15 BaseMode.__init__(self, stdscr, encoding) + self.action_input = SelectInput(self,None,None,["Cancel","Apply","OK"],0) + self.refresh() def __draw_catetories(self): for i,category in enumerate(self.categories): @@ -82,18 +86,10 @@ class Preferences(BaseMode): self.stdscr.vline(1,self.div_off,'|',self.rows-2) def __draw_actions(self): - c = self.cols-22 - self.stdscr.hline(self.rows-3,self.div_off+1,"_",self.cols) - if self.active_zone != ZONE.ACTIONS: - self.add_string(self.rows-2,"[Cancel] [Apply] [OK]",col=c) - else: - if self.cur_action == 0: - self.add_string(self.rows-2,"[{!black,white,bold!}Cancel{!white,black!}] [Apply] [OK]",col=c) - elif self.cur_action == 1: - self.add_string(self.rows-2,"[Cancel] [{!black,white,bold!}Apply{!white,black!}] [OK]",col=c) - elif self.cur_action == 2: - self.add_string(self.rows-2,"[Cancel] [Apply] [{!black,white,bold!}OK{!white,black!}]",col=c) - + if self.action_input: + selected = self.active_zone == ZONE.ACTIONS + self.stdscr.hline(self.rows-3,self.div_off+1,"_",self.cols) + self.action_input.render(self.stdscr,self.rows-2,self.cols,selected,self.cols-22) def refresh(self): if self.popup == None and self.messages: @@ -126,19 +122,15 @@ class Preferences(BaseMode): pass def __actions_read(self, c): - # Navigate actions - if c == curses.KEY_LEFT: - self.cur_action = max(0,self.cur_action-1) - elif c == curses.KEY_RIGHT: - self.cur_action = min(2,self.cur_action+1) - elif c == curses.KEY_ENTER or c == 10: + self.action_input.handle_read(c) + if c == curses.KEY_ENTER or c == 10: # take action - if self.cur_action == 0: # cancel + if self.action_input.selidx == 0: # cancel self.back_to_parent() - elif self.cur_action == 1: # apply + elif self.action_input.selidx == 1: # apply # TODO: Actually apply pass - elif self.cur_action == 2: # OK + elif self.action_input.selidx == 2: # OK # TODO: Actually apply self.back_to_parent() From 376a23e6fd19306c2cf8a397ddc96319c78bd647 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 9 Feb 2011 18:40:19 +0000 Subject: [PATCH 062/329] Fix #1513: Unhandled Twisted Error in test_listen_port --- deluge/core/core.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deluge/core/core.py b/deluge/core/core.py index 9fb5defc6..6d4c13793 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -754,7 +754,11 @@ class Core(component.Component): def on_get_page(result): return bool(int(result)) + def logError(failure): + log.warning("Error testing listen port: %s", failure) + d.addCallback(on_get_page) + d.addErrback(logError) return d From 553f35eae56e3d140a1500fdc8368bcdf9c2a477 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 11 Feb 2011 01:05:28 +0000 Subject: [PATCH 063/329] Fix #1510 - Cannot create a torrent with only non-zero tier trackers --- deluge/ui/gtkui/createtorrentdialog.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 6ee302132..147fd6435 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -285,14 +285,11 @@ class CreateTorrentDialog: tracker = None else: # Create a list of lists [[tier0, ...], [tier1, ...], ...] + tier_dict = {} for tier, tracker in self.trackers_liststore: - try: - tier_list = trackers[tier] - except IndexError: - trackers.insert(tier, []) - - trackers[tier].append(tracker) + tier_dict.setdefault(tier, []).append(tracker) + trackers = [tier_dict[tier] for tier in sorted(tier_dict)] # Get the first tracker in the first tier tracker = trackers[0][0] From e198ea14e4349436db1a7c754bbb2dcab7f76a53 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 11 Feb 2011 01:07:47 +0000 Subject: [PATCH 064/329] Fix Create Torrent Dialog Box - Some buttons raise Type Error if no row selected --- deluge/ui/gtkui/createtorrentdialog.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py index 147fd6435..786347e55 100644 --- a/deluge/ui/gtkui/createtorrentdialog.py +++ b/deluge/ui/gtkui/createtorrentdialog.py @@ -379,6 +379,8 @@ class CreateTorrentDialog: def _on_button_up_clicked(self, widget): log.debug("_on_button_up_clicked") row = self.glade.get_widget("tracker_treeview").get_selection().get_selected()[1] + if row is None: + return if self.trackers_liststore[row][0] == 0: return else: @@ -387,6 +389,8 @@ class CreateTorrentDialog: def _on_button_down_clicked(self, widget): log.debug("_on_button_down_clicked") row = self.glade.get_widget("tracker_treeview").get_selection().get_selected()[1] + if row is None: + return self.trackers_liststore[row][0] += 1 def _on_button_add_clicked(self, widget): @@ -430,4 +434,6 @@ class CreateTorrentDialog: def _on_button_remove_clicked(self, widget): log.debug("_on_button_remove_clicked") row = self.glade.get_widget("tracker_treeview").get_selection().get_selected()[1] + if row is None: + return self.trackers_liststore.remove(row) From f8737777b1b6fc8daba6f1ee855ceed6376d3504 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 11 Feb 2011 09:48:00 +0000 Subject: [PATCH 065/329] Fix #1527 - Converting unicode to unicode error in move_storage --- deluge/core/torrent.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index a1a2bdd27..21a184e63 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -807,10 +807,15 @@ class Torrent(object): def move_storage(self, dest): """Move a torrent's storage location""" - - # Convert path from utf8 to unicode - dest_u=unicode(dest,"utf-8") - + + # Attempt to convert utf8 path to unicode + # Note: Inconsistent encoding for 'dest', needs future investigation + try: + dest_u = unicode(dest, "utf-8") + except TypeError: + # String is already unicode + dest_u = dest + if not os.path.exists(dest_u): try: # Try to make the destination path if it doesn't exist From 98ca371b15596a2d9ffe120ddb1ed47e62583da2 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 11 Feb 2011 20:24:27 +0000 Subject: [PATCH 066/329] Sidebar: Enabled strings for translation and added icons to Trackers filter --- deluge/data/pixmaps/tracker_all16.png | Bin 0 -> 1097 bytes deluge/data/pixmaps/tracker_warning16.png | Bin 0 -> 683 bytes deluge/ui/gtkui/filtertreeview.py | 79 ++++++++++++++++------ 3 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 deluge/data/pixmaps/tracker_all16.png create mode 100644 deluge/data/pixmaps/tracker_warning16.png diff --git a/deluge/data/pixmaps/tracker_all16.png b/deluge/data/pixmaps/tracker_all16.png new file mode 100644 index 0000000000000000000000000000000000000000..36756bbcc50598f12930a2ef3c2cf4fa5a7f6b1d GIT binary patch literal 1097 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj zI14-?iy0VruY)k7lg8`{1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh zq!<_&_&|z6GD~t&89eh!Qj79ZOVouLBPNx>?fn1y*6SyfC&`_?VdIlAM=ii>QRR$)=oLz_D-wD`TwXZEM0AU^ z1Zi^a5NHm)<8|PHQ&7h1b0Hc+Mk*dY9EQ1a7xt(b&-|XER%~3X{{7#&s9Br;S#oS97XSr`*b*Xf*u&{i@dDgS}e7n25*6w^Q&%Y&J z#%8r;NpFqa@jA8BVJ64pK26xxW|Vcxw&(6#J)d9G)8)%wKfm(!_BIxch?V*4dB1Mm z|2?cf?9sIevs_;J$+%8cFgaz@G^fyErMpql+ewfAWb5uNtykU0B*0sHy}CA6-}nCC zm&Gfm^iI^?uxsvt@>}hx&m!)2B}f~do0H{onZ=1iNBUg7RaD2Z&2xi1O23}=*W+k- z@{jR#wBRf0==t-foL+Wto5b(rwvE-nZ{Db0Fx~O%-)o^OqOq5^?pxNTwNcb-!)EEF z+qX;mX5HB4s!{A=H+$LsbBdB%AP&E1!4ZFKHHSrMS4`u39&B>=x8bk zw%FvEUOb~}PI%O;0I!8p7A;*k$^CNi6IW4%3%b#3*XOy#ofQ+YmG!fES0r~%N7$mE zFyYBh^LY>Monh9S^U>%+X_t$Vm(twl7t91!uy$@rpZCrs#C2oy-w>J0CKc%mCO;Eu zUcS4~ELrV8tB>4SJz+lfPPfB1q9hkaJUg-J$`p}pf1W>- zb84_i1e3GB(r(D@w@*#yc^tN(E~%>zb7SVOMWsTH+)WBsPM%yU z>ndI-&>h-!>FD&OuL1{Z^W50h zea+S_-aprgOtr}0u(pfuu=hpxvc<9fTWfhW-tIM8`ZCeBsL;q{qPT4JTRrXaCrx^D zWTw0Lg%~Xl$$Jy?cH0~)83iRFU)|MzTzrxwkN7J7d>kmpFb zqFx&*s^=D3h`QPYj$UC`8>*OAFwI(m|fSZa2Y=0Q_12(3Lxt6kQE8nSgGci7@ zG-Th2JD0eMy|rJ|aHh__@g*SdwY70>z!`xre7`^ zW`r$>OI!7%uqxp2J++X1i+*>{SkUu2VHF=Y!>7D9yVM^xm!4PU^+91nyTbunM4*k6?(_A);G@B6O|h2rKvj!6dRfBN*8jr-c8Z7)lE lIDRYHO!m9~bHh*0 Date: Mon, 14 Feb 2011 12:25:04 +0100 Subject: [PATCH 067/329] add back write method and keep track of events for (future) event view --- deluge/ui/console/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index bd2f8c657..cb252d3fb 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -92,6 +92,9 @@ class ConsoleUI(component.Component): def __init__(self, args=None): component.Component.__init__(self, "ConsoleUI", 2) + # keep track of events for the log view + self.events = [] + try: locale.setlocale(locale.LC_ALL, '') self.encoding = locale.getpreferredencoding() @@ -160,3 +163,6 @@ class ConsoleUI(component.Component): def on_client_disconnect(self): component.stop() + + def write(self, s): + self.events.append(s) From ac8c928a5b976dedf06f33ea2dcf1013ab7d09c7 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 14 Feb 2011 12:25:43 +0100 Subject: [PATCH 068/329] don't always refresh on __init__ --- deluge/ui/console/modes/basemode.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/basemode.py b/deluge/ui/console/modes/basemode.py index 24cb3cca4..2dd9b87d7 100644 --- a/deluge/ui/console/modes/basemode.py +++ b/deluge/ui/console/modes/basemode.py @@ -72,7 +72,7 @@ class CursesStdIO(object): class BaseMode(CursesStdIO): - def __init__(self, stdscr, encoding=None): + def __init__(self, stdscr, encoding=None, do_refresh=True): """ A mode that provides a curses screen designed to run as a reader in a twisted reactor. This mode doesn't do much, just shows status bars and "Base Mode" on the screen @@ -116,7 +116,8 @@ class BaseMode(CursesStdIO): colors.init_colors() # Do a refresh right away to draw the screen - self.refresh() + if do_refresh: + self.refresh() def on_resize_norefresh(self, *args): log.debug("on_resize_from_signal") From 77eb1a5f8295c9677a69075a912f94c1d24a2a1d Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 14 Feb 2011 12:26:24 +0100 Subject: [PATCH 069/329] prefs actually work. some tweaks to inputs to better support prefs not all prefs available yet --- deluge/ui/console/modes/alltorrents.py | 9 +- deluge/ui/console/modes/input_popup.py | 129 +++++++++++- deluge/ui/console/modes/preference_panes.py | 212 ++++++++++++++++++++ deluge/ui/console/modes/preferences.py | 74 +++++-- 4 files changed, 402 insertions(+), 22 deletions(-) create mode 100644 deluge/ui/console/modes/preference_panes.py diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index a45ee7875..049103666 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -330,10 +330,10 @@ class AllTorrents(BaseMode): td = TorrentDetail(self,tid,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(td) - def show_prefrences(self): + def show_preferences(self, core_config): component.stop(["AllTorrentsStateUpdater"]) self.stdscr.clear() - prefs = Preferences(self,self.stdscr,self.encoding) + prefs = Preferences(self,core_config,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(prefs) def _torrent_filter(self, idx, data): @@ -376,7 +376,6 @@ class AllTorrents(BaseMode): self.popup.add_line("Q_ueued",data=FILTER.QUEUED,foreground="yellow") def _do_add(self, result): - result["add_paused"] = (result["add_paused"] == "Yes") log.debug("Adding Torrent: %s (dl path: %s) (paused: %d)",result["file"],result["path"],result["add_paused"]) def suc_cb(msg): self.report_message("Torrent Added",msg) @@ -400,7 +399,7 @@ class AllTorrents(BaseMode): self.popup = InputPopup(self,"Add Torrent (Esc to cancel)",close_cb=self._do_add) self.popup.add_text_input("Enter path to torrent file:","file") self.popup.add_text_input("Enter save path:","path",dl) - self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],ap) + self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],[True,False],ap) def report_message(self,title,message): self.messages.append((title,message)) @@ -613,7 +612,7 @@ class AllTorrents(BaseMode): for l in HELP_LINES: self.popup.add_line(l) elif chr(c) == 'p': - self.show_prefrences() + client.core.get_config().addCallback(self.show_preferences) return self.refresh(effected_lines) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 459637d78..9c1dc4547 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -58,13 +58,121 @@ class InputField: return False def get_value(self): return None + def set_value(self, value): + pass + +class CheckedInput(InputField): + def __init__(self, parent, message, name, checked=False): + self.parent = parent + self.chkd_inact = "[X] %s"%message + self.unchkd_inact = "[ ] %s"%message + self.chkd_act = "[{!black,white,bold!}X{!white,black!}] %s"%message + self.unchkd_act = "[{!black,white,bold!} {!white,black!}] %s"%message + self.name = name + self.checked = checked + + def render(self, screen, row, width, active, col=1): + if self.checked and active: + self.parent.add_string(row,self.chkd_act,screen,col,False,True) + elif self.checked: + self.parent.add_string(row,self.chkd_inact,screen,col,False,True) + elif active: + self.parent.add_string(row,self.unchkd_act,screen,col,False,True) + else: + self.parent.add_string(row,self.unchkd_inact,screen,col,False,True) + return 1 + + def handle_read(self, c): + if c == 32: + self.checked = not self.checked + + def get_value(self): + return self.checked + + def set_value(self, c): + self.checked = c + +class IntSpinInput(InputField): + def __init__(self, parent, message, name, move_func, value, min_val, max_val): + self.parent = parent + self.message = message + self.name = name + self.value = int(value) + self.initvalue = self.value + self.valstr = "%d"%self.value + self.cursor = len(self.valstr) + self.cursoff = len(self.message)+4 # + 4 for the " [ " in the rendered string + self.move_func = move_func + self.min_val = min_val + self.max_val = max_val + + def render(self, screen, row, width, active, col=1): + if not active and not self.valstr: + self.value = self.initvalue + self.valstr = "%d"%self.value + self.cursor = len(self.valstr) + if not self.valstr: + self.parent.add_string(row,"%s [ ]"%self.message,screen,col,False,True) + elif active: + self.parent.add_string(row,"%s [ {!black,white,bold!}%d{!white,black!} ]"%(self.message,self.value),screen,col,False,True) + else: + self.parent.add_string(row,"%s [ %d ]"%(self.message,self.value),screen,col,False,True) + + if active: + self.move_func(row,self.cursor+self.cursoff) + + return 1 + + def handle_read(self, c): + if c == curses.KEY_PPAGE: + self.value+=1 + elif c == curses.KEY_NPAGE: + self.value-=1 + elif c == curses.KEY_LEFT: + self.cursor = max(0,self.cursor-1) + elif c == curses.KEY_RIGHT: + self.cursor = min(len(self.valstr),self.cursor+1) + elif c == curses.KEY_HOME: + self.cursor = 0 + elif c == curses.KEY_END: + self.cursor = len(self.value) + elif c == curses.KEY_BACKSPACE or c == 127: + if self.valstr and self.cursor > 0: + self.valstr = self.valstr[:self.cursor - 1] + self.valstr[self.cursor:] + self.cursor-=1 + if self.valstr: + self.value = int(self.valstr) + elif c == curses.KEY_DC: + if self.valstr and self.cursor < len(self.valstr): + self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:] + elif c > 47 and c < 58: + if c == 48 and self.cursor == 0: return + if self.cursor == len(self.valstr): + self.valstr += chr(c) + self.value = int(self.valstr) + else: + # Insert into string + self.valstr = self.valstr[:self.cursor] + chr(c) + self.valstr[self.cursor:] + self.value = int(self.valstr) + # Move the cursor forward + self.cursor+=1 + + + def get_value(self): + return self.value + + def set_value(self, val): + self.value = int(val) + self.valstr = "%d"%self.value + self.cursor = len(self.valstr) class SelectInput(InputField): - def __init__(self, parent, message, name, opts, selidx): + def __init__(self, parent, message, name, opts, vals, selidx): self.parent = parent self.message = message self.name = name self.opts = opts + self.vals = vals self.selidx = selidx def render(self, screen, row, width, selected, col=1): @@ -92,7 +200,14 @@ class SelectInput(InputField): self.selidx = min(len(self.opts)-1,self.selidx+1) def get_value(self): - return self.opts[self.selidx] + return self.vals[self.selidx] + + def set_value(self, nv): + for i,val in enumerate(self.vals): + if nv == val: + self.selidx = i + return + raise Exception("Invalid value for SelectInput") class TextInput(InputField): def __init__(self, parent, move_func, width, message, name, value, docmp): @@ -106,7 +221,7 @@ class TextInput(InputField): self.docmp = docmp self.tab_count = 0 - self.cursor = 0 + self.cursor = len(self.value) self.opts = None self.opt_off = 0 @@ -131,6 +246,10 @@ class TextInput(InputField): def get_value(self): return self.value + def set_value(self,val): + self.value = val + self.cursor = len(self.value) + # most of the cursor,input stuff here taken from ui/console/screen.py def handle_read(self,c): if c == 9 and self.docmp: @@ -264,8 +383,8 @@ class InputPopup(Popup): self.inputs.append(TextInput(self.parent, self.move, self.width, message, name, value, complete)) - def add_select_input(self, message, name, opts, default_index=0): - self.inputs.append(SelectInput(self.parent, message, name, opts, default_index)) + def add_select_input(self, message, name, opts, vals, default_index=0): + self.inputs.append(SelectInput(self.parent, message, name, opts, vals, default_index)) def _refresh_lines(self): self._cursor_row = -1 diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py new file mode 100644 index 000000000..572adb5a4 --- /dev/null +++ b/deluge/ui/console/modes/preference_panes.py @@ -0,0 +1,212 @@ +# +# preference_panes.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +from deluge.ui.console.modes.input_popup import TextInput,SelectInput,CheckedInput,IntSpinInput + +try: + import curses +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + + +class Header: + def __init__(self, parent, header, space_above, space_below): + self.parent = parent + self.header = "{!white,black,bold!}%s"%header + self.space_above = space_above + self.space_below = space_below + + def render(self, screen, row, width, active, offset): + rows = 1 + if self.space_above: + row += 1 + rows += 1 + self.parent.add_string(row,self.header,screen,offset-1,False,True) + if self.space_below: rows += 1 + return rows + + +class BasePane: + def __init__(self, offset, parent, width): + self.offset = offset+1 + self.parent = parent + self.width = width + self.inputs = [] + self.active_input = -1 + + def move(self,r,c): + self._cursor_row = r + self._cursor_col = c + + def add_config_values(self,conf_dict): + for ipt in self.inputs: + if not isinstance(ipt,Header): + conf_dict[ipt.name] = ipt.get_value() + + def update_values(self, conf_dict): + for ipt in self.inputs: + if not isinstance(ipt,Header): + try: + ipt.set_value(conf_dict[ipt.name]) + except KeyError: # just ignore if it's not in dict + pass + + def render(self, mode, screen, width, active): + self._cursor_row = -1 + if self.active_input < 0: + for i,ipt in enumerate(self.inputs): + if not isinstance(ipt,Header): + self.active_input = i + break + crow = 1 + for i,ipt in enumerate(self.inputs): + act = active and i==self.active_input + crow += ipt.render(screen,crow,width, act, self.offset) + + if active and self._cursor_row >= 0: + curses.curs_set(2) + screen.move(self._cursor_row,self._cursor_col+self.offset-1) + else: + curses.curs_set(0) + + # just handles setting the active input + def handle_read(self,c): + if not self.inputs: # no inputs added yet + return + + if c == curses.KEY_UP: + nc = max(0,self.active_input-1) + while isinstance(self.inputs[nc], Header): + nc-=1 + if nc <= 0: break + if not isinstance(self.inputs[nc], Header): + self.active_input = nc + elif c == curses.KEY_DOWN: + ilen = len(self.inputs) + nc = min(self.active_input+1,ilen-1) + while isinstance(self.inputs[nc], Header): + nc+=1 + if nc >= ilen: break + if not isinstance(self.inputs[nc], Header): + self.active_input = nc + else: + self.inputs[self.active_input].handle_read(c) + + + def add_header(self, header, space_above=False, space_below=False): + self.inputs.append(Header(self.parent, header, space_above, space_below)) + + def add_text_input(self, name, msg, dflt_val): + self.inputs.append(TextInput(self.parent,self.move,self.width,msg,name,dflt_val,False)) + + def add_select_input(self, name, msg, opts, vals, selidx): + self.inputs.append(SelectInput(self.parent,msg,name,opts,vals,selidx)) + + def add_checked_input(self, name, message, checked): + self.inputs.append(CheckedInput(self.parent,message,name,checked)) + + def add_int_spin_input(self, name, message, value, min_val, max_val): + self.inputs.append(IntSpinInput(self.parent,message,name,self.move,value,min_val,max_val)) + + +class DownloadsPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + + self.add_header("Folders") + self.add_text_input("download_location","Download To:",parent.core_config["download_location"]) + self.add_header("Allocation") + + if parent.core_config["compact_allocation"]: + alloc_idx = 1 + else: + alloc_idx = 0 + self.add_select_input("compact_allocation","Allocation:",["Use Full Allocation","Use Compact Allocation"],[False,True],alloc_idx) + self.add_header("Options",True) + self.add_checked_input("prioritize_first_last_pieces","Prioritize first and last pieces of torrent",parent.core_config["prioritize_first_last_pieces"]) + self.add_checked_input("add_paused","Add torrents in paused state",parent.core_config["add_paused"]) + + +class NetworkPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + +class BandwidthPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + self.add_header("Global Bandwidth Usage") + self.add_int_spin_input("max_connections_global","Maximum Connections:",parent.core_config["max_connections_global"],0,1000) + self.add_int_spin_input("max_upload_slots_global","Maximum Upload Slots:",parent.core_config["max_upload_slots_global"],0,1000) + #self.add_int_spin_input("max_download_speed","Maximum Download Speed (KiB/s):",-1,0,1000) + +class InterfacePane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + # does classic mode make sense in console? + #self.add_header("Classic Mode") + #self.add_checked_input("classic_mode","Enable",False) + + # add title bar control here + +class OtherPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + self.add_header("GeoIP Database") + self.add_text_input("geoip_db_location","Location:",parent.core_config["geoip_db_location"]) + +class DaemonPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + self.add_header("Port") + self.add_int_spin_input("daemon_port","Daemon Port:",parent.core_config["daemon_port"],0,1000) + self.add_header("Connections",True) + self.add_checked_input("allow_remote","Allow remote connections",parent.core_config["allow_remote"]) + self.add_header("Other",True) + self.add_checked_input("new_release_check","Periodically check the website for new releases",parent.core_config["new_release_check"]) + +class QueuePane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + +class ProxyPane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) + +class CachePane(BasePane): + def __init__(self, offset, parent, width): + BasePane.__init__(self,offset,parent,width) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index 32b3c4c4f..b59b49932 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -35,9 +35,12 @@ # import deluge.component as component +from deluge.ui.client import client from basemode import BaseMode from input_popup import SelectInput +from preference_panes import DownloadsPane,NetworkPane,BandwidthPane,InterfacePane +from preference_panes import OtherPane,DaemonPane,QueuePane,ProxyPane,CachePane from collections import deque @@ -56,7 +59,7 @@ class ZONE: ACTIONS = 2 class Preferences(BaseMode): - def __init__(self, parent_mode, stdscr, encoding=None): + def __init__(self, parent_mode, core_config, stdscr, encoding=None): self.parent_mode = parent_mode self.categories = [_("Downloads"), _("Network"), _("Bandwidth"), _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), @@ -66,13 +69,30 @@ class Preferences(BaseMode): self.messages = deque() self.action_input = None + self.core_config = core_config + self.active_zone = ZONE.CATEGORIES # how wide is the left 'pane' with categories self.div_off = 15 - BaseMode.__init__(self, stdscr, encoding) - self.action_input = SelectInput(self,None,None,["Cancel","Apply","OK"],0) + BaseMode.__init__(self, stdscr, encoding, False) + + # create the panes + self.prefs_width = self.cols-self.div_off-1 + self.panes = [ + DownloadsPane(self.div_off+2, self, self.prefs_width), + NetworkPane(self.div_off+2, self, self.prefs_width), + BandwidthPane(self.div_off+2, self, self.prefs_width), + InterfacePane(self.div_off+2, self, self.prefs_width), + OtherPane(self.div_off+2, self, self.prefs_width), + DaemonPane(self.div_off+2, self, self.prefs_width), + QueuePane(self.div_off+2, self, self.prefs_width), + ProxyPane(self.div_off+2, self, self.prefs_width), + CachePane(self.div_off+2, self, self.prefs_width) + ] + + self.action_input = SelectInput(self,None,None,["Cancel","Apply","OK"],[0,1,2],0) self.refresh() def __draw_catetories(self): @@ -85,11 +105,13 @@ class Preferences(BaseMode): self.add_string(i+1,"- %s"%category) self.stdscr.vline(1,self.div_off,'|',self.rows-2) + def __draw_preferences(self): + self.panes[self.cur_cat].render(self,self.stdscr, self.prefs_width, self.active_zone == ZONE.PREFRENCES) + def __draw_actions(self): - if self.action_input: - selected = self.active_zone == ZONE.ACTIONS - self.stdscr.hline(self.rows-3,self.div_off+1,"_",self.cols) - self.action_input.render(self.stdscr,self.rows-2,self.cols,selected,self.cols-22) + selected = self.active_zone == ZONE.ACTIONS + self.stdscr.hline(self.rows-3,self.div_off+1,"_",self.cols) + self.action_input.render(self.stdscr,self.rows-2,self.cols,selected,self.cols-22) def refresh(self): if self.popup == None and self.messages: @@ -103,6 +125,9 @@ class Preferences(BaseMode): self.__draw_catetories() self.__draw_actions() + + # do this last since it moves the cursor + self.__draw_preferences() self.stdscr.noutrefresh() @@ -119,7 +144,32 @@ class Preferences(BaseMode): self.cur_cat = min(len(self.categories)-1,self.cur_cat+1) def __prefs_read(self, c): - pass + self.panes[self.cur_cat].handle_read(c) + + def __apply_prefs(self): + new_core_config = {} + for pane in self.panes: + pane.add_config_values(new_core_config) + # Apply Core Prefs + if client.connected(): + # Only do this if we're connected to a daemon + config_to_set = {} + for key in new_core_config.keys(): + # The values do not match so this needs to be updated + if self.core_config[key] != new_core_config[key]: + config_to_set[key] = new_core_config[key] + + if config_to_set: + # Set each changed config value in the core + client.core.set_config(config_to_set) + client.force_call(True) + # Update the configuration + self.core_config.update(config_to_set) + + def __update_preferences(self,core_config): + self.core_config = core_config + for pane in self.panes: + pane.update_values(core_config) def __actions_read(self, c): self.action_input.handle_read(c) @@ -128,10 +178,10 @@ class Preferences(BaseMode): if self.action_input.selidx == 0: # cancel self.back_to_parent() elif self.action_input.selidx == 1: # apply - # TODO: Actually apply - pass + self.__apply_prefs() + client.core.get_config().addCallback(self.__update_preferences) elif self.action_input.selidx == 2: # OK - # TODO: Actually apply + self.__apply_prefs() self.back_to_parent() @@ -160,7 +210,7 @@ class Preferences(BaseMode): reactor.stop() return - elif c == 9: + if c == 9: self.active_zone += 1 if self.active_zone > ZONE.ACTIONS: self.active_zone = ZONE.CATEGORIES From 4a071ecba17110db822898185aebc7ef41a151a4 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 14 Feb 2011 12:38:18 +0100 Subject: [PATCH 070/329] add an eventview --- deluge/ui/console/modes/alltorrents.py | 10 +++ deluge/ui/console/modes/eventview.py | 105 +++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 deluge/ui/console/modes/eventview.py diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 049103666..2e4056ed3 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -49,6 +49,7 @@ from input_popup import InputPopup from torrentdetail import TorrentDetail from preferences import Preferences from torrent_actions import torrent_actions_popup +from eventview import EventView import format_utils @@ -336,6 +337,12 @@ class AllTorrents(BaseMode): prefs = Preferences(self,core_config,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(prefs) + def __show_events(self): + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + ev = EventView(self,self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(ev) + def _torrent_filter(self, idx, data): if data==FILTER.ALL: self.updater.status_dict = {} @@ -614,5 +621,8 @@ class AllTorrents(BaseMode): elif chr(c) == 'p': client.core.get_config().addCallback(self.show_preferences) return + elif chr(c) == 'e': + self.__show_events() + return self.refresh(effected_lines) diff --git a/deluge/ui/console/modes/eventview.py b/deluge/ui/console/modes/eventview.py new file mode 100644 index 000000000..31fb606a0 --- /dev/null +++ b/deluge/ui/console/modes/eventview.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# +# eventview.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.component as component +from basemode import BaseMode +try: + import curses +except ImportError: + pass + +import logging +log = logging.getLogger(__name__) + +class EventView(BaseMode): + def __init__(self, parent_mode, stdscr, encoding=None): + self.parent_mode = parent_mode + BaseMode.__init__(self, stdscr, encoding) + + def refresh(self): + "This method just shows each line of the event log" + events = component.get("ConsoleUI").events + + self.add_string(0,self.statusbars.topbar) + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) + + if events: + for i,event in enumerate(events): + self.add_string(i+1,event) + else: + self.add_string(1,"{!white,black,bold!}No events to show yet") + + self.stdscr.noutrefresh() + curses.doupdate() + + def back_to_overview(self): + self.stdscr.clear() + component.get("ConsoleUI").set_mode(self.parent_mode) + self.parent_mode.resume() + + def _doRead(self): + c = self.stdscr.getch() + + if c > 31 and c < 256: + if chr(c) == 'Q': + from twisted.internet import reactor + if client.connected(): + def on_disconnect(result): + reactor.stop() + client.disconnect().addCallback(on_disconnect) + else: + reactor.stop() + return + elif chr(c) == 'q': + self.back_to_overview() + return + + if c == 27: + self.back_to_overview() + return + + # TODO: Scroll event list + if c == curses.KEY_UP: + pass + elif c == curses.KEY_PPAGE: + pass + elif c == curses.KEY_DOWN: + pass + elif c == curses.KEY_NPAGE: + pass + + #self.refresh() From 1e0005f572345de86bbbb6bc11df98958979a911 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 14 Feb 2011 00:18:45 +0000 Subject: [PATCH 071/329] Fix: os.join created root path in Remove_Empty_Folder if variable 'folder' had a leading slash --- deluge/core/torrentmanager.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 9e6b35dcf..4c57874fc 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -42,6 +42,7 @@ import time import shutil import operator import logging +import re from twisted.internet import reactor from twisted.internet.task import LoopingCall @@ -746,18 +747,20 @@ class TorrentManager(component.Component): fastresume_file.close() except IOError: log.warning("Error trying to save fastresume file") - + def remove_empty_folders(self, torrent_id, folder): """ Recursively removes folders but only if they are empty. Cleans up after libtorrent folder renames. - + """ if torrent_id not in self.torrents: - raise InvalidTorrentError("torrent_id is not in session") - + raise InvalidTorrentError("torrent_id is not in session") + info = self.torrents[torrent_id].get_status(['save_path']) - folder_full_path = os.path.join(info['save_path'], folder) + # Regex removes leading slashes that causes join function to ignore save_path + folder_full_path = os.path.join(info['save_path'], re.sub("^/*", "", folder)) + folder_full_path = os.path.normpath(folder_full_path) try: if not os.listdir(folder_full_path): @@ -775,7 +778,7 @@ class TorrentManager(component.Component): log.debug("%s", strerror) except OSError as (errno, strerror): - log.debug("Cannot Remove Folder: %s (ErrNo %s)", strerror, errno) + log.debug("Cannot Remove Folder: %s (ErrNo %s)", strerror, errno) def queue_top(self, torrent_id): """Queue torrent to top""" @@ -1038,7 +1041,7 @@ class TorrentManager(component.Component): if len(wait_on_folder[2]) == 1: # This is the last alert we were waiting for, time to send signal component.get("EventManager").emit(TorrentFolderRenamedEvent(torrent_id, wait_on_folder[0], wait_on_folder[1])) - # Empty folders are removed after libtorrent folder renames + # Empty folders are removed after libtorrent folder renames self.remove_empty_folders(torrent_id, wait_on_folder[0]) del torrent.waiting_on_folder_rename[i] self.save_resume_data((torrent_id,)) From 06003b3650d54564db3110fde21d2395f84553d8 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 14 Feb 2011 20:57:33 +0000 Subject: [PATCH 072/329] Fix translate issue for Trackers tree in sidebar --- deluge/ui/gtkui/filtertreeview.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py index 1b10e9246..b7ba36e03 100644 --- a/deluge/ui/gtkui/filtertreeview.py +++ b/deluge/ui/gtkui/filtertreeview.py @@ -235,14 +235,13 @@ class FilterTreeView(component.Component): pix = self.get_pixmap(cat, value) label = value - if cat == "state" or cat == "tracker_host": - label = _t(value) - if label == "": if cat == "tracker_host": label = _t("none") elif cat == "label": label = _t("no_label") + elif cat == "state" or cat == "tracker_host": + label = _t(value) row = self.treestore.append(self.cat_nodes[cat],[cat, value, label, count , pix, True]) self.filters[(cat, value)] = row From c523958bf6a77681761422681e07f76b06b6b8b2 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 14 Feb 2011 23:33:52 +0000 Subject: [PATCH 073/329] Fixes for gtk-ui translations --- deluge/ui/gtkui/connectionmanager.py | 10 +++---- deluge/ui/gtkui/files_tab.py | 26 +++++++++++++---- deluge/ui/gtkui/glade/filtertree_menu.glade | 2 +- deluge/ui/gtkui/glade/main_window.glade | 31 +++++++++++---------- deluge/ui/gtkui/glade/tray_menu.glade | 12 ++------ deluge/ui/gtkui/preferences.py | 2 +- 6 files changed, 47 insertions(+), 36 deletions(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 96fef9d1d..9ce16ac3c 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -148,16 +148,16 @@ class ConnectionManager(component.Component): # Setup host list treeview self.hostlist.set_model(self.liststore) render = gtk.CellRendererPixbuf() - column = gtk.TreeViewColumn("Status", render) + column = gtk.TreeViewColumn(_("Status"), render) column.set_cell_data_func(render, cell_render_status, 3) self.hostlist.append_column(column) render = gtk.CellRendererText() - column = gtk.TreeViewColumn("Host", render, text=HOSTLIST_COL_HOST) + column = gtk.TreeViewColumn(_("Host"), render, text=HOSTLIST_COL_HOST) column.set_cell_data_func(render, cell_render_host, (1, 2, 4)) column.set_expand(True) self.hostlist.append_column(column) render = gtk.CellRendererText() - column = gtk.TreeViewColumn("Version", render, text=HOSTLIST_COL_VERSION) + column = gtk.TreeViewColumn(_("Version"), render, text=HOSTLIST_COL_VERSION) self.hostlist.append_column(column) # Load any saved host entries @@ -385,7 +385,7 @@ class ConnectionManager(component.Component): self.glade.get_widget("image_startdaemon").set_from_stock( gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) self.glade.get_widget("label_startdaemon").set_text( - "_Stop Daemon") + _("_Stop Daemon")) # Update the start daemon button if the selected host is localhost if localhost and status == _("Offline"): @@ -393,7 +393,7 @@ class ConnectionManager(component.Component): self.glade.get_widget("image_startdaemon").set_from_stock( gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) self.glade.get_widget("label_startdaemon").set_text( - "_Start Daemon") + _("_Start Daemon")) if not localhost: # An offline host diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index 2bcb531fa..b182618f7 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -53,13 +53,29 @@ import common log = logging.getLogger(__name__) +def _(message): return message + +TRANSLATE = { + "Do Not Download": _("Do Not Download"), + "Normal Priority": _("Normal Priority"), + "High Priority": _("High Priority"), + "Highest Priority": _("Highest Priority"), +} + +del _ + +def _t(text): + if text in TRANSLATE: + text = TRANSLATE[text] + return _(text) + def cell_priority(column, cell, model, row, data): if model.get_value(row, 5) == -1: # This is a folder, so lets just set it blank for now cell.set_property("text", "") return priority = model.get_value(row, data) - cell.set_property("text", deluge.common.FILE_PRIORITY[priority]) + cell.set_property("text", _t(deluge.common.FILE_PRIORITY[priority])) def cell_priority_icon(column, cell, model, row, data): if model.get_value(row, 5) == -1: @@ -67,13 +83,13 @@ def cell_priority_icon(column, cell, model, row, data): cell.set_property("stock-id", None) return priority = model.get_value(row, data) - if deluge.common.FILE_PRIORITY[priority] == _("Do Not Download"): + if deluge.common.FILE_PRIORITY[priority] == "Do Not Download": cell.set_property("stock-id", gtk.STOCK_NO) - elif deluge.common.FILE_PRIORITY[priority] == _("Normal Priority"): + elif deluge.common.FILE_PRIORITY[priority] == "Normal Priority": cell.set_property("stock-id", gtk.STOCK_YES) - elif deluge.common.FILE_PRIORITY[priority] == _("High Priority"): + elif deluge.common.FILE_PRIORITY[priority] == "High Priority": cell.set_property("stock-id", gtk.STOCK_GO_UP) - elif deluge.common.FILE_PRIORITY[priority] == _("Highest Priority"): + elif deluge.common.FILE_PRIORITY[priority] == "Highest Priority": cell.set_property("stock-id", gtk.STOCK_GOTO_TOP) def cell_filename(column, cell, model, row, data): diff --git a/deluge/ui/gtkui/glade/filtertree_menu.glade b/deluge/ui/gtkui/glade/filtertree_menu.glade index a981875f0..2e9ccdd15 100644 --- a/deluge/ui/gtkui/glade/filtertree_menu.glade +++ b/deluge/ui/gtkui/glade/filtertree_menu.glade @@ -23,7 +23,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Pause All + _Pause All True diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade index c3fd1f6ad..c4ab57cfb 100644 --- a/deluge/ui/gtkui/glade/main_window.glade +++ b/deluge/ui/gtkui/glade/main_window.glade @@ -24,7 +24,7 @@ - _Add Torrent + _Add Torrent True False True @@ -41,7 +41,7 @@ - _Create Torrent + _Create Torrent True True False @@ -60,7 +60,7 @@ - Quit & _Shutdown Daemon + Quit & _Shutdown Daemon GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True False @@ -81,7 +81,7 @@ - gtk-quit + gtk-quit True True True @@ -102,7 +102,7 @@ True - gtk-preferences + gtk-preferences True True True @@ -111,7 +111,7 @@ - _Connection Manager + _Connection Manager True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True @@ -236,7 +236,7 @@ - _Homepage + _Homepage True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True @@ -253,7 +253,7 @@ - _FAQ + _FAQ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Frequently Asked Questions @@ -271,7 +271,7 @@ - _Community + _Community True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True @@ -333,6 +333,7 @@ True False + Remove torrent Remove Torrent gtk-remove @@ -560,7 +561,7 @@ - _Expand All + _Expand All True True False @@ -581,7 +582,7 @@ - _Do Not Download + _Do Not Download True True False @@ -597,7 +598,7 @@ - _Normal Priority + _Normal Priority True True False @@ -613,7 +614,7 @@ - _High Priority + _High Priority True True False @@ -629,7 +630,7 @@ - Hi_ghest Priority + Hi_ghest Priority True True False @@ -2742,7 +2743,7 @@ True - _Add Peer + _Add Peer True Add a peer by its IP True diff --git a/deluge/ui/gtkui/glade/tray_menu.glade b/deluge/ui/gtkui/glade/tray_menu.glade index 526ecc40b..ac983601f 100644 --- a/deluge/ui/gtkui/glade/tray_menu.glade +++ b/deluge/ui/gtkui/glade/tray_menu.glade @@ -123,6 +123,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Quit & Shutdown Daemon True + False @@ -143,17 +144,10 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Quit + gtk-quit + True True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-quit - 1 - - diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 28aa8762d..edc253e1b 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -71,7 +71,7 @@ class Preferences(component.Component): self.liststore = gtk.ListStore(int, str) self.treeview.set_model(self.liststore) render = gtk.CellRendererText() - column = gtk.TreeViewColumn("Categories", render, text=1) + column = gtk.TreeViewColumn(_("Categories"), render, text=1) self.treeview.append_column(column) # Add the default categories i = 0 From d3a61bbda4495655056ac1dea02f18ec3fdc31ba Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Tue, 15 Feb 2011 12:49:04 +0000 Subject: [PATCH 074/329] fix scrolling on the edit trackers window --- deluge/ui/web/js/deluge-all/EditTrackersWindow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js index 589ab1f5d..5925e7552 100644 --- a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js +++ b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js @@ -86,7 +86,6 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, { }, stripeRows: true, singleSelect: true, - autoScroll: true, listeners: { 'dblclick': {fn: this.onListNodeDblClicked, scope: this}, 'selectionchange': {fn: this.onSelect, scope: this} @@ -96,6 +95,7 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, { this.panel = this.add({ margins: '0 0 0 0', items: [this.list], + autoScroll: true, bbar: new Ext.Toolbar({ items: [ { From 0b3c408e64104bb52dbc813b8ddb2a3aa8cbba66 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Tue, 15 Feb 2011 12:54:25 +0000 Subject: [PATCH 075/329] make the edit trackers window resizable --- deluge/ui/web/js/deluge-all/EditTrackersWindow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js index 5925e7552..4beae3f6c 100644 --- a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js +++ b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js @@ -43,7 +43,7 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, { height: 220, plain: true, closable: true, - resizable: false, + resizable: true, bodyStyle: 'padding: 5px', buttonAlign: 'right', From 8a9e732f9536688afd22ed44416555cf7507cf39 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 18:55:27 +0100 Subject: [PATCH 076/329] lots of new preference work --- deluge/ui/console/modes/alltorrents.py | 22 ++- deluge/ui/console/modes/input_popup.py | 209 +++++++++++++++++++- deluge/ui/console/modes/preference_panes.py | 204 ++++++++++++++++--- deluge/ui/console/modes/preferences.py | 7 +- 4 files changed, 403 insertions(+), 39 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 2e4056ed3..4c606e009 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -331,11 +331,21 @@ class AllTorrents(BaseMode): td = TorrentDetail(self,tid,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(td) - def show_preferences(self, core_config): - component.stop(["AllTorrentsStateUpdater"]) - self.stdscr.clear() - prefs = Preferences(self,core_config,self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(prefs) + def show_preferences(self): + def _on_get_config(config): + client.core.get_listen_port().addCallback(_on_get_listen_port,config) + + def _on_get_listen_port(port,config): + client.core.get_cache_status().addCallback(_on_get_cache_status,port,config) + + def _on_get_cache_status(status,port,config): + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + prefs = Preferences(self,config,port,status,self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(prefs) + + client.core.get_config().addCallback(_on_get_config) + def __show_events(self): component.stop(["AllTorrentsStateUpdater"]) @@ -619,7 +629,7 @@ class AllTorrents(BaseMode): for l in HELP_LINES: self.popup.add_line(l) elif chr(c) == 'p': - client.core.get_config().addCallback(self.show_preferences) + self.show_preferences() return elif chr(c) == 'e': self.__show_events() diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 9c1dc4547..b59c914cd 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -49,6 +49,7 @@ from popup import Popup log = logging.getLogger(__name__) class InputField: + depend = None # render the input. return number of rows taken up def render(self,screen,row,width,selected,col=1): return 0 @@ -61,6 +62,20 @@ class InputField: def set_value(self, value): pass + def set_depend(self,i,inverse=False): + if not isinstance(i,CheckedInput): + raise Exception("Can only depend on CheckedInputs") + self.depend = i + self.inverse = inverse + + def depend_skip(self): + if not self.depend: + return False + if self.inverse: + return self.depend.checked + else: + return not self.depend.checked + class CheckedInput(InputField): def __init__(self, parent, message, name, checked=False): self.parent = parent @@ -92,6 +107,71 @@ class CheckedInput(InputField): def set_value(self, c): self.checked = c + +class CheckedPlusInput(InputField): + def __init__(self, parent, message, name, child,checked=False): + self.parent = parent + self.chkd_inact = "[X] %s"%message + self.unchkd_inact = "[ ] %s"%message + self.chkd_act = "[{!black,white,bold!}X{!white,black!}] %s"%message + self.unchkd_act = "[{!black,white,bold!} {!white,black!}] %s"%message + self.name = name + self.checked = checked + self.msglen = len(self.chkd_inact)+1 + self.child = child + self.child_active = False + + def render(self, screen, row, width, active, col=1): + isact = active and not self.child_active + if self.checked and isact: + self.parent.add_string(row,self.chkd_act,screen,col,False,True) + elif self.checked: + self.parent.add_string(row,self.chkd_inact,screen,col,False,True) + elif isact: + self.parent.add_string(row,self.unchkd_act,screen,col,False,True) + else: + self.parent.add_string(row,self.unchkd_inact,screen,col,False,True) + + if active and self.checked and self.child_active: + self.parent.add_string(row+1,"(esc to leave)",screen,col,False,True) + elif active and self.checked: + self.parent.add_string(row+1,"(right arrow to edit)",screen,col,False,True) + rows = 2 + # show child + if self.checked: + if isinstance(self.child,(TextInput,IntSpinInput,FloatSpinInput)): + crows = self.child.render(screen,row,width-self.msglen,self.child_active and active,col+self.msglen,self.msglen) + else: + crows = self.child.render(screen,row,width-self.msglen,self.child_active and active,col+self.msglen) + rows = max(rows,crows) + else: + self.parent.add_string(row,"(enable to view/edit value)",screen,col+self.msglen,False,True) + return rows + + def handle_read(self, c): + if self.child_active: + if c == 27: # leave child on esc + self.child_active = False + return + # pass keys through to child + self.child.handle_read(c) + else: + if c == 32: + self.checked = not self.checked + if c == curses.KEY_RIGHT: + self.child_active = True + + def get_value(self): + return self.checked + + def set_value(self, c): + self.checked = c + + def get_child(self): + return self.child + + + class IntSpinInput(InputField): def __init__(self, parent, message, name, move_func, value, min_val, max_val): self.parent = parent @@ -106,7 +186,7 @@ class IntSpinInput(InputField): self.min_val = min_val self.max_val = max_val - def render(self, screen, row, width, active, col=1): + def render(self, screen, row, width, active, col=1, cursor_offset=0): if not active and not self.valstr: self.value = self.initvalue self.valstr = "%d"%self.value @@ -119,7 +199,7 @@ class IntSpinInput(InputField): self.parent.add_string(row,"%s [ %d ]"%(self.message,self.value),screen,col,False,True) if active: - self.move_func(row,self.cursor+self.cursoff) + self.move_func(row,self.cursor+self.cursoff+cursor_offset) return 1 @@ -166,6 +246,112 @@ class IntSpinInput(InputField): self.valstr = "%d"%self.value self.cursor = len(self.valstr) + +class FloatSpinInput(InputField): + def __init__(self, parent, message, name, move_func, value, inc_amt, precision, min_val, max_val): + self.parent = parent + self.message = message + self.name = name + self.precision = precision + self.inc_amt = inc_amt + self.value = round(float(value),self.precision) + self.initvalue = self.value + self.fmt = "%%.%df"%precision + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + self.cursoff = len(self.message)+4 # + 4 for the " [ " in the rendered string + self.move_func = move_func + self.min_val = min_val + self.max_val = max_val + self.need_update = False + + def render(self, screen, row, width, active, col=1, cursor_offset=0): + if not active and not self.valstr: + self.value = self.initvalue + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + if not active and self.need_update: + self.value = round(float(self.valstr),self.precision) + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + if not self.valstr: + self.parent.add_string(row,"%s [ ]"%self.message,screen,col,False,True) + elif active: + self.parent.add_string(row,"%s [ {!black,white,bold!}%s{!white,black!} ]"%(self.message,self.valstr),screen,col,False,True) + else: + self.parent.add_string(row,"%s [ %s ]"%(self.message,self.valstr),screen,col,False,True) + if active: + self.move_func(row,self.cursor+self.cursoff+cursor_offset) + + return 1 + + def handle_read(self, c): + if c == curses.KEY_PPAGE: + self.value+=self.inc_amt + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + elif c == curses.KEY_NPAGE: + self.value-=self.inc_amt + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + elif c == curses.KEY_LEFT: + self.cursor = max(0,self.cursor-1) + elif c == curses.KEY_RIGHT: + self.cursor = min(len(self.valstr),self.cursor+1) + elif c == curses.KEY_HOME: + self.cursor = 0 + elif c == curses.KEY_END: + self.cursor = len(self.value) + elif c == curses.KEY_BACKSPACE or c == 127: + if self.valstr and self.cursor > 0: + self.valstr = self.valstr[:self.cursor - 1] + self.valstr[self.cursor:] + self.cursor-=1 + self.need_update = True + elif c == curses.KEY_DC: + if self.valstr and self.cursor < len(self.valstr): + self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:] + self.need_update = True + elif c == 45 and self.cursor == 0 and self.min_val < 0: + minus_place = self.valstr.find('-') + if minus_place >= 0: return + self.valstr = chr(c)+self.valstr + self.cursor += 1 + self.need_update = True + elif c == 46: + minus_place = self.valstr.find('-') + if self.cursor <= minus_place: return + point_place = self.valstr.find('.') + if point_place >= 0: return + if self.cursor == len(self.valstr): + self.valstr += chr(c) + else: + # Insert into string + self.valstr = self.valstr[:self.cursor] + chr(c) + self.valstr[self.cursor:] + self.need_update = True + # Move the cursor forward + self.cursor+=1 + elif (c > 47 and c < 58): + minus_place = self.valstr.find('-') + if self.cursor <= minus_place: return + if self.cursor == len(self.valstr): + self.valstr += chr(c) + else: + # Insert into string + self.valstr = self.valstr[:self.cursor] + chr(c) + self.valstr[self.cursor:] + self.need_update = True + # Move the cursor forward + self.cursor+=1 + + + def get_value(self): + return self.value + + def set_value(self, val): + self.value = round(float(val),self.precision) + self.valstr = self.fmt%self.value + self.cursor = len(self.valstr) + + class SelectInput(InputField): def __init__(self, parent, message, name, opts, vals, selidx): self.parent = parent @@ -225,23 +411,28 @@ class TextInput(InputField): self.opts = None self.opt_off = 0 - def render(self,screen,row,width,selected,col=1): + def render(self,screen,row,width,selected,col=1,cursor_offset=0): + if self.message: + self.parent.add_string(row,self.message,screen,col,False,True) + row += 1 if selected: if self.opts: - self.parent.add_string(row+2,self.opts[self.opt_off:],screen,col,False,True) + self.parent.add_string(row+1,self.opts[self.opt_off:],screen,col,False,True) if self.cursor > (width-3): - self.move_func(row+1,width-2) + self.move_func(row,width-2) else: - self.move_func(row+1,self.cursor+1) - self.parent.add_string(row,self.message,screen,col,False,True) + self.move_func(row,self.cursor+1+cursor_offset) slen = len(self.value)+3 if slen > width: vstr = self.value[(slen-width):] else: vstr = self.value.ljust(width-2) - self.parent.add_string(row+1,"{!black,white,bold!}%s"%vstr,screen,col,False,False) + self.parent.add_string(row,"{!black,white,bold!}%s"%vstr,screen,col,False,False) - return 3 + if self.message: + return 3 + else: + return 2 def get_value(self): return self.value diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py index 572adb5a4..d30a4f978 100644 --- a/deluge/ui/console/modes/preference_panes.py +++ b/deluge/ui/console/modes/preference_panes.py @@ -33,7 +33,7 @@ # # -from deluge.ui.console.modes.input_popup import TextInput,SelectInput,CheckedInput,IntSpinInput +from deluge.ui.console.modes.input_popup import TextInput,SelectInput,CheckedInput,IntSpinInput,FloatSpinInput,CheckedPlusInput try: import curses @@ -44,12 +44,17 @@ import logging log = logging.getLogger(__name__) -class Header: +class NoInput: + def depend_skip(self): + return False + +class Header(NoInput): def __init__(self, parent, header, space_above, space_below): self.parent = parent self.header = "{!white,black,bold!}%s"%header self.space_above = space_above self.space_below = space_below + self.name = header def render(self, screen, row, width, active, offset): rows = 1 @@ -60,6 +65,24 @@ class Header: if self.space_below: rows += 1 return rows +class InfoField(NoInput): + def __init__(self,parent,label,value,name): + self.parent = parent + self.label = label + self.value = value + self.txt = "%s %s"%(label,value) + self.name = name + + def render(self, screen, row, width, active, offset): + self.parent.add_string(row,self.txt,screen,offset-1,False,True) + return 1 + + def set_value(self, v): + self.value = v + if type(v) == float: + self.txt = "%s %.2f"%(self.label,self.value) + else: + self.txt = "%s %s"%(self.label,self.value) class BasePane: def __init__(self, offset, parent, width): @@ -75,26 +98,45 @@ class BasePane: def add_config_values(self,conf_dict): for ipt in self.inputs: - if not isinstance(ipt,Header): - conf_dict[ipt.name] = ipt.get_value() + if not isinstance(ipt,NoInput): + # gross, have to special case in/out ports since they are tuples + if ipt.name in ("listen_ports_to","listen_ports_from", + "out_ports_from","out_ports_to"): + if ipt.name == "listen_ports_to": + conf_dict["listen_ports"] = (self.infrom.get_value(),self.into.get_value()) + if ipt.name == "out_ports_to": + conf_dict["outgoing_ports"] = (self.outfrom.get_value(),self.outto.get_value()) + else: + conf_dict[ipt.name] = ipt.get_value() + if hasattr(ipt,"get_child"): + c = ipt.get_child() + conf_dict[c.name] = c.get_value() def update_values(self, conf_dict): for ipt in self.inputs: - if not isinstance(ipt,Header): + if not isinstance(ipt,NoInput): try: ipt.set_value(conf_dict[ipt.name]) except KeyError: # just ignore if it's not in dict pass + if hasattr(ipt,"get_child"): + try: + c = ipt.get_child() + c.set_value(conf_dict[c.name]) + except KeyError: # just ignore if it's not in dict + pass def render(self, mode, screen, width, active): self._cursor_row = -1 if self.active_input < 0: for i,ipt in enumerate(self.inputs): - if not isinstance(ipt,Header): + if not isinstance(ipt,NoInput): self.active_input = i - break + break crow = 1 for i,ipt in enumerate(self.inputs): + if ipt.depend_skip(): + continue act = active and i==self.active_input crow += ipt.render(screen,crow,width, act, self.offset) @@ -104,6 +146,8 @@ class BasePane: else: curses.curs_set(0) + return crow + # just handles setting the active input def handle_read(self,c): if not self.inputs: # no inputs added yet @@ -111,18 +155,20 @@ class BasePane: if c == curses.KEY_UP: nc = max(0,self.active_input-1) - while isinstance(self.inputs[nc], Header): + while isinstance(self.inputs[nc], NoInput) or self.inputs[nc].depend_skip(): nc-=1 if nc <= 0: break - if not isinstance(self.inputs[nc], Header): + if not isinstance(self.inputs[nc], NoInput) or self.inputs[nc].depend_skip(): self.active_input = nc elif c == curses.KEY_DOWN: ilen = len(self.inputs) nc = min(self.active_input+1,ilen-1) - while isinstance(self.inputs[nc], Header): + while isinstance(self.inputs[nc], NoInput) or self.inputs[nc].depend_skip(): nc+=1 - if nc >= ilen: break - if not isinstance(self.inputs[nc], Header): + if nc >= ilen: + nc-=1 + break + if not isinstance(self.inputs[nc], NoInput) or self.inputs[nc].depend_skip(): self.active_input = nc else: self.inputs[self.active_input].handle_read(c) @@ -131,6 +177,9 @@ class BasePane: def add_header(self, header, space_above=False, space_below=False): self.inputs.append(Header(self.parent, header, space_above, space_below)) + def add_info_field(self, label, value, name): + self.inputs.append(InfoField(self.parent, label, value, name)) + def add_text_input(self, name, msg, dflt_val): self.inputs.append(TextInput(self.parent,self.move,self.width,msg,name,dflt_val,False)) @@ -140,9 +189,15 @@ class BasePane: def add_checked_input(self, name, message, checked): self.inputs.append(CheckedInput(self.parent,message,name,checked)) + def add_checkedplus_input(self, name, message, child, checked): + self.inputs.append(CheckedPlusInput(self.parent,message,name,child,checked)) + def add_int_spin_input(self, name, message, value, min_val, max_val): self.inputs.append(IntSpinInput(self.parent,message,name,self.move,value,min_val,max_val)) + def add_float_spin_input(self, name, message, value, inc_amt, precision, min_val, max_val): + self.inputs.append(FloatSpinInput(self.parent,message,name,self.move,value,inc_amt,precision,min_val,max_val)) + class DownloadsPane(BasePane): def __init__(self, offset, parent, width): @@ -150,13 +205,21 @@ class DownloadsPane(BasePane): self.add_header("Folders") self.add_text_input("download_location","Download To:",parent.core_config["download_location"]) - self.add_header("Allocation") + cmptxt = TextInput(self.parent,self.move,self.width,None,"move_completed_path",parent.core_config["move_completed_path"],False) + self.add_checkedplus_input("move_completed","Move completed to:",cmptxt,parent.core_config["move_completed"]) + autotxt = TextInput(self.parent,self.move,self.width,None,"autoadd_location",parent.core_config["autoadd_location"],False) + self.add_checkedplus_input("autoadd_enable","Auto add .torrents from:",autotxt,parent.core_config["autoadd_enable"]) + copytxt = TextInput(self.parent,self.move,self.width,None,"torrentfiles_location",parent.core_config["torrentfiles_location"],False) + self.add_checkedplus_input("copy_torrent_file","Copy of .torrent files to:",copytxt,parent.core_config["copy_torrent_file"]) + self.add_checked_input("del_copy_torrent_file","Delete copy of torrent file on remove",parent.core_config["del_copy_torrent_file"]) + + self.add_header("Allocation",True) if parent.core_config["compact_allocation"]: alloc_idx = 1 else: alloc_idx = 0 - self.add_select_input("compact_allocation","Allocation:",["Use Full Allocation","Use Compact Allocation"],[False,True],alloc_idx) + self.add_select_input("compact_allocation",None,["Use Full Allocation","Use Compact Allocation"],[False,True],alloc_idx) self.add_header("Options",True) self.add_checked_input("prioritize_first_last_pieces","Prioritize first and last pieces of torrent",parent.core_config["prioritize_first_last_pieces"]) self.add_checked_input("add_paused","Add torrents in paused state",parent.core_config["add_paused"]) @@ -165,35 +228,91 @@ class DownloadsPane(BasePane): class NetworkPane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) + self.add_header("Incomming Ports") + inrand = CheckedInput(parent,"Use Random Ports Active Port: %d"%parent.active_port,"random_port",parent.core_config["random_port"]) + self.inputs.append(inrand) + listen_ports = parent.core_config["listen_ports"] + self.infrom = IntSpinInput(self.parent," From:","listen_ports_from",self.move,listen_ports[0],0,65535) + self.infrom.set_depend(inrand,True) + self.into = IntSpinInput(self.parent," To: ","listen_ports_to",self.move,listen_ports[1],0,65535) + self.into.set_depend(inrand,True) + self.inputs.append(self.infrom) + self.inputs.append(self.into) + + + self.add_header("Outgoing Ports",True) + outrand = CheckedInput(parent,"Use Random Ports","random_outgoing_ports",parent.core_config["random_outgoing_ports"]) + self.inputs.append(outrand) + out_ports = parent.core_config["outgoing_ports"] + self.outfrom = IntSpinInput(self.parent," From:","out_ports_from",self.move,out_ports[0],0,65535) + self.outfrom.set_depend(outrand,True) + self.outto = IntSpinInput(self.parent," To: ","out_ports_to",self.move,out_ports[1],0,65535) + self.outto.set_depend(outrand,True) + self.inputs.append(self.outfrom) + self.inputs.append(self.outto) + + + self.add_header("Interface",True) + self.add_text_input("listen_interface","IP address of the interface to listen on (leave empty for default):",parent.core_config["listen_interface"]) + + self.add_header("TOS",True) + self.add_text_input("peer_tos","Peer TOS Byte:",parent.core_config["peer_tos"]) + + self.add_header("Network Extras") + self.add_checked_input("upnp","UPnP",parent.core_config["upnp"]) + self.add_checked_input("natpmp","NAT-PMP",parent.core_config["natpmp"]) + self.add_checked_input("utpex","Peer Exchange",parent.core_config["utpex"]) + self.add_checked_input("lsd","LSD",parent.core_config["lsd"]) + self.add_checked_input("dht","DHT",parent.core_config["dht"]) + + self.add_header("Encryption",True) + self.add_select_input("enc_in_policy","Inbound:",["Forced","Enabled","Disabled"],[0,1,2],parent.core_config["enc_in_policy"]) + self.add_select_input("enc_out_policy","Outbound:",["Forced","Enabled","Disabled"],[0,1,2],parent.core_config["enc_out_policy"]) + self.add_select_input("enc_level","Level:",["Handshake","Full Stream","Either"],[0,1,2],parent.core_config["enc_level"]) + self.add_checked_input("enc_prefer_rc4","Encrypt Entire Stream",parent.core_config["enc_prefer_rc4"]) + class BandwidthPane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) self.add_header("Global Bandwidth Usage") - self.add_int_spin_input("max_connections_global","Maximum Connections:",parent.core_config["max_connections_global"],0,1000) - self.add_int_spin_input("max_upload_slots_global","Maximum Upload Slots:",parent.core_config["max_upload_slots_global"],0,1000) - #self.add_int_spin_input("max_download_speed","Maximum Download Speed (KiB/s):",-1,0,1000) + self.add_int_spin_input("max_connections_global","Maximum Connections:",parent.core_config["max_connections_global"],-1,9000) + self.add_int_spin_input("max_upload_slots_global","Maximum Upload Slots:",parent.core_config["max_upload_slots_global"],-1,9000) + self.add_float_spin_input("max_download_speed","Maximum Download Speed (KiB/s):",parent.core_config["max_download_speed"],1.0,1,-1.0,60000.0) + self.add_float_spin_input("max_upload_speed","Maximum Upload Speed (KiB/s):",parent.core_config["max_upload_speed"],1.0,1,-1.0,60000.0) + self.add_int_spin_input("max_half_open_connections","Maximum Half-Open Connections:",parent.core_config["max_half_open_connections"],-1,9999) + self.add_int_spin_input("max_connections_per_second","Maximum Connection Attempts per Second:",parent.core_config["max_connections_per_second"],-1,9999) + self.add_checked_input("ignore_limits_on_local_network","Ignore limits on local network",parent.core_config["ignore_limits_on_local_network"]) + self.add_checked_input("rate_limit_ip_overhead","Rate Limit IP Overhead",parent.core_config["rate_limit_ip_overhead"]) + self.add_header("Per Torrent Bandwidth Usage",True) + self.add_int_spin_input("max_connections_per_torrent","Maximum Connections:",parent.core_config["max_connections_per_torrent"],-1,9000) + self.add_int_spin_input("max_upload_slots_per_torrent","Maximum Upload Slots:",parent.core_config["max_upload_slots_per_torrent"],-1,9000) + self.add_float_spin_input("max_download_speed_per_torrent","Maximum Download Speed (KiB/s):",parent.core_config["max_download_speed_per_torrent"],1.0,1,-1.0,60000.0) + self.add_float_spin_input("max_upload_speed_per_torrent","Maximum Upload Speed (KiB/s):",parent.core_config["max_upload_speed_per_torrent"],1.0,1,-1.0,60000.0) class InterfacePane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) - # does classic mode make sense in console? - #self.add_header("Classic Mode") - #self.add_checked_input("classic_mode","Enable",False) - + self.add_header("Interface Settings Comming Soon") # add title bar control here + class OtherPane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) - self.add_header("GeoIP Database") + self.add_header("System Information") + self.add_info_field(" Help us improve Deluge by sending us your","","") + self.add_info_field(" Python version, PyGTK version, OS and processor","","") + self.add_info_field(" types. Absolutely no other information is sent.","","") + self.add_checked_input("send_info","Yes, please send anonymous statistics.",parent.core_config["send_info"]) + self.add_header("GeoIP Database",True) self.add_text_input("geoip_db_location","Location:",parent.core_config["geoip_db_location"]) class DaemonPane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) self.add_header("Port") - self.add_int_spin_input("daemon_port","Daemon Port:",parent.core_config["daemon_port"],0,1000) + self.add_int_spin_input("daemon_port","Daemon Port:",parent.core_config["daemon_port"],0,65535) self.add_header("Connections",True) self.add_checked_input("allow_remote","Allow remote connections",parent.core_config["allow_remote"]) self.add_header("Other",True) @@ -202,11 +321,50 @@ class DaemonPane(BasePane): class QueuePane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) + self.add_header("General") + self.add_checked_input("queue_new_to_top","Queue new torrents to top",parent.core_config["queue_new_to_top"]) + self.add_header("Active Torrents",True) + self.add_int_spin_input("max_active_limit","Total active:",parent.core_config["max_active_limit"],-1,9999) + self.add_int_spin_input("max_active_downloading","Total active downloading:",parent.core_config["max_active_downloading"],-1,9999) + self.add_int_spin_input("max_active_seeding","Total active seeding:",parent.core_config["max_active_seeding"],-1,9999) + self.add_checked_input("dont_count_slow_torrents","Do not count slow torrents",parent.core_config["dont_count_slow_torrents"]) + self.add_header("Seeding",True) + self.add_float_spin_input("share_ratio_limit","Share Ratio Limit:",parent.core_config["share_ratio_limit"],1.0,2,-1.0,100.0) + self.add_float_spin_input("seed_time_ratio_limit","Share Time Ratio:",parent.core_config["seed_time_ratio_limit"],1.0,2,-1.0,100.0) + self.add_int_spin_input("seed_time_limit","Seed time (m):",parent.core_config["seed_time_limit"],-1,10000) + seedratio = FloatSpinInput(self.parent,"","stop_seed_ratio",self.move,parent.core_config["stop_seed_ratio"],0.1,2,0.5,100.0) + self.add_checkedplus_input("stop_seed_at_ratio","Stop seeding when share ratio reaches:",seedratio,parent.core_config["stop_seed_at_ratio"]) + self.add_checked_input("remove_seed_at_ratio","Remove torrent when share ratio reached",parent.core_config["remove_seed_at_ratio"]) class ProxyPane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) + self.add_header("Proxy Settings Comming Soon") class CachePane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) + self.add_header("Settings") + self.add_int_spin_input("cache_size","Cache Size (16 KiB blocks):",parent.core_config["cache_size"],0,99999) + self.add_int_spin_input("cache_expiry","Cache Expiry (seconds):",parent.core_config["cache_expiry"],1,32000) + self.add_header("Status (press 'r' to refresh status)",True) + self.add_header(" Write") + self.add_info_field(" Blocks Written:",self.parent.status["blocks_written"],"blocks_written") + self.add_info_field(" Writes:",self.parent.status["writes"],"writes") + self.add_info_field(" Write Cache Hit Ratio:","%.2f"%self.parent.status["write_hit_ratio"],"write_hit_ratio") + self.add_header(" Read") + self.add_info_field(" Blocks Read:",self.parent.status["blocks_read"],"blocks_read") + self.add_info_field(" Blocks Read hit:",self.parent.status["blocks_read_hit"],"blocks_read_hit") + self.add_info_field(" Reads:",self.parent.status["reads"],"reads") + self.add_info_field(" Read Cache Hit Ratio:","%.2f"%self.parent.status["read_hit_ratio"],"read_hit_ratio") + self.add_header(" Size") + self.add_info_field(" Cache Size:",self.parent.status["cache_size"],"cache_size") + self.add_info_field(" Read Cache Size:",self.parent.status["read_cache_size"],"read_cache_size") + + def update_cache_status(self, status): + for ipt in self.inputs: + if isinstance(ipt,InfoField): + try: + ipt.set_value(status[ipt.name]) + except KeyError: + pass diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index b59b49932..929101332 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -59,7 +59,7 @@ class ZONE: ACTIONS = 2 class Preferences(BaseMode): - def __init__(self, parent_mode, core_config, stdscr, encoding=None): + def __init__(self, parent_mode, core_config, active_port, status, stdscr, encoding=None): self.parent_mode = parent_mode self.categories = [_("Downloads"), _("Network"), _("Bandwidth"), _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), @@ -70,6 +70,8 @@ class Preferences(BaseMode): self.action_input = None self.core_config = core_config + self.active_port = active_port + self.status = status self.active_zone = ZONE.CATEGORIES @@ -220,6 +222,9 @@ class Preferences(BaseMode): if self.active_zone < ZONE.CATEGORIES: self.active_zone = ZONE.ACTIONS + elif c == 114 and isinstance(self.panes[self.cur_cat],CachePane): + client.core.get_cache_status().addCallback(self.panes[self.cur_cat].update_cache_status) + else: if self.active_zone == ZONE.CATEGORIES: self.__category_read(c) From c015c3a57d5ef6bb53c55112f48aaa3b33b2fed3 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 19:10:51 +0100 Subject: [PATCH 077/329] update help a bit --- deluge/ui/console/modes/alltorrents.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 4c606e009..72403305e 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -80,9 +80,11 @@ All popup windows can be closed/canceled by hitting the Esc key The actions you can perform and the keys to perform them are as follows: +'h' - Show this help + 'a' - Add a torrent -'h' - Show this help +'p' - View/Set preferences 'f' - Show only torrents in a certain state (Will open a popup where you can select the state you want to see) @@ -96,7 +98,7 @@ The actions you can perform and the keys to perform them are as follows: and last marked torrent 'c' - Un-mark all torrents -Right Arrow - Show torrent details. This includes more detailed information +Right Arrow - Torrent Detail Mode. This includes more detailed information about the currently selected torrent, as well as a view of the files in the torrent and the ability to set file priorities. From 7a4006439b5c4b7cc4a5c568945448a70915cc78 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 19:10:57 +0100 Subject: [PATCH 078/329] add preferences help --- deluge/ui/console/modes/preferences.py | 52 +++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index 929101332..c96324db6 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -37,7 +37,7 @@ import deluge.component as component from deluge.ui.client import client from basemode import BaseMode -from input_popup import SelectInput +from input_popup import Popup,SelectInput from preference_panes import DownloadsPane,NetworkPane,BandwidthPane,InterfacePane from preference_panes import OtherPane,DaemonPane,QueuePane,ProxyPane,CachePane @@ -53,6 +53,52 @@ except ImportError: import logging log = logging.getLogger(__name__) + +# Big help string that gets displayed when the user hits 'h' +HELP_STR = \ +"""This screen lets you view and configure various options +in deluge. + +There are three main sections to this screen. Only one +section is active at a time. You can switch the active +section by hitting TAB (or Shift-TAB to go back one) + +The section on the left displays the various categories +that the settings fall in. You can navigate the list +using the up/down arrows + +The section on the right shows the settings for the +selected category. When this section is active +you can navigate the various settings with the up/down +arrows. Special keys for each input type are described +below. + +The final section is at the bottom right, the: +[Cancel] [Apply] [OK] buttons. When this section +is active, simply select the option you want using +the arrow keys and press Enter to confim. + + +Special keys for various input types are as follows: +- For text inputs you can simply type in the value. + +- For numeric inputs (indicated by the value being + in []s), you can type a value, or use PageUp and + PageDown to increment/decrement the value. + +- For checkbox inputs use the spacebar to toggle + +- For checkbox plus something else inputs (the + something else being only visible when you + check the box) you can toggle the check with + space, use the right arrow to edit the other + value, and escape to get back to the check box. + + +""" +HELP_LINES = HELP_STR.split('\n') + + class ZONE: CATEGORIES = 0 PREFRENCES = 1 @@ -211,6 +257,10 @@ class Preferences(BaseMode): else: reactor.stop() return + elif chr(c) == 'h': + self.popup = Popup(self,"Preferences Help") + for l in HELP_LINES: + self.popup.add_line(l) if c == 9: self.active_zone += 1 From 4ff0fb19ee4752f91249efb618b4a3cd0d611495 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 19:36:17 +0100 Subject: [PATCH 079/329] left arrow goes back to overview from torrent details --- deluge/ui/console/modes/torrentdetail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 6beaa7ed2..646e00b02 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -439,7 +439,7 @@ class TorrentDetail(BaseMode, component.Component): self.back_to_overview() return - if c == 27: + if c == 27 or c == curses.KEY_LEFT: self.back_to_overview() return From 962bfc3d2cee92a5a64cfc5fa79d2a8a9677742d Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 20:14:14 +0100 Subject: [PATCH 080/329] support searching torrent names in alltorrent view --- deluge/ui/console/modes/alltorrents.py | 94 ++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 5 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 72403305e..c4b831fbd 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -67,7 +67,8 @@ HELP_STR = \ """This screen shows an overview of the current torrents Deluge is managing. The currently selected torrent is indicated by having a white background. You can change the selected torrent using the up/down arrows or the -PgUp/Pg keys. +PgUp/Pg keys. Home and End keys go to the first and last torrent +respectively. Operations can be performed on multiple torrents by marking them and then hitting Enter. See below for the keys used to mark torrents. @@ -86,6 +87,10 @@ The actions you can perform and the keys to perform them are as follows: 'p' - View/Set preferences +'/' - Search torrent names. Enter to exectue search, ESC to cancel + +'n' - Next matching torrent for last search + 'f' - Show only torrents in a certain state (Will open a popup where you can select the state you want to see) @@ -149,6 +154,7 @@ class StateUpdater(component.Component): class AllTorrents(BaseMode): def __init__(self, stdscr, encoding=None): self.formatted_rows = None + self.torrent_names = None self.cursel = 1 self.curoff = 1 # TODO: this should really be 0 indexed self.column_string = "" @@ -160,6 +166,9 @@ class AllTorrents(BaseMode): self._go_top = False self._curr_filter = None + self.entering_search = False + self.search_string = None + self.cursor = 0 self.coreconfig = component.get("ConsoleUI").coreconfig @@ -227,10 +236,12 @@ class AllTorrents(BaseMode): def set_state(self, state, refresh): self.curstate = state # cache in case we change sort order + newnames = [] newrows = [] self._sorted_ids = self._sort_torrents(self.curstate) for torrent_id in self._sorted_ids: ts = self.curstate[torrent_id] + newnames.append(ts["name"]) newrows.append((format_utils.format_row([self._format_queue(ts["queue"]), ts["name"], "%s"%deluge.common.fsize(ts["total_wanted"]), @@ -243,6 +254,7 @@ class AllTorrents(BaseMode): ],self.column_widths),ts["state"])) self.numtorrents = len(state) self.formatted_rows = newrows + self.torrent_names = newnames if refresh: self.refresh() @@ -455,8 +467,12 @@ class AllTorrents(BaseMode): else: self.add_string(0,"%s {!filterstatus!}Current filter: %s"%(self.statusbars.topbar,self._curr_filter)) self.add_string(1,self.column_string) - hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) - self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) + + if self.entering_search: + self.add_string(self.rows - 1,"Search torrents: %s"%self.search_string) + else: + hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) + self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) # add all the torrents if self.formatted_rows == []: @@ -520,6 +536,12 @@ class AllTorrents(BaseMode): self.add_string(1, "Waiting for torrents from core...") #self.stdscr.redrawwin() + if self.entering_search: + curses.curs_set(2) + self.stdscr.move(self.rows-1,self.cursor+17) + else: + curses.curs_set(0) + self.stdscr.noutrefresh() if self.popup: @@ -536,6 +558,54 @@ class AllTorrents(BaseMode): self.marked.append(idx) self.last_mark = idx + def __do_search(self): + # search forward for the next torrent matching self.search_string + for i,n in enumerate(self.torrent_names[self.cursel:]): + if n.find(self.search_string) >= 0: + self.cursel += (i+1) + if ((self.curoff + self.rows - 5) < self.cursel): + self.curoff = self.cursel - self.rows + 5 + return + + def __update_search(self, c): + if c == curses.KEY_BACKSPACE or c == 127: + if self.search_string and self.cursor > 0: + self.search_string = self.search_string[:self.cursor - 1] + self.search_string[self.cursor:] + self.cursor-=1 + elif c == curses.KEY_DC: + if self.search_string and self.cursor < len(self.search_string): + self.search_string = self.search_string[:self.cursor] + self.search_string[self.cursor+1:] + elif c == curses.KEY_LEFT: + self.cursor = max(0,self.cursor-1) + elif c == curses.KEY_RIGHT: + self.cursor = min(len(self.search_string),self.cursor+1) + elif c == curses.KEY_HOME: + self.cursor = 0 + elif c == curses.KEY_END: + self.cursor = len(self.search_string) + elif c == 27: + self.search_string = None + self.entering_search = False + elif c == 10 or c == curses.KEY_ENTER: + self.entering_search = False + self.__do_search() + elif c > 31 and c < 256: + stroke = chr(c) + uchar = "" + while not uchar: + try: + uchar = stroke.decode(self.encoding) + except UnicodeDecodeError: + c = self.stdscr.getch() + stroke += chr(c) + if uchar: + if self.cursor == len(self.search_string): + self.search_string += uchar + else: + # Insert into string + self.search_string = self.search_string[:self.cursor] + uchar + self.search_string[self.cursor:] + # Move the cursor forward + self.cursor+=1 def _doRead(self): # Read the character @@ -563,6 +633,11 @@ class AllTorrents(BaseMode): if self.formatted_rows==None or self.popup: return + elif self.entering_search: + self.__update_search(c) + self.refresh([]) + return + #log.error("pressed key: %d\n",c) #if c == 27: # handle escape # log.error("CANCEL") @@ -580,6 +655,10 @@ class AllTorrents(BaseMode): effected_lines = [self.cursel-2,self.cursel-1] elif c == curses.KEY_NPAGE: self._scroll_down(int(self.rows/2)) + elif c == curses.KEY_HOME: + self._scroll_up(self.cursel) + elif c == curses.KEY_END: + self._scroll_down(self.numtorrents-self.cursel) elif c == curses.KEY_RIGHT: # We enter a new mode for the selected torrent here @@ -594,10 +673,15 @@ class AllTorrents(BaseMode): self.last_mark = self.cursel torrent_actions_popup(self,self._selected_torrent_ids(),details=True) return - else: if c > 31 and c < 256: - if chr(c) == 'j': + if chr(c) == '/': + self.search_string = "" + self.cursor = 0 + self.entering_search = True + elif chr(c) == 'n' and self.search_string: + self.__do_search() + elif chr(c) == 'j': if not self._scroll_up(1): effected_lines = [self.cursel-1,self.cursel] elif chr(c) == 'k': From ce2516ab2c667cffdd965807af285851ccf03728 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 15 Feb 2011 20:15:43 +0100 Subject: [PATCH 081/329] search field is black,white --- deluge/ui/console/modes/alltorrents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index c4b831fbd..e9d1899d2 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -469,7 +469,7 @@ class AllTorrents(BaseMode): self.add_string(1,self.column_string) if self.entering_search: - self.add_string(self.rows - 1,"Search torrents: %s"%self.search_string) + self.add_string(self.rows - 1,"{!black,white!}Search torrents: %s"%self.search_string) else: hstr = "%sPress [h] for help"%(" "*(self.cols - len(self.statusbars.bottombar) - 10)) self.add_string(self.rows - 1, "%s%s"%(self.statusbars.bottombar,hstr)) From 837322478b3de381b5026cbd4d7ccd7b8d8a77ad Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Feb 2011 15:30:14 +0100 Subject: [PATCH 082/329] return deferred for proper command line behavior --- deluge/ui/console/commands/cache.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/commands/cache.py b/deluge/ui/console/commands/cache.py index eee7e049f..92c016d9f 100644 --- a/deluge/ui/console/commands/cache.py +++ b/deluge/ui/console/commands/cache.py @@ -47,4 +47,6 @@ class Command(BaseCommand): for key, value in status.items(): self.console.write("{!info!}%s: {!input!}%s" % (key, value)) - client.core.get_cache_status().addCallback(on_cache_status) + d = client.core.get_cache_status() + d.addCallback(on_cache_status) + return d From 1789e8d03cec2a395605153cafaeb4bcb5f5ff1c Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Feb 2011 16:03:11 +0100 Subject: [PATCH 083/329] Minor changes for command line usage --- deluge/ui/console/commands/debug.py | 2 +- deluge/ui/console/commands/halt.py | 3 ++- deluge/ui/console/commands/quit.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/commands/debug.py b/deluge/ui/console/commands/debug.py index 118f9542b..40e87eda2 100644 --- a/deluge/ui/console/commands/debug.py +++ b/deluge/ui/console/commands/debug.py @@ -44,7 +44,7 @@ import deluge.component as component class Command(BaseCommand): """Enable and disable debugging""" - usage = 'debug [on|off]' + usage = 'Usage: debug [on|off]' def handle(self, state='', **options): if state == 'on': deluge.log.setLoggerLevel("debug") diff --git a/deluge/ui/console/commands/halt.py b/deluge/ui/console/commands/halt.py index 0a4de27a9..1c239dec4 100644 --- a/deluge/ui/console/commands/halt.py +++ b/deluge/ui/console/commands/halt.py @@ -39,7 +39,8 @@ from deluge.ui.client import client import deluge.component as component class Command(BaseCommand): - "Shutdown the deluge server." + "Shutdown the deluge server" + usage = "Usage: halt" def handle(self, **options): self.console = component.get("ConsoleUI") diff --git a/deluge/ui/console/commands/quit.py b/deluge/ui/console/commands/quit.py index f0e2fae22..1c95f9461 100644 --- a/deluge/ui/console/commands/quit.py +++ b/deluge/ui/console/commands/quit.py @@ -40,6 +40,7 @@ from twisted.internet import reactor class Command(BaseCommand): """Exit from the client.""" aliases = ['exit'] + interactive_only = True def handle(self, *args, **options): if client.connected(): def on_disconnect(result): From 9a3316f95028bb5a1fe72d43b09ae0ac42ab6475 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Feb 2011 16:04:54 +0100 Subject: [PATCH 084/329] use '-' instead of '~' in progress bar --- deluge/ui/console/commands/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/commands/info.py b/deluge/ui/console/commands/info.py index d42a80eeb..cf5ae48bd 100644 --- a/deluge/ui/console/commands/info.py +++ b/deluge/ui/console/commands/info.py @@ -85,7 +85,7 @@ def format_progressbar(progress, width): s = "[" p = int(round((progress/100) * w)) s += "#" * p - s += "~" * (w - p) + s += "-" * (w - p) s += "]" return s From e1a3a431f07db9c6ca3db41b6b2cb6d54812600a Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Feb 2011 16:26:58 +0100 Subject: [PATCH 085/329] support command line options again --- deluge/ui/console/commander.py | 145 ++++++++++++++++++++++++++++ deluge/ui/console/main.py | 166 ++++++++++++++++++++++++++++++++- 2 files changed, 307 insertions(+), 4 deletions(-) create mode 100644 deluge/ui/console/commander.py diff --git a/deluge/ui/console/commander.py b/deluge/ui/console/commander.py new file mode 100644 index 000000000..5af4bb908 --- /dev/null +++ b/deluge/ui/console/commander.py @@ -0,0 +1,145 @@ +# +# commander.py +# +# Copyright (C) 2008-2009 Ido Abramovich +# Copyright (C) 2009 Andrew Resch +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +from twisted.internet import defer, reactor +import deluge.component as component +from deluge.ui.client import client +from deluge.ui.console import UI_PATH +from colors import strip_colors + +import logging +log = logging.getLogger(__name__) + +class Commander: + def __init__(self, cmds): + self._commands = cmds + self.console = component.get("ConsoleUI") + + def write(self,line): + print(strip_colors(line)) + + def do_command(self, cmd): + """ + Processes a command. + + :param cmd: str, the command string + + """ + if not cmd: + return + cmd, _, line = cmd.partition(' ') + try: + parser = self._commands[cmd].create_parser() + except KeyError: + self.write("{!error!}Unknown command: %s" % cmd) + return + args = self._commands[cmd].split(line) + + # Do a little hack here to print 'command --help' properly + parser._print_help = parser.print_help + def print_help(f=None): + if self.interactive: + self.write(parser.format_help()) + else: + parser._print_help(f) + parser.print_help = print_help + + # Only these commands can be run when not connected to a daemon + not_connected_cmds = ["help", "connect", "quit"] + aliases = [] + for c in not_connected_cmds: + aliases.extend(self._commands[c].aliases) + not_connected_cmds.extend(aliases) + + if not client.connected() and cmd not in not_connected_cmds: + self.write("{!error!}Not connected to a daemon, please use the connect command first.") + return + + try: + options, args = parser.parse_args(args) + except Exception, e: + self.write("{!error!}Error parsing options: %s" % e) + return + + if not getattr(options, '_exit', False): + try: + ret = self._commands[cmd].handle(*args, **options.__dict__) + except Exception, e: + self.write("{!error!}" + str(e)) + log.exception(e) + import traceback + self.write("%s" % traceback.format_exc()) + return defer.succeed(True) + else: + return ret + + def exec_args(self,args,host,port,username,password): + def on_connect(result): + def on_started(result): + def on_started(result): + deferreds = [] + # If we have args, lets process them and quit + # allow multiple commands split by ";" + for arg in args.split(";"): + deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) + + def on_complete(result): + self.do_command("quit") + + dl = defer.DeferredList(deferreds).addCallback(on_complete) + + # We need to wait for the rpcs in start() to finish before processing + # any of the commands. + self.console.started_deferred.addCallback(on_started) + component.start().addCallback(on_started) + + def on_connect_fail(result): + from deluge.ui.client import DelugeRPCError + if isinstance(result.value,DelugeRPCError): + rm = result.value.exception_msg + else: + rm = result.getErrorMessage() + print "Could not connect to: %s:%d\n %s"%(host,port,rm) + self.do_command("quit") + + if host: + d = client.connect(host,port,username,password) + else: + d = client.connect() + d.addCallback(on_connect) + d.addErrback(on_connect_fail) + diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index cb252d3fb..cdfb35242 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -53,6 +53,7 @@ from deluge.ui.console.eventlog import EventLog #import screen import colors from deluge.ui.ui import _UI +from deluge.ui.console import UI_PATH log = logging.getLogger(__name__) @@ -62,11 +63,62 @@ class Console(_UI): def __init__(self): super(Console, self).__init__("console") + group = optparse.OptionGroup(self.parser, "Console Options","These options control how " + "the console connects to the daemon. These options will be " + "used if you pass a command, or if you have autoconnect " + "enabled for the console ui.") + + group.add_option("-d","--daemon",dest="daemon_addr", + action="store",type="str",default="127.0.0.1", + help="Set the address of the daemon to connect to." + " [default: %default]") + group.add_option("-p","--port",dest="daemon_port", + help="Set the port to connect to the daemon on. [default: %default]", + action="store",type="int",default=58846) + group.add_option("-u","--username",dest="daemon_user", + help="Set the username to connect to the daemon with. [default: %default]", + action="store",type="string") + group.add_option("-P","--password",dest="daemon_pass", + help="Set the password to connect to the daemon with. [default: %default]", + action="store",type="string") + self.parser.add_option_group(group) + + self.cmds = load_commands(os.path.join(UI_PATH, 'commands')) + class CommandOptionGroup(optparse.OptionGroup): + def __init__(self, parser, title, description=None, cmds = None): + optparse.OptionGroup.__init__(self,parser,title,description) + self.cmds = cmds + + def format_help(self, formatter): + result = formatter.format_heading(self.title) + formatter.indent() + if self.description: + result += "%s\n"%formatter.format_description(self.description) + for cname in self.cmds: + cmd = self.cmds[cname] + if cmd.interactive_only or cname in cmd.aliases: continue + allnames = [cname] + allnames.extend(cmd.aliases) + cname = "/".join(allnames) + result += formatter.format_heading(" - ".join([cname,cmd.__doc__])) + formatter.indent() + result += "%*s%s\n" % (formatter.current_indent, "", cmd.usage) + formatter.dedent() + formatter.dedent() + return result + cmd_group = CommandOptionGroup(self.parser, "Console Commands", + description="The following commands can be issued at the " + "command line. Commands should be quoted, so, for example, " + "to pause torrent with id 'abc' you would run: '%s " + "\"pause abc\"'"%os.path.basename(sys.argv[0]), + cmds=self.cmds) + self.parser.add_option_group(cmd_group) def start(self): super(Console, self).start() - - ConsoleUI(self.args) + ConsoleUI(self.args,self.cmds,(self.options.daemon_addr, + self.options.daemon_port,self.options.daemon_user, + self.options.daemon_pass)) def start(): Console().start() @@ -88,8 +140,61 @@ class OptionParser(optparse.OptionParser): raise Exception(msg) +class BaseCommand(object): + + usage = 'usage' + interactive_only = False + option_list = tuple() + aliases = [] + + def complete(self, text, *args): + return [] + def handle(self, *args, **options): + pass + + @property + def name(self): + return 'base' + + @property + def epilog(self): + return self.__doc__ + + def split(self, text): + if deluge.common.windows_check(): + text = text.replace('\\', '\\\\') + return shlex.split(text) + + def create_parser(self): + return OptionParser(prog = self.name, + usage = self.usage, + epilog = self.epilog, + option_list = self.option_list) + + +def load_commands(command_dir, exclude=[]): + def get_command(name): + return getattr(__import__('deluge.ui.console.commands.%s' % name, {}, {}, ['Command']), 'Command')() + + try: + commands = [] + for filename in os.listdir(command_dir): + if filename.split('.')[0] in exclude or filename.startswith('_'): + continue + if not (filename.endswith('.py') or filename.endswith('.pyc')): + continue + cmd = get_command(filename.split('.')[len(filename.split('.')) - 2]) + aliases = [ filename.split('.')[len(filename.split('.')) - 2] ] + aliases.extend(cmd.aliases) + for a in aliases: + commands.append((a, cmd)) + return dict(commands) + except OSError, e: + return {} + + class ConsoleUI(component.Component): - def __init__(self, args=None): + def __init__(self, args=None, cmds = None, daemon = None): component.Component.__init__(self, "ConsoleUI", 2) # keep track of events for the log view @@ -114,6 +219,18 @@ class ConsoleUI(component.Component): if args: args = args[0] self.interactive = False + if not cmds: + print "Sorry, couldn't find any commands" + return + else: + self._commands = cmds + from commander import Commander + cmdr = Commander(cmds) + if daemon: + cmdr.exec_args(args,*daemon) + else: + cmdr.exec_args(args,None,None,None,None) + self.coreconfig = CoreConfig() if self.interactive and not deluge.common.windows_check(): @@ -155,6 +272,44 @@ class ConsoleUI(component.Component): reactor.run() + def start(self): + # Maintain a list of (torrent_id, name) for use in tab completion + if not self.interactive: + self.started_deferred = defer.Deferred() + self.torrents = [] + def on_session_state(result): + def on_torrents_status(torrents): + for torrent_id, status in torrents.items(): + self.torrents.append((torrent_id, status["name"])) + self.started_deferred.callback(True) + + client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) + client.core.get_session_state().addCallback(on_session_state) + + + def match_torrent(self, string): + """ + Returns a list of torrent_id matches for the string. It will search both + torrent_ids and torrent names, but will only return torrent_ids. + + :param string: str, the string to match on + + :returns: list of matching torrent_ids. Will return an empty list if + no matches are found. + + """ + ret = [] + for tid, name in self.torrents: + if tid.startswith(string) or name.startswith(string): + ret.append(tid) + + return ret + + + def set_batch_write(self, batch): + # only kept for legacy reasons, don't actually do anything + pass + def set_mode(self, mode): reactor.removeReader(self.screen) self.screen = mode @@ -165,4 +320,7 @@ class ConsoleUI(component.Component): component.stop() def write(self, s): - self.events.append(s) + if self.interactive: + self.events.append(s) + else: + print colors.strip_colors(s) From 3db7bcbfc765ac7d633cb101e38238ed04e1703e Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Feb 2011 16:30:49 +0100 Subject: [PATCH 086/329] make message popups a bit more sane --- deluge/ui/console/modes/popup.py | 37 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 7cc468a1d..0702801d1 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -259,25 +259,36 @@ class MessagePopup(Popup): def __init__(self, parent_mode, title, message): self.message = message self.width= int(parent_mode.cols/2) - lns = self._split_message(self.message) - height = max(len(lns),self._min_height) - Popup.__init__(self,parent_mode,title,height_req=(height+2)) - lft = height - len(lns) - if lft: - for i in range(0,int(lft/2)): - lns.insert(0,"") + lns = self._split_message() + Popup.__init__(self,parent_mode,title,height_req=len(lns)) self._lines = lns - def _split_message(self,message): + def _split_message(self): ret = [] wl = (self.width-2) - for i in range(0,len(self.message),wl): - l = self.message[i:i+wl] - lp = (wl-len(self._strip_re.sub('',l)))/2 - ret.append("%s%s"%(lp*" ",l)) + + s1 = self.message.split("\n") + + for s in s1: + while len(self._strip_re.sub('',s)) > wl: + sidx = s.rfind(" ",0,wl-1) + sidx += 1 + if sidx > 0: + ret.append(s[0:sidx]) + s = s[sidx:] + else: + # can't find a reasonable split, just split at width + ret.append(s[0:wl]) + s = s[wl:] + if s: + ret.append(s) + + for i in range(len(ret),self._min_height): + ret.append(" ") + return ret def handle_resize(self): Popup.handle_resize(self) self.clear() - self._lines = self._split_message(self.message) + self._lines = self._split_message() From e16ee523a54e9d81eb86e94626daf7e3dbb0603a Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Feb 2011 17:41:10 +0100 Subject: [PATCH 087/329] fix messagepopup height_req --- deluge/ui/console/modes/popup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 0702801d1..0bb2a04c0 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -260,7 +260,7 @@ class MessagePopup(Popup): self.message = message self.width= int(parent_mode.cols/2) lns = self._split_message() - Popup.__init__(self,parent_mode,title,height_req=len(lns)) + Popup.__init__(self,parent_mode,title,height_req=(len(lns)+2)) self._lines = lns def _split_message(self): From d9d8762c8ea67ec300946894303715b8ea9f644d Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Feb 2011 17:41:28 +0100 Subject: [PATCH 088/329] add get_torrent_name --- deluge/ui/console/main.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index cdfb35242..e7c743245 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -306,6 +306,17 @@ class ConsoleUI(component.Component): return ret + def get_torrent_name(self, torrent_id): + if self.interactive and hasattr(self.screen,"get_torrent_name"): + return self.screen.get_torrent_name(torrent_id) + + for tid, name in self.torrents: + if torrent_id == tid: + return name + + return None + + def set_batch_write(self, batch): # only kept for legacy reasons, don't actually do anything pass From 3da5cd9816c9ddc5ea30779934d6e1a65e03d399 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Feb 2011 17:43:35 +0100 Subject: [PATCH 089/329] add get_torrent_name --- deluge/ui/console/modes/alltorrents.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index e9d1899d2..ee57a59e5 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -258,6 +258,12 @@ class AllTorrents(BaseMode): if refresh: self.refresh() + def get_torrent_name(self, torrent_id): + for p,i in enumerate(self._sorted_ids): + if torrent_id == i: + return self.torrent_names[p] + return None + def _scroll_up(self, by): prevoff = self.curoff self.cursel = max(self.cursel - by,1) From 1173f1c714f63ea03e25461e1ee6da7dc98a126f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Feb 2011 17:44:12 +0100 Subject: [PATCH 090/329] support globbing for multi-file add and have better fail reports --- deluge/ui/console/modes/add_util.py | 50 ++++++++++++++++---------- deluge/ui/console/modes/alltorrents.py | 36 +++++++++++++++---- 2 files changed, 61 insertions(+), 25 deletions(-) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 28372631d..49720df97 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -42,31 +42,43 @@ from deluge.ui.client import client import deluge.component as component from optparse import make_option -import os -import base64 +import os,base64,glob -def add_torrent(t_file, options, success_cb, fail_cb): +try: + import libtorrent + add_get_info = libtorrent.torrent_info +except: + add_get_info = deluge.ui.common.TorrentInfo + +def add_torrent(t_file, options, success_cb, fail_cb, ress): t_options = {} if options["path"]: t_options["download_location"] = os.path.expanduser(options["path"]) t_options["add_paused"] = options["add_paused"] - # Keep a list of deferreds to make a DeferredList - if not os.path.exists(t_file): - fail_cb("{!error!}%s doesn't exist!" % t_file) - return - if not os.path.isfile(t_file): - fail_cb("{!error!}%s is a directory!" % t_file) - return - + files = glob.glob(t_file) + num_files = len(files) + ress["total"] = num_files - filename = os.path.split(t_file)[-1] - filedump = base64.encodestring(open(t_file).read()) + if num_files <= 0: + fail_cb("Doesn't exist",t_file,ress) - def on_success(result): - success_cb("{!success!}Torrent added!") - def on_fail(result): - fail_cb("{!error!}Torrent was not added! %s" % result) + for f in files: + if not os.path.exists(f): + fail_cb("Doesn't exist",f,ress) + continue + if not os.path.isfile(f): + fail_cb("Is a directory",f,ress) + continue + + try: + add_get_info(f) + except Exception as e: + fail_cb(e.message,f,ress) + continue + + filename = os.path.split(f)[-1] + filedump = base64.encodestring(open(f).read()) + + client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) - client.core.add_torrent_file(filename, filedump, t_options).addCallback(on_success).addErrback(on_fail) - diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index ee57a59e5..578cdbf33 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -412,13 +412,37 @@ class AllTorrents(BaseMode): self.popup.add_line("_Checking",data=FILTER.CHECKING,foreground="blue") self.popup.add_line("Q_ueued",data=FILTER.QUEUED,foreground="yellow") + def __report_add_status(self, succ_cnt, fail_cnt, fail_msgs): + if fail_cnt == 0: + self.report_message("Torrents Added","{!success!}Sucessfully added %d torrent(s)"%succ_cnt) + else: + msg = ("{!error!}Failed to add the following %d torrent(s):\n {!error!}"%fail_cnt)+"\n {!error!}".join(fail_msgs) + if succ_cnt != 0: + msg += "\n \n{!success!}Sucessfully added %d torrent(s)"%succ_cnt + self.report_message("Torrent Add Report",msg) + def _do_add(self, result): - log.debug("Adding Torrent: %s (dl path: %s) (paused: %d)",result["file"],result["path"],result["add_paused"]) - def suc_cb(msg): - self.report_message("Torrent Added",msg) - def fail_cb(msg): - self.report_message("Failed To Add Torrent",msg) - add_torrent(result["file"],result,suc_cb,fail_cb) + log.debug("Adding Torrent(s): %s (dl path: %s) (paused: %d)",result["file"],result["path"],result["add_paused"]) + ress = {"succ":0, + "fail":0, + "fmsg":[]} + + def fail_cb(msg,t_file,ress): + log.debug("failed to add torrent: %s: %s"%(t_file,msg)) + ress["fail"]+=1 + ress["fmsg"].append("%s: %s"%(t_file,msg)) + if (ress["succ"]+ress["fail"]) >= ress["total"]: + self.__report_add_status(ress["succ"],ress["fail"],ress["fmsg"]) + def suc_cb(tid,t_file,ress): + if tid: + log.debug("added torrent: %s (%s)"%(t_file,tid)) + ress["succ"]+=1 + if (ress["succ"]+ress["fail"]) >= ress["total"]: + self.__report_add_status(ress["succ"],ress["fail"],ress["fmsg"]) + else: + fail_cb("Already in session (probably)",t_file,ress) + + add_torrent(result["file"],result,suc_cb,fail_cb,ress) def _show_torrent_add_popup(self): dl = "" From b0c561dbbce4dc74b16f13ce24d36c6b01ade3c4 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 22 Feb 2011 00:09:27 +0100 Subject: [PATCH 091/329] add add_checked_input --- deluge/ui/console/modes/input_popup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index b59c914cd..183d33d95 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -577,6 +577,9 @@ class InputPopup(Popup): def add_select_input(self, message, name, opts, vals, default_index=0): self.inputs.append(SelectInput(self.parent, message, name, opts, vals, default_index)) + def add_checked_input(self, message, name, checked=False): + self.inputs.append(CheckedInput(self.parent,message,name,checked)) + def _refresh_lines(self): self._cursor_row = -1 self._cursor_col = -1 From 10816cb8f408212686a744e697a2fb078ba432cc Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 12:32:32 +0100 Subject: [PATCH 092/329] always have a torrents list, in case get_torrent_name gets called from a mode without get_torrent_name in new ui --- deluge/ui/console/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 31692afb5..8114dbb8a 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -279,9 +279,9 @@ Please use commands from the command line, eg:\n def start(self): # Maintain a list of (torrent_id, name) for use in tab completion + self.torrents = [] if not self.interactive: self.started_deferred = defer.Deferred() - self.torrents = [] def on_session_state(result): def on_torrents_status(torrents): for torrent_id, status in torrents.items(): From 4e5d88da8261cf1693e5d6ada2322604a5ea0926 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 12:34:29 +0100 Subject: [PATCH 093/329] import deluge.ui.common for TorrentInfo command --- deluge/ui/console/modes/add_util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 49720df97..9349cefa4 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -48,6 +48,7 @@ try: import libtorrent add_get_info = libtorrent.torrent_info except: + import deluge.ui.common add_get_info = deluge.ui.common.TorrentInfo def add_torrent(t_file, options, success_cb, fail_cb, ress): From e83d540fe411d0644a3daf280de3aa8e081f596d Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 13:38:54 +0100 Subject: [PATCH 094/329] update help --- deluge/ui/console/modes/alltorrents.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 578cdbf33..56ca031a3 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -96,6 +96,8 @@ The actions you can perform and the keys to perform them are as follows: 'i' - Show more detailed information about the current selected torrent +'e' - Show the event log view ('q' to get out of event log) + 'Q' - quit 'm' - Mark a torrent From 2b04955128bc83e1f956ff6fb0e52adec8eb435c Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 13:39:20 +0100 Subject: [PATCH 095/329] don't double add current torrent on action popup --- deluge/ui/console/modes/alltorrents.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 56ca031a3..3acb2b83d 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -701,7 +701,8 @@ class AllTorrents(BaseMode): # Enter Key elif (c == curses.KEY_ENTER or c == 10) and self.numtorrents: - self.marked.append(self.cursel) + if self.cursel not in self.marked: + self.marked.append(self.cursel) self.last_mark = self.cursel torrent_actions_popup(self,self._selected_torrent_ids(),details=True) return From 5619991f2a632f8fb3dddb7e58d3474174d9b6d6 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 13:39:38 +0100 Subject: [PATCH 096/329] add move storage option to torrent actions --- deluge/ui/console/modes/torrent_actions.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/deluge/ui/console/modes/torrent_actions.py b/deluge/ui/console/modes/torrent_actions.py index c8501e8a2..5667c6c3b 100644 --- a/deluge/ui/console/modes/torrent_actions.py +++ b/deluge/ui/console/modes/torrent_actions.py @@ -34,6 +34,7 @@ from deluge.ui.client import client from popup import SelectablePopup +from input_popup import InputPopup import logging log = logging.getLogger(__name__) @@ -45,6 +46,7 @@ class ACTION: EDIT_TRACKERS=3 RECHECK=4 REMOVE=5 + MOVE_STORAGE=9 REMOVE_DATA=6 REMOVE_NODATA=7 @@ -81,6 +83,21 @@ def torrent_action(idx, data, mode, ids): popup.add_line("_Cancel",data=0) mode.set_popup(popup) return False + elif data==ACTION.MOVE_STORAGE: + def do_move(res): + import os.path + if os.path.exists(res["path"]) and not os.path.isdir(res["path"]): + mode.report_message("Cannot Move Storage","{!error!}%s exists and is not a directory"%res["path"]) + else: + log.debug("Moving %s to: %s",ids,res["path"]) + client.core.move_storage(ids,res["path"]).addErrback(action_error,mode) + if len(ids) == 1: + mode.clear_marks() + return True + popup = InputPopup(mode,"Move Storage (Esc to cancel)",close_cb=do_move) + popup.add_text_input("Enter path to move to:","path") + mode.set_popup(popup) + return False elif data==ACTION.RECHECK: log.debug("Rechecking torrents: %s", ids) client.core.force_recheck(ids).addErrback(action_error,mode) @@ -108,6 +125,7 @@ def torrent_actions_popup(mode,tids,details=False): popup.add_divider() popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) popup.add_line("_Force Recheck",data=ACTION.RECHECK) + popup.add_line("_Move Storage",data=ACTION.MOVE_STORAGE) if details: popup.add_divider() popup.add_line("Torrent _Details",data=ACTION.DETAILS) From 7f52472e9ec24ae03df4166b8847ab4742e880d5 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 13:56:22 +0100 Subject: [PATCH 097/329] add move command for console ui --- deluge/ui/console/commands/move.py | 111 +++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 deluge/ui/console/commands/move.py diff --git a/deluge/ui/console/commands/move.py b/deluge/ui/console/commands/move.py new file mode 100644 index 000000000..011031417 --- /dev/null +++ b/deluge/ui/console/commands/move.py @@ -0,0 +1,111 @@ +# +# move.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +from deluge.ui.console.main import BaseCommand +from deluge.ui.client import client +import deluge.component as component + +import os.path + + +class Command(BaseCommand): + """Move torrents' storage location""" + usage = "Usage: move [ ...] " + + def handle(self, *args, **options): + self.console = component.get("ConsoleUI") + + if len(args) < 2: + self.console.write(self.usage) + return + + path = args[-1] + + if os.path.exists(path) and not os.path.isdir(path): + self.console.write("{!error!}Cannot Move Storage: %s exists and is not a directory"%path) + return + + ids = [] + for i in args[:-1]: + ids.extend(self.console.match_torrent(i)) + + names = [] + for i in ids: + names.append(self.console.get_torrent_name(i)) + namestr = ", ".join(names) + + def on_move(res): + self.console.write("Moved \"%s\" to %s"%(namestr,path)) + + d = client.core.move_storage(ids,path) + d.addCallback(on_move) + return d + + def complete(self, line): + line = os.path.abspath(os.path.expanduser(line)) + ret = [] + if os.path.exists(line): + # This is a correct path, check to see if it's a directory + if os.path.isdir(line): + # Directory, so we need to show contents of directory + #ret.extend(os.listdir(line)) + for f in os.listdir(line): + # Skip hidden + if f.startswith("."): + continue + f = os.path.join(line, f) + if os.path.isdir(f): + f += "/" + ret.append(f) + else: + # This is a file, but we could be looking for another file that + # shares a common prefix. + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + ret.append(os.path.join( os.path.dirname(line), f)) + else: + # This path does not exist, so lets do a listdir on it's parent + # and find any matches. + ret = [] + if os.path.isdir(os.path.dirname(line)): + for f in os.listdir(os.path.dirname(line)): + if f.startswith(os.path.split(line)[1]): + p = os.path.join(os.path.dirname(line), f) + + if os.path.isdir(p): + p += "/" + ret.append(p) + + return ret From 543fcf722c3800f3803a785a012277b794138169 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 14:58:40 +0100 Subject: [PATCH 098/329] use os.path.commonprefix to do better completion --- deluge/ui/console/modes/input_popup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 183d33d95..6a0f3f5c4 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -469,7 +469,13 @@ class TextInput(InputField): self.value = opts[0] self.cursor = len(opts[0]) self.tab_count = 0 - elif len(opts) > 1 and second_hit: # display multiple options on second tab hit + elif len(opts) > 1: + prefix = os.path.commonprefix(opts) + if prefix: + self.value = prefix + self.cursor = len(prefix) + + if len(opts) > 1 and second_hit: # display multiple options on second tab hit self.opts = " ".join(opts) # Cursor movement From 956ea10a003a6ab5d9a2fa60db5d878671c263eb Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 16:56:54 +0100 Subject: [PATCH 099/329] convert torrent_ids back into a list in case we need to remove from it --- deluge/core/filtermanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/core/filtermanager.py b/deluge/core/filtermanager.py index 359eb45a5..e04cb9dbb 100644 --- a/deluge/core/filtermanager.py +++ b/deluge/core/filtermanager.py @@ -136,7 +136,7 @@ class FilterManager(component.Component): if "id"in filter_dict: #optimized filter for id: - torrent_ids = filter_dict["id"] + torrent_ids = list(filter_dict["id"]) del filter_dict["id"] else: torrent_ids = self.torrents.get_torrent_list() From 40a572298770c8d62d1fe20791988de4949e2464 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 16:57:56 +0100 Subject: [PATCH 100/329] support -s STATE in info --- deluge/ui/console/commands/info.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/commands/info.py b/deluge/ui/console/commands/info.py index cf5ae48bd..7e6ed99ac 100644 --- a/deluge/ui/console/commands/info.py +++ b/deluge/ui/console/commands/info.py @@ -70,6 +70,8 @@ status_keys = ["state", "is_finished" ] +states = ["Active", "Downloading", "Seeding", "Paused", "Checking", "Error", "Queued"] + def format_progressbar(progress, width): """ @@ -98,11 +100,17 @@ class Command(BaseCommand): help='shows more information per torrent'), make_option('-i', '--id', action='store_true', default=False, dest='tid', help='use internal id instead of torrent name'), + make_option('-s', '--state', action='store', dest='state', + help="Only retrieve torrents in state STATE. " + "Allowable values are: %s "%(", ".join(states))), ) - usage = "Usage: info [ [ ...]]\n"\ + usage = "Usage: info [-v | -i | -s ] [ [ ...]]\n"\ + " info -s will show only torrents in state \n"\ " You can give the first few characters of a torrent-id to identify the torrent." + + def handle(self, *args, **options): self.console = component.get("ConsoleUI") # Compile a list of torrent_ids to request the status of @@ -121,7 +129,17 @@ class Command(BaseCommand): def on_torrents_status_fail(reason): self.console.write("{!error!}Error getting torrent info: %s" % reason) - d = client.core.get_torrents_status({"id": torrent_ids}, status_keys) + status_dict = {"id": torrent_ids} + + if options["state"]: + if options["state"] not in states: + self.console.write("Invalid state: %s"%options["state"]) + self.console.write("Allowble values are: %s."%(", ".join(states))) + return + else: + status_dict["state"] = options["state"] + + d = client.core.get_torrents_status(status_dict, status_keys) d.addCallback(on_torrents_status) d.addErrback(on_torrents_status_fail) return d From b11468c19bc1f2ce21e076d5be945efbdc84878f Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 17:17:55 +0100 Subject: [PATCH 101/329] handle double-wide unicode characters --- deluge/ui/console/modes/format_utils.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 3b73edbad..81906d4b1 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -33,6 +33,11 @@ # import deluge.common +try: + import unicodedata + haveud = True +except: + haveud = False def format_speed(speed): if (speed > 0): @@ -61,7 +66,14 @@ def trim_string(string, w): return "%s... "%(string[0:w-4]) def format_column(col, lim): - size = len(col) + dbls = 0 + if haveud and isinstance(col,unicode): + # might have some double width chars + for c in col: + if unicodedata.east_asian_width(c) in ['W','F']: + # found a wide/full char + dbls += 1 + size = len(col)+dbls if (size >= lim - 1): return trim_string(col,lim) else: From 9e4ea0a6715e9c847a36267a7158227a2fb3588e Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 17:18:12 +0100 Subject: [PATCH 102/329] don't trim rows (basemode seems to get confused on strings with double-wide chars) --- deluge/ui/console/modes/alltorrents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 3acb2b83d..accd2d17f 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -559,7 +559,7 @@ class AllTorrents(BaseMode): else: colorstr = "{!%s,%s!}"%(fg,bg) - self.add_string(currow,"%s%s"%(colorstr,row[0])) + self.add_string(currow,"%s%s"%(colorstr,row[0]),trim=False) tidx += 1 currow += 1 if (currow > (self.rows - 2)): From 62421080effd8889d2d83e8665d87d29b0f9b34f Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 22 Feb 2011 18:04:16 +0100 Subject: [PATCH 103/329] better unicode handling and trimming --- deluge/ui/console/modes/format_utils.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 81906d4b1..811c742e7 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -62,20 +62,38 @@ def format_priority(prio): else: return pstring -def trim_string(string, w): +def trim_string(string, w, have_dbls): + if have_dbls: + # have to do this the slow way + chrs = [] + width = 4 + idx = 0 + while width < w: + chrs.append(string[idx]) + if unicodedata.east_asian_width(string[idx]) in ['W','F']: + width += 2 + else: + width += 1 + idx += 1 + if width != w: + chrs.pop() + chrs.append('.') + return "%s... "%("".join(chrs)) + else: return "%s... "%(string[0:w-4]) def format_column(col, lim): dbls = 0 if haveud and isinstance(col,unicode): # might have some double width chars + col = unicodedata.normalize("NFC",col) for c in col: if unicodedata.east_asian_width(c) in ['W','F']: # found a wide/full char dbls += 1 size = len(col)+dbls if (size >= lim - 1): - return trim_string(col,lim) + return trim_string(col,lim,dbls>0) else: return "%s%s"%(col," "*(lim-size)) From d1efe5f1b4fed70b82eedeb124d4feb62ec03243 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 23 Feb 2011 15:53:14 +0100 Subject: [PATCH 104/329] support adding url arguments in add.py command --- deluge/ui/console/commands/add.py | 45 ++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/deluge/ui/console/commands/add.py b/deluge/ui/console/commands/add.py index 7878438d9..71ef1e7d1 100644 --- a/deluge/ui/console/commands/add.py +++ b/deluge/ui/console/commands/add.py @@ -39,6 +39,7 @@ from deluge.ui.console.main import BaseCommand import deluge.ui.console.colors as colors from deluge.ui.client import client import deluge.component as component +import deluge.common from optparse import make_option import os @@ -49,36 +50,48 @@ class Command(BaseCommand): option_list = BaseCommand.option_list + ( make_option('-p', '--path', dest='path', help='save path for torrent'), + make_option('-u', '--urls', action='store_true', default=False, dest='force_url', + help='Interpret all given torrent-file arguments as URLs'), + make_option('-f', '--files', action='store_true', default=False, dest='force_file', + help='Interpret all given torrent-file arguments as files'), ) - usage = "Usage: add [-p ] [ ...]" + usage = "Usage: add [-p ] [-u | --urls] [-f | --files] [ ...]" def handle(self, *args, **options): self.console = component.get("ConsoleUI") + if options["force_file"] and options["force_url"]: + self.console.write("{!error!}Cannot specify --urls and --files at the same time") + return + t_options = {} if options["path"]: t_options["download_location"] = os.path.expanduser(options["path"]) + def on_success(result): + self.console.write("{!success!}Torrent added!") + def on_fail(result): + self.console.write("{!error!}Torrent was not added! %s" % result) + # Keep a list of deferreds to make a DeferredList deferreds = [] for arg in args: - if not os.path.exists(arg): - self.console.write("{!error!}%s doesn't exist!" % arg) - continue - if not os.path.isfile(arg): - self.console.write("{!error!}This is a directory!") - continue - self.console.write("{!info!}Attempting to add torrent: %s" % arg) - filename = os.path.split(arg)[-1] - filedump = base64.encodestring(open(arg, "rb").read()) + if not options["force_file"] and (deluge.common.is_url(arg) or options["force_url"]): + self.console.write("{!info!}Attempting to add torrent from url: %s" % arg) + deferreds.append(client.core.add_torrent_url(arg, t_options).addCallback(on_success).addErrback(on_fail)) + else: + if not os.path.exists(arg): + self.console.write("{!error!}%s doesn't exist!" % arg) + continue + if not os.path.isfile(arg): + self.console.write("{!error!}This is a directory!") + continue + self.console.write("{!info!}Attempting to add torrent: %s" % arg) + filename = os.path.split(arg)[-1] + filedump = base64.encodestring(open(arg, "rb").read()) - def on_success(result): - self.console.write("{!success!}Torrent added!") - def on_fail(result): - self.console.write("{!error!}Torrent was not added! %s" % result) - - deferreds.append(client.core.add_torrent_file(filename, filedump, t_options).addCallback(on_success).addErrback(on_fail)) + deferreds.append(client.core.add_torrent_file(filename, filedump, t_options).addCallback(on_success).addErrback(on_fail)) return defer.DeferredList(deferreds) From 60d96c6f2096da64ec895a30d8ed8d05c0800f2c Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 23 Feb 2011 16:07:47 +0100 Subject: [PATCH 105/329] add add_spaces to InputPopup --- deluge/ui/console/modes/input_popup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 6a0f3f5c4..44f9de0c2 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -562,6 +562,7 @@ class InputPopup(Popup): def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): Popup.__init__(self,parent_mode,title,width_req,height_req,close_cb) self.inputs = [] + self.spaces = [] self.current_input = 0 def move(self,r,c): @@ -580,6 +581,9 @@ class InputPopup(Popup): self.inputs.append(TextInput(self.parent, self.move, self.width, message, name, value, complete)) + def add_spaces(self, num): + self.spaces.append((len(self.inputs)-1,num)) + def add_select_input(self, message, name, opts, vals, default_index=0): self.inputs.append(SelectInput(self.parent, message, name, opts, vals, default_index)) @@ -591,8 +595,12 @@ class InputPopup(Popup): self._cursor_col = -1 curses.curs_set(0) crow = 1 + spos = 0 for i,ipt in enumerate(self.inputs): crow += ipt.render(self.screen,crow,self.width,i==self.current_input) + if self.spaces and (spos < len(self.spaces)) and (i == self.spaces[spos][0]): + crow += self.spaces[spos][1] + spos += 1 # need to do this last as adding things moves the cursor if self._cursor_row >= 0: From 62f6683730f2c3c5e15b6132c3d79afaba731e6e Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 23 Feb 2011 16:12:49 +0100 Subject: [PATCH 106/329] support urls from add dialog --- deluge/ui/console/modes/add_util.py | 39 ++++++++++++++++---------- deluge/ui/console/modes/alltorrents.py | 2 ++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 9349cefa4..02c084d47 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -40,6 +40,7 @@ from twisted.internet import defer from deluge.ui.client import client import deluge.component as component +import deluge.common from optparse import make_option import os,base64,glob @@ -57,7 +58,12 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): t_options["download_location"] = os.path.expanduser(options["path"]) t_options["add_paused"] = options["add_paused"] - files = glob.glob(t_file) + is_url = (not (options["path_type"]==1)) and (deluge.common.is_url(t_file) or options["path_type"]==2) + + if is_url: + files = [t_file] + else: + files = glob.glob(t_file) num_files = len(files) ress["total"] = num_files @@ -65,21 +71,24 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): fail_cb("Doesn't exist",t_file,ress) for f in files: - if not os.path.exists(f): - fail_cb("Doesn't exist",f,ress) - continue - if not os.path.isfile(f): - fail_cb("Is a directory",f,ress) - continue + if is_url: + client.core.add_torrent_url(f, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) + else: + if not os.path.exists(f): + fail_cb("Doesn't exist",f,ress) + continue + if not os.path.isfile(f): + fail_cb("Is a directory",f,ress) + continue - try: - add_get_info(f) - except Exception as e: - fail_cb(e.message,f,ress) - continue + try: + add_get_info(f) + except Exception as e: + fail_cb(e.message,f,ress) + continue - filename = os.path.split(f)[-1] - filedump = base64.encodestring(open(f).read()) + filename = os.path.split(f)[-1] + filedump = base64.encodestring(open(f).read()) - client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) + client.core.add_torrent_file(filename, filedump, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index accd2d17f..5343383b6 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -463,6 +463,8 @@ class AllTorrents(BaseMode): self.popup.add_text_input("Enter path to torrent file:","file") self.popup.add_text_input("Enter save path:","path",dl) self.popup.add_select_input("Add Paused:","add_paused",["Yes","No"],[True,False],ap) + self.popup.add_spaces(1) + self.popup.add_select_input("Path is:","path_type",["Auto","File","URL"],[0,1,2],0) def report_message(self,title,message): self.messages.append((title,message)) From 5f0f7204a8e195d5470f0dfa910e89220c72dbe2 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 23 Feb 2011 16:15:34 +0100 Subject: [PATCH 107/329] don't use libtorrent anymore in add --- deluge/ui/console/modes/add_util.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 02c084d47..168a6b1eb 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -36,21 +36,14 @@ # statement from all source files in the program, then also delete it here. # # -from twisted.internet import defer - from deluge.ui.client import client import deluge.component as component +from deluge.ui.common import TorrentInfo import deluge.common -from optparse import make_option import os,base64,glob -try: - import libtorrent - add_get_info = libtorrent.torrent_info -except: - import deluge.ui.common - add_get_info = deluge.ui.common.TorrentInfo + def add_torrent(t_file, options, success_cb, fail_cb, ress): t_options = {} @@ -82,7 +75,7 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): continue try: - add_get_info(f) + TorrentInfo(f) except Exception as e: fail_cb(e.message,f,ress) continue From 499a58f50df649be997f9e520eddf6d1b29cb82d Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 23 Feb 2011 10:47:16 -0800 Subject: [PATCH 108/329] Revert 67ea05921cb904cb2ddf5811cd96534321bfeefa which changed how event handlers worked. Unfortunately this will not work with plugins as they do not have the events defined and the creation of the event object fails. --- ChangeLog | 1 - deluge/core/eventmanager.py | 2 +- deluge/core/rpcserver.py | 3 +- deluge/event.py | 96 +++----- deluge/ui/client.py | 11 +- deluge/ui/console/eventlog.py | 50 ++--- deluge/ui/console/main.py | 367 ++++++++++++++++++++----------- deluge/ui/coreconfig.py | 4 +- deluge/ui/gtkui/files_tab.py | 64 +++--- deluge/ui/gtkui/mainwindow.py | 8 +- deluge/ui/gtkui/menubar.py | 6 +- deluge/ui/gtkui/pluginmanager.py | 8 +- deluge/ui/gtkui/statusbar.py | 6 +- deluge/ui/gtkui/systemtray.py | 6 +- deluge/ui/gtkui/torrentview.py | 24 +- deluge/ui/sessionproxy.py | 26 +-- deluge/ui/web/pluginmanager.py | 38 ++-- 17 files changed, 393 insertions(+), 327 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83d3bfa1c..54111bc71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,6 @@ * #1247: Fix deluge-gtk from hanging on shutdown * #995: Rewrote tracker_icons * Make the distinction between adding to the session new unmanaged torrents and torrents loaded from state. This will break backwards compatability. - * Pass a copy of an event instead of passing the event arguments to the event handlers. This will break backwards compatability. ==== GtkUI ==== * Fix uncaught exception when closing deluge in classic mode diff --git a/deluge/core/eventmanager.py b/deluge/core/eventmanager.py index 1199813d8..198507007 100644 --- a/deluge/core/eventmanager.py +++ b/deluge/core/eventmanager.py @@ -55,7 +55,7 @@ class EventManager(component.Component): if event.name in self.handlers: for handler in self.handlers[event.name]: #log.debug("Running handler %s for event %s with args: %s", event.name, handler, event.args) - handler(event.copy()) + handler(*event.args) def register_event_handler(self, event, handler): """ diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 2858b3b30..ef2e3342f 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -486,8 +486,7 @@ class RPCServer(component.Component): # Find sessions interested in this event for session_id, interest in self.factory.interested_events.iteritems(): if event.name in interest: - log.debug("Emit Event: %s %s", event.name, zip(event.__slots__, - event.args)) + log.debug("Emit Event: %s %s", event.name, event.args) # This session is interested so send a RPC_EVENT self.factory.session_protocols[session_id].sendData( (RPC_EVENT, event.name, event.args) diff --git a/deluge/event.py b/deluge/event.py index a4fc8b4a3..14e13940b 100644 --- a/deluge/event.py +++ b/deluge/event.py @@ -2,7 +2,6 @@ # event.py # # Copyright (C) 2009 Andrew Resch -# Copyright (C) 2010 Pedro Algarvio # # Deluge is free software. # @@ -48,8 +47,6 @@ class DelugeEventMetaClass(type): """ This metaclass simply keeps a list of all events classes created. """ - __slots__ = () - def __init__(cls, name, bases, dct): super(DelugeEventMetaClass, cls).__init__(name, bases, dct) if name != "DelugeEvent": @@ -65,26 +62,23 @@ class DelugeEvent(object): :type args: list """ - __slots__ = () __metaclass__ = DelugeEventMetaClass def _get_name(self): return self.__class__.__name__ - name = property(fget=_get_name) def _get_args(self): - return [getattr(self, arg) for arg in self.__slots__] - args = property(fget=_get_args) + if not hasattr(self, "_args"): + return [] + return self._args - def copy(self): - return self.__class__(*self.args) + name = property(fget=_get_name) + args = property(fget=_get_args) class TorrentAddedEvent(DelugeEvent): """ Emitted when a new torrent is successfully added to the session. """ - __slots__ = ('torrent_id', 'from_state') - def __init__(self, torrent_id, from_state): """ :param torrent_id: the torrent_id of the torrent that was added @@ -92,41 +86,34 @@ class TorrentAddedEvent(DelugeEvent): :param from_state: was the torrent loaded from state? Or is it a new torrent. :type from_state: bool """ - self.torrent_id = torrent_id - self.from_state = from_state + self._args = [torrent_id, from_state] class TorrentRemovedEvent(DelugeEvent): """ Emitted when a torrent has been removed from the session. """ - __slots__ = ('torrent_id',) - def __init__(self, torrent_id): """ :param torrent_id: the torrent_id :type torrent_id: string """ - self.torrent_id = torrent_id + self._args = [torrent_id] class PreTorrentRemovedEvent(DelugeEvent): """ Emitted when a torrent is about to be removed from the session. """ - __slots__ = ('torrent_id',) - def __init__(self, torrent_id): """ :param torrent_id: the torrent_id :type torrent_id: string """ - self.torrent_id = torrent_id + self._args = [torrent_id] class TorrentStateChangedEvent(DelugeEvent): """ Emitted when a torrent changes state. """ - __slots__ = ('torrent_id', 'state') - def __init__(self, torrent_id, state): """ :param torrent_id: the torrent_id @@ -134,20 +121,18 @@ class TorrentStateChangedEvent(DelugeEvent): :param state: the new state :type state: string """ - self.torrent_id = torrent_id - self.state = state + self._args = [torrent_id, state] class TorrentQueueChangedEvent(DelugeEvent): """ Emitted when the queue order has changed. """ + pass class TorrentFolderRenamedEvent(DelugeEvent): """ Emitted when a folder within a torrent has been renamed. """ - __slots__ = ('torrent_id', 'old', 'new') - def __init__(self, torrent_id, old, new): """ :param torrent_id: the torrent_id @@ -157,54 +142,44 @@ class TorrentFolderRenamedEvent(DelugeEvent): :param new: the new folder name :type new: string """ - self.torrent_id = torrent_id - self.old = old - self.new = new + self._args = [torrent_id, old, new] class TorrentFileRenamedEvent(DelugeEvent): """ Emitted when a file within a torrent has been renamed. """ - __slots__ = ('torrent_id', 'index', 'filename') - - def __init__(self, torrent_id, index, filename): + def __init__(self, torrent_id, index, name): """ :param torrent_id: the torrent_id :type torrent_id: string :param index: the index of the file :type index: int - :param filename: the new filename - :type filename: string + :param name: the new filename + :type name: string """ - self.torrent_id = torrent_id - self.index = index - self.filename = filename + self._args = [torrent_id, index, name] class TorrentFinishedEvent(DelugeEvent): """ Emitted when a torrent finishes downloading. """ - __slots__ = ('torrent_id',) - def __init__(self, torrent_id): """ :param torrent_id: the torrent_id :type torrent_id: string """ - self.torrent_id = torrent_id + self._args = [torrent_id] class TorrentResumedEvent(DelugeEvent): """ Emitted when a torrent resumes from a paused state. """ - __slots__ = ('torrent_id',) - def __init__(self, torrent_id): """ :param torrent_id: the torrent_id :type torrent_id: string """ - self.torrent_id = torrent_id + self._args = [torrent_id] class TorrentFileCompletedEvent(DelugeEvent): """ @@ -213,8 +188,6 @@ class TorrentFileCompletedEvent(DelugeEvent): This will only work with libtorrent 0.15 or greater. """ - __slots__ = ('torrent_id', 'index') - def __init__(self, torrent_id, index): """ :param torrent_id: the torrent_id @@ -222,75 +195,60 @@ class TorrentFileCompletedEvent(DelugeEvent): :param index: the file index :type index: int """ - self.torrent_id = torrent_id - self.index = index + self._args = [torrent_id, index] class NewVersionAvailableEvent(DelugeEvent): """ Emitted when a more recent version of Deluge is available. """ - __slots__ = ('new_release',) - def __init__(self, new_release): """ :param new_release: the new version that is available :type new_release: string """ - self.new_release = new_release + self._args = [new_release] class SessionStartedEvent(DelugeEvent): """ Emitted when a session has started. This typically only happens once when the daemon is initially started. """ + pass class SessionPausedEvent(DelugeEvent): """ Emitted when the session has been paused. """ + pass class SessionResumedEvent(DelugeEvent): """ Emitted when the session has been resumed. """ + pass class ConfigValueChangedEvent(DelugeEvent): """ Emitted when a config value changes in the Core. """ - __slots__ = ('key', 'value') - def __init__(self, key, value): """ :param key: the key that changed :type key: string :param value: the new value of the `:param:key` """ - self.key = key - self.value = value + self._args = [key, value] class PluginEnabledEvent(DelugeEvent): """ Emitted when a plugin is enabled in the Core. """ - __slots__ = ('plugin_name',) - - def __init__(self, plugin_name): - """ - :param plugin_name: the plugin name - :type plugin_name: string - """ - self.plugin_name = plugin_name + def __init__(self, name): + self._args = [name] class PluginDisabledEvent(DelugeEvent): """ Emitted when a plugin is disabled in the Core. """ - __slots__ = ('plugin_name',) - - def __init__(self, plugin_name): - """ - :param plugin_name: the plugin name - :type plugin_name: string - """ - self.plugin_name = plugin_name + def __init__(self, name): + self._args = [name] diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 9852b2998..1a45e7d19 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -45,7 +45,7 @@ import zlib import deluge.common import deluge.component as component -from deluge.event import known_events +from deluge.log import LOG as log if deluge.common.windows_check(): import win32api @@ -166,14 +166,13 @@ class DelugeRPCProtocol(Protocol): message_type = request[0] if message_type == RPC_EVENT: - event_name = request[1] + event = request[1] #log.debug("Received RPCEvent: %s", event) # A RPCEvent was received from the daemon so run any handlers # associated with it. - if event_name in self.factory.event_handlers: - event = known_events[event_name](*request[2]) - for handler in self.factory.event_handlers[event_name]: - reactor.callLater(0, handler, event.copy()) + if event in self.factory.event_handlers: + for handler in self.factory.event_handlers[event]: + reactor.callLater(0, handler, *request[2]) continue request_id = request[1] diff --git a/deluge/ui/console/eventlog.py b/deluge/ui/console/eventlog.py index 351186dd8..162bb3ff2 100644 --- a/deluge/ui/console/eventlog.py +++ b/deluge/ui/console/eventlog.py @@ -62,53 +62,53 @@ class EventLog(component.Component): client.register_event_handler("PluginEnabledEvent", self.on_plugin_enabled_event) client.register_event_handler("PluginDisabledEvent", self.on_plugin_disabled_event) - def on_torrent_added_event(self, event): + def on_torrent_added_event(self, torrent_id, from_state): def on_torrent_status(status): self.console.write(self.prefix + "TorrentAdded(from_state=%s): {!info!}%s (%s)" % ( - event.from_state, status["name"], event.torrent_id) + from_state, status["name"], torrent_id) ) - client.core.get_torrent_status(event.torrent_id, ["name"]).addCallback(on_torrent_status) + client.core.get_torrent_status(torrent_id, ["name"]).addCallback(on_torrent_status) - def on_torrent_removed_event(self, event): + def on_torrent_removed_event(self, torrent_id): self.console.write(self.prefix + "TorrentRemoved: {!info!}%s (%s)" % - (self.console.get_torrent_name(event.torrent_id), event.torrent_id)) + (self.console.get_torrent_name(torrent_id), torrent_id)) - def on_torrent_state_changed_event(self, event): + def on_torrent_state_changed_event(self, torrent_id, state): # Modify the state string color - if event.state in colors.state_color: - state = colors.state_color[event.state] + event.state + if state in colors.state_color: + state = colors.state_color[state] + state self.console.write(self.prefix + "TorrentStateChanged: %s {!info!}%s (%s)" % - (state, self.console.get_torrent_name(event.torrent_id), event.torrent_id)) + (state, self.console.get_torrent_name(torrent_id), torrent_id)) - def on_torrent_paused_event(self, event): + def on_torrent_paused_event(self, torrent_id): self.console.write(self.prefix + "TorrentPaused: {!info!}%s (%s)" % - (self.console.get_torrent_name(event.torrent_id), event.torrent_id)) + (self.console.get_torrent_name(torrent_id), torrent_id)) - def on_torrent_finished_event(self, event): + def on_torrent_finished_event(self, torrent_id): self.console.write(self.prefix + "TorrentFinished: {!info!}%s (%s)" % - (self.console.get_torrent_name(event.torrent_id), event.torrent_id)) + (self.console.get_torrent_name(torrent_id), torrent_id)) - def on_new_version_available_event(self, event): + def on_new_version_available_event(self, version): self.console.write(self.prefix + "NewVersionAvailable: {!info!}%s" % - (event.new_release)) + (version)) - def on_session_paused_event(self, event): + def on_session_paused_event(self): self.console.write(self.prefix + "SessionPaused") - def on_session_resumed_event(self, event): + def on_session_resumed_event(self): self.console.write(self.prefix + "SessionResumed") - def on_config_value_changed_event(self, event): + def on_config_value_changed_event(self, key, value): color = "{!white,black,bold!}" - if type(event.value) in colors.type_color: - color = colors.type_color[type(event.value)] + if type(value) in colors.type_color: + color = colors.type_color[type(value)] self.console.write(self.prefix + "ConfigValueChanged: {!input!}%s: %s%s" % - (event.key, color, event.value)) + (key, color, value)) - def on_plugin_enabled_event(self, event): - self.console.write(self.prefix + "PluginEnabled: {!info!}%s" % event.plugin_name) + def on_plugin_enabled_event(self, name): + self.console.write(self.prefix + "PluginEnabled: {!info!}%s" % name) - def on_plugin_disabled_event(self, event): - self.console.write(self.prefix + "PluginDisabled: {!info!}%s" % event.plugin_name) + def on_plugin_disabled_event(self, name): + self.console.write(self.prefix + "PluginDisabled: {!info!}%s" % name) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 8114dbb8a..7d5e1a91a 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -34,28 +34,24 @@ # # -import os -import sys -import logging +import os, sys import optparse import shlex import locale from twisted.internet import defer, reactor +from deluge.ui.console import UI_PATH import deluge.component as component from deluge.ui.client import client import deluge.common from deluge.ui.coreconfig import CoreConfig -from deluge.ui.sessionproxy import SessionProxy from deluge.ui.console.statusbars import StatusBars from deluge.ui.console.eventlog import EventLog -#import screen +import screen import colors +from deluge.log import LOG as log from deluge.ui.ui import _UI -from deluge.ui.console import UI_PATH - -log = logging.getLogger(__name__) class Console(_UI): @@ -63,62 +59,16 @@ class Console(_UI): def __init__(self): super(Console, self).__init__("console") - group = optparse.OptionGroup(self.parser, "Console Options","These options control how " - "the console connects to the daemon. These options will be " - "used if you pass a command, or if you have autoconnect " - "enabled for the console ui.") + cmds = load_commands(os.path.join(UI_PATH, 'commands')) - group.add_option("-d","--daemon",dest="daemon_addr", - action="store",type="str",default="127.0.0.1", - help="Set the address of the daemon to connect to." - " [default: %default]") - group.add_option("-p","--port",dest="daemon_port", - help="Set the port to connect to the daemon on. [default: %default]", - action="store",type="int",default=58846) - group.add_option("-u","--username",dest="daemon_user", - help="Set the username to connect to the daemon with. [default: %default]", - action="store",type="string") - group.add_option("-P","--password",dest="daemon_pass", - help="Set the password to connect to the daemon with. [default: %default]", - action="store",type="string") + group = optparse.OptionGroup(self.parser, "Console Commands", + "\n".join(cmds.keys())) self.parser.add_option_group(group) - self.cmds = load_commands(os.path.join(UI_PATH, 'commands')) - class CommandOptionGroup(optparse.OptionGroup): - def __init__(self, parser, title, description=None, cmds = None): - optparse.OptionGroup.__init__(self,parser,title,description) - self.cmds = cmds - - def format_help(self, formatter): - result = formatter.format_heading(self.title) - formatter.indent() - if self.description: - result += "%s\n"%formatter.format_description(self.description) - for cname in self.cmds: - cmd = self.cmds[cname] - if cmd.interactive_only or cname in cmd.aliases: continue - allnames = [cname] - allnames.extend(cmd.aliases) - cname = "/".join(allnames) - result += formatter.format_heading(" - ".join([cname,cmd.__doc__])) - formatter.indent() - result += "%*s%s\n" % (formatter.current_indent, "", cmd.usage) - formatter.dedent() - formatter.dedent() - return result - cmd_group = CommandOptionGroup(self.parser, "Console Commands", - description="The following commands can be issued at the " - "command line. Commands should be quoted, so, for example, " - "to pause torrent with id 'abc' you would run: '%s " - "\"pause abc\"'"%os.path.basename(sys.argv[0]), - cmds=self.cmds) - self.parser.add_option_group(cmd_group) - def start(self): super(Console, self).start() - ConsoleUI(self.args,self.cmds,(self.options.daemon_addr, - self.options.daemon_port,self.options.daemon_user, - self.options.daemon_pass)) + + ConsoleUI(self.args) def start(): Console().start() @@ -139,11 +89,9 @@ class OptionParser(optparse.OptionParser): """ raise Exception(msg) - class BaseCommand(object): usage = 'usage' - interactive_only = False option_list = tuple() aliases = [] @@ -171,7 +119,6 @@ class BaseCommand(object): epilog = self.epilog, option_list = self.option_list) - def load_commands(command_dir, exclude=[]): def get_command(name): return getattr(__import__('deluge.ui.console.commands.%s' % name, {}, {}, ['Command']), 'Command')() @@ -192,13 +139,11 @@ def load_commands(command_dir, exclude=[]): except OSError, e: return {} - class ConsoleUI(component.Component): - def __init__(self, args=None, cmds = None, daemon = None): + def __init__(self, args=None): component.Component.__init__(self, "ConsoleUI", 2) - # keep track of events for the log view - self.events = [] + self.batch_write = False try: locale.setlocale(locale.LC_ALL, '') @@ -207,10 +152,8 @@ class ConsoleUI(component.Component): self.encoding = sys.getdefaultencoding() log.debug("Using encoding: %s", self.encoding) - - - # start up the session proxy - self.sessionproxy = SessionProxy() + # Load all the commands + self._commands = load_commands(os.path.join(UI_PATH, 'commands')) client.set_disconnect_callback(self.on_client_disconnect) @@ -219,18 +162,30 @@ class ConsoleUI(component.Component): if args: args = args[0] self.interactive = False - if not cmds: - print "Sorry, couldn't find any commands" - return - else: - self._commands = cmds - from commander import Commander - cmdr = Commander(cmds) - if daemon: - cmdr.exec_args(args,*daemon) - else: - cmdr.exec_args(args,None,None,None,None) - + + # Try to connect to the localhost daemon + def on_connect(result): + def on_started(result): + if not self.interactive: + def on_started(result): + deferreds = [] + # If we have args, lets process them and quit + # allow multiple commands split by ";" + for arg in args.split(";"): + deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) + + def on_complete(result): + self.do_command("quit") + + dl = defer.DeferredList(deferreds).addCallback(on_complete) + + # We need to wait for the rpcs in start() to finish before processing + # any of the commands. + self.started_deferred.addCallback(on_started) + component.start().addCallback(on_started) + + d = client.connect() + d.addCallback(on_connect) self.coreconfig = CoreConfig() if self.interactive and not deluge.common.windows_check(): @@ -239,13 +194,8 @@ class ConsoleUI(component.Component): import curses.wrapper curses.wrapper(self.run) elif self.interactive and deluge.common.windows_check(): - print """\nDeluge-console does not run in interactive mode on Windows. \n -Please use commands from the command line, eg:\n - deluge-console.exe help - deluge-console.exe info - deluge-console.exe "add --help" - deluge-console.exe "add -p c:\\mytorrents c:\\new.torrent" - """ + print "You cannot run the deluge-console in interactive mode in Windows.\ + Please use commands from the command line, eg: deluge-console config;help;exit" else: reactor.run() @@ -260,9 +210,8 @@ Please use commands from the command line, eg:\n # We want to do an interactive session, so start up the curses screen and # pass it the function that handles commands colors.init_colors() + self.screen = screen.Screen(stdscr, self.do_command, self.tab_completer, self.encoding) self.statusbars = StatusBars() - from modes.connectionmanager import ConnectionManager - self.screen = ConnectionManager(stdscr, self.encoding) self.eventlog = EventLog() self.screen.topbar = "{!status!}Deluge " + deluge.common.get_version() + " Console" @@ -276,22 +225,202 @@ Please use commands from the command line, eg:\n # Start the twisted mainloop reactor.run() - def start(self): + # This gets fired once we have received the torrents list from the core + self.started_deferred = defer.Deferred() + # Maintain a list of (torrent_id, name) for use in tab completion self.torrents = [] - if not self.interactive: - self.started_deferred = defer.Deferred() - def on_session_state(result): - def on_torrents_status(torrents): - for torrent_id, status in torrents.items(): - self.torrents.append((torrent_id, status["name"])) - self.started_deferred.callback(True) + def on_session_state(result): + def on_torrents_status(torrents): + for torrent_id, status in torrents.items(): + self.torrents.append((torrent_id, status["name"])) + self.started_deferred.callback(True) - client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) - client.core.get_session_state().addCallback(on_session_state) + client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) + client.core.get_session_state().addCallback(on_session_state) + + # Register some event handlers to keep the torrent list up-to-date + client.register_event_handler("TorrentAddedEvent", self.on_torrent_added_event) + client.register_event_handler("TorrentRemovedEvent", self.on_torrent_removed_event) + + def update(self): + pass + + def set_batch_write(self, batch): + """ + When this is set the screen is not refreshed after a `:meth:write` until + this is set to False. + + :param batch: set True to prevent screen refreshes after a `:meth:write` + :type batch: bool + + """ + self.batch_write = batch + if not batch and self.interactive: + self.screen.refresh() + + def write(self, line): + """ + Writes a line out depending on if we're in interactive mode or not. + + :param line: str, the line to print + + """ + if self.interactive: + self.screen.add_line(line, not self.batch_write) + else: + print(colors.strip_colors(line)) + + def do_command(self, cmd): + """ + Processes a command. + + :param cmd: str, the command string + + """ + if not cmd: + return + cmd, _, line = cmd.partition(' ') + try: + parser = self._commands[cmd].create_parser() + except KeyError: + self.write("{!error!}Unknown command: %s" % cmd) + return + args = self._commands[cmd].split(line) + + # Do a little hack here to print 'command --help' properly + parser._print_help = parser.print_help + def print_help(f=None): + if self.interactive: + self.write(parser.format_help()) + else: + parser._print_help(f) + parser.print_help = print_help + + # Only these commands can be run when not connected to a daemon + not_connected_cmds = ["help", "connect", "quit"] + aliases = [] + for c in not_connected_cmds: + aliases.extend(self._commands[c].aliases) + not_connected_cmds.extend(aliases) + + if not client.connected() and cmd not in not_connected_cmds: + self.write("{!error!}Not connected to a daemon, please use the connect command first.") + return + + try: + options, args = parser.parse_args(args) + except Exception, e: + self.write("{!error!}Error parsing options: %s" % e) + return + + if not getattr(options, '_exit', False): + try: + ret = self._commands[cmd].handle(*args, **options.__dict__) + except Exception, e: + self.write("{!error!}" + str(e)) + log.exception(e) + import traceback + self.write("%s" % traceback.format_exc()) + return defer.succeed(True) + else: + return ret + + def tab_completer(self, line, cursor, second_hit): + """ + Called when the user hits 'tab' and will autocomplete or show options. + If a command is already supplied in the line, this function will call the + complete method of the command. + + :param line: str, the current input string + :param cursor: int, the cursor position in the line + :param second_hit: bool, if this is the second time in a row the tab key + has been pressed + + :returns: 2-tuple (string, cursor position) + + """ + # First check to see if there is no space, this will mean that it's a + # command that needs to be completed. + if " " not in line: + possible_matches = [] + # Iterate through the commands looking for ones that startwith the + # line. + for cmd in self._commands: + if cmd.startswith(line): + possible_matches.append(cmd + " ") + + line_prefix = "" + else: + cmd = line.split(" ")[0] + if cmd in self._commands: + # Call the command's complete method to get 'er done + possible_matches = self._commands[cmd].complete(line.split(" ")[-1]) + line_prefix = " ".join(line.split(" ")[:-1]) + " " + else: + # This is a bogus command + return (line, cursor) + + # No matches, so just return what we got passed + if len(possible_matches) == 0: + return (line, cursor) + # If we only have 1 possible match, then just modify the line and + # return it, else we need to print out the matches without modifying + # the line. + elif len(possible_matches) == 1: + new_line = line_prefix + possible_matches[0] + return (new_line, len(new_line)) + else: + if second_hit: + # Only print these out if it's a second_hit + self.write(" ") + for match in possible_matches: + self.write(match) + else: + p = " ".join(line.split(" ")[:-1]) + new_line = " ".join([p, os.path.commonprefix(possible_matches)]) + if len(new_line) > len(line): + line = new_line + cursor = len(line) + return (line, cursor) + + def tab_complete_torrent(self, line): + """ + Completes torrent_ids or names. + + :param line: str, the string to complete + + :returns: list of matches + + """ + + possible_matches = [] + + # Find all possible matches + for torrent_id, torrent_name in self.torrents: + if torrent_id.startswith(line): + possible_matches.append(torrent_id + " ") + if torrent_name.startswith(line): + possible_matches.append(torrent_name + " ") + + return possible_matches + + def get_torrent_name(self, torrent_id): + """ + Gets a torrent name from the torrents list. + + :param torrent_id: str, the torrent_id + + :returns: the name of the torrent or None + """ + + for tid, name in self.torrents: + if torrent_id == tid: + return name + + return None - def match_torrent(self, string): """ Returns a list of torrent_id matches for the string. It will search both @@ -310,33 +439,15 @@ Please use commands from the command line, eg:\n return ret + def on_torrent_added_event(self, event): + def on_torrent_status(status): + self.torrents.append((event.torrent_id, status["name"])) + client.core.get_torrent_status(event.torrent_id, ["name"]).addCallback(on_torrent_status) - def get_torrent_name(self, torrent_id): - if self.interactive and hasattr(self.screen,"get_torrent_name"): - return self.screen.get_torrent_name(torrent_id) - - for tid, name in self.torrents: - if torrent_id == tid: - return name - - return None - - - def set_batch_write(self, batch): - # only kept for legacy reasons, don't actually do anything - pass - - def set_mode(self, mode): - reactor.removeReader(self.screen) - self.screen = mode - self.statusbars.screen = self.screen - reactor.addReader(self.screen) + def on_torrent_removed_event(self, event): + for index, (tid, name) in enumerate(self.torrents): + if event.torrent_id == tid: + del self.torrents[index] def on_client_disconnect(self): component.stop() - - def write(self, s): - if self.interactive: - self.events.append(s) - else: - print colors.strip_colors(s) diff --git a/deluge/ui/coreconfig.py b/deluge/ui/coreconfig.py index fe002e64a..6120dcfa8 100644 --- a/deluge/ui/coreconfig.py +++ b/deluge/ui/coreconfig.py @@ -45,8 +45,8 @@ class CoreConfig(component.Component): log.debug("CoreConfig init..") component.Component.__init__(self, "CoreConfig") self.config = {} - def on_configvaluechanged_event(event): - self.config[event.key] = event.value + def on_configvaluechanged_event(key, value): + self.config[key] = value client.register_event_handler("ConfigValueChangedEvent", on_configvaluechanged_event) def start(self): diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py index b182618f7..10b15bda8 100644 --- a/deluge/ui/gtkui/files_tab.py +++ b/deluge/ui/gtkui/files_tab.py @@ -627,34 +627,34 @@ class FilesTab(Tab): def _on_filename_editing_canceled(self, renderer): self._editing_index = None - def _on_torrentfilerenamed_event(self, event): - log.debug("index: %s name: %s", event.index, event.filename) + def _on_torrentfilerenamed_event(self, torrent_id, index, name): + log.debug("index: %s name: %s", index, name) - if event.torrent_id not in self.files_list: + if torrent_id not in self.files_list: return - old_name = self.files_list[event.torrent_id][event.index]["path"] - self.files_list[event.torrent_id][event.index]["path"] = event.filename + old_name = self.files_list[torrent_id][index]["path"] + self.files_list[torrent_id][index]["path"] = name # We need to update the filename displayed if we're currently viewing # this torrents files. - if event.torrent_id == self.torrent_id: + if torrent_id == self.torrent_id: old_name_len = len(old_name.split("/")) - name_len = len(event.filename.split("/")) + name_len = len(name.split("/")) if old_name_len != name_len: # The parent path list changes depending on which way the file # is moving in the tree if old_name_len < name_len: parent_path = [o for o in old_name.split("/")[:-1]] else: - parent_path = [o for o in event.filename.split("/")[:-1]] + parent_path = [o for o in name.split("/")[:-1]] # Find the iter to the parent folder we need to add a new folder # to. def find_parent(model, path, itr, user_data): if model[itr][0] == parent_path[0] + "/": if len(parent_path) == 1: # This is the parent iter - to_create = event.filename.split("/")[len(old_name.split("/")[:-1]):-1] + to_create = name.split("/")[len(old_name.split("/")[:-1]):-1] parent_iter = itr for tc in to_create: @@ -673,8 +673,8 @@ class FilesTab(Tab): # Find the iter for the file that needs to be moved def get_file_iter(model, path, itr, user_data): - if model[itr][5] == event.index: - model[itr][0] = event.filename.split("/")[-1] + if model[itr][5] == index: + model[itr][0] = name.split("/")[-1] t = self.treestore.append( parent_iter, self.treestore.get(itr, @@ -693,7 +693,7 @@ class FilesTab(Tab): if parent_path: self.treestore.foreach(find_parent, None) else: - new_folders = event.filename.split("/")[:-1] + new_folders = name.split("/")[:-1] parent_iter = None for f in new_folders: parent_iter = self.treestore.append(parent_iter, @@ -707,8 +707,8 @@ class FilesTab(Tab): else: # This is just changing a filename without any folder changes def set_file_name(model, path, itr, user_data): - if model[itr][5] == event.index: - model[itr][0] = os.path.split(event.filename)[-1] + if model[itr][5] == index: + model[itr][0] = os.path.split(name)[-1] return True self.treestore.foreach(set_file_name, None) @@ -754,40 +754,40 @@ class FilesTab(Tab): self.treestore.remove(itr) itr = parent - def _on_torrentfolderrenamed_event(self, event): + def _on_torrentfolderrenamed_event(self, torrent_id, old_folder, new_folder): log.debug("on_torrent_folder_renamed_signal") - log.debug("old_folder: %s new_folder: %s", event.old, event.new) + log.debug("old_folder: %s new_folder: %s", old_folder, new_folder) - if event.torrent_id not in self.files_list: + if torrent_id not in self.files_list: return - if event.old[-1] != "/": - event.old += "/" - if event.new[-1] != "/": - event.new += "/" + if old_folder[-1] != "/": + old_folder += "/" + if new_folder[-1] != "/": + new_folder += "/" - for fd in self.files_list[event.torrent_id]: - if fd["path"].startswith(event.old): - fd["path"] = fd["path"].replace(event.old, event.new, 1) + for fd in self.files_list[torrent_id]: + if fd["path"].startswith(old_folder): + fd["path"] = fd["path"].replace(old_folder, new_folder, 1) - if event.torrent_id == self.torrent_id: + if torrent_id == self.torrent_id: - old_split = event.old.split("/") + old_split = old_folder.split("/") try: old_split.remove("") except: pass - new_split = event.new.split("/") + new_split = new_folder.split("/") try: new_split.remove("") except: pass - old_folder_iter = self.get_iter_at_path(event.old) + old_folder_iter = self.get_iter_at_path(old_folder) old_folder_iter_parent = self.treestore.iter_parent(old_folder_iter) - new_folder_iter = self.get_iter_at_path(event.new) + new_folder_iter = self.get_iter_at_path(new_folder) if len(new_split) == len(old_split): # These are at the same tree depth, so it's a simple rename self.treestore[old_folder_iter][0] = new_split[-1] + "/" @@ -807,9 +807,9 @@ class FilesTab(Tab): # and if so, we delete it self.remove_childless_folders(old_folder_iter_parent) - def _on_torrentremoved_event(self, event): - if event.torrent_id in self.files_list: - del self.files_list[event.torrent_id] + def _on_torrentremoved_event(self, torrent_id): + if torrent_id in self.files_list: + del self.files_list[torrent_id] def _on_drag_data_get_data(self, treeview, context, selection, target_id, etime): paths = self.listview.get_selection().get_selected_rows()[1] diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index bc582c439..12fa5a96d 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -247,11 +247,11 @@ class MainWindow(component.Component): else: self.window.set_title("Deluge") - def on_newversionavailable_event(self, event): + def on_newversionavailable_event(self, new_version): if self.config["show_new_releases"]: from deluge.ui.gtkui.new_release_dialog import NewReleaseDialog - reactor.callLater(5.0, NewReleaseDialog().show, event.new_release) + reactor.callLater(5.0, NewReleaseDialog().show, new_version) - def on_torrentfinished_event(self, event): + def on_torrentfinished_event(self, torrent_id): from deluge.ui.gtkui.notification import Notification - Notification().notify(event.torrent_id) + Notification().notify(torrent_id) diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index ce80e5463..901e6b3c6 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -230,11 +230,11 @@ class MenuBar(component.Component): return sep ### Callbacks ### - def on_torrentstatechanged_event(self, event): - if event.state == "Paused": + def on_torrentstatechanged_event(self, torrent_id, state): + if state == "Paused": self.update_menu() - def on_torrentresumed_event(self, event): + def on_torrentresumed_event(self, torrent_id): self.update_menu() def on_sessionpaused_event(self): diff --git a/deluge/ui/gtkui/pluginmanager.py b/deluge/ui/gtkui/pluginmanager.py index 8c4ffdc88..b5169977d 100644 --- a/deluge/ui/gtkui/pluginmanager.py +++ b/deluge/ui/gtkui/pluginmanager.py @@ -91,11 +91,11 @@ class PluginManager(deluge.pluginmanagerbase.PluginManagerBase, for plugin in enabled_plugins: self.enable_plugin(plugin) - def _on_plugin_enabled_event(self, event): - self.enable_plugin(event.plugin_name) + def _on_plugin_enabled_event(self, name): + self.enable_plugin(name) - def _on_plugin_disabled_event(self, event): - self.disable_plugin(event.plugin_name) + def _on_plugin_disabled_event(self, name): + self.disable_plugin(name) ## Hook functions def run_on_show_prefs(self): diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py index 52f8c7fb5..60202a213 100644 --- a/deluge/ui/gtkui/statusbar.py +++ b/deluge/ui/gtkui/statusbar.py @@ -288,14 +288,14 @@ class StatusBar(component.Component): client.core.get_session_status(keys).addCallback(self._on_get_session_status) client.core.get_free_space().addCallback(self._on_get_free_space) - def on_configvaluechanged_event(self, event): + def on_configvaluechanged_event(self, key, value): """ This is called when we receive a ConfigValueChangedEvent from the core. """ - if event.key in self.config_value_changed_dict.keys(): - self.config_value_changed_dict[event.key](event.value) + if key in self.config_value_changed_dict.keys(): + self.config_value_changed_dict[key](value) def _on_max_connections_global(self, max_connections): self.max_connections = max_connections diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 265846c3f..c4bce4928 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -210,12 +210,12 @@ class SystemTray(component.Component): "payload_upload_rate", "payload_download_rate"]).addCallback(self._on_get_session_status) - def config_value_changed(self, event): + def config_value_changed(self, key, value): """This is called when we received a config_value_changed signal from the core.""" - if event.key in self.config_value_changed_dict.keys(): - self.config_value_changed_dict[event.key](event.value) + if key in self.config_value_changed_dict.keys(): + self.config_value_changed_dict[key](value) def _on_max_download_speed(self, max_download_speed): if self.max_download_speed != max_download_speed: diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 4f71a8aca..659010f05 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -521,31 +521,31 @@ class TorrentView(listview.ListView, component.Component): def on_drag_drop(self, widget, drag_context, x, y, timestamp): widget.stop_emission("drag-drop") - def on_torrentadded_event(self, event): - self.add_row(event.torrent_id) - self.mark_dirty(event.torrent_id) + def on_torrentadded_event(self, torrent_id, from_state): + self.add_row(torrent_id) + self.mark_dirty(torrent_id) - def on_torrentremoved_event(self, event): - self.remove_row(event.torrent_id) + def on_torrentremoved_event(self, torrent_id): + self.remove_row(torrent_id) - def on_torrentstatechanged_event(self, event): + def on_torrentstatechanged_event(self, torrent_id, state): # Update the torrents state for row in self.liststore: - if not event.torrent_id == row[self.columns["torrent_id"].column_indices[0]]: + if not torrent_id == row[self.columns["torrent_id"].column_indices[0]]: continue - row[self.get_column_index(_("Progress"))[1]] = event.state + row[self.get_column_index(_("Progress"))[1]] = state - self.mark_dirty(event.torrent_id) + self.mark_dirty(torrent_id) - def on_sessionpaused_event(self, event): + def on_sessionpaused_event(self): self.mark_dirty() self.update() - def on_sessionresumed_event(self, event): + def on_sessionresumed_event(self): self.mark_dirty() self.update() - def on_torrentqueuechanged_event(self, event): + def on_torrentqueuechanged_event(self): self.mark_dirty() self.update() diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py index 4fc53d85b..f14a05a7c 100644 --- a/deluge/ui/sessionproxy.py +++ b/deluge/ui/sessionproxy.py @@ -236,21 +236,21 @@ class SessionProxy(component.Component): d = client.core.get_torrents_status(filter_dict, keys, True) return d.addCallback(on_status, None, keys) - def on_torrent_state_changed(self, event): - if event.torrent_id in self.torrents: - self.torrents[event.torrent_id][1]["state"] = event.state - self.cache_times[event.torrent_id]["state"] = time.time() + def on_torrent_state_changed(self, torrent_id, state): + if torrent_id in self.torrents: + self.torrents[torrent_id][1]["state"] = state + self.cache_times[torrent_id]["state"] = time.time() - def on_torrent_added(self, event): - self.torrents[event.torrent_id] = [time.time() - self.cache_time - 1, {}] - self.cache_times[event.torrent_id] = {} + def on_torrent_added(self, torrent_id, from_state): + self.torrents[torrent_id] = [time.time() - self.cache_time - 1, {}] + self.cache_times[torrent_id] = {} def on_status(status): - self.torrents[event.torrent_id][1].update(status) + self.torrents[torrent_id][1].update(status) t = time.time() for key in status: - self.cache_times[event.torrent_id][key] = t - client.core.get_torrent_status(event.torrent_id, []).addCallback(on_status) + self.cache_times[torrent_id][key] = t + client.core.get_torrent_status(torrent_id, []).addCallback(on_status) - def on_torrent_removed(self, event): - del self.torrents[event.torrent_id] - del self.cache_times[event.torrent_id] + def on_torrent_removed(self, torrent_id): + del self.torrents[torrent_id] + del self.cache_times[torrent_id] diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py index ec4c61c58..d247e0729 100644 --- a/deluge/ui/web/pluginmanager.py +++ b/deluge/ui/web/pluginmanager.py @@ -58,26 +58,26 @@ def gather_info(plugin): "debug_scripts": debug_scripts, "script_directories": directories } - + class PluginManager(PluginManagerBase, component.Component): def __init__(self): component.Component.__init__(self, "Web.PluginManager") self.config = ConfigManager("web.conf") PluginManagerBase.__init__(self, "web.conf", "deluge.plugin.web") - + client.register_event_handler("PluginEnabledEvent", self._on_plugin_enabled_event) client.register_event_handler("PluginDisabledEvent", self._on_plugin_disabled_event) - + def _on_get_enabled_plugins(self, plugins): for plugin in plugins: self.enable_plugin(plugin) + + def _on_plugin_enabled_event(self, name): + self.enable_plugin(name) - def _on_plugin_enabled_event(self, event): - self.enable_plugin(event.plugin_name) - - def _on_plugin_disabled_event(self, event): - self.disable_plugin(event.plugin_name) - + def _on_plugin_disabled_event(self, name): + self.disable_plugin(name) + def disable_plugin(self, name): # Get the plugin instance try: @@ -85,31 +85,31 @@ class PluginManager(PluginManagerBase, component.Component): except KeyError: log.info("Plugin has no web ui") return - + info = gather_info(plugin) scripts = component.get("Scripts") for script in info["scripts"]: scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower())) - + for script in info["debug_scripts"]: scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower()), "debug") scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower()), "dev") - + super(PluginManager, self).disable_plugin(name) - + def enable_plugin(self, name): super(PluginManager, self).enable_plugin(name) - + # Get the plugin instance try: plugin = component.get("WebPlugin." + name) except KeyError: log.info("Plugin has no web ui") return - + info = gather_info(plugin) - + scripts = component.get("Scripts") for script in info["scripts"]: log.debug("adding script %s for %s", name, os.path.basename(script)) @@ -127,16 +127,16 @@ class PluginManager(PluginManagerBase, component.Component): # Update the enabled plugins from the core d = client.core.get_enabled_plugins() d.addCallback(self._on_get_enabled_plugins) - + def stop(self): """ Stop the plugin manager """ self.disable_plugins() - + def update(self): pass - + def get_plugin_resources(self, name): # Get the plugin instance try: From 64e38eac20423ad19ed79ef623b21e459c8b473d Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 23 Feb 2011 11:01:59 -0800 Subject: [PATCH 109/329] Revert "Fixed "PluginEnabledEvent" and "PluginDisabledEvent" the argument cannot be called name since that should contain the event name." This reverts commit 078ed6ba71d431b5321ce6de360e17c6c9757451. --- deluge/event.py | 9 +-- deluge/plugins/autoadd/autoadd/core.py | 24 +++---- deluge/plugins/autoadd/autoadd/gtkui.py | 66 +++++++++---------- deluge/plugins/execute/execute/core.py | 24 +++---- deluge/plugins/execute/execute/gtkui.py | 12 ++-- deluge/plugins/extractor/extractor/core.py | 20 +++--- deluge/plugins/freespace/freespace/core.py | 16 ++--- deluge/plugins/freespace/freespace/gtkui.py | 14 ++-- deluge/plugins/label/label/core.py | 12 ++-- .../notifications/notifications/core.py | 4 +- deluge/plugins/scheduler/scheduler/core.py | 7 +- deluge/plugins/scheduler/scheduler/gtkui.py | 4 +- deluge/ui/web/pluginmanager.py | 2 +- 13 files changed, 105 insertions(+), 109 deletions(-) diff --git a/deluge/event.py b/deluge/event.py index 14e13940b..23027673f 100644 --- a/deluge/event.py +++ b/deluge/event.py @@ -243,12 +243,13 @@ class PluginEnabledEvent(DelugeEvent): """ Emitted when a plugin is enabled in the Core. """ - def __init__(self, name): - self._args = [name] + def __init__(self, plugin_name): + self._args = [plugin_name] class PluginDisabledEvent(DelugeEvent): """ Emitted when a plugin is disabled in the Core. """ - def __init__(self, name): - self._args = [name] + def __init__(self, plugin_name): + self._args = [plugin_name] + diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py index 4f48a9799..99c0d3a28 100644 --- a/deluge/plugins/autoadd/autoadd/core.py +++ b/deluge/plugins/autoadd/autoadd/core.py @@ -59,7 +59,7 @@ OPTIONS_AVAILABLE = { #option: builtin "enabled":False, "path":False, "append_extension":False, - "abspath":False, + "abspath":False, "download_location":True, "max_download_speed":True, "max_upload_speed":True, @@ -81,6 +81,8 @@ MAX_NUM_ATTEMPTS = 10 class AutoaddOptionsChangedEvent(DelugeEvent): """Emitted when the options for the plugin are changed.""" + def __init__(self): + pass def CheckInput(cond, message): if not cond: @@ -88,7 +90,7 @@ def CheckInput(cond, message): class Core(CorePluginBase): def enable(self): - + #reduce typing, assigning some values to self... self.config = deluge.configmanager.ConfigManager("autoadd.conf", DEFAULT_PREFS) self.watchdirs = self.config["watchdirs"] @@ -127,7 +129,7 @@ class Core(CorePluginBase): def update(self): pass - + @export() def set_options(self, watchdir_id, options): """Update the options for a watch folder.""" @@ -147,14 +149,14 @@ class Core(CorePluginBase): #disable the watch loop if it was active if watchdir_id in self.update_timers: self.disable_watchdir(watchdir_id) - + self.watchdirs[watchdir_id].update(options) #re-enable watch loop if appropriate if self.watchdirs[watchdir_id]['enabled']: self.enable_watchdir(watchdir_id) self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) - + def load_torrent(self, filename): try: log.debug("Attempting to open %s for add.", filename) @@ -171,7 +173,7 @@ class Core(CorePluginBase): info = lt.torrent_info(lt.bdecode(filedump)) return filedump - + def update_watchdir(self, watchdir_id): """Check the watch folder for new torrents to add.""" watchdir_id = str(watchdir_id) @@ -185,7 +187,7 @@ class Core(CorePluginBase): log.warning("Invalid AutoAdd folder: %s", watchdir["abspath"]) self.disable_watchdir(watchdir_id) return - + # Generate options dict for watchdir opts = {} if 'stop_at_ratio_toggle' in watchdir: @@ -246,7 +248,7 @@ class Core(CorePluginBase): """Disables any watch folders with unhandled exceptions.""" self.disable_watchdir(watchdir_id) log.error("Disabling '%s', error during update: %s" % (self.watchdirs[watchdir_id]["path"], failure)) - + @export def enable_watchdir(self, watchdir_id): watchdir_id = str(watchdir_id) @@ -259,7 +261,7 @@ class Core(CorePluginBase): self.watchdirs[watchdir_id]['enabled'] = True self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) - + @export def disable_watchdir(self, watchdir_id): watchdir_id = str(watchdir_id) @@ -287,7 +289,7 @@ class Core(CorePluginBase): def get_config(self): """Returns the config dictionary.""" return self.config.config - + @export() def get_watchdirs(self): return self.watchdirs.keys() @@ -319,7 +321,7 @@ class Core(CorePluginBase): self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) return watchdir_id - + @export def remove(self, watchdir_id): """Remove a watch folder.""" diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py index 9ad27cb9f..e71fb3b2f 100644 --- a/deluge/plugins/autoadd/autoadd/gtkui.py +++ b/deluge/plugins/autoadd/autoadd/gtkui.py @@ -115,22 +115,22 @@ class OptionsDialog(): self.glade.get_widget(field+"_entry").show() self.glade.get_widget(field+"_chooser").hide() self.set_sensitive() - + def on_get_enabled_plugins(result): - if 'Label' in result: + if 'Label' in result: self.glade.get_widget('label_frame').show() else: self.glade.get_widget('label_frame').hide() self.glade.get_widget('label_toggle').set_active(False) - + client.core.get_enabled_plugins().addCallback(on_get_enabled_plugins) - + def set_sensitive(self): maintoggles = ['download_location', 'append_extension', 'move_completed', 'label', \ 'max_download_speed', 'max_upload_speed', 'max_connections', \ 'max_upload_slots', 'add_paused', 'auto_managed', 'stop_at_ratio', 'queue_to_top'] [self.on_toggle_toggled(self.glade.get_widget(x+'_toggle')) for x in maintoggles] - + def on_toggle_toggled(self, tb): toggle = str(tb.name).replace("_toggle", "") isactive = tb.get_active() @@ -168,29 +168,29 @@ class OptionsDialog(): self.glade.get_widget('stop_at_ratio').set_active(isactive) self.glade.get_widget('stop_ratio').set_sensitive(isactive) self.glade.get_widget('remove_at_ratio').set_sensitive(isactive) - + def on_apply(self, Event=None): client.autoadd.set_options(str(self.watchdir_id), self.generate_opts()).addCallbacks(self.on_added, self.on_error_show) - + def on_error_show(self, result): self.glade.get_widget('error_label').set_text(result.value.exception_msg) self.err_dialog = self.glade.get_widget('error_dialog') self.err_dialog.set_transient_for(self.dialog) result.cleanFailure() self.err_dialog.show() - + def on_added(self, result): self.dialog.destroy() - + def on_error_ok(self, Event=None): self.err_dialog.hide() - + def on_add(self, Event=None): client.autoadd.add(self.generate_opts()).addCallbacks(self.on_added, self.on_error_show) - + def on_cancel(self, Event=None): self.dialog.destroy() - + def generate_opts(self): # generate options dict based on gtk objects options = {} @@ -219,11 +219,11 @@ class OptionsDialog(): options[id] = self.glade.get_widget(id).get_active() options[id+'_toggle'] = self.glade.get_widget(id+'_toggle').get_active() return options - + class GtkUI(GtkPluginBase): def enable(self): - + self.glade = gtk.glade.XML(get_resource("config.glade")) self.glade.signal_autoconnect({ "on_add_button_clicked": self.on_add_button_clicked, @@ -231,18 +231,18 @@ class GtkUI(GtkPluginBase): "on_remove_button_clicked": self.on_remove_button_clicked }) self.opts_dialog = OptionsDialog() - + component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs) client.register_event_handler("AutoaddOptionsChangedEvent", self.on_options_changed_event) - + self.watchdirs = {} - + vbox = self.glade.get_widget("watchdirs_vbox") sw = gtk.ScrolledWindow() sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - + vbox.pack_start(sw, True, True, 0) self.store = self.create_model() @@ -258,28 +258,28 @@ class GtkUI(GtkPluginBase): component.get("Preferences").add_page("AutoAdd", self.glade.get_widget("prefs_box")) self.on_show_prefs() - + def disable(self): component.get("Preferences").remove_page("AutoAdd") component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs) - + def create_model(self): - + store = gtk.ListStore(str, bool, str) for watchdir_id, watchdir in self.watchdirs.iteritems(): store.append([watchdir_id, watchdir['enabled'], watchdir['path']]) return store - + def create_columns(self, treeView): rendererToggle = gtk.CellRendererToggle() column = gtk.TreeViewColumn("On", rendererToggle, activatable=True, active=1) - column.set_sort_column_id(1) + column.set_sort_column_id(1) treeView.append_column(column) tt = gtk.Tooltip() tt.set_text('Double-click to toggle') treeView.set_tooltip_cell(tt, None, None, rendererToggle) - + rendererText = gtk.CellRendererText() column = gtk.TreeViewColumn("Path", rendererText, text=2) column.set_sort_column_id(2) @@ -291,20 +291,20 @@ class GtkUI(GtkPluginBase): def load_watchdir_list(self): pass - + def add_watchdir_entry(self): pass - + def on_add_button_clicked(self, Event=None): #display options_window self.opts_dialog.show() - + def on_remove_button_clicked(self, Event=None): tree, tree_id = self.treeView.get_selection().get_selected() watchdir_id = str(self.store.get_value(tree_id, 0)) if watchdir_id: client.autoadd.remove(watchdir_id) - + def on_edit_button_clicked(self, Event=None, a=None, col=None): tree, tree_id = self.treeView.get_selection().get_selected() watchdir_id = str(self.store.get_value(tree_id, 0)) @@ -316,7 +316,7 @@ class GtkUI(GtkPluginBase): client.autoadd.enable_watchdir(watchdir_id) else: self.opts_dialog.show(self.watchdirs[watchdir_id], watchdir_id) - + def on_listitem_activated(self, treeview): tree, tree_id = self.treeView.get_selection().get_selected() if tree_id: @@ -325,7 +325,7 @@ class GtkUI(GtkPluginBase): else: self.glade.get_widget('edit_button').set_sensitive(False) self.glade.get_widget('remove_button').set_sensitive(False) - + def on_apply_prefs(self): log.debug("applying prefs for AutoAdd") for watchdir_id, watchdir in self.watchdirs.iteritems(): @@ -333,8 +333,8 @@ class GtkUI(GtkPluginBase): def on_show_prefs(self): client.autoadd.get_config().addCallback(self.cb_get_config) - - def on_options_changed_event(self, event): + + def on_options_changed_event(self): client.autoadd.get_config().addCallback(self.cb_get_config) def cb_get_config(self, config): @@ -346,4 +346,4 @@ class GtkUI(GtkPluginBase): # Disable the remove and edit buttons, because nothing in the store is selected self.glade.get_widget('remove_button').set_sensitive(False) self.glade.get_widget('edit_button').set_sensitive(False) - + diff --git a/deluge/plugins/execute/execute/core.py b/deluge/plugins/execute/execute/core.py index 1dda1c802..54362b1c7 100644 --- a/deluge/plugins/execute/execute/core.py +++ b/deluge/plugins/execute/execute/core.py @@ -64,19 +64,15 @@ class ExecuteCommandAddedEvent(DelugeEvent): """ Emitted when a new command is added. """ - __slots__ = ('command_id', 'event', 'command') def __init__(self, command_id, event, command): - self.command_id = command_id - self.event = event - self.command = command + self._args = [command_id, event, command] class ExecuteCommandRemovedEvent(DelugeEvent): """ Emitted when a command is removed. """ - __slots__ = ('command_id',) def __init__(self, command_id): - self.command_id = command_id + self._args = [command_id] class Core(CorePluginBase): def enable(self): @@ -86,17 +82,17 @@ class Core(CorePluginBase): # Go through the commands list and register event handlers for command in self.config["commands"]: - event_name = command[EXECUTE_EVENT] - if event_name in self.registered_events: + event = command[EXECUTE_EVENT] + if event in self.registered_events: continue - def create_event_handler(event_name): - def event_handler(event): - self.execute_commands(event.torrent_id, event_name) + def create_event_handler(event): + def event_handler(torrent_id): + self.execute_commands(torrent_id, event) return event_handler - event_handler = create_event_handler(event_name) - event_manager.register_event_handler(EVENT_MAP[event_name], event_handler) - self.registered_events[event_name] = event_handler + event_handler = create_event_handler(event) + event_manager.register_event_handler(EVENT_MAP[event], event_handler) + self.registered_events[event] = event_handler log.debug("Execute core plugin enabled!") diff --git a/deluge/plugins/execute/execute/gtkui.py b/deluge/plugins/execute/execute/gtkui.py index c1102a76e..3cd148a55 100644 --- a/deluge/plugins/execute/execute/gtkui.py +++ b/deluge/plugins/execute/execute/gtkui.py @@ -161,13 +161,13 @@ class ExecutePreferences(object): command = widget.get_text() client.execute.save_command(command_id, event, command) - def on_command_added_event(self, event): - log.debug("Adding command %s: %s", event.event, event.command) - self.add_command(event.command_id, event.event, event.command) + def on_command_added_event(self, command_id, event, command): + log.debug("Adding command %s: %s", event, command) + self.add_command(command_id, event, command) - def on_command_removed_event(self, event): - log.debug("Removing command %s", event.command_id) - self.remove_command(event.command_id) + def on_command_removed_event(self, command_id): + log.debug("Removing command %s", command_id) + self.remove_command(command_id) class GtkUI(GtkPluginBase): diff --git a/deluge/plugins/extractor/extractor/core.py b/deluge/plugins/extractor/extractor/core.py index d8d5d8fd7..03eeda1e7 100644 --- a/deluge/plugins/extractor/extractor/core.py +++ b/deluge/plugins/extractor/extractor/core.py @@ -77,14 +77,14 @@ class Core(CorePluginBase): def update(self): pass - def _on_torrent_finished(self, event): + def _on_torrent_finished(self, torrent_id): """ This is called when a torrent finishes. We need to check to see if there are any files to extract. """ # Get the save path - save_path = component.get("TorrentManager")[event.torrent_id].get_status(["save_path"])["save_path"] - files = component.get("TorrentManager")[event.torrent_id].get_files() + save_path = component.get("TorrentManager")[torrent_id].get_status(["save_path"])["save_path"] + files = component.get("TorrentManager")[torrent_id].get_files() for f in files: ext = os.path.splitext(f["path"]) if ext[1] in (".gz", ".bz2", ".lzma"): @@ -100,22 +100,22 @@ class Core(CorePluginBase): # Now that we have the cmd, lets run it to extract the files fp = os.path.join(save_path, f["path"]) - + # Get the destination path dest = self.config["extract_path"] if self.config["use_name_folder"]: - name = component.get("TorrentManager")[event.torrent_id].get_status(["name"])["name"] + name = component.get("TorrentManager")[torrent_id].get_status(["name"])["name"] dest = os.path.join(dest, name) - # Create the destination folder if it doesn't exist + # Create the destination folder if it doesn't exist if not os.path.exists(dest): try: os.makedirs(dest) except Exception, e: log.error("Error creating destination folder: %s", e) return - - log.debug("Extracting to %s", dest) + + log.debug("Extracting to %s", dest) def on_extract_success(result, torrent_id): # XXX: Emit an event log.debug("Extract was successful for %s", torrent_id) @@ -126,8 +126,8 @@ class Core(CorePluginBase): # Run the command and add some callbacks d = getProcessValue(cmd[0], cmd[1].split() + [str(fp)], {}, str(dest)) - d.addCallback(on_extract_success, event.torrent_id) - d.addErrback(on_extract_failed, event.torrent_id) + d.addCallback(on_extract_success, torrent_id) + d.addErrback(on_extract_failed, torrent_id) @export def set_config(self, config): diff --git a/deluge/plugins/freespace/freespace/core.py b/deluge/plugins/freespace/freespace/core.py index 0e4846a3d..eb90ecb68 100644 --- a/deluge/plugins/freespace/freespace/core.py +++ b/deluge/plugins/freespace/freespace/core.py @@ -55,14 +55,12 @@ class LowDiskSpaceEvent(DelugeEvent): """Triggered when the available space for a specific path is getting too low. """ - __slots__ = ('percents_dict',) - def __init__(self, percents_dict): """ :param percents: dictionary of path keys with their respecive occupation percentages. """ - self.percents_dict = percents_dict + self._args = [percents_dict] DEFAULT_PREFS = { "enabled": False, @@ -174,25 +172,25 @@ class Core(CorePluginBase): free_percent = free_blocks * 100 / total_blocks return free_percent - def __custom_email_notification(self, event): + def __custom_email_notification(self, ocupied_percents): subject = _("Low Disk Space Warning") message = _("You're running low on disk space:\n") - for path, ocupied_percent in event.percents_dict.iteritems(): + for path, ocupied_percent in ocupied_percents.iteritems(): message += _(' %s%% ocupation in %s\n') % (ocupied_percent, path) # "\"%s\"%% space occupation on %s") % (ocupied_percent, path) return subject, message - def __on_plugin_enabled(self, event): - if event.plugin_name == 'Notifications': + def __on_plugin_enabled(self, plugin_name): + if plugin_name == 'Notifications': component.get("CorePlugin.Notifications"). \ register_custom_email_notification( "LowDiskSpaceEvent", self.__custom_email_notification ) - def __on_plugin_disabled(self, event): - if event.plugin_name == 'Notifications': + def __on_plugin_disabled(self, plugin_name): + if plugin_name == 'Notifications': component.get("CorePlugin.Notifications"). \ deregister_custom_email_notification("LowDiskSpaceEvent") diff --git a/deluge/plugins/freespace/freespace/gtkui.py b/deluge/plugins/freespace/freespace/gtkui.py index 83d94b3b2..21405ccda 100644 --- a/deluge/plugins/freespace/freespace/gtkui.py +++ b/deluge/plugins/freespace/freespace/gtkui.py @@ -134,22 +134,22 @@ class GtkUI(GtkPluginBase): self.glade.get_widget('enabled').set_active(config['enabled']) self.glade.get_widget('percent').set_value(config['percent']) - def __custom_popup_notification(self, event): + def __custom_popup_notification(self, ocupied_percents): title = _("Low Free Space") message = '' - for path, percent in event.percents_dict.iteritems(): + for path, percent in ocupied_percents.iteritems(): message += '%s%% %s\n' % (percent, path) message += '\n' return title, message - def __custom_blink_notification(self, event): + def __custom_blink_notification(self, ocupied_percents): return True # Yes, do blink - def __custom_sound_notification(self, event): + def __custom_sound_notification(self, ocupied_percents): return '' # Use default sound - def __on_plugin_enabled(self, event): - if event.plugin_name == 'Notifications': + def __on_plugin_enabled(self, plugin_name): + if plugin_name == 'Notifications': notifications = component.get("GtkPlugin.Notifications") notifications.register_custom_popup_notification( "LowDiskSpaceEvent", self.__custom_popup_notification @@ -161,7 +161,7 @@ class GtkUI(GtkPluginBase): "LowDiskSpaceEvent", self.__custom_sound_notification ) - def __on_plugin_disabled(self, event): + def __on_plugin_disabled(self, plugin_name): pass # if plugin_name == 'Notifications': # notifications = component.get("GtkPlugin.Notifications") diff --git a/deluge/plugins/label/label/core.py b/deluge/plugins/label/label/core.py index cf6c7b970..5c76f5d19 100644 --- a/deluge/plugins/label/label/core.py +++ b/deluge/plugins/label/label/core.py @@ -133,20 +133,20 @@ class Core(CorePluginBase): return dict( [(label, 0) for label in self.labels.keys()]) ## Plugin hooks ## - def post_torrent_add(self, event): + def post_torrent_add(self, torrent_id, from_state): log.debug("post_torrent_add") - torrent = self.torrents[event.torrent_id] + torrent = self.torrents[torrent_id] for label_id, options in self.labels.iteritems(): if options["auto_add"]: if self._has_auto_match(torrent, options): - self.set_torrent(event.torrent_id, label_id) + self.set_torrent(torrent_id, label_id) return - def post_torrent_remove(self, event): + def post_torrent_remove(self, torrent_id): log.debug("post_torrent_remove") - if event.torrent_id in self.torrent_labels: - del self.torrent_labels[event.torrent_id] + if torrent_id in self.torrent_labels: + del self.torrent_labels[torrent_id] ## Utils ## def clean_config(self): diff --git a/deluge/plugins/notifications/notifications/core.py b/deluge/plugins/notifications/notifications/core.py index 747f2d104..2139de257 100644 --- a/deluge/plugins/notifications/notifications/core.py +++ b/deluge/plugins/notifications/notifications/core.py @@ -188,9 +188,9 @@ Subject: %(subject)s return _("Notification email sent.") - def _on_torrent_finished_event(self, event): + def _on_torrent_finished_event(self, torrent_id): log.debug("Handler for TorrentFinishedEvent called for CORE") - torrent = component.get("TorrentManager")[event.torrent_id] + torrent = component.get("TorrentManager")[torrent_id] torrent_status = torrent.get_status({}) # Email subject = _("Finished Torrent \"%(name)s\"") % torrent_status diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py index 542746393..c4b13d492 100644 --- a/deluge/plugins/scheduler/scheduler/core.py +++ b/deluge/plugins/scheduler/scheduler/core.py @@ -76,12 +76,11 @@ class SchedulerEvent(DelugeEvent): """ Emitted when a schedule state changes. """ - __slots__ = ('colour',) def __init__(self, colour): """ :param colour: str, the current scheduler state """ - self.colour = colour + self._args = [colour] class Core(CorePluginBase): def enable(self): @@ -120,8 +119,8 @@ class Core(CorePluginBase): pass - def on_config_value_changed(self, event): - if event.key in CONTROLLED_SETTINGS: + def on_config_value_changed(self, key, value): + if key in CONTROLLED_SETTINGS: self.do_schedule(False) def __apply_set_functions(self): diff --git a/deluge/plugins/scheduler/scheduler/gtkui.py b/deluge/plugins/scheduler/scheduler/gtkui.py index 2bf73cbd3..739f29ab5 100644 --- a/deluge/plugins/scheduler/scheduler/gtkui.py +++ b/deluge/plugins/scheduler/scheduler/gtkui.py @@ -203,9 +203,9 @@ class GtkUI(GtkPluginBase): client.scheduler.get_config().addCallback(on_get_config) - def on_scheduler_event(self, event): + def on_scheduler_event(self, state): def on_state_deferred(s): - self.status_item.set_image_from_file(get_resource(event.colour.lower() + ".png")) + self.status_item.set_image_from_file(get_resource(state.lower() + ".png")) self.state_deferred.addCallback(on_state_deferred) diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py index d247e0729..bbf56ef6f 100644 --- a/deluge/ui/web/pluginmanager.py +++ b/deluge/ui/web/pluginmanager.py @@ -77,7 +77,7 @@ class PluginManager(PluginManagerBase, component.Component): def _on_plugin_disabled_event(self, name): self.disable_plugin(name) - + def disable_plugin(self, name): # Get the plugin instance try: From 4c2f9a1a0a2ef19a257afff273bfb842f0ec9980 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 23 Feb 2011 20:04:15 +0100 Subject: [PATCH 110/329] un-revert main.py as it doesn't actually handle events. --- deluge/ui/console/main.py | 367 +++++++++++++------------------------- 1 file changed, 128 insertions(+), 239 deletions(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 7d5e1a91a..8114dbb8a 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -34,24 +34,28 @@ # # -import os, sys +import os +import sys +import logging import optparse import shlex import locale from twisted.internet import defer, reactor -from deluge.ui.console import UI_PATH import deluge.component as component from deluge.ui.client import client import deluge.common from deluge.ui.coreconfig import CoreConfig +from deluge.ui.sessionproxy import SessionProxy from deluge.ui.console.statusbars import StatusBars from deluge.ui.console.eventlog import EventLog -import screen +#import screen import colors -from deluge.log import LOG as log from deluge.ui.ui import _UI +from deluge.ui.console import UI_PATH + +log = logging.getLogger(__name__) class Console(_UI): @@ -59,16 +63,62 @@ class Console(_UI): def __init__(self): super(Console, self).__init__("console") - cmds = load_commands(os.path.join(UI_PATH, 'commands')) + group = optparse.OptionGroup(self.parser, "Console Options","These options control how " + "the console connects to the daemon. These options will be " + "used if you pass a command, or if you have autoconnect " + "enabled for the console ui.") - group = optparse.OptionGroup(self.parser, "Console Commands", - "\n".join(cmds.keys())) + group.add_option("-d","--daemon",dest="daemon_addr", + action="store",type="str",default="127.0.0.1", + help="Set the address of the daemon to connect to." + " [default: %default]") + group.add_option("-p","--port",dest="daemon_port", + help="Set the port to connect to the daemon on. [default: %default]", + action="store",type="int",default=58846) + group.add_option("-u","--username",dest="daemon_user", + help="Set the username to connect to the daemon with. [default: %default]", + action="store",type="string") + group.add_option("-P","--password",dest="daemon_pass", + help="Set the password to connect to the daemon with. [default: %default]", + action="store",type="string") self.parser.add_option_group(group) + self.cmds = load_commands(os.path.join(UI_PATH, 'commands')) + class CommandOptionGroup(optparse.OptionGroup): + def __init__(self, parser, title, description=None, cmds = None): + optparse.OptionGroup.__init__(self,parser,title,description) + self.cmds = cmds + + def format_help(self, formatter): + result = formatter.format_heading(self.title) + formatter.indent() + if self.description: + result += "%s\n"%formatter.format_description(self.description) + for cname in self.cmds: + cmd = self.cmds[cname] + if cmd.interactive_only or cname in cmd.aliases: continue + allnames = [cname] + allnames.extend(cmd.aliases) + cname = "/".join(allnames) + result += formatter.format_heading(" - ".join([cname,cmd.__doc__])) + formatter.indent() + result += "%*s%s\n" % (formatter.current_indent, "", cmd.usage) + formatter.dedent() + formatter.dedent() + return result + cmd_group = CommandOptionGroup(self.parser, "Console Commands", + description="The following commands can be issued at the " + "command line. Commands should be quoted, so, for example, " + "to pause torrent with id 'abc' you would run: '%s " + "\"pause abc\"'"%os.path.basename(sys.argv[0]), + cmds=self.cmds) + self.parser.add_option_group(cmd_group) + def start(self): super(Console, self).start() - - ConsoleUI(self.args) + ConsoleUI(self.args,self.cmds,(self.options.daemon_addr, + self.options.daemon_port,self.options.daemon_user, + self.options.daemon_pass)) def start(): Console().start() @@ -89,9 +139,11 @@ class OptionParser(optparse.OptionParser): """ raise Exception(msg) + class BaseCommand(object): usage = 'usage' + interactive_only = False option_list = tuple() aliases = [] @@ -119,6 +171,7 @@ class BaseCommand(object): epilog = self.epilog, option_list = self.option_list) + def load_commands(command_dir, exclude=[]): def get_command(name): return getattr(__import__('deluge.ui.console.commands.%s' % name, {}, {}, ['Command']), 'Command')() @@ -139,11 +192,13 @@ def load_commands(command_dir, exclude=[]): except OSError, e: return {} + class ConsoleUI(component.Component): - def __init__(self, args=None): + def __init__(self, args=None, cmds = None, daemon = None): component.Component.__init__(self, "ConsoleUI", 2) - self.batch_write = False + # keep track of events for the log view + self.events = [] try: locale.setlocale(locale.LC_ALL, '') @@ -152,8 +207,10 @@ class ConsoleUI(component.Component): self.encoding = sys.getdefaultencoding() log.debug("Using encoding: %s", self.encoding) - # Load all the commands - self._commands = load_commands(os.path.join(UI_PATH, 'commands')) + + + # start up the session proxy + self.sessionproxy = SessionProxy() client.set_disconnect_callback(self.on_client_disconnect) @@ -162,30 +219,18 @@ class ConsoleUI(component.Component): if args: args = args[0] self.interactive = False - - # Try to connect to the localhost daemon - def on_connect(result): - def on_started(result): - if not self.interactive: - def on_started(result): - deferreds = [] - # If we have args, lets process them and quit - # allow multiple commands split by ";" - for arg in args.split(";"): - deferreds.append(defer.maybeDeferred(self.do_command, arg.strip())) - - def on_complete(result): - self.do_command("quit") - - dl = defer.DeferredList(deferreds).addCallback(on_complete) - - # We need to wait for the rpcs in start() to finish before processing - # any of the commands. - self.started_deferred.addCallback(on_started) - component.start().addCallback(on_started) - - d = client.connect() - d.addCallback(on_connect) + if not cmds: + print "Sorry, couldn't find any commands" + return + else: + self._commands = cmds + from commander import Commander + cmdr = Commander(cmds) + if daemon: + cmdr.exec_args(args,*daemon) + else: + cmdr.exec_args(args,None,None,None,None) + self.coreconfig = CoreConfig() if self.interactive and not deluge.common.windows_check(): @@ -194,8 +239,13 @@ class ConsoleUI(component.Component): import curses.wrapper curses.wrapper(self.run) elif self.interactive and deluge.common.windows_check(): - print "You cannot run the deluge-console in interactive mode in Windows.\ - Please use commands from the command line, eg: deluge-console config;help;exit" + print """\nDeluge-console does not run in interactive mode on Windows. \n +Please use commands from the command line, eg:\n + deluge-console.exe help + deluge-console.exe info + deluge-console.exe "add --help" + deluge-console.exe "add -p c:\\mytorrents c:\\new.torrent" + """ else: reactor.run() @@ -210,8 +260,9 @@ class ConsoleUI(component.Component): # We want to do an interactive session, so start up the curses screen and # pass it the function that handles commands colors.init_colors() - self.screen = screen.Screen(stdscr, self.do_command, self.tab_completer, self.encoding) self.statusbars = StatusBars() + from modes.connectionmanager import ConnectionManager + self.screen = ConnectionManager(stdscr, self.encoding) self.eventlog = EventLog() self.screen.topbar = "{!status!}Deluge " + deluge.common.get_version() + " Console" @@ -225,202 +276,22 @@ class ConsoleUI(component.Component): # Start the twisted mainloop reactor.run() - def start(self): - # This gets fired once we have received the torrents list from the core - self.started_deferred = defer.Deferred() + def start(self): # Maintain a list of (torrent_id, name) for use in tab completion self.torrents = [] - def on_session_state(result): - def on_torrents_status(torrents): - for torrent_id, status in torrents.items(): - self.torrents.append((torrent_id, status["name"])) - self.started_deferred.callback(True) + if not self.interactive: + self.started_deferred = defer.Deferred() + def on_session_state(result): + def on_torrents_status(torrents): + for torrent_id, status in torrents.items(): + self.torrents.append((torrent_id, status["name"])) + self.started_deferred.callback(True) - client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) - client.core.get_session_state().addCallback(on_session_state) - - # Register some event handlers to keep the torrent list up-to-date - client.register_event_handler("TorrentAddedEvent", self.on_torrent_added_event) - client.register_event_handler("TorrentRemovedEvent", self.on_torrent_removed_event) - - def update(self): - pass - - def set_batch_write(self, batch): - """ - When this is set the screen is not refreshed after a `:meth:write` until - this is set to False. - - :param batch: set True to prevent screen refreshes after a `:meth:write` - :type batch: bool - - """ - self.batch_write = batch - if not batch and self.interactive: - self.screen.refresh() - - def write(self, line): - """ - Writes a line out depending on if we're in interactive mode or not. - - :param line: str, the line to print - - """ - if self.interactive: - self.screen.add_line(line, not self.batch_write) - else: - print(colors.strip_colors(line)) - - def do_command(self, cmd): - """ - Processes a command. - - :param cmd: str, the command string - - """ - if not cmd: - return - cmd, _, line = cmd.partition(' ') - try: - parser = self._commands[cmd].create_parser() - except KeyError: - self.write("{!error!}Unknown command: %s" % cmd) - return - args = self._commands[cmd].split(line) - - # Do a little hack here to print 'command --help' properly - parser._print_help = parser.print_help - def print_help(f=None): - if self.interactive: - self.write(parser.format_help()) - else: - parser._print_help(f) - parser.print_help = print_help - - # Only these commands can be run when not connected to a daemon - not_connected_cmds = ["help", "connect", "quit"] - aliases = [] - for c in not_connected_cmds: - aliases.extend(self._commands[c].aliases) - not_connected_cmds.extend(aliases) - - if not client.connected() and cmd not in not_connected_cmds: - self.write("{!error!}Not connected to a daemon, please use the connect command first.") - return - - try: - options, args = parser.parse_args(args) - except Exception, e: - self.write("{!error!}Error parsing options: %s" % e) - return - - if not getattr(options, '_exit', False): - try: - ret = self._commands[cmd].handle(*args, **options.__dict__) - except Exception, e: - self.write("{!error!}" + str(e)) - log.exception(e) - import traceback - self.write("%s" % traceback.format_exc()) - return defer.succeed(True) - else: - return ret - - def tab_completer(self, line, cursor, second_hit): - """ - Called when the user hits 'tab' and will autocomplete or show options. - If a command is already supplied in the line, this function will call the - complete method of the command. - - :param line: str, the current input string - :param cursor: int, the cursor position in the line - :param second_hit: bool, if this is the second time in a row the tab key - has been pressed - - :returns: 2-tuple (string, cursor position) - - """ - # First check to see if there is no space, this will mean that it's a - # command that needs to be completed. - if " " not in line: - possible_matches = [] - # Iterate through the commands looking for ones that startwith the - # line. - for cmd in self._commands: - if cmd.startswith(line): - possible_matches.append(cmd + " ") - - line_prefix = "" - else: - cmd = line.split(" ")[0] - if cmd in self._commands: - # Call the command's complete method to get 'er done - possible_matches = self._commands[cmd].complete(line.split(" ")[-1]) - line_prefix = " ".join(line.split(" ")[:-1]) + " " - else: - # This is a bogus command - return (line, cursor) - - # No matches, so just return what we got passed - if len(possible_matches) == 0: - return (line, cursor) - # If we only have 1 possible match, then just modify the line and - # return it, else we need to print out the matches without modifying - # the line. - elif len(possible_matches) == 1: - new_line = line_prefix + possible_matches[0] - return (new_line, len(new_line)) - else: - if second_hit: - # Only print these out if it's a second_hit - self.write(" ") - for match in possible_matches: - self.write(match) - else: - p = " ".join(line.split(" ")[:-1]) - new_line = " ".join([p, os.path.commonprefix(possible_matches)]) - if len(new_line) > len(line): - line = new_line - cursor = len(line) - return (line, cursor) - - def tab_complete_torrent(self, line): - """ - Completes torrent_ids or names. - - :param line: str, the string to complete - - :returns: list of matches - - """ - - possible_matches = [] - - # Find all possible matches - for torrent_id, torrent_name in self.torrents: - if torrent_id.startswith(line): - possible_matches.append(torrent_id + " ") - if torrent_name.startswith(line): - possible_matches.append(torrent_name + " ") - - return possible_matches - - def get_torrent_name(self, torrent_id): - """ - Gets a torrent name from the torrents list. - - :param torrent_id: str, the torrent_id - - :returns: the name of the torrent or None - """ - - for tid, name in self.torrents: - if torrent_id == tid: - return name - - return None + client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) + client.core.get_session_state().addCallback(on_session_state) + def match_torrent(self, string): """ Returns a list of torrent_id matches for the string. It will search both @@ -439,15 +310,33 @@ class ConsoleUI(component.Component): return ret - def on_torrent_added_event(self, event): - def on_torrent_status(status): - self.torrents.append((event.torrent_id, status["name"])) - client.core.get_torrent_status(event.torrent_id, ["name"]).addCallback(on_torrent_status) - def on_torrent_removed_event(self, event): - for index, (tid, name) in enumerate(self.torrents): - if event.torrent_id == tid: - del self.torrents[index] + def get_torrent_name(self, torrent_id): + if self.interactive and hasattr(self.screen,"get_torrent_name"): + return self.screen.get_torrent_name(torrent_id) + + for tid, name in self.torrents: + if torrent_id == tid: + return name + + return None + + + def set_batch_write(self, batch): + # only kept for legacy reasons, don't actually do anything + pass + + def set_mode(self, mode): + reactor.removeReader(self.screen) + self.screen = mode + self.statusbars.screen = self.screen + reactor.addReader(self.screen) def on_client_disconnect(self): component.stop() + + def write(self, s): + if self.interactive: + self.events.append(s) + else: + print colors.strip_colors(s) From 9ac0d62149286e5a5d336e081a64791739bfd62a Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 23 Feb 2011 11:21:47 -0800 Subject: [PATCH 111/329] Remove some imports that are no longer neccessary --- deluge/common.py | 1 - deluge/core/core.py | 8 -------- deluge/core/pluginmanager.py | 2 -- deluge/core/rpcserver.py | 2 +- deluge/core/torrentmanager.py | 3 +-- deluge/maketorrent.py | 2 +- deluge/rencode.py | 1 - deluge/ui/gtkui/connectionmanager.py | 1 - deluge/ui/gtkui/mainwindow.py | 1 - deluge/ui/gtkui/peers_tab.py | 1 - deluge/ui/gtkui/torrentview.py | 2 +- 11 files changed, 4 insertions(+), 20 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index c3270b14f..7246cd3fe 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -40,7 +40,6 @@ import os import time import subprocess import platform -import sys import chardet import logging diff --git a/deluge/core/core.py b/deluge/core/core.py index 6d4c13793..983bfa75c 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -38,18 +38,10 @@ from deluge._libtorrent import lt import os import glob import base64 -import shutil import logging import threading -import pkg_resources -import warnings import tempfile - -from twisted.internet import reactor, defer -from twisted.internet.task import LoopingCall -import twisted.web.client - from deluge.httpdownloader import download_file import deluge.configmanager diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py index 119928979..5ef5ef55f 100644 --- a/deluge/core/pluginmanager.py +++ b/deluge/core/pluginmanager.py @@ -37,8 +37,6 @@ """PluginManager for Core""" import logging -from twisted.internet import reactor -from twisted.internet.task import LoopingCall from deluge.event import PluginEnabledEvent, PluginDisabledEvent import deluge.pluginmanagerbase diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index ef2e3342f..e309f7bda 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -43,7 +43,7 @@ import logging import traceback from twisted.internet.protocol import Factory, Protocol -from twisted.internet import ssl, reactor, defer +from twisted.internet import reactor, defer from OpenSSL import crypto, SSL from types import FunctionType diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 4c57874fc..269fe0213 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -44,7 +44,6 @@ import operator import logging import re -from twisted.internet import reactor from twisted.internet.task import LoopingCall from deluge._libtorrent import lt @@ -569,7 +568,7 @@ class TorrentManager(component.Component): # Remove the torrent from deluge's session try: del self.torrents[torrent_id] - except KeyError, ValueError: + except (KeyError, ValueError): return False # Save the session state diff --git a/deluge/maketorrent.py b/deluge/maketorrent.py index 585dcaa4e..196399df7 100644 --- a/deluge/maketorrent.py +++ b/deluge/maketorrent.py @@ -38,7 +38,7 @@ import os from hashlib import sha1 as sha from deluge.common import get_path_size -from deluge.bencode import bencode, bdecode +from deluge.bencode import bencode class InvalidPath(Exception): """ diff --git a/deluge/rencode.py b/deluge/rencode.py index 2b32c001b..1172df2e5 100644 --- a/deluge/rencode.py +++ b/deluge/rencode.py @@ -63,7 +63,6 @@ __all__ = ['dumps', 'loads'] # import struct -import string from threading import Lock # Default number of bits for serialized floats, either 32 or 64 (also a parameter for dumps()). diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 9ce16ac3c..2ea302e76 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -35,7 +35,6 @@ import gtk import pkg_resources -import urlparse import time import hashlib import logging diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 12fa5a96d..a3265d813 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -38,7 +38,6 @@ import pygtk pygtk.require('2.0') import gtk import gtk.glade -import gobject import logging import pkg_resources from urlparse import urlparse diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py index 20cdfbfad..b4a39ce55 100644 --- a/deluge/ui/gtkui/peers_tab.py +++ b/deluge/ui/gtkui/peers_tab.py @@ -40,7 +40,6 @@ import logging import os.path import cPickle import pkg_resources -import gobject from itertools import izip from deluge.ui.client import client diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 659010f05..46d9dbcc3 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -477,7 +477,7 @@ class TorrentView(listview.ListView, component.Component): return [] return torrent_ids - except ValueError, TypeError: + except (ValueError, TypeError): return [] def get_torrent_status(self, torrent_id): From b2f349c05dbb3621272b4ea2776439203f6eeee4 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 23 Feb 2011 11:22:29 -0800 Subject: [PATCH 112/329] Remove unnecessary import --- deluge/core/preferencesmanager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index a79659866..bc108c007 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -38,7 +38,6 @@ import os import logging import threading import pkg_resources -from twisted.internet import reactor from twisted.internet.task import LoopingCall from deluge._libtorrent import lt From 87473f2cde16db14023e1fbfa816702d7e5add12 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 12:08:22 +0100 Subject: [PATCH 113/329] support magnet uris in add command/dialog --- deluge/ui/console/commands/add.py | 6 +++++- deluge/ui/console/modes/add_util.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/commands/add.py b/deluge/ui/console/commands/add.py index 71ef1e7d1..37a3eb2aa 100644 --- a/deluge/ui/console/commands/add.py +++ b/deluge/ui/console/commands/add.py @@ -56,7 +56,8 @@ class Command(BaseCommand): help='Interpret all given torrent-file arguments as files'), ) - usage = "Usage: add [-p ] [-u | --urls] [-f | --files] [ ...]" + usage = "Usage: add [-p ] [-u | --urls] [-f | --files] [ ...]\n"\ + " arguments can be file paths, URLs or magnet uris" def handle(self, *args, **options): self.console = component.get("ConsoleUI") @@ -80,6 +81,9 @@ class Command(BaseCommand): if not options["force_file"] and (deluge.common.is_url(arg) or options["force_url"]): self.console.write("{!info!}Attempting to add torrent from url: %s" % arg) deferreds.append(client.core.add_torrent_url(arg, t_options).addCallback(on_success).addErrback(on_fail)) + elif not options["force_file"] and (deluge.common.is_magnet(arg)): + self.console.write("{!info!}Attempting to add torrent from magnet uri: %s" % arg) + deferreds.append(client.core.add_torrent_magnet(arg, t_options).addCallback(on_success).addErrback(on_fail)) else: if not os.path.exists(arg): self.console.write("{!error!}%s doesn't exist!" % arg) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index 168a6b1eb..bdd235e87 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -52,8 +52,9 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): t_options["add_paused"] = options["add_paused"] is_url = (not (options["path_type"]==1)) and (deluge.common.is_url(t_file) or options["path_type"]==2) + is_mag = not(is_url) and (not (options["path_type"]==1)) and deluge.common.is_magnet(t_file) - if is_url: + if is_url or is_mag: files = [t_file] else: files = glob.glob(t_file) @@ -66,6 +67,8 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): for f in files: if is_url: client.core.add_torrent_url(f, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) + elif is_mag: + client.core.add_torrent_magnet(f, t_options).addCallback(success_cb,f,ress).addErrback(fail_cb,f,ress) else: if not os.path.exists(f): fail_cb("Doesn't exist",f,ress) From ee75786e4047c750ecf26f04746cb92df42999cc Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 12:08:42 +0100 Subject: [PATCH 114/329] handle the case where libtorrent doesn't know what files are in a torrent. this is the case when torrent was added by a magnet link --- deluge/ui/console/modes/torrentdetail.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 646e00b02..4c5d41e84 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -123,9 +123,12 @@ class TorrentDetail(BaseMode, component.Component): log.debug("got state") if not self.file_list: # don't keep getting the files once we've got them once - self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (torrent has %d files)"%len(state["files"])).center(self.cols)) - self.file_list,self.file_dict = self.build_file_list(state["files"],state["file_progress"],state["file_priorities"]) - self._status_keys.remove("files") + if state.get("files"): + self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (torrent has %d files)"%len(state["files"])).center(self.cols)) + self.file_list,self.file_dict = self.build_file_list(state["files"],state["file_progress"],state["file_priorities"]) + self._status_keys.remove("files") + else: + self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (File list unknown)").center(self.cols)) self._fill_progress(self.file_list,state["file_progress"]) for i,prio in enumerate(state["file_priorities"]): self.file_dict[i][6] = prio @@ -187,6 +190,7 @@ class TorrentDetail(BaseMode, component.Component): # fills in progress fields in all entries based on progs # returns the # of bytes complete in all the children of fs def _fill_progress(self,fs,progs): + if not progs: return 0 tb = 0 for f in fs: if f[3]: # dir, has some children From 5ae242472f54c26207b1357e8eba22fc2a5c4f1d Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 12:11:14 +0100 Subject: [PATCH 115/329] don't search for empty string in alltorrents.py --- deluge/ui/console/modes/alltorrents.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 5343383b6..157b07276 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -622,7 +622,10 @@ class AllTorrents(BaseMode): self.entering_search = False elif c == 10 or c == curses.KEY_ENTER: self.entering_search = False - self.__do_search() + if self.search_string: + self.__do_search() + else: + self.search_string = None elif c > 31 and c < 256: stroke = chr(c) uchar = "" From 510c81776f13c803aff8f32d434efefd4d3d6b5e Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 13:24:35 +0100 Subject: [PATCH 116/329] add status command --- deluge/ui/console/commands/status.py | 126 +++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 deluge/ui/console/commands/status.py diff --git a/deluge/ui/console/commands/status.py b/deluge/ui/console/commands/status.py new file mode 100644 index 000000000..9dc6b29db --- /dev/null +++ b/deluge/ui/console/commands/status.py @@ -0,0 +1,126 @@ +# +# status.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# + +from optparse import make_option +from twisted.internet import defer +from deluge.ui.console.main import BaseCommand +from deluge.ui.client import client +import deluge.common +import deluge.component as component + +class Command(BaseCommand): + """Shows a various status information from the daemon.""" + option_list = BaseCommand.option_list + ( + make_option('-r', '--raw', action='store_true', default=False, dest='raw', + help='Don\'t format upload/download rates in KiB/s (useful for scripts that want to do their own parsing)'), + make_option('-n', '--no-torrents', action='store_false', default=True, dest='show_torrents', + help='Don\'t show torrent status (this will make the command a bit faster)'), + ) + + + usage = "Usage: status [-r] [-n]" + def handle(self, *args, **options): + self.console = component.get("ConsoleUI") + self.status = None + self.connections = None + if options["show_torrents"]: + self.torrents = None + else: + self.torrents = -2 + + self.raw = options["raw"] + + def on_session_status(status): + self.status = status + if self.status != None and self.connections != None and self.torrents != None: + self.print_status() + + def on_num_connections(conns): + self.connections = conns + if self.status != None and self.connections != None and self.torrents != None: + self.print_status() + + def on_torrents_status(status): + self.torrents = status + if self.status != None and self.connections != None and self.torrents != None: + self.print_status() + + def on_torrents_status_fail(reason): + self.torrents = -1 + if self.status != None and self.connections != None and self.torrents != None: + self.print_status() + + deferreds = [] + + ds = client.core.get_session_status(["payload_upload_rate","payload_download_rate","dht_nodes"]) + ds.addCallback(on_session_status) + deferreds.append(ds) + + dc = client.core.get_num_connections() + dc.addCallback(on_num_connections) + deferreds.append(dc) + + if options["show_torrents"]: + dt = client.core.get_torrents_status({}, ["state"]) + dt.addCallback(on_torrents_status) + dt.addErrback(on_torrents_status_fail) + deferreds.append(dt) + + return defer.DeferredList(deferreds) + + def print_status(self): + self.console.set_batch_write(True) + if self.raw: + self.console.write("{!info!}Total upload: %f"%self.status["payload_upload_rate"]) + self.console.write("{!info!}Total download: %f"%self.status["payload_download_rate"]) + else: + self.console.write("{!info!}Total upload: %s"%deluge.common.fspeed(self.status["payload_upload_rate"])) + self.console.write("{!info!}Total download: %s"%deluge.common.fspeed(self.status["payload_download_rate"])) + self.console.write("{!info!}DHT Nodes: %i"%self.status["dht_nodes"]) + self.console.write("{!info!}Total connections: %i"%self.connections) + if self.torrents == -1: + self.console.write("{!error!}Error getting torrent info") + elif self.torrents != -2: + self.console.write("{!info!}Total torrents: %i"%len(self.torrents)) + states = ["Downloading","Seeding","Paused","Checking","Error","Queued"] + state_counts = {} + for state in states: + state_counts[state] = 0 + for t in self.torrents: + s = self.torrents[t] + state_counts[s["state"]] += 1 + for state in states: + self.console.write("{!info!} %s: %i"%(state,state_counts[state])) + + self.console.set_batch_write(False) From 1cce30393b787fb5af836fe6e2a65157a93f6f5c Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 13:24:45 +0100 Subject: [PATCH 117/329] add interactive field to commander so command -h will work --- deluge/ui/console/commander.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/commander.py b/deluge/ui/console/commander.py index 5af4bb908..5f3503049 100644 --- a/deluge/ui/console/commander.py +++ b/deluge/ui/console/commander.py @@ -45,9 +45,10 @@ import logging log = logging.getLogger(__name__) class Commander: - def __init__(self, cmds): + def __init__(self, cmds, interactive=False): self._commands = cmds self.console = component.get("ConsoleUI") + self.interactive = interactive def write(self,line): print(strip_colors(line)) From fab1e8412d3e8ad8a3a913949f3dbf18a9f78199 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 24 Feb 2011 14:18:49 +0100 Subject: [PATCH 118/329] encode string before write to specified encoding --- deluge/ui/console/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 8114dbb8a..33f4d4e65 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -339,4 +339,4 @@ Please use commands from the command line, eg:\n if self.interactive: self.events.append(s) else: - print colors.strip_colors(s) + print colors.strip_colors(s.encode(self.encoding)) From 930addb389d708ce46554dce122231dc72db3e00 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Sun, 27 Feb 2011 17:12:57 +0100 Subject: [PATCH 119/329] add 'legacy' mode, which is basically just the old deluge-console, for curmudgeons --- deluge/ui/console/commands/gui.py | 51 +++ deluge/ui/console/main.py | 20 +- deluge/ui/console/modes/alltorrents.py | 20 +- deluge/ui/console/modes/legacy.py | 603 +++++++++++++++++++++++++ 4 files changed, 687 insertions(+), 7 deletions(-) create mode 100644 deluge/ui/console/commands/gui.py create mode 100644 deluge/ui/console/modes/legacy.py diff --git a/deluge/ui/console/commands/gui.py b/deluge/ui/console/commands/gui.py new file mode 100644 index 000000000..eb10cc0ce --- /dev/null +++ b/deluge/ui/console/commands/gui.py @@ -0,0 +1,51 @@ +# +# status.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# + +from deluge.ui.console.main import BaseCommand +import deluge.common +import deluge.component as component +from deluge.ui.console.modes.alltorrents import AllTorrents + +class Command(BaseCommand): + """Exit this mode and go into the more 'gui' like mode""" + usage = "Usage: gui" + interactive_only = True + def handle(self, *args, **options): + console = component.get("ConsoleUI") + try: + at = component.get("AllTorrentsStateUpdater").alltorrent + except KeyError: + at = AllTorrents(console.stdscr,console.encoding) + console.set_mode(at) + at.resume() diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 33f4d4e65..0795d17e6 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -50,11 +50,11 @@ from deluge.ui.coreconfig import CoreConfig from deluge.ui.sessionproxy import SessionProxy from deluge.ui.console.statusbars import StatusBars from deluge.ui.console.eventlog import EventLog -#import screen import colors from deluge.ui.ui import _UI from deluge.ui.console import UI_PATH + log = logging.getLogger(__name__) class Console(_UI): @@ -216,6 +216,7 @@ class ConsoleUI(component.Component): # Set the interactive flag to indicate where we should print the output self.interactive = True + self._commands = cmds if args: args = args[0] self.interactive = False @@ -223,7 +224,6 @@ class ConsoleUI(component.Component): print "Sorry, couldn't find any commands" return else: - self._commands = cmds from commander import Commander cmdr = Commander(cmds) if daemon: @@ -262,6 +262,7 @@ Please use commands from the command line, eg:\n colors.init_colors() self.statusbars = StatusBars() from modes.connectionmanager import ConnectionManager + self.stdscr = stdscr self.screen = ConnectionManager(stdscr, self.encoding) self.eventlog = EventLog() @@ -303,6 +304,8 @@ Please use commands from the command line, eg:\n no matches are found. """ + if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + return self.screen.match_torrent(string) ret = [] for tid, name in self.torrents: if tid.startswith(string) or name.startswith(string): @@ -323,8 +326,12 @@ Please use commands from the command line, eg:\n def set_batch_write(self, batch): - # only kept for legacy reasons, don't actually do anything - pass + if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + return self.screen.set_batch_write(batch) + + def tab_complete_torrent(self, line): + if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + return self.screen.tab_complete_torrent(line) def set_mode(self, mode): reactor.removeReader(self.screen) @@ -337,6 +344,9 @@ Please use commands from the command line, eg:\n def write(self, s): if self.interactive: - self.events.append(s) + if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + self.screen.write(s) + else: + self.events.append(s) else: print colors.strip_colors(s.encode(self.encoding)) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 157b07276..99386a85c 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -50,6 +50,7 @@ from torrentdetail import TorrentDetail from preferences import Preferences from torrent_actions import torrent_actions_popup from eventview import EventView +from legacy import Legacy import format_utils @@ -129,8 +130,9 @@ class FILTER: QUEUED=7 class StateUpdater(component.Component): - def __init__(self, cb, sf,tcb): + def __init__(self, alltorrent, cb, sf,tcb): component.Component.__init__(self, "AllTorrentsStateUpdater", 1, depend=["SessionProxy"]) + self.alltorrent = alltorrent self._status_cb = cb self._status_fields = sf self.status_dict = {} @@ -174,6 +176,8 @@ class AllTorrents(BaseMode): self.coreconfig = component.get("ConsoleUI").coreconfig + self.legacy_mode = None + BaseMode.__init__(self, stdscr, encoding) curses.curs_set(0) self.stdscr.notimeout(0) @@ -181,7 +185,7 @@ class AllTorrents(BaseMode): self._status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] - self.updater = StateUpdater(self.set_state,self._status_fields,self._on_torrent_status) + self.updater = StateUpdater(self,self.set_state,self._status_fields,self._on_torrent_status) self.column_names = ["#", "Name","Size","State","Progress","Seeders","Peers","Down Speed","Up Speed"] self._update_columns() @@ -375,6 +379,15 @@ class AllTorrents(BaseMode): ev = EventView(self,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(ev) + def __legacy_mode(self): + component.stop(["AllTorrentsStateUpdater"]) + self.stdscr.clear() + if not self.legacy_mode: + self.legacy_mode = Legacy(self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(self.legacy_mode) + self.legacy_mode.refresh() + curses.curs_set(2) + def _torrent_filter(self, idx, data): if data==FILTER.ALL: self.updater.status_dict = {} @@ -758,5 +771,8 @@ class AllTorrents(BaseMode): elif chr(c) == 'e': self.__show_events() return + elif chr(c) == 'l': + self.__legacy_mode() + return self.refresh(effected_lines) diff --git a/deluge/ui/console/modes/legacy.py b/deluge/ui/console/modes/legacy.py new file mode 100644 index 000000000..0434bac07 --- /dev/null +++ b/deluge/ui/console/modes/legacy.py @@ -0,0 +1,603 @@ +# +# legacy.py +# +# Copyright (C) 2008-2009 Ido Abramovich +# Copyright (C) 2009 Andrew Resch +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +try: + import curses +except ImportError: + pass + + +from basemode import BaseMode +import deluge.ui.console.colors as colors +from twisted.internet import defer, reactor +from deluge.ui.client import client +import deluge.component as component + +import logging,os +log = logging.getLogger(__name__) + + +LINES_BUFFER_SIZE = 5000 +INPUT_HISTORY_SIZE = 500 + +class Legacy(BaseMode): + def __init__(self, stdscr, encoding=None): + + self.batch_write = False + self.lines = [] + + # A list of strings to be displayed based on the offset (scroll) + self.lines = [] + # The offset to display lines + self.display_lines_offset = 0 + + # Holds the user input and is cleared on 'enter' + self.input = "" + self.input_incomplete = "" + # Keep track of where the cursor is + self.input_cursor = 0 + # Keep a history of inputs + self.input_history = [] + self.input_history_index = 0 + + # Keep track of double-tabs + self.tab_count = 0 + + # Get a handle to the main console + self.console = component.get("ConsoleUI") + + # show the cursor + curses.curs_set(2) + + BaseMode.__init__(self, stdscr, encoding) + + # This gets fired once we have received the torrents list from the core + self.started_deferred = defer.Deferred() + + # Maintain a list of (torrent_id, name) for use in tab completion + self.torrents = [] + def on_session_state(result): + def on_torrents_status(torrents): + for torrent_id, status in torrents.items(): + self.torrents.append((torrent_id, status["name"])) + self.started_deferred.callback(True) + + client.core.get_torrents_status({"id": result}, ["name"]).addCallback(on_torrents_status) + client.core.get_session_state().addCallback(on_session_state) + + # Register some event handlers to keep the torrent list up-to-date + client.register_event_handler("TorrentAddedEvent", self.on_torrent_added_event) + client.register_event_handler("TorrentRemovedEvent", self.on_torrent_removed_event) + + def update(self): + pass + + def _doRead(self): + # Read the character + c = self.stdscr.getch() + + # We clear the input string and send it to the command parser on ENTER + if c == curses.KEY_ENTER or c == 10: + if self.input: + self.add_line(">>> " + self.input) + self.do_command(self.input.encode(self.encoding)) + if len(self.input_history) == INPUT_HISTORY_SIZE: + # Remove the oldest input history if the max history size + # is reached. + del self.input_history[0] + self.input_history.append(self.input) + self.input_history_index = len(self.input_history) + self.input = "" + self.input_incomplete = "" + self.input_cursor = 0 + self.stdscr.refresh() + + # Run the tab completer function + elif c == 9: + # Keep track of tab hit count to know when it's double-hit + self.tab_count += 1 + if self.tab_count > 1: + second_hit = True + self.tab_count = 0 + else: + second_hit = False + + if self.tab_completer: + # We only call the tab completer function if we're at the end of + # the input string on the cursor is on a space + if self.input_cursor == len(self.input) or self.input[self.input_cursor] == " ": + self.input, self.input_cursor = self.tab_completer(self.input, self.input_cursor, second_hit) + + # We use the UP and DOWN keys to cycle through input history + elif c == curses.KEY_UP: + if self.input_history_index - 1 >= 0: + if self.input_history_index == len(self.input_history): + # We're moving from non-complete input so save it just incase + # we move back down to it. + self.input_incomplete = self.input + # Going back in the history + self.input_history_index -= 1 + self.input = self.input_history[self.input_history_index] + self.input_cursor = len(self.input) + elif c == curses.KEY_DOWN: + if self.input_history_index + 1 < len(self.input_history): + # Going forward in the history + self.input_history_index += 1 + self.input = self.input_history[self.input_history_index] + self.input_cursor = len(self.input) + elif self.input_history_index + 1 == len(self.input_history): + # We're moving back down to an incomplete input + self.input_history_index += 1 + self.input = self.input_incomplete + self.input_cursor = len(self.input) + + # Cursor movement + elif c == curses.KEY_LEFT: + if self.input_cursor: + self.input_cursor -= 1 + elif c == curses.KEY_RIGHT: + if self.input_cursor < len(self.input): + self.input_cursor += 1 + elif c == curses.KEY_HOME: + self.input_cursor = 0 + elif c == curses.KEY_END: + self.input_cursor = len(self.input) + + # Scrolling through buffer + elif c == curses.KEY_PPAGE: + self.display_lines_offset += self.rows - 3 + # We substract 3 for the unavailable lines and 1 extra due to len(self.lines) + if self.display_lines_offset > (len(self.lines) - 4 - self.rows): + self.display_lines_offset = len(self.lines) - 4 - self.rows + + self.refresh() + elif c == curses.KEY_NPAGE: + self.display_lines_offset -= self.rows - 3 + if self.display_lines_offset < 0: + self.display_lines_offset = 0 + self.refresh() + + # We remove the tab count if the key wasn't a tab + if c != 9: + self.tab_count = 0 + + # Delete a character in the input string based on cursor position + if c == curses.KEY_BACKSPACE or c == 127: + if self.input and self.input_cursor > 0: + self.input = self.input[:self.input_cursor - 1] + self.input[self.input_cursor:] + self.input_cursor -= 1 + + elif c == curses.KEY_DC: + if self.input and self.input_cursor < len(self.input): + self.input = self.input[:self.input_cursor] + self.input[self.input_cursor + 1:] + + # A key to add to the input string + else: + if c > 31 and c < 256: + # Emulate getwch + stroke = chr(c) + uchar = "" + while not uchar: + try: + uchar = stroke.decode(self.encoding) + except UnicodeDecodeError: + c = self.stdscr.getch() + stroke += chr(c) + + if uchar: + if self.input_cursor == len(self.input): + self.input += uchar + else: + # Insert into string + self.input = self.input[:self.input_cursor] + uchar + self.input[self.input_cursor:] + + # Move the cursor forward + self.input_cursor += 1 + + # Update the input string on the screen + self.add_string(self.rows - 1, self.input) + try: + self.stdscr.move(self.rows - 1, self.input_cursor) + except curses.error: + pass + self.stdscr.refresh() + + + + def refresh(self): + """ + Refreshes the screen. + Updates the lines based on the`:attr:lines` based on the `:attr:display_lines_offset` + attribute and the status bars. + """ + self.stdscr.clear() + + # Update the status bars + self.add_string(0, self.statusbars.topbar) + self.add_string(self.rows - 2, self.statusbars.bottombar) + + # The number of rows minus the status bars and the input line + available_lines = self.rows - 3 + # If the amount of lines exceeds the number of rows, we need to figure out + # which ones to display based on the offset + if len(self.lines) > available_lines: + # Get the lines to display based on the offset + offset = len(self.lines) - self.display_lines_offset + lines = self.lines[-(available_lines - offset):offset] + elif len(self.lines) == available_lines: + lines = self.lines + else: + lines = [""] * (available_lines - len(self.lines)) + lines.extend(self.lines) + + # Add the lines to the screen + for index, line in enumerate(lines): + self.add_string(index + 1, line) + + # Add the input string + self.add_string(self.rows - 1, self.input) + + # Move the cursor + try: + self.stdscr.move(self.rows - 1, self.input_cursor) + except curses.error: + pass + self.stdscr.redrawwin() + self.stdscr.refresh() + + + def add_line(self, text, refresh=True): + """ + Add a line to the screen. This will be showed between the two bars. + The text can be formatted with color using the following format: + + "{!fg, bg, attributes, ...!}" + + See: http://docs.python.org/library/curses.html#constants for attributes. + + Alternatively, it can use some built-in scheme for coloring. + See colors.py for built-in schemes. + + "{!scheme!}" + + Examples: + + "{!blue, black, bold!}My Text is {!white, black!}cool" + "{!info!}I am some info text!" + "{!error!}Uh oh!" + + :param text: the text to show + :type text: string + :param refresh: if True, the screen will refresh after the line is added + :type refresh: bool + + """ + + def get_line_chunks(line): + """ + Returns a list of 2-tuples (color string, text) + + """ + chunks = [] + num_chunks = line.count("{!") + for i in range(num_chunks): + # Find the beginning and end of the color tag + beg = line.find("{!") + end = line.find("!}") + 2 + color = line[beg:end] + line = line[end:] + + # Check to see if this is the last chunk + if i + 1 == num_chunks: + text = line + else: + # Not the last chunk so get the text up to the next tag + # and remove the text from line + text = line[:line.find("{!")] + line = line[line.find("{!"):] + + chunks.append((color, text)) + + return chunks + + for line in text.splitlines(): + # We need to check for line lengths here and split as necessary + try: + line_length = colors.get_line_length(line) + except colors.BadColorString: + log.error("Passed a bad colored string..") + line_length = len(line) + + if line_length >= (self.cols - 1): + s = "" + # The length of the text without the color tags + s_len = 0 + # We need to split this over multiple lines + for chunk in get_line_chunks(line): + if (len(chunk[1]) + s_len) < (self.cols - 1): + # This chunk plus the current string in 's' isn't over + # the maximum width, so just append the color tag and text + s += chunk[0] + chunk[1] + s_len += len(chunk[1]) + else: + # The chunk plus the current string in 's' is too long. + # We need to take as much of the chunk and put it into 's' + # with the color tag. + remain = (self.cols - 1) - s_len + s += chunk[0] + chunk[1][:remain] + # We append the line since it's full + self.lines.append(s) + # Start a new 's' with the remainder chunk + s = chunk[0] + chunk[1][remain:] + s_len = len(chunk[1][remain:]) + # Append the final string which may or may not be the full width + if s: + self.lines.append(s) + else: + self.lines.append(line) + + while len(self.lines) > LINES_BUFFER_SIZE: + # Remove the oldest line if the max buffer size has been reached + del self.lines[0] + + if refresh: + self.refresh() + + + def add_string(self, row, string): + """ + Adds a string to the desired `:param:row`. + + :param row: int, the row number to write the string + + """ + col = 0 + try: + parsed = colors.parse_color_string(string, self.encoding) + except colors.BadColorString, e: + log.error("Cannot add bad color string %s: %s", string, e) + return + + for index, (color, s) in enumerate(parsed): + if index + 1 == len(parsed): + # This is the last string so lets append some " " to it + s += " " * (self.cols - (col + len(s)) - 1) + try: + self.stdscr.addstr(row, col, s, color) + except curses.error: + pass + + col += len(s) + + + def do_command(self, cmd): + """ + Processes a command. + + :param cmd: str, the command string + + """ + if not cmd: + return + cmd, _, line = cmd.partition(' ') + try: + parser = self.console._commands[cmd].create_parser() + except KeyError: + self.write("{!error!}Unknown command: %s" % cmd) + return + args = self.console._commands[cmd].split(line) + + # Do a little hack here to print 'command --help' properly + parser._print_help = parser.print_help + def print_help(f=None): + parser._print_help(f) + parser.print_help = print_help + + # Only these commands can be run when not connected to a daemon + not_connected_cmds = ["help", "connect", "quit"] + aliases = [] + for c in not_connected_cmds: + aliases.extend(self.console._commands[c].aliases) + not_connected_cmds.extend(aliases) + + if not client.connected() and cmd not in not_connected_cmds: + self.write("{!error!}Not connected to a daemon, please use the connect command first.") + return + + try: + options, args = parser.parse_args(args) + except Exception, e: + self.write("{!error!}Error parsing options: %s" % e) + return + + if not getattr(options, '_exit', False): + try: + ret = self.console._commands[cmd].handle(*args, **options.__dict__) + except Exception, e: + self.write("{!error!}" + str(e)) + log.exception(e) + import traceback + self.write("%s" % traceback.format_exc()) + return defer.succeed(True) + else: + return ret + + + + def set_batch_write(self, batch): + """ + When this is set the screen is not refreshed after a `:meth:write` until + this is set to False. + + :param batch: set True to prevent screen refreshes after a `:meth:write` + :type batch: bool + + """ + self.batch_write = batch + if not batch: + self.refresh() + + def write(self, line): + """ + Writes a line out + + :param line: str, the line to print + + """ + self.add_line(line, not self.batch_write) + + + def tab_completer(self, line, cursor, second_hit): + """ + Called when the user hits 'tab' and will autocomplete or show options. + If a command is already supplied in the line, this function will call the + complete method of the command. + + :param line: str, the current input string + :param cursor: int, the cursor position in the line + :param second_hit: bool, if this is the second time in a row the tab key + has been pressed + + :returns: 2-tuple (string, cursor position) + + """ + # First check to see if there is no space, this will mean that it's a + # command that needs to be completed. + if " " not in line: + possible_matches = [] + # Iterate through the commands looking for ones that startwith the + # line. + for cmd in self.console._commands: + if cmd.startswith(line): + possible_matches.append(cmd + " ") + + line_prefix = "" + else: + cmd = line.split(" ")[0] + if cmd in self.console._commands: + # Call the command's complete method to get 'er done + possible_matches = self.console._commands[cmd].complete(line.split(" ")[-1]) + line_prefix = " ".join(line.split(" ")[:-1]) + " " + else: + # This is a bogus command + return (line, cursor) + + # No matches, so just return what we got passed + if len(possible_matches) == 0: + return (line, cursor) + # If we only have 1 possible match, then just modify the line and + # return it, else we need to print out the matches without modifying + # the line. + elif len(possible_matches) == 1: + new_line = line_prefix + possible_matches[0] + return (new_line, len(new_line)) + else: + if second_hit: + # Only print these out if it's a second_hit + self.write(" ") + for match in possible_matches: + self.write(match) + else: + p = " ".join(line.split(" ")[:-1]) + new_line = " ".join([p, os.path.commonprefix(possible_matches)]) + if len(new_line) > len(line): + line = new_line + cursor = len(line) + return (line, cursor) + + + def tab_complete_torrent(self, line): + """ + Completes torrent_ids or names. + + :param line: str, the string to complete + + :returns: list of matches + + """ + possible_matches = [] + + # Find all possible matches + for torrent_id, torrent_name in self.torrents: + if torrent_id.startswith(line): + possible_matches.append(torrent_id + " ") + if torrent_name.startswith(line): + possible_matches.append(torrent_name + " ") + + return possible_matches + + def get_torrent_name(self, torrent_id): + """ + Gets a torrent name from the torrents list. + + :param torrent_id: str, the torrent_id + + :returns: the name of the torrent or None + """ + + for tid, name in self.torrents: + if torrent_id == tid: + return name + + return None + + def match_torrent(self, string): + """ + Returns a list of torrent_id matches for the string. It will search both + torrent_ids and torrent names, but will only return torrent_ids. + + :param string: str, the string to match on + + :returns: list of matching torrent_ids. Will return an empty list if + no matches are found. + + """ + ret = [] + for tid, name in self.torrents: + if tid.startswith(string) or name.startswith(string): + ret.append(tid) + + return ret + + def on_torrent_added_event(self, event): + def on_torrent_status(status): + self.torrents.append((event.torrent_id, status["name"])) + client.core.get_torrent_status(event.torrent_id, ["name"]).addCallback(on_torrent_status) + + def on_torrent_removed_event(self, event): + for index, (tid, name) in enumerate(self.torrents): + if event.torrent_id == tid: + del self.torrents[index] From e43c532e63659f8f4f7abd38e1213604a8889265 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Sun, 27 Feb 2011 17:14:50 +0100 Subject: [PATCH 120/329] remove screen.py all functionality has been moved elsewhere at this point --- deluge/ui/console/screen.py | 449 ------------------------------------ 1 file changed, 449 deletions(-) delete mode 100644 deluge/ui/console/screen.py diff --git a/deluge/ui/console/screen.py b/deluge/ui/console/screen.py deleted file mode 100644 index 7ea7cb785..000000000 --- a/deluge/ui/console/screen.py +++ /dev/null @@ -1,449 +0,0 @@ -# -# screen.py -# -# Copyright (C) 2009 Andrew Resch -# -# 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 -# statement from all source files in the program, then also delete it here. -# -# - -import sys -import logging -try: - import curses -except ImportError: - pass - -import colors -try: - import signal - from fcntl import ioctl - import termios - import struct -except: - pass - -from twisted.internet import reactor - -log = logging.getLogger(__name__) - -class CursesStdIO(object): - """fake fd to be registered as a reader with the twisted reactor. - Curses classes needing input should extend this""" - - def fileno(self): - """ We want to select on FD 0 """ - return 0 - - def doRead(self): - """called when input is ready""" - pass - def logPrefix(self): return 'CursesClient' - -LINES_BUFFER_SIZE = 5000 -INPUT_HISTORY_SIZE = 500 - -class Screen(CursesStdIO): - def __init__(self, stdscr, command_parser, tab_completer=None, encoding=None): - """ - A curses screen designed to run as a reader in a twisted reactor. - - :param command_parser: a function that will be passed a string when the - user hits enter - :param tab_completer: a function that is sent the `:prop:input` string when - the user hits tab. It's intended purpose is to modify the input string. - It should return a 2-tuple (input string, input cursor). - - """ - log.debug("Screen init!") - # Function to be called with commands - self.command_parser = command_parser - self.tab_completer = tab_completer - self.stdscr = stdscr - # Make the input calls non-blocking - self.stdscr.nodelay(1) - - # Holds the user input and is cleared on 'enter' - self.input = "" - self.input_incomplete = "" - # Keep track of where the cursor is - self.input_cursor = 0 - # Keep a history of inputs - self.input_history = [] - self.input_history_index = 0 - - # Keep track of double-tabs - self.tab_count = 0 - - # Strings for the 2 status bars - self.topbar = "" - self.bottombar = "" - - # A list of strings to be displayed based on the offset (scroll) - self.lines = [] - # The offset to display lines - self.display_lines_offset = 0 - - # Keep track of the screen size - self.rows, self.cols = self.stdscr.getmaxyx() - try: - signal.signal(signal.SIGWINCH, self.on_resize) - except Exception, e: - log.debug("Unable to catch SIGWINCH signal!") - - if not encoding: - self.encoding = sys.getdefaultencoding() - else: - self.encoding = encoding - - # Do a refresh right away to draw the screen - self.refresh() - - def on_resize(self, *args): - log.debug("on_resize_from_signal") - # Get the new rows and cols value - self.rows, self.cols = struct.unpack("hhhh", ioctl(0, termios.TIOCGWINSZ ,"\000"*8))[0:2] - curses.resizeterm(self.rows, self.cols) - self.refresh() - - def connectionLost(self, reason): - self.close() - - def add_line(self, text, refresh=True): - """ - Add a line to the screen. This will be showed between the two bars. - The text can be formatted with color using the following format: - - "{!fg, bg, attributes, ...!}" - - See: http://docs.python.org/library/curses.html#constants for attributes. - - Alternatively, it can use some built-in scheme for coloring. - See colors.py for built-in schemes. - - "{!scheme!}" - - Examples: - - "{!blue, black, bold!}My Text is {!white, black!}cool" - "{!info!}I am some info text!" - "{!error!}Uh oh!" - - :param text: the text to show - :type text: string - :param refresh: if True, the screen will refresh after the line is added - :type refresh: bool - - """ - - def get_line_chunks(line): - """ - Returns a list of 2-tuples (color string, text) - - """ - chunks = [] - num_chunks = line.count("{!") - for i in range(num_chunks): - # Find the beginning and end of the color tag - beg = line.find("{!") - end = line.find("!}") + 2 - color = line[beg:end] - line = line[end:] - - # Check to see if this is the last chunk - if i + 1 == num_chunks: - text = line - else: - # Not the last chunk so get the text up to the next tag - # and remove the text from line - text = line[:line.find("{!")] - line = line[line.find("{!"):] - - chunks.append((color, text)) - - return chunks - - for line in text.splitlines(): - # We need to check for line lengths here and split as necessary - try: - line_length = colors.get_line_length(line) - except colors.BadColorString: - log.error("Passed a bad colored string..") - line_length = len(line) - - if line_length >= (self.cols - 1): - s = "" - # The length of the text without the color tags - s_len = 0 - # We need to split this over multiple lines - for chunk in get_line_chunks(line): - if (len(chunk[1]) + s_len) < (self.cols - 1): - # This chunk plus the current string in 's' isn't over - # the maximum width, so just append the color tag and text - s += chunk[0] + chunk[1] - s_len += len(chunk[1]) - else: - # The chunk plus the current string in 's' is too long. - # We need to take as much of the chunk and put it into 's' - # with the color tag. - remain = (self.cols - 1) - s_len - s += chunk[0] + chunk[1][:remain] - # We append the line since it's full - self.lines.append(s) - # Start a new 's' with the remainder chunk - s = chunk[0] + chunk[1][remain:] - s_len = len(chunk[1][remain:]) - # Append the final string which may or may not be the full width - if s: - self.lines.append(s) - else: - self.lines.append(line) - - while len(self.lines) > LINES_BUFFER_SIZE: - # Remove the oldest line if the max buffer size has been reached - del self.lines[0] - - if refresh: - self.refresh() - - def add_string(self, row, string): - """ - Adds a string to the desired `:param:row`. - - :param row: int, the row number to write the string - - """ - col = 0 - try: - parsed = colors.parse_color_string(string, self.encoding) - except colors.BadColorString, e: - log.error("Cannot add bad color string %s: %s", string, e) - return - - for index, (color, s) in enumerate(parsed): - if index + 1 == len(parsed): - # This is the last string so lets append some " " to it - s += " " * (self.cols - (col + len(s)) - 1) - try: - self.stdscr.addstr(row, col, s, color) - except curses.error: - pass - - col += len(s) - - def refresh(self): - """ - Refreshes the screen. - Updates the lines based on the`:attr:lines` based on the `:attr:display_lines_offset` - attribute and the status bars. - """ - self.stdscr.clear() - - # Update the status bars - self.add_string(0, self.topbar) - self.add_string(self.rows - 2, self.bottombar) - - # The number of rows minus the status bars and the input line - available_lines = self.rows - 3 - # If the amount of lines exceeds the number of rows, we need to figure out - # which ones to display based on the offset - if len(self.lines) > available_lines: - # Get the lines to display based on the offset - offset = len(self.lines) - self.display_lines_offset - lines = self.lines[-(available_lines - offset):offset] - elif len(self.lines) == available_lines: - lines = self.lines - else: - lines = [""] * (available_lines - len(self.lines)) - lines.extend(self.lines) - - # Add the lines to the screen - for index, line in enumerate(lines): - self.add_string(index + 1, line) - - # Add the input string - self.add_string(self.rows - 1, self.input) - - # Move the cursor - try: - self.stdscr.move(self.rows - 1, self.input_cursor) - except curses.error: - pass - self.stdscr.redrawwin() - self.stdscr.refresh() - - def doRead(self): - """ - Called when there is data to be read, ie, input from the keyboard. - """ - # We wrap this function to catch exceptions and shutdown the mainloop - try: - self._doRead() - except Exception, e: - log.exception(e) - reactor.stop() - - def _doRead(self): - # Read the character - c = self.stdscr.getch() - - # We clear the input string and send it to the command parser on ENTER - if c == curses.KEY_ENTER or c == 10: - if self.input: - self.add_line(">>> " + self.input) - self.command_parser(self.input.encode(self.encoding)) - if len(self.input_history) == INPUT_HISTORY_SIZE: - # Remove the oldest input history if the max history size - # is reached. - del self.input_history[0] - self.input_history.append(self.input) - self.input_history_index = len(self.input_history) - self.input = "" - self.input_incomplete = "" - self.input_cursor = 0 - self.stdscr.refresh() - - # Run the tab completer function - elif c == 9: - # Keep track of tab hit count to know when it's double-hit - self.tab_count += 1 - if self.tab_count > 1: - second_hit = True - self.tab_count = 0 - else: - second_hit = False - - if self.tab_completer: - # We only call the tab completer function if we're at the end of - # the input string on the cursor is on a space - if self.input_cursor == len(self.input) or self.input[self.input_cursor] == " ": - self.input, self.input_cursor = self.tab_completer(self.input, self.input_cursor, second_hit) - - # We use the UP and DOWN keys to cycle through input history - elif c == curses.KEY_UP: - if self.input_history_index - 1 >= 0: - if self.input_history_index == len(self.input_history): - # We're moving from non-complete input so save it just incase - # we move back down to it. - self.input_incomplete = self.input - # Going back in the history - self.input_history_index -= 1 - self.input = self.input_history[self.input_history_index] - self.input_cursor = len(self.input) - elif c == curses.KEY_DOWN: - if self.input_history_index + 1 < len(self.input_history): - # Going forward in the history - self.input_history_index += 1 - self.input = self.input_history[self.input_history_index] - self.input_cursor = len(self.input) - elif self.input_history_index + 1 == len(self.input_history): - # We're moving back down to an incomplete input - self.input_history_index += 1 - self.input = self.input_incomplete - self.input_cursor = len(self.input) - - # Cursor movement - elif c == curses.KEY_LEFT: - if self.input_cursor: - self.input_cursor -= 1 - elif c == curses.KEY_RIGHT: - if self.input_cursor < len(self.input): - self.input_cursor += 1 - elif c == curses.KEY_HOME: - self.input_cursor = 0 - elif c == curses.KEY_END: - self.input_cursor = len(self.input) - - # Scrolling through buffer - elif c == curses.KEY_PPAGE: - self.display_lines_offset += self.rows - 3 - # We substract 3 for the unavailable lines and 1 extra due to len(self.lines) - if self.display_lines_offset > (len(self.lines) - 4 - self.rows): - self.display_lines_offset = len(self.lines) - 4 - self.rows - - self.refresh() - elif c == curses.KEY_NPAGE: - self.display_lines_offset -= self.rows - 3 - if self.display_lines_offset < 0: - self.display_lines_offset = 0 - self.refresh() - - # We remove the tab count if the key wasn't a tab - if c != 9: - self.tab_count = 0 - - # Delete a character in the input string based on cursor position - if c == curses.KEY_BACKSPACE or c == 127: - if self.input and self.input_cursor > 0: - self.input = self.input[:self.input_cursor - 1] + self.input[self.input_cursor:] - self.input_cursor -= 1 - - elif c == curses.KEY_DC: - if self.input and self.input_cursor < len(self.input): - self.input = self.input[:self.input_cursor] + self.input[self.input_cursor + 1:] - - # A key to add to the input string - else: - if c > 31 and c < 256: - # Emulate getwch - stroke = chr(c) - uchar = "" - while not uchar: - try: - uchar = stroke.decode(self.encoding) - except UnicodeDecodeError: - c = self.stdscr.getch() - stroke += chr(c) - - if uchar: - if self.input_cursor == len(self.input): - self.input += uchar - else: - # Insert into string - self.input = self.input[:self.input_cursor] + uchar + self.input[self.input_cursor:] - - # Move the cursor forward - self.input_cursor += 1 - - # Update the input string on the screen - self.add_string(self.rows - 1, self.input) - try: - self.stdscr.move(self.rows - 1, self.input_cursor) - except curses.error: - pass - self.stdscr.refresh() - - def close(self): - """ - Clean up the curses stuff on exit. - """ - curses.nocbreak() - self.stdscr.keypad(0) - curses.echo() - curses.endwin() From 2193240c6656224cec79c69b74b0c5c1de704ec4 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Sun, 27 Feb 2011 17:15:12 +0100 Subject: [PATCH 121/329] update help for legacy mode --- deluge/ui/console/modes/alltorrents.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 99386a85c..65ff2a47e 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -99,6 +99,8 @@ The actions you can perform and the keys to perform them are as follows: 'e' - Show the event log view ('q' to get out of event log) +'l' - Go into 'legacy' mode (the way deluge-console used to work) + 'Q' - quit 'm' - Mark a torrent From 11d8332e434a836b440449c0a766dac8272bfedd Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Mon, 28 Feb 2011 14:03:39 +0100 Subject: [PATCH 122/329] make sure we're in interactive mode before checking for screen --- deluge/ui/console/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 0795d17e6..ddba4b59f 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -304,7 +304,7 @@ Please use commands from the command line, eg:\n no matches are found. """ - if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + if self.interactive and isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): return self.screen.match_torrent(string) ret = [] for tid, name in self.torrents: @@ -326,11 +326,11 @@ Please use commands from the command line, eg:\n def set_batch_write(self, batch): - if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + if self.interactive and isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): return self.screen.set_batch_write(batch) def tab_complete_torrent(self, line): - if isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): + if self.interactive and isinstance(self.screen,deluge.ui.console.modes.legacy.Legacy): return self.screen.tab_complete_torrent(line) def set_mode(self, mode): From ccc047848adda4b4c8aafb86391e5525f690b6ac Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Mon, 28 Feb 2011 20:22:49 +0100 Subject: [PATCH 123/329] split long lines in torrent info popup --- deluge/ui/console/modes/alltorrents.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 65ff2a47e..352a8e5e1 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -317,7 +317,16 @@ class AllTorrents(BaseMode): else: info = state[f[2][0]] - self.popup.add_line("{!info!}%s: {!input!}%s"%(f[0],info)) + nl = len(f[0])+4 + if (nl+len(info))>self.popup.width: + self.popup.add_line("{!info!}%s: {!input!}%s"%(f[0],info[:(self.popup.width - nl)])) + info = info[(self.popup.width - nl):] + n = self.popup.width-3 + chunks = [info[i:i+n] for i in xrange(0, len(info), n)] + for c in chunks: + self.popup.add_line(" %s"%c) + else: + self.popup.add_line("{!info!}%s: {!input!}%s"%(f[0],info)) self.refresh() else: self.updater.set_torrent_to_update(None,None) From 426eea154ee18fffb965c008e515e4dcff6d1b8b Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 1 Mar 2011 19:11:53 +0100 Subject: [PATCH 124/329] add a wrap_string function that works properly --- deluge/ui/console/modes/format_utils.py | 76 +++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 811c742e7..73a5ec034 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -99,3 +99,79 @@ def format_column(col, lim): def format_row(row,column_widths): return "".join([format_column(row[i],column_widths[i]) for i in range(0,len(row))]) + +import re +from collections import deque +_strip_re = re.compile("\{!.*?!\}") +def wrap_string(string,width,min_lines=0,strip_colors=True): + """ + Wrap a string to fit in a particular width. Returns a list of output lines. + + :param string: str, the string to wrap + :param width: int, the maximum width of a line of text + :param min_lines: int, extra lines will be added so the output tuple contains at least min_lines lines + :param strip_colors: boolean, if True, text in {!!} blocks will not be considered as adding to the + width of the line. They will still be present in the output. + """ + ret = [] + s1 = string.split("\n") + + def insert_clr(s,offset,mtchs,clrs): + end_pos = offset+len(s) + while mtchs and (mtchs[0] <= end_pos) and (mtchs[0] >= offset): + mtc = mtchs.popleft()-offset + clr = clrs.popleft() + end_pos += len(clr) + s = "%s%s%s"%(s[:mtc],clr,s[mtc:]) + return s + + for s in s1: + cur_pos = offset = 0 + if strip_colors: + mtchs = deque() + clrs = deque() + for m in _strip_re.finditer(s): + mtchs.append(m.start()) + clrs.append(m.group()) + cstr = _strip_re.sub('',s) + else: + cstr = s + while len(cstr) > width: + sidx = cstr.rfind(" ",0,width-1) + sidx += 1 + if sidx > 0: + if strip_colors: + to_app = cstr[0:sidx] + to_app = insert_clr(to_app,offset,mtchs,clrs) + ret.append(to_app) + offset += len(to_app) + else: + ret.append(cstr[0:sidx]) + cstr = cstr[sidx:] + if not cstr: + cstr = None + break + else: + # can't find a reasonable split, just split at width + if strip_colors: + to_app = cstr[0:width] + to_app = insert_clr(to_app,offset,mtchs,clrs) + ret.append(to_app) + offset += len(to_app) + else: + ret.append(cstr[0:width]) + cstr = cstr[width:] + if not cstr: + cstr = None + break + if cstr != None: + if strip_colors: + ret.append(insert_clr(cstr,offset,mtchs,clrs)) + else: + ret.append(cstr) + + if min_lines>0: + for i in range(len(ret),min_lines): + ret.append(" ") + + return ret From 8d541ad4194222c63ac031ea61534a467674581e Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 1 Mar 2011 19:12:05 +0100 Subject: [PATCH 125/329] use new wrap_string function in MessagePopup --- deluge/ui/console/modes/popup.py | 42 +++++++------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 0bb2a04c0..27561c815 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -40,11 +40,12 @@ try: except ImportError: pass +import format_utils import logging log = logging.getLogger(__name__) class Popup: - def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None): + def __init__(self,parent_mode,title,width_req=-1,height_req=-1,close_cb=None,init_lines=None): """ Init a new popup. The default constructor will handle sizing and borders and the like. @@ -81,7 +82,10 @@ class Popup: self.height,self.width = self.screen.getmaxyx() self._divider = None self._lineoff = 0 - self._lines = [] + if init_lines: + self._lines = init_lines + else: + self._lines = [] def _refresh_lines(self): crow = 1 @@ -252,42 +256,14 @@ class MessagePopup(Popup): """ Popup that just displays a message """ - import re - _strip_re = re.compile("\{!.*?!\}") - _min_height = 3 - def __init__(self, parent_mode, title, message): self.message = message self.width= int(parent_mode.cols/2) - lns = self._split_message() - Popup.__init__(self,parent_mode,title,height_req=(len(lns)+2)) + lns = format_utils.wrap_string(self.message,self.width-2,3,True) + hr = min(len(lns)+2,int(parent_mode.rows/2)) + Popup.__init__(self,parent_mode,title,height_req=hr) self._lines = lns - def _split_message(self): - ret = [] - wl = (self.width-2) - - s1 = self.message.split("\n") - - for s in s1: - while len(self._strip_re.sub('',s)) > wl: - sidx = s.rfind(" ",0,wl-1) - sidx += 1 - if sidx > 0: - ret.append(s[0:sidx]) - s = s[sidx:] - else: - # can't find a reasonable split, just split at width - ret.append(s[0:wl]) - s = s[wl:] - if s: - ret.append(s) - - for i in range(len(ret),self._min_height): - ret.append(" ") - - return ret - def handle_resize(self): Popup.handle_resize(self) self.clear() From 5fb01dacc0213b1c180466fd01a8588efe79383b Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 1 Mar 2011 19:12:48 +0100 Subject: [PATCH 126/329] add a {!normal!} color scheme --- deluge/ui/console/colors.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/ui/console/colors.py b/deluge/ui/console/colors.py index bc092373c..3df92294e 100644 --- a/deluge/ui/console/colors.py +++ b/deluge/ui/console/colors.py @@ -57,6 +57,7 @@ color_pairs = { # Some default color schemes schemes = { "input": ("white", "black"), + "normal": ("white","black"), "status": ("yellow", "blue", "bold"), "info": ("white", "black", "bold"), "error": ("red", "black", "bold"), From 356f298e9cefa0c692662fb7c0e71f19a96aa21c Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 1 Mar 2011 19:13:17 +0100 Subject: [PATCH 127/329] update help display using new wrap_string. re-wrap on resize add some highlighting --- deluge/ui/console/modes/alltorrents.py | 72 +++++++++++++------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 352a8e5e1..88fc92c4f 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -64,62 +64,60 @@ log = logging.getLogger(__name__) # Big help string that gets displayed when the user hits 'h' -HELP_STR = \ -"""This screen shows an overview of the current torrents Deluge is managing. -The currently selected torrent is indicated by having a white background. -You can change the selected torrent using the up/down arrows or the -PgUp/Pg keys. Home and End keys go to the first and last torrent +HELP_STR = """\ +This screen shows an overview of the current torrents Deluge is managing. \ +The currently selected torrent is indicated by having a white background. \ +You can change the selected torrent using the up/down arrows or the \ +PgUp/Pg keys. Home and End keys go to the first and last torrent \ respectively. -Operations can be performed on multiple torrents by marking them and +Operations can be performed on multiple torrents by marking them and \ then hitting Enter. See below for the keys used to mark torrents. -You can scroll a popup window that doesn't fit its content (like +You can scroll a popup window that doesn't fit its content (like \ this one) using the up/down arrows. -All popup windows can be closed/canceled by hitting the Esc key +All popup windows can be closed/canceled by hitting the Esc key \ (you might need to wait a second for an Esc to register) -The actions you can perform and the keys to perform them are as follows: +The actions you can perform and the keys to perform them are as follows: \ -'h' - Show this help +{!info!}'h'{!normal!} - Show this help -'a' - Add a torrent +{!info!}'a'{!normal!} - Add a torrent -'p' - View/Set preferences +{!info!}'p'{!normal!} - View/Set preferences -'/' - Search torrent names. Enter to exectue search, ESC to cancel +{!info!}'/'{!normal!} - Search torrent names. Enter to exectue search, ESC to cancel -'n' - Next matching torrent for last search +{!info!}'n'{!normal!} - Next matching torrent for last search -'f' - Show only torrents in a certain state +{!info!}'f'{!normal!} - Show only torrents in a certain state (Will open a popup where you can select the state you want to see) -'i' - Show more detailed information about the current selected torrent +{!info!}'i'{!normal!} - Show more detailed information about the current selected torrent -'e' - Show the event log view ('q' to get out of event log) +{!info!}'e'{!normal!} - Show the event log view ({!info!}'q'{!normal!} to get out of event log) -'l' - Go into 'legacy' mode (the way deluge-console used to work) +{!info!}'l'{!normal!} - Go into 'legacy' mode (the way deluge-console used to work) -'Q' - quit +{!info!}'Q'{!normal!} - quit -'m' - Mark a torrent -'M' - Mark all torrents between currently selected torrent - and last marked torrent -'c' - Un-mark all torrents +{!info!}'m'{!normal!} - Mark a torrent +{!info!}'M'{!normal!} - Mark all torrents between currently selected torrent and last marked torrent +{!info!}'c'{!normal!} - Un-mark all torrents -Right Arrow - Torrent Detail Mode. This includes more detailed information - about the currently selected torrent, as well as a view of the - files in the torrent and the ability to set file priorities. +{!info!}Right Arrow{!normal!} - Torrent Detail Mode. This includes more detailed information \ +about the currently selected torrent, as well as a view of the \ +files in the torrent and the ability to set file priorities. -Enter - Show torrent actions popup. Here you can do things like - pause/resume, remove, recheck and so one. These actions - apply to all currently marked torrents. The currently - selected torrent is automatically marked when you press enter. +{!info!}Enter{!normal!} - Show torrent actions popup. Here you can do things like \ +pause/resume, remove, recheck and so one. These actions \ +apply to all currently marked torrents. The currently \ +selected torrent is automatically marked when you press enter. -'q'/Esc - Close a popup +{!info!}'q'/Esc{!normal!} - Close a popup """ -HELP_LINES = HELP_STR.split('\n') class FILTER: ALL=0 @@ -184,6 +182,8 @@ class AllTorrents(BaseMode): curses.curs_set(0) self.stdscr.notimeout(0) + self.__split_help() + self._status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] @@ -219,6 +219,9 @@ class AllTorrents(BaseMode): "seeding_time","time_added","distributed_copies", "num_pieces", "piece_length","save_path"] + def __split_help(self): + self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) + def resume(self): component.start(["AllTorrentsStateUpdater"]) self.refresh() @@ -335,6 +338,7 @@ class AllTorrents(BaseMode): def on_resize(self, *args): BaseMode.on_resize_norefresh(self, *args) self._update_columns() + self.__split_help() if self.popup: self.popup.handle_resize() self.refresh() @@ -773,9 +777,7 @@ class AllTorrents(BaseMode): elif chr(c) == 'f': self._show_torrent_filter_popup() elif chr(c) == 'h': - self.popup = Popup(self,"Help") - for l in HELP_LINES: - self.popup.add_line(l) + self.popup = Popup(self,"Help",init_lines=self.__help_lines) elif chr(c) == 'p': self.show_preferences() return From 84f278dbcc551177cba975edb24e03f9d4d7fbcb Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 1 Mar 2011 19:39:55 +0100 Subject: [PATCH 128/329] show a 'scrollbar' of sorts for popups with a lot of text --- deluge/ui/console/modes/popup.py | 51 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index 27561c815..e74203059 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -78,10 +78,10 @@ class Popup: self.screen = curses.newwin(height_req,width_req,by,bx) self.title = title - self._close_cb = close_cb + self.__close_cb = close_cb self.height,self.width = self.screen.getmaxyx() - self._divider = None - self._lineoff = 0 + self.divider = None + self.lineoff = 0 if init_lines: self._lines = init_lines else: @@ -89,11 +89,9 @@ class Popup: def _refresh_lines(self): crow = 1 - for row,line in enumerate(self._lines): + for line in self._lines[self.lineoff:]: if (crow >= self.height-1): break - if (row < self._lineoff): - continue self.parent.add_string(crow,line,self.screen,1,False,True) crow+=1 @@ -110,6 +108,13 @@ class Popup: self.parent.add_string(0,"{!white,black,bold!}%s"%self.title,self.screen,toff,False,True) self._refresh_lines() + if (len(self._lines) > (self.height-2)): + lts = len(self._lines)-(self.height-3) + perc_sc = float(self.lineoff)/lts + sb_pos = int((self.height-2)*perc_sc)+1 + if (sb_pos == 1) and (self.lineoff != 0): + sb_pos += 1 + self.parent.add_string(sb_pos, "{!white,black,bold!}|",self.screen,col=(self.width-1),pad=False,trim=False) self.screen.redrawwin() self.screen.noutrefresh() @@ -119,19 +124,19 @@ class Popup: def handle_read(self, c): if c == curses.KEY_UP: - self._lineoff = max(0,self._lineoff -1) + self.lineoff = max(0,self.lineoff -1) elif c == curses.KEY_DOWN: - if len(self._lines)-self._lineoff > (self.height-2): - self._lineoff += 1 + if len(self._lines)-self.lineoff > (self.height-2): + self.lineoff += 1 elif c == curses.KEY_ENTER or c == 10 or c == 27: # close on enter/esc - if self._close_cb: - self._close_cb() + if self.__close_cb: + self.__close_cb() return True # close the popup if c > 31 and c < 256 and chr(c) == 'q': - if self._close_cb: - self._close_cb() + if self.__close_cb: + self.__close_cb() return True # close the popup self.refresh() @@ -145,9 +150,9 @@ class Popup: self._lines.append(string) def add_divider(self): - if not self._divider: - self._divider = "-"*(self.width-2) - self._lines.append(self._divider) + if not self.divider: + self.divider = "-"*(self.width-2) + self._lines.append(self.divider) class SelectablePopup(Popup): @@ -187,7 +192,7 @@ class SelectablePopup(Popup): for row,line in enumerate(self._lines): if (crow >= self.height-1): break - if (row < self._lineoff): + if (row < self.lineoff): continue fg = self._line_foregrounds[row] udx = self._udxs.get(crow) @@ -216,21 +221,21 @@ class SelectablePopup(Popup): return (idx,self._select_data[idx]) def add_divider(self,color="white"): - if not self._divider: - self._divider = "-"*(self.width-6)+" -" - self._lines.append(self._divider) + if not self.divider: + self.divider = "-"*(self.width-6)+" -" + self._lines.append(self.divider) self._line_foregrounds.append(color) def handle_read(self, c): if c == curses.KEY_UP: - #self._lineoff = max(0,self._lineoff -1) + #self.lineoff = max(0,self.lineoff -1) if (self._selected != self._selectable_lines[0] and len(self._selectable_lines) > 1): idx = self._selectable_lines.index(self._selected) self._selected = self._selectable_lines[idx-1] elif c == curses.KEY_DOWN: - #if len(self._lines)-self._lineoff > (self.height-2): - # self._lineoff += 1 + #if len(self._lines)-self.lineoff > (self.height-2): + # self.lineoff += 1 idx = self._selectable_lines.index(self._selected) if (idx < len(self._selectable_lines)-1): self._selected = self._selectable_lines[idx+1] From d9c1a56d448437ddb7c77089904682f3d3cd60b7 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Mon, 7 Mar 2011 12:14:36 +0100 Subject: [PATCH 129/329] use config params for columns to show --- deluge/ui/console/modes/alltorrents.py | 52 ++++++++++------ deluge/ui/console/modes/column.py | 85 ++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 deluge/ui/console/modes/column.py diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 88fc92c4f..db4c312f5 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -38,6 +38,7 @@ import deluge.component as component from basemode import BaseMode import deluge.common from deluge.ui.client import client +from deluge.configmanager import ConfigManager from collections import deque @@ -52,7 +53,7 @@ from torrent_actions import torrent_actions_popup from eventview import EventView from legacy import Legacy -import format_utils +import format_utils,column try: import curses @@ -116,7 +117,8 @@ pause/resume, remove, recheck and so one. These actions \ apply to all currently marked torrents. The currently \ selected torrent is automatically marked when you press enter. -{!info!}'q'/Esc{!normal!} - Close a popup +{!info!}'q'/Esc{!normal!} - Close a popup (Note that Esc can take a moment to register \ +as having been pressed. """ class FILTER: @@ -129,6 +131,20 @@ class FILTER: ERROR=6 QUEUED=7 +DEFAULT_PREFS = { + "columns":["#", "Name","Size","State","Progress","Seeders","Peers","Down Speed","Up Speed"], + "column_widths":{ + "#":5, + "Name":-1, + "Size":15, + "State":13, + "Progress":10, + "Seeders":10, + "Peers":10, + "Down Speed":15, + "Up Speed":15} +} + class StateUpdater(component.Component): def __init__(self, alltorrent, cb, sf,tcb): component.Component.__init__(self, "AllTorrentsStateUpdater", 1, depend=["SessionProxy"]) @@ -175,6 +191,7 @@ class AllTorrents(BaseMode): self.cursor = 0 self.coreconfig = component.get("ConsoleUI").coreconfig + self.__update_config() self.legacy_mode = None @@ -188,9 +205,7 @@ class AllTorrents(BaseMode): "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] self.updater = StateUpdater(self,self.set_state,self._status_fields,self._on_torrent_status) - - self.column_names = ["#", "Name","Size","State","Progress","Seeders","Peers","Down Speed","Up Speed"] - self._update_columns() + self.__update_columns() self._info_fields = [ @@ -219,6 +234,11 @@ class AllTorrents(BaseMode): "seeding_time","time_added","distributed_copies", "num_pieces", "piece_length","save_path"] + def __update_config(self): + self.config = ConfigManager("console.conf",DEFAULT_PREFS) + self.__columns = self.config["columns"] + self.__config_widths = self.config["column_widths"] + def __split_help(self): self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) @@ -227,11 +247,11 @@ class AllTorrents(BaseMode): self.refresh() - def _update_columns(self): - self.column_widths = [5,-1,15,13,10,10,10,15,15] + def __update_columns(self): + self.column_widths = [self.__config_widths[c] for c in self.__columns] req = sum(filter(lambda x:x >= 0,self.column_widths)) if (req > self.cols): # can't satisfy requests, just spread out evenly - cw = int(self.cols/len(self.column_names)) + cw = int(self.cols/len(self.__columns)) for i in range(0,len(self.column_widths)): self.column_widths[i] = cw else: @@ -242,7 +262,7 @@ class AllTorrents(BaseMode): if (self.column_widths[i] < 0): self.column_widths[i] = vw - self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.column_names[i]," "*(self.column_widths[i]-len(self.column_names[i]))) for i in range(0,len(self.column_names))])) + self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.__columns[i]," "*(self.column_widths[i]-len(self.__columns[i]))) for i in range(0,len(self.__columns))])) def set_state(self, state, refresh): @@ -253,16 +273,8 @@ class AllTorrents(BaseMode): for torrent_id in self._sorted_ids: ts = self.curstate[torrent_id] newnames.append(ts["name"]) - newrows.append((format_utils.format_row([self._format_queue(ts["queue"]), - ts["name"], - "%s"%deluge.common.fsize(ts["total_wanted"]), - ts["state"], - format_utils.format_progress(ts["progress"]), - format_utils.format_seeds_peers(ts["num_seeds"],ts["total_seeds"]), - format_utils.format_seeds_peers(ts["num_peers"],ts["total_peers"]), - format_utils.format_speed(ts["download_payload_rate"]), - format_utils.format_speed(ts["upload_payload_rate"]) - ],self.column_widths),ts["state"])) + newrows.append((format_utils.format_row([column.get_column_value(name,ts) for name in self.__columns],self.column_widths),ts["state"])) + self.numtorrents = len(state) self.formatted_rows = newrows self.torrent_names = newnames @@ -337,7 +349,7 @@ class AllTorrents(BaseMode): def on_resize(self, *args): BaseMode.on_resize_norefresh(self, *args) - self._update_columns() + self.__update_columns() self.__split_help() if self.popup: self.popup.handle_resize() diff --git a/deluge/ui/console/modes/column.py b/deluge/ui/console/modes/column.py new file mode 100644 index 000000000..f1eb327ed --- /dev/null +++ b/deluge/ui/console/modes/column.py @@ -0,0 +1,85 @@ +# +# column.py +# +# Copyright (C) 2011 Nick Lanham +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# + +import deluge.common +import format_utils + +def format_queue(qnum): + if (qnum >= 0): + return "%d"%(qnum+1) + else: + return "" + +columns = { + "#":(("queue",),format_queue), + "Name":(("name",),None), + "Size":(("total_wanted",),deluge.common.fsize), + "State":(("state",),None), + "Progress":(("progress",),format_utils.format_progress), + "Seeders":(("num_seeds","total_seeds"),format_utils.format_seeds_peers), + "Peers":(("num_peers","total_peers"),format_utils.format_seeds_peers), + "Down Speed":(("download_payload_rate",),format_utils.format_speed), + "Up Speed":(("upload_payload_rate",),format_utils.format_speed), + } + +def get_column_value(name,state): + try: + col = columns[name] + except KeyError: + log.debug("No such column: %s",name) + return None + + if col[1] != None: + args = [] + try: + for key in col[0]: + args.append(state[key]) + except: + log.debug("Could not get column field: %s",col[1]) + return None + colval = col[1](*args) + else: + colval = state[col[0][0]] + return colval + + +def get_required_fields(cols): + fields = [] + for col in cols: + fields.extend(columns.get(col)[0]) + return fields + + + From 62da60a0e40c3eb8fae120885fab60bad31cbcb6 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Mon, 7 Mar 2011 12:37:23 +0100 Subject: [PATCH 130/329] break out each column preference --- deluge/ui/console/modes/alltorrents.py | 28 ++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index db4c312f5..aae90b06d 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -132,7 +132,15 @@ class FILTER: QUEUED=7 DEFAULT_PREFS = { - "columns":["#", "Name","Size","State","Progress","Seeders","Peers","Down Speed","Up Speed"], + "show_queue":True, + "show_name":True, + "show_size":True, + "show_state":True, + "show_progress":True, + "show_seeders":True, + "show_peers":True, + "show_downspeed":True, + "show_upspeed":True, "column_widths":{ "#":5, "Name":-1, @@ -145,6 +153,22 @@ DEFAULT_PREFS = { "Up Speed":15} } +column_prefs = ["show_queue","show_name","show_size","show_state", + "show_progress","show_seeders","show_peers", + "show_downspeed","show_upspeed"] + +prefs_to_names = { + "show_queue":"#", + "show_name":"Name", + "show_size":"Size", + "show_state":"State", + "show_progress":"Progress", + "show_seeders":"Seeders", + "show_peers":"Peers", + "show_downspeed":"Down Speed", + "show_upspeed":"Up Speed" +} + class StateUpdater(component.Component): def __init__(self, alltorrent, cb, sf,tcb): component.Component.__init__(self, "AllTorrentsStateUpdater", 1, depend=["SessionProxy"]) @@ -236,7 +260,7 @@ class AllTorrents(BaseMode): def __update_config(self): self.config = ConfigManager("console.conf",DEFAULT_PREFS) - self.__columns = self.config["columns"] + self.__columns = [prefs_to_names[pref] for pref in column_prefs if self.config[pref]] self.__config_widths = self.config["column_widths"] def __split_help(self): From f2d560351efe00c4d8c7c05841120df9e7e27e07 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Mon, 7 Mar 2011 13:40:25 +0100 Subject: [PATCH 131/329] add preferences for display and size of columns in alltorrent mode --- deluge/ui/console/modes/alltorrents.py | 60 ++++++++++----------- deluge/ui/console/modes/preference_panes.py | 16 ++++-- deluge/ui/console/modes/preferences.py | 25 ++++++++- 3 files changed, 65 insertions(+), 36 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index aae90b06d..3d8320e22 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# alltorrens.py +# alltorrents.py # # Copyright (C) 2011 Nick Lanham # @@ -141,32 +141,31 @@ DEFAULT_PREFS = { "show_peers":True, "show_downspeed":True, "show_upspeed":True, - "column_widths":{ - "#":5, - "Name":-1, - "Size":15, - "State":13, - "Progress":10, - "Seeders":10, - "Peers":10, - "Down Speed":15, - "Up Speed":15} + "queue_width":5, + "name_width":-1, + "size_width":15, + "state_width":13, + "progress_width":10, + "seeders_width":10, + "peers_width":10, + "downspeed_width":15, + "upspeed_width":15, } -column_prefs = ["show_queue","show_name","show_size","show_state", - "show_progress","show_seeders","show_peers", - "show_downspeed","show_upspeed"] +column_pref_names = ["queue","name","size","state", + "progress","seeders","peers", + "downspeed","upspeed"] prefs_to_names = { - "show_queue":"#", - "show_name":"Name", - "show_size":"Size", - "show_state":"State", - "show_progress":"Progress", - "show_seeders":"Seeders", - "show_peers":"Peers", - "show_downspeed":"Down Speed", - "show_upspeed":"Up Speed" + "queue":"#", + "name":"Name", + "size":"Size", + "state":"State", + "progress":"Progress", + "seeders":"Seeders", + "peers":"Peers", + "downspeed":"Down Speed", + "upspeed":"Up Speed" } class StateUpdater(component.Component): @@ -215,7 +214,6 @@ class AllTorrents(BaseMode): self.cursor = 0 self.coreconfig = component.get("ConsoleUI").coreconfig - self.__update_config() self.legacy_mode = None @@ -229,7 +227,7 @@ class AllTorrents(BaseMode): "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] self.updater = StateUpdater(self,self.set_state,self._status_fields,self._on_torrent_status) - self.__update_columns() + self.update_config() self._info_fields = [ @@ -258,10 +256,11 @@ class AllTorrents(BaseMode): "seeding_time","time_added","distributed_copies", "num_pieces", "piece_length","save_path"] - def __update_config(self): + def update_config(self): self.config = ConfigManager("console.conf",DEFAULT_PREFS) - self.__columns = [prefs_to_names[pref] for pref in column_prefs if self.config[pref]] - self.__config_widths = self.config["column_widths"] + self.__cols_to_show = [pref for pref in column_pref_names if self.config["show_%s"%pref]] + self.__columns = [prefs_to_names[col] for col in self.__cols_to_show] + self.__update_columns() def __split_help(self): self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) @@ -270,9 +269,8 @@ class AllTorrents(BaseMode): component.start(["AllTorrentsStateUpdater"]) self.refresh() - def __update_columns(self): - self.column_widths = [self.__config_widths[c] for c in self.__columns] + self.column_widths = [self.config["%s_width"%c] for c in self.__cols_to_show] req = sum(filter(lambda x:x >= 0,self.column_widths)) if (req > self.cols): # can't satisfy requests, just spread out evenly cw = int(self.cols/len(self.__columns)) @@ -418,7 +416,7 @@ class AllTorrents(BaseMode): def _on_get_cache_status(status,port,config): component.stop(["AllTorrentsStateUpdater"]) self.stdscr.clear() - prefs = Preferences(self,config,port,status,self.stdscr,self.encoding) + prefs = Preferences(self,config,self.config,port,status,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(prefs) client.core.get_config().addCallback(_on_get_config) diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py index d30a4f978..25aafd72b 100644 --- a/deluge/ui/console/modes/preference_panes.py +++ b/deluge/ui/console/modes/preference_panes.py @@ -34,6 +34,7 @@ # from deluge.ui.console.modes.input_popup import TextInput,SelectInput,CheckedInput,IntSpinInput,FloatSpinInput,CheckedPlusInput +import deluge.ui.console.modes.alltorrents try: import curses @@ -293,9 +294,18 @@ class BandwidthPane(BasePane): class InterfacePane(BasePane): def __init__(self, offset, parent, width): BasePane.__init__(self,offset,parent,width) - self.add_header("Interface Settings Comming Soon") - # add title bar control here - + self.add_header("Columns To Display") + for cpn in deluge.ui.console.modes.alltorrents.column_pref_names: + pn = "show_%s"%cpn + self.add_checked_input(pn, + deluge.ui.console.modes.alltorrents.prefs_to_names[cpn], + parent.console_config[pn]) + self.add_header("Column Widths (-1 = expand)",True) + for cpn in deluge.ui.console.modes.alltorrents.column_pref_names: + pn = "%s_width"%cpn + self.add_int_spin_input(pn, + deluge.ui.console.modes.alltorrents.prefs_to_names[cpn], + parent.console_config[pn],-1,100) class OtherPane(BasePane): def __init__(self, offset, parent, width): diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index c96324db6..a44bf80ed 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -105,7 +105,7 @@ class ZONE: ACTIONS = 2 class Preferences(BaseMode): - def __init__(self, parent_mode, core_config, active_port, status, stdscr, encoding=None): + def __init__(self, parent_mode, core_config, console_config, active_port, status, stdscr, encoding=None): self.parent_mode = parent_mode self.categories = [_("Downloads"), _("Network"), _("Bandwidth"), _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), @@ -116,6 +116,7 @@ class Preferences(BaseMode): self.action_input = None self.core_config = core_config + self.console_config = console_config self.active_port = active_port self.status = status @@ -197,7 +198,8 @@ class Preferences(BaseMode): def __apply_prefs(self): new_core_config = {} for pane in self.panes: - pane.add_config_values(new_core_config) + if not isinstance(pane,InterfacePane): + pane.add_config_values(new_core_config) # Apply Core Prefs if client.connected(): # Only do this if we're connected to a daemon @@ -214,6 +216,25 @@ class Preferences(BaseMode): # Update the configuration self.core_config.update(config_to_set) + # Update Interface Prefs + new_console_config = {} + didupdate = False + for pane in self.panes: + # could just access panes by index, but that would break if panes + # are ever reordered, so do it the slightly slower but safer way + if isinstance(pane,InterfacePane): + pane.add_config_values(new_console_config) + for key in new_console_config.keys(): + # The values do not match so this needs to be updated + if self.console_config[key] != new_console_config[key]: + self.console_config[key] = new_console_config[key] + didupdate = True + if didupdate: + # changed something, save config and tell alltorrents + self.console_config.save() + self.parent_mode.update_config() + + def __update_preferences(self,core_config): self.core_config = core_config for pane in self.panes: From f35145b0a6f2c31dd32436ddebc123d7dd711a9b Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 8 Mar 2011 00:16:42 +0100 Subject: [PATCH 132/329] make alltorrents a component like it should be and get rid of alltorrentsstateupdater --- deluge/ui/console/commands/gui.py | 2 +- deluge/ui/console/modes/alltorrents.py | 85 +++++++++++--------------- 2 files changed, 37 insertions(+), 50 deletions(-) diff --git a/deluge/ui/console/commands/gui.py b/deluge/ui/console/commands/gui.py index eb10cc0ce..35335e9fb 100644 --- a/deluge/ui/console/commands/gui.py +++ b/deluge/ui/console/commands/gui.py @@ -44,7 +44,7 @@ class Command(BaseCommand): def handle(self, *args, **options): console = component.get("ConsoleUI") try: - at = component.get("AllTorrentsStateUpdater").alltorrent + at = component.get("AllTorrents") except KeyError: at = AllTorrents(console.stdscr,console.encoding) console.set_mode(at) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 3d8320e22..c24e455c2 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -168,33 +168,7 @@ prefs_to_names = { "upspeed":"Up Speed" } -class StateUpdater(component.Component): - def __init__(self, alltorrent, cb, sf,tcb): - component.Component.__init__(self, "AllTorrentsStateUpdater", 1, depend=["SessionProxy"]) - self.alltorrent = alltorrent - self._status_cb = cb - self._status_fields = sf - self.status_dict = {} - self._torrent_cb = tcb - self._torrent_to_update = None - - def set_torrent_to_update(self, tid, keys): - self._torrent_to_update = tid - self._torrent_keys = keys - - def start(self): - component.get("SessionProxy").get_torrents_status(self.status_dict, self._status_fields).addCallback(self._on_torrents_status,False) - - def update(self): - component.get("SessionProxy").get_torrents_status(self.status_dict, self._status_fields).addCallback(self._on_torrents_status,True) - if self._torrent_to_update: - component.get("SessionProxy").get_torrent_status(self._torrent_to_update, self._torrent_keys).addCallback(self._torrent_cb) - - def _on_torrents_status(self, state, refresh): - self._status_cb(state,refresh) - - -class AllTorrents(BaseMode): +class AllTorrents(BaseMode, component.Component): def __init__(self, stdscr, encoding=None): self.formatted_rows = None self.torrent_names = None @@ -217,18 +191,20 @@ class AllTorrents(BaseMode): self.legacy_mode = None + self.__status_dict = {} + self.__status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", + "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] + self.__torrent_info_id = None + BaseMode.__init__(self, stdscr, encoding) + component.Component.__init__(self, "AllTorrents", 1, depend=["SessionProxy"]) curses.curs_set(0) self.stdscr.notimeout(0) self.__split_help() - - self._status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", - "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] - - self.updater = StateUpdater(self,self.set_state,self._status_fields,self._on_torrent_status) self.update_config() + component.start(["AllTorrents"]) self._info_fields = [ ("Name",None,("name",)), @@ -250,12 +226,22 @@ class AllTorrents(BaseMode): ("Pieces", format_utils.format_pieces, ("num_pieces","piece_length")), ] - self._status_keys = ["name","state","download_payload_rate","upload_payload_rate", + self.__status_keys = ["name","state","download_payload_rate","upload_payload_rate", "progress","eta","all_time_download","total_uploaded", "ratio", "num_seeds","total_seeds","num_peers","total_peers", "active_time", "seeding_time","time_added","distributed_copies", "num_pieces", "piece_length","save_path"] + # component start/update + def start(self): + log.error("STARTING") + component.get("SessionProxy").get_torrents_status(self.__status_dict, self.__status_fields).addCallback(self.set_state,False) + + def update(self): + component.get("SessionProxy").get_torrents_status(self.__status_dict, self.__status_fields).addCallback(self.set_state,True) + if self.__torrent_info_id: + component.get("SessionProxy").get_torrent_status(self.__torrent_info_id, self.__status_keys).addCallback(self._on_torrent_status) + def update_config(self): self.config = ConfigManager("console.conf",DEFAULT_PREFS) self.__cols_to_show = [pref for pref in column_pref_names if self.config["show_%s"%pref]] @@ -266,7 +252,7 @@ class AllTorrents(BaseMode): self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) def resume(self): - component.start(["AllTorrentsStateUpdater"]) + component.start(["AllTorrents"]) self.refresh() def __update_columns(self): @@ -366,7 +352,7 @@ class AllTorrents(BaseMode): self.popup.add_line("{!info!}%s: {!input!}%s"%(f[0],info)) self.refresh() else: - self.updater.set_torrent_to_update(None,None) + self.__torrent_info_id = None def on_resize(self, *args): @@ -401,7 +387,7 @@ class AllTorrents(BaseMode): def show_torrent_details(self,tid): - component.stop(["AllTorrentsStateUpdater"]) + component.stop(["AllTorrents"]) self.stdscr.clear() td = TorrentDetail(self,tid,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(td) @@ -414,7 +400,7 @@ class AllTorrents(BaseMode): client.core.get_cache_status().addCallback(_on_get_cache_status,port,config) def _on_get_cache_status(status,port,config): - component.stop(["AllTorrentsStateUpdater"]) + component.stop(["AllTorrents"]) self.stdscr.clear() prefs = Preferences(self,config,self.config,port,status,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(prefs) @@ -423,13 +409,13 @@ class AllTorrents(BaseMode): def __show_events(self): - component.stop(["AllTorrentsStateUpdater"]) + component.stop(["AllTorrents"]) self.stdscr.clear() ev = EventView(self,self.stdscr,self.encoding) component.get("ConsoleUI").set_mode(ev) def __legacy_mode(self): - component.stop(["AllTorrentsStateUpdater"]) + component.stop(["AllTorrents"]) self.stdscr.clear() if not self.legacy_mode: self.legacy_mode = Legacy(self.stdscr,self.encoding) @@ -439,28 +425,28 @@ class AllTorrents(BaseMode): def _torrent_filter(self, idx, data): if data==FILTER.ALL: - self.updater.status_dict = {} + self.__status_dict = {} self._curr_filter = None elif data==FILTER.ACTIVE: - self.updater.status_dict = {"state":"Active"} + self.__status_dict = {"state":"Active"} self._curr_filter = "Active" elif data==FILTER.DOWNLOADING: - self.updater.status_dict = {"state":"Downloading"} + self.__status_dict = {"state":"Downloading"} self._curr_filter = "Downloading" elif data==FILTER.SEEDING: - self.updater.status_dict = {"state":"Seeding"} + self.__status_dict = {"state":"Seeding"} self._curr_filter = "Seeding" elif data==FILTER.PAUSED: - self.updater.status_dict = {"state":"Paused"} + self.__status_dict = {"state":"Paused"} self._curr_filter = "Paused" elif data==FILTER.CHECKING: - self.updater.status_dict = {"state":"Checking"} + self.__status_dict = {"state":"Checking"} self._curr_filter = "Checking" elif data==FILTER.ERROR: - self.updater.status_dict = {"state":"Error"} + self.__status_dict = {"state":"Error"} self._curr_filter = "Error" elif data==FILTER.QUEUED: - self.updater.status_dict = {"state":"Queued"} + self.__status_dict = {"state":"Queued"} self._curr_filter = "Queued" self._go_top = True return True @@ -790,9 +776,10 @@ class AllTorrents(BaseMode): elif chr(c) == 'i': cid = self.current_torrent_id() if cid: - self.popup = Popup(self,"Info",close_cb=lambda:self.updater.set_torrent_to_update(None,None)) + def cb(): self.__torrent_info_id = None + self.popup = Popup(self,"Info",close_cb=cb) self.popup.add_line("Getting torrent info...") - self.updater.set_torrent_to_update(cid,self._status_keys) + self.__torrent_info_id = cid elif chr(c) == 'm': self._mark_unmark(self.cursel) effected_lines = [self.cursel-1] From 255af3c4855a9498bac84c314669e169d1d9d2c5 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 8 Mar 2011 00:35:55 +0100 Subject: [PATCH 133/329] set status fields to get from visible columns --- deluge/ui/console/modes/alltorrents.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index c24e455c2..5f2993729 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -192,8 +192,6 @@ class AllTorrents(BaseMode, component.Component): self.legacy_mode = None self.__status_dict = {} - self.__status_fields = ["queue","name","total_wanted","state","progress","num_seeds","total_seeds", - "num_peers","total_peers","download_payload_rate", "upload_payload_rate"] self.__torrent_info_id = None BaseMode.__init__(self, stdscr, encoding) @@ -246,6 +244,7 @@ class AllTorrents(BaseMode, component.Component): self.config = ConfigManager("console.conf",DEFAULT_PREFS) self.__cols_to_show = [pref for pref in column_pref_names if self.config["show_%s"%pref]] self.__columns = [prefs_to_names[col] for col in self.__cols_to_show] + self.__status_fields = column.get_required_fields(self.__columns) self.__update_columns() def __split_help(self): From e0bb8869aa65495d23dcc5c42ed387c97a3d6d45 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 8 Mar 2011 11:34:59 +0100 Subject: [PATCH 134/329] add some more columns --- deluge/ui/console/modes/alltorrents.py | 38 ++++++++++++++++++++++--- deluge/ui/console/modes/column.py | 18 ++++++++++-- deluge/ui/console/modes/format_utils.py | 14 +++++++++ 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 5f2993729..778ffa44e 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -141,6 +141,15 @@ DEFAULT_PREFS = { "show_peers":True, "show_downspeed":True, "show_upspeed":True, + "show_eta":False, + "show_ratio":False, + "show_avail":False, + "show_added":False, + "show_tracker":False, + "show_savepath":False, + "show_downloaded":False, + "show_uploaded":False, + "show_owner":False, "queue_width":5, "name_width":-1, "size_width":15, @@ -150,11 +159,23 @@ DEFAULT_PREFS = { "peers_width":10, "downspeed_width":15, "upspeed_width":15, + "eta_width":10, + "ratio_width":10, + "avail_width":10, + "added_width":25, + "tracker_width":15, + "savepath_width":15, + "downloaded_width":13, + "uploaded_width":13, + "owner_width":10, } column_pref_names = ["queue","name","size","state", "progress","seeders","peers", - "downspeed","upspeed"] + "downspeed","upspeed","eta", + "ratio","avail","added","tracker", + "savepath","downloaded","uploaded", + "owner"] prefs_to_names = { "queue":"#", @@ -165,7 +186,16 @@ prefs_to_names = { "seeders":"Seeders", "peers":"Peers", "downspeed":"Down Speed", - "upspeed":"Up Speed" + "upspeed":"Up Speed", + "eta":"ETA", + "ratio":"Ratio", + "avail":"Avail", + "added":"Added", + "tracker":"Tracker", + "savepath":"Save Path", + "downloaded":"Downloaded", + "uploaded":"Uploaded", + "owner":"Owner", } class AllTorrents(BaseMode, component.Component): @@ -214,13 +244,13 @@ class AllTorrents(BaseMode, component.Component): ("Path", None, ("save_path",)), ("Downloaded",deluge.common.fsize,("all_time_download",)), ("Uploaded", deluge.common.fsize,("total_uploaded",)), - ("Share Ratio", lambda x:x < 0 and "∞" or "%.3f"%x, ("ratio",)), + ("Share Ratio", format_utils.format_float, ("ratio",)), ("Seeders",format_utils.format_seeds_peers,("num_seeds","total_seeds")), ("Peers",format_utils.format_seeds_peers,("num_peers","total_peers")), ("Active Time",deluge.common.ftime,("active_time",)), ("Seeding Time",deluge.common.ftime,("seeding_time",)), ("Date Added",deluge.common.fdate,("time_added",)), - ("Availability", lambda x:x < 0 and "∞" or "%.3f"%x, ("distributed_copies",)), + ("Availability", format_utils.format_float, ("distributed_copies",)), ("Pieces", format_utils.format_pieces, ("num_pieces","piece_length")), ] diff --git a/deluge/ui/console/modes/column.py b/deluge/ui/console/modes/column.py index f1eb327ed..fcc7878a0 100644 --- a/deluge/ui/console/modes/column.py +++ b/deluge/ui/console/modes/column.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # # column.py # @@ -36,6 +37,10 @@ import deluge.common import format_utils +import logging +log = logging.getLogger(__name__) + + def format_queue(qnum): if (qnum >= 0): return "%d"%(qnum+1) @@ -52,13 +57,22 @@ columns = { "Peers":(("num_peers","total_peers"),format_utils.format_seeds_peers), "Down Speed":(("download_payload_rate",),format_utils.format_speed), "Up Speed":(("upload_payload_rate",),format_utils.format_speed), + "ETA":(("eta",), format_utils.format_time), + "Ratio":(("ratio",), format_utils.format_float), + "Avail":(("distributed_copies",), format_utils.format_float), + "Added":(("time_added",), deluge.common.fdate), + "Tracker":(("tracker_host",), None), + "Save Path":(("save_path",), None), + "Downloaded":(("all_time_download",), deluge.common.fsize), + "Uploaded":(("total_uploaded",), deluge.common.fsize), + "Owner":(("owner",),None) } def get_column_value(name,state): try: col = columns[name] except KeyError: - log.debug("No such column: %s",name) + log.error("No such column: %s",name) return None if col[1] != None: @@ -67,7 +81,7 @@ def get_column_value(name,state): for key in col[0]: args.append(state[key]) except: - log.debug("Could not get column field: %s",col[1]) + log.error("Could not get column field: %s",col[0]) return None colval = col[1](*args) else: diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 73a5ec034..826d5142e 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # format_utils.py # # Copyright (C) 2011 Nick Lanham @@ -45,6 +47,18 @@ def format_speed(speed): else: return "-" +def format_time(time): + if (time > 0): + return deluge.common.ftime(time) + else: + return "-" + +def format_float(x): + if x < 0: + return "∞" + else: + return "%.3f"%x + def format_seeds_peers(num, total): return "%d (%d)"%(num,total) From 08843ccad592cddd874037f6d47906246f73c2a0 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 8 Mar 2011 12:21:45 +0100 Subject: [PATCH 135/329] support prefs that don't fit on the screen remove superfluous log message --- deluge/ui/console/modes/alltorrents.py | 1 - deluge/ui/console/modes/preference_panes.py | 18 +++++++++++++++++- deluge/ui/console/modes/preferences.py | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 778ffa44e..083bbf6b7 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -262,7 +262,6 @@ class AllTorrents(BaseMode, component.Component): # component start/update def start(self): - log.error("STARTING") component.get("SessionProxy").get_torrents_status(self.__status_dict, self.__status_fields).addCallback(self.set_state,False) def update(self): diff --git a/deluge/ui/console/modes/preference_panes.py b/deluge/ui/console/modes/preference_panes.py index 25aafd72b..e24921629 100644 --- a/deluge/ui/console/modes/preference_panes.py +++ b/deluge/ui/console/modes/preference_panes.py @@ -93,6 +93,9 @@ class BasePane: self.inputs = [] self.active_input = -1 + # have we scrolled down in the list + self.input_offset = 0 + def move(self,r,c): self._cursor_row = r self._cursor_col = c @@ -134,12 +137,25 @@ class BasePane: if not isinstance(ipt,NoInput): self.active_input = i break + drew_act = not active crow = 1 for i,ipt in enumerate(self.inputs): - if ipt.depend_skip(): + if ipt.depend_skip() or i= (mode.prefs_height): + break + + if not drew_act: + self.input_offset+=1 + mode.refresh() + return 0 if active and self._cursor_row >= 0: curses.curs_set(2) diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py index a44bf80ed..0c0cd5a52 100644 --- a/deluge/ui/console/modes/preferences.py +++ b/deluge/ui/console/modes/preferences.py @@ -129,6 +129,7 @@ class Preferences(BaseMode): # create the panes self.prefs_width = self.cols-self.div_off-1 + self.prefs_height = self.rows-4 self.panes = [ DownloadsPane(self.div_off+2, self, self.prefs_width), NetworkPane(self.div_off+2, self, self.prefs_width), From a0f968966419f1cb854b0672262a818bf101e1b5 Mon Sep 17 00:00:00 2001 From: John Garland Date: Mon, 7 Mar 2011 18:30:25 +1100 Subject: [PATCH 136/329] Handle partial downloads due to incorrect headers (fixes #1517) --- deluge/core/core.py | 21 +++++++++++++-------- deluge/tests/test_core.py | 12 +++++++++++- deluge/ui/gtkui/addtorrentdialog.py | 20 +++++++++++++------- deluge/ui/web/json_api.py | 19 ++++++++++++++++++- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 983bfa75c..7d616ee9d 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -229,7 +229,7 @@ class Core(component.Component): :returns: a Deferred which returns the torrent_id as a str or None """ log.info("Attempting to add url %s", url) - def on_get_file(filename): + def on_download_success(filename): # We got the file, so add it to the session f = open(filename, "rb") data = f.read() @@ -240,15 +240,20 @@ class Core(component.Component): log.warning("Couldn't remove temp file: %s", e) return self.add_torrent_file(filename, base64.encodestring(data), options) - def on_get_file_error(failure): - # Log the error and pass the failure onto the client - log.error("Error occured downloading torrent from %s", url) - log.error("Reason: %s", failure.getErrorMessage()) - return failure + def on_download_fail(failure): + if failure.check(twisted.web.client.PartialDownloadError): + result = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True, + allow_compression=False) + result.addCallbacks(on_download_success, on_download_fail) + else: + # Log the error and pass the failure onto the client + log.error("Error occured downloading torrent from %s", url) + log.error("Reason: %s", failure.getErrorMessage()) + result = failure + return result d = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True) - d.addCallback(on_get_file) - d.addErrback(on_get_file_error) + d.addCallbacks(on_download_success, on_download_fail) return d @export diff --git a/deluge/tests/test_core.py b/deluge/tests/test_core.py index 1e74f30cf..76a1beeac 100644 --- a/deluge/tests/test_core.py +++ b/deluge/tests/test_core.py @@ -53,7 +53,7 @@ class CoreTestCase(unittest.TestCase): return d def test_add_torrent_url_with_cookie(self): - url = "http://deluge-torrent.org/test_torrent.php" + url = "http://deluge-torrent.org/test_torrent.php?test=cookie" options = {} headers = { "Cookie" : "password=deluge" } info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" @@ -66,6 +66,16 @@ class CoreTestCase(unittest.TestCase): return d + def test_add_torrent_url_with_partial_download(self): + url = "http://deluge-torrent.org/test_torrent.php?test=partial" + options = {} + info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" + + d = self.core.add_torrent_url(url, options) + d.addCallback(self.assertEquals, info_hash) + + return d + def test_add_magnet(self): info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" import deluge.common diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index a4fb421f0..b26c8c16a 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -46,7 +46,9 @@ import os import pkg_resources +import twisted.web.client from deluge.ui.client import client +from deluge.httpdownloader import download_file import deluge.component as component import listview from deluge.configmanager import ConfigManager @@ -654,14 +656,18 @@ class AddTorrentDialog(component.Component): dialog.destroy() def on_download_fail(result): - log.debug("Download failed: %s", result) - dialog.destroy() - dialogs.ErrorDialog(_("Download Failed"), _("Failed to download : %s" % url), details=result.getErrorMessage(), parent=self.dialog).run() + if result.check(twisted.web.client.PartialDownloadError): + result = download_file(url, tmp_file, on_part, allow_compression=False) + result.addCallbacks(on_download_success, on_download_fail) + else: + log.debug("Download failed: %s", result) + dialog.destroy() + dialogs.ErrorDialog(_("Download Failed"), _("Failed to download : %s" % url), + details=result.getErrorMessage(), parent=self.dialog).run() + return result - import deluge.httpdownloader - d = deluge.httpdownloader.download_file(url, tmp_file, on_part) - d.addCallback(on_download_success) - d.addErrback(on_download_fail) + d = download_file(url, tmp_file, on_part) + d.addCallbacks(on_download_success, on_download_fail) def _on_button_hash_clicked(self, widget): log.debug("_on_button_hash_clicked") diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index c190f2804..486dd3883 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -45,6 +45,7 @@ from types import FunctionType from twisted.internet import reactor from twisted.internet.defer import Deferred, DeferredList from twisted.web import http, resource, server +import twisted.web.client from deluge import common, component, httpdownloader from deluge.configmanager import ConfigManager, get_config_dir @@ -639,13 +640,29 @@ class WebApi(JSONComponent): :rtype: string """ + def on_download_success(result): + log.debug("Successfully downloaded %s to %s", url, result) + return result + + def on_download_fail(result): + if result.check(twisted.web.client.PartialDownloadError): + result = httpdownloader.download_file(url, tmp_file, headers=headers, + allow_compression=False) + result.addCallbacks(on_download_success, on_download_fail) + else: + log.error("Error occured downloading torrent from %s", url) + log.error("Reason: %s", result.getErrorMessage()) + return result + tmp_file = os.path.join(tempfile.gettempdir(), url.split("/")[-1]) log.debug("filename: %s", tmp_file) headers = {} if cookie: headers["Cookie"] = cookie log.debug("cookie: %s", cookie) - return httpdownloader.download_file(url, tmp_file, headers=headers) + d = httpdownloader.download_file(url, tmp_file, headers=headers) + d.addCallbacks(on_download_success, on_download_fail) + return d @export def get_torrent_info(self, filename): From 32b41fabd626ea8a13fc26565316f803b8e92a64 Mon Sep 17 00:00:00 2001 From: John Garland Date: Wed, 9 Mar 2011 00:37:35 +1100 Subject: [PATCH 137/329] Handle redirection when adding a torrent by url --- deluge/core/core.py | 14 ++++++++++++-- deluge/tests/test_core.py | 10 ++++++++++ deluge/ui/gtkui/addtorrentdialog.py | 8 +++++++- deluge/ui/web/json_api.py | 8 +++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 7d616ee9d..d0c80fd09 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -41,6 +41,12 @@ import base64 import logging import threading import tempfile +from urlparse import urljoin + +from twisted.internet import reactor, defer +from twisted.internet.task import LoopingCall +import twisted.web.client +import twisted.web.error from deluge.httpdownloader import download_file @@ -241,9 +247,13 @@ class Core(component.Component): return self.add_torrent_file(filename, base64.encodestring(data), options) def on_download_fail(failure): - if failure.check(twisted.web.client.PartialDownloadError): + if failure.check(twisted.web.error.PageRedirect): + new_url = urljoin(url, failure.getErrorMessage().split(" to ")[1]) + result = download_file(new_url, tempfile.mkstemp()[1], headers=headers, force_filename=True) + result.addCallbacks(on_download_success, on_download_fail) + elif failure.check(twisted.web.client.PartialDownloadError): result = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True, - allow_compression=False) + allow_compression=False) result.addCallbacks(on_download_success, on_download_fail) else: # Log the error and pass the failure onto the client diff --git a/deluge/tests/test_core.py b/deluge/tests/test_core.py index 76a1beeac..f56a95772 100644 --- a/deluge/tests/test_core.py +++ b/deluge/tests/test_core.py @@ -66,6 +66,16 @@ class CoreTestCase(unittest.TestCase): return d + def test_add_torrent_url_with_redirect(self): + url = "http://deluge-torrent.org/test_torrent.php?test=redirect" + options = {} + info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" + + d = self.core.add_torrent_url(url, options) + d.addCallback(self.assertEquals, info_hash) + + return d + def test_add_torrent_url_with_partial_download(self): url = "http://deluge-torrent.org/test_torrent.php?test=partial" options = {} diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index b26c8c16a..2f9ceb1a1 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -43,10 +43,12 @@ import gobject import base64 import logging import os +from urlparse import urljoin import pkg_resources import twisted.web.client +import twisted.web.error from deluge.ui.client import client from deluge.httpdownloader import download_file import deluge.component as component @@ -656,7 +658,11 @@ class AddTorrentDialog(component.Component): dialog.destroy() def on_download_fail(result): - if result.check(twisted.web.client.PartialDownloadError): + if result.check(twisted.web.error.PageRedirect): + new_url = urljoin(url, result.getErrorMessage().split(" to ")[1]) + result = download_file(new_url, tmp_file, on_part) + result.addCallbacks(on_download_success, on_download_fail) + elif result.check(twisted.web.client.PartialDownloadError): result = download_file(url, tmp_file, on_part, allow_compression=False) result.addCallbacks(on_download_success, on_download_fail) else: diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 486dd3883..836578498 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -40,12 +40,14 @@ import shutil import logging import hashlib import tempfile +from urlparse import urljoin from types import FunctionType from twisted.internet import reactor from twisted.internet.defer import Deferred, DeferredList from twisted.web import http, resource, server import twisted.web.client +import twisted.web.error from deluge import common, component, httpdownloader from deluge.configmanager import ConfigManager, get_config_dir @@ -645,7 +647,11 @@ class WebApi(JSONComponent): return result def on_download_fail(result): - if result.check(twisted.web.client.PartialDownloadError): + if result.check(twisted.web.error.PageRedirect): + new_url = urljoin(url, result.getErrorMessage().split(" to ")[1]) + result = httpdownloader.download_file(new_url, tmp_file, headers=headers) + result.addCallbacks(on_download_success, on_download_fail) + elif result.check(twisted.web.client.PartialDownloadError): result = httpdownloader.download_file(url, tmp_file, headers=headers, allow_compression=False) result.addCallbacks(on_download_success, on_download_fail) From f30a2858ce35439c1d2bb36bf9d65fa417e8d568 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Tue, 8 Mar 2011 14:43:09 +0000 Subject: [PATCH 138/329] convert the tests to use a local webserver instead of pinging deluge-torrent.org and damoxc.net --- deluge/tests/test_httpdownloader.py | 94 +++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 13 deletions(-) diff --git a/deluge/tests/test_httpdownloader.py b/deluge/tests/test_httpdownloader.py index 54b4c053d..edcbeccdb 100644 --- a/deluge/tests/test_httpdownloader.py +++ b/deluge/tests/test_httpdownloader.py @@ -1,17 +1,85 @@ +import os + from twisted.trial import unittest +from twisted.internet import reactor from twisted.python.failure import Failure +from twisted.web.http import FORBIDDEN, NOT_MODIFIED +from twisted.web.resource import Resource, ForbiddenResource +from twisted.web.server import Site from deluge.httpdownloader import download_file from deluge.log import setupLogger +from deluge.ui.web.common import compress from email.utils import formatdate +def rpath(*paths): + return os.path.join(os.path.dirname(__file__), *paths) + +class TestRedirectResource(Resource): + + def render(self, request): + request.redirect("http://localhost:51242/") + +class TestRenameResource(Resource): + + def render(self, request): + filename = request.args.get("filename", ["renamed_file"])[0] + request.setHeader("Content-Type", "text/plain") + request.setHeader("Content-Disposition", "attachment; filename=" + + filename) + return "This file should be called " + filename + +class TestCookieResource(Resource): + + def render(self, request): + request.setHeader("Content-Type", "text/plain") + if request.getCookie("password") is None: + return "Password cookie not set!" + + if request.getCookie("password") == "deluge": + return "COOKIE MONSTER!" + + return request.getCookie("password") + +class TestGzipResource(Resource): + + def render(self, request): + message = request.args.get("msg", ["EFFICIENCY!"])[0] + request.setHeader("Content-Type", "text/plain") + return compress(message, request) + +class TopLevelResource(Resource): + + addSlash = True + + def __init__(self): + Resource.__init__(self) + self.putChild("cookie", TestCookieResource()) + self.putChild("gzip", TestGzipResource()) + self.putChild("redirect", TestRedirectResource()) + self.putChild("rename", TestRenameResource()) + + def getChild(self, path, request): + if path == "": + return self + else: + return Resource.getChild(self, path, request) + + def render(self, request): + if request.getHeader("If-Modified-Since"): + request.setResponseCode(NOT_MODIFIED) + return "

Deluge HTTP Downloader tests webserver here

" + class DownloadFileTestCase(unittest.TestCase): + def setUp(self): setupLogger("warning", "log_file") + self.website = Site(TopLevelResource()) + self.webserver = reactor.listenTCP(51242, self.website) def tearDown(self): - pass + return self.webserver.stopListening() def assertContains(self, filename, contents): f = open(filename) @@ -34,19 +102,19 @@ class DownloadFileTestCase(unittest.TestCase): return filename def test_download(self): - d = download_file("http://deluge-torrent.org", "index.html") + d = download_file("http://localhost:51242/", "index.html") d.addCallback(self.assertEqual, "index.html") return d def test_download_without_required_cookies(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=cookie" + url = "http://localhost:51242/cookie" d = download_file(url, "none") d.addCallback(self.fail) d.addErrback(self.assertIsInstance, Failure) return d def test_download_with_required_cookies(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=cookie" + url = "http://localhost:51242/cookie" cookie = { "cookie" : "password=deluge" } d = download_file(url, "monster", headers=cookie) d.addCallback(self.assertEqual, "monster") @@ -54,61 +122,61 @@ class DownloadFileTestCase(unittest.TestCase): return d def test_download_with_rename(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=rename&filename=renamed" + url = "http://localhost:51242/rename?filename=renamed" d = download_file(url, "original") d.addCallback(self.assertEqual, "renamed") d.addCallback(self.assertContains, "This file should be called renamed") return d def test_download_with_rename_fail(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=rename&filename=renamed" + url = "http://localhost:51242/rename?filename=renamed" d = download_file(url, "original") d.addCallback(self.assertEqual, "original") d.addCallback(self.assertContains, "This file should be called renamed") return d def test_download_with_rename_sanitised(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=rename&filename=/etc/passwd" + url = "http://localhost:51242/rename?filename=/etc/passwd" d = download_file(url, "original") d.addCallback(self.assertEqual, "passwd") d.addCallback(self.assertContains, "This file should be called /etc/passwd") return d def test_download_with_rename_prevented(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=rename&filename=spam" + url = "http://localhost:51242/rename?filename=spam" d = download_file(url, "forced", force_filename=True) d.addCallback(self.assertEqual, "forced") d.addCallback(self.assertContains, "This file should be called spam") return d def test_download_with_gzip_encoding(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=gzip&msg=success" + url = "http://localhost:51242/gzip?msg=success" d = download_file(url, "gzip_encoded") d.addCallback(self.assertContains, "success") return d def test_download_with_gzip_encoding_disabled(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=gzip&msg=fail" + url = "http://localhost:51242/gzip?msg=fail" d = download_file(url, "gzip_encoded", allow_compression=False) d.addCallback(self.failIfContains, "fail") return d def test_page_redirect(self): - url = "http://damoxc.net/deluge/httpdownloader.php?test=redirect" + url = 'http://localhost:51242/redirect' d = download_file(url, "none") d.addCallback(self.fail) d.addErrback(self.assertIsInstance, Failure) return d def test_page_not_found(self): - d = download_file("http://does.not.exist", "none") + d = download_file("http://localhost:51242/page/not/found", "none") d.addCallback(self.fail) d.addErrback(self.assertIsInstance, Failure) return d def test_page_not_modified(self): headers = { 'If-Modified-Since' : formatdate(usegmt=True) } - d = download_file("http://deluge-torrent.org", "index.html", headers=headers) + d = download_file("http://localhost:51242/", "index.html", headers=headers) d.addCallback(self.fail) d.addErrback(self.assertIsInstance, Failure) return d From 280781ded9dc3212636cd5f63c99d7d131073f77 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Sun, 13 Mar 2011 12:42:29 +0100 Subject: [PATCH 139/329] queue management in torrent actions --- deluge/ui/console/modes/torrent_actions.py | 35 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/modes/torrent_actions.py b/deluge/ui/console/modes/torrent_actions.py index 5667c6c3b..a15de5246 100644 --- a/deluge/ui/console/modes/torrent_actions.py +++ b/deluge/ui/console/modes/torrent_actions.py @@ -46,12 +46,15 @@ class ACTION: EDIT_TRACKERS=3 RECHECK=4 REMOVE=5 - MOVE_STORAGE=9 - REMOVE_DATA=6 REMOVE_NODATA=7 - DETAILS=8 + MOVE_STORAGE=9 + QUEUE=10 + QUEUE_TOP=11 + QUEUE_UP=12 + QUEUE_DOWN=13 + QUEUE_BOTTOM=14 def action_error(error,mode): rerr = error.value @@ -66,6 +69,30 @@ def torrent_action(idx, data, mode, ids): elif data==ACTION.RESUME: log.debug("Resuming torrents: %s", ids) client.core.resume_torrent(ids).addErrback(action_error,mode) + elif data==ACTION.QUEUE: + def do_queue(idx,qact,mode,ids): + if qact == ACTION.QUEUE_TOP: + log.debug("Queuing torrents top") + client.core.queue_top(ids) + elif qact == ACTION.QUEUE_UP: + log.debug("Queuing torrents up") + client.core.queue_up(ids) + elif qact == ACTION.QUEUE_DOWN: + log.debug("Queuing torrents down") + client.core.queue_down(ids) + elif qact == ACTION.QUEUE_BOTTOM: + log.debug("Queuing torrents bottom") + client.core.queue_bottom(ids) + if len(ids) == 1: + mode.clear_marks() + return True + popup = SelectablePopup(mode,"Queue Action",do_queue,mode,ids) + popup.add_line("_Top",data=ACTION.QUEUE_TOP) + popup.add_line("_Up",data=ACTION.QUEUE_UP) + popup.add_line("_Down",data=ACTION.QUEUE_DOWN) + popup.add_line("_Bottom",data=ACTION.QUEUE_BOTTOM) + mode.set_popup(popup) + return False elif data==ACTION.REMOVE: def do_remove(idx,data,mode,ids): if data: @@ -121,6 +148,8 @@ def torrent_actions_popup(mode,tids,details=False): popup.add_line("_Pause",data=ACTION.PAUSE) popup.add_line("_Resume",data=ACTION.RESUME) popup.add_divider() + popup.add_line("Queue",data=ACTION.QUEUE) + popup.add_divider() popup.add_line("_Update Tracker",data=ACTION.REANNOUNCE) popup.add_divider() popup.add_line("Remo_ve Torrent",data=ACTION.REMOVE) From e81a279dc2103ef3e259e13e9b4be9013a085ff4 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Sat, 19 Mar 2011 12:38:55 +0100 Subject: [PATCH 140/329] fix naming issue with close callback in popups --- deluge/ui/console/modes/input_popup.py | 4 ++-- deluge/ui/console/modes/popup.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 44f9de0c2..8c52f11a6 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -613,12 +613,12 @@ class InputPopup(Popup): elif c == curses.KEY_DOWN: self.current_input = min(len(self.inputs)-1,self.current_input+1) elif c == curses.KEY_ENTER or c == 10: - if self._close_cb: + if self.close_cb: vals = {} for ipt in self.inputs: vals[ipt.name] = ipt.get_value() curses.curs_set(0) - self._close_cb(vals) + self.close_cb(vals) return True # close the popup elif c == 27: # close on esc, no action return True diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py index e74203059..f4d00d49e 100644 --- a/deluge/ui/console/modes/popup.py +++ b/deluge/ui/console/modes/popup.py @@ -78,7 +78,7 @@ class Popup: self.screen = curses.newwin(height_req,width_req,by,bx) self.title = title - self.__close_cb = close_cb + self.close_cb = close_cb self.height,self.width = self.screen.getmaxyx() self.divider = None self.lineoff = 0 @@ -130,13 +130,13 @@ class Popup: self.lineoff += 1 elif c == curses.KEY_ENTER or c == 10 or c == 27: # close on enter/esc - if self.__close_cb: - self.__close_cb() + if self.close_cb: + self.close_cb() return True # close the popup if c > 31 and c < 256 and chr(c) == 'q': - if self.__close_cb: - self.__close_cb() + if self.close_cb: + self.close_cb() return True # close the popup self.refresh() From 67add964de95c8408ee9adff59e8dac191e23536 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Tue, 22 Mar 2011 17:16:03 -0700 Subject: [PATCH 141/329] Apply patch from #1581 to add an option to enable the app indicator interface --- .../ui/gtkui/glade/preferences_dialog.glade | 24 +++++++++++++-- deluge/ui/gtkui/gtkui.py | 1 + deluge/ui/gtkui/preferences.py | 5 ++++ deluge/ui/gtkui/systemtray.py | 29 ++++++++++++++----- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index d4cdc6115..76c71ce58 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -2068,6 +2068,26 @@ Disabled 2 + + + True + 10 + + + Enable Application Indicator + True + False + False + False + True + True + + + + + 3 + + True @@ -2088,7 +2108,7 @@ Disabled False - 3 + 4 @@ -2131,7 +2151,7 @@ Disabled - 4 + 5 diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 1609a2869..1efbda3ba 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -116,6 +116,7 @@ DEFAULT_PREFS = { "enable_system_tray": True, "close_to_tray": True, "start_in_tray": False, + "enable_appindicator": False, "lock_tray": False, "tray_password": "", "check_new_releases": True, diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index edc253e1b..a13937a2d 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -471,6 +471,8 @@ class Preferences(component.Component): self.gtkui_config["close_to_tray"]) self.glade.get_widget("chk_start_in_tray").set_active( self.gtkui_config["start_in_tray"]) + self.glade.get_widget("chk_enable_appindicator").set_active( + self.gtkui_config["enable_appindicator"]) self.glade.get_widget("chk_lock_tray").set_active( self.gtkui_config["lock_tray"]) self.glade.get_widget("chk_classic_mode").set_active( @@ -637,6 +639,8 @@ class Preferences(component.Component): self.glade.get_widget("chk_min_on_close").get_active() new_gtkui_config["start_in_tray"] = \ self.glade.get_widget("chk_start_in_tray").get_active() + new_gtkui_config["enable_appindicator"] = \ + self.glade.get_widget("chk_enable_appindicator").get_active() new_gtkui_config["lock_tray"] = \ self.glade.get_widget("chk_lock_tray").get_active() passhex = sha_hash(\ @@ -782,6 +786,7 @@ class Preferences(component.Component): "spin_outgoing_port_max": False}, "chk_use_tray": {"chk_min_on_close": True, "chk_start_in_tray": True, + "chk_enable_appindicator": True, "chk_lock_tray": True}, "chk_lock_tray": {"txt_tray_password": True, "password_label": True}, diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index c4bce4928..b465c5423 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -70,6 +70,10 @@ class SystemTray(component.Component): ] self.config.register_set_function("enable_system_tray", self.on_enable_system_tray_set) + # bit of a hack to prevent function from doing something on startup + self.__enabled_set_once = False + self.config.register_set_function("enable_appindicator", + self.on_enable_appindicator_set) self.max_download_speed = -1.0 self.download_rate = 0.0 @@ -103,7 +107,7 @@ class SystemTray(component.Component): self.tray_menu = self.tray_glade.get_widget("tray_menu") - if appindicator: + if appindicator and self.config["enable_appindicator"]: log.debug("Enabling the Application Indicator..") self.indicator = appindicator.Indicator ( "deluge", "deluge", appindicator.CATEGORY_APPLICATION_STATUS) @@ -162,7 +166,7 @@ class SystemTray(component.Component): # These do not work with appindicator currently and can crash Deluge. # Related to Launchpad bug #608219 - if appindicator: + if appindicator and self.config["enable_appindicator"]: self.hide_widget_list.remove("menuitem_download_limit") self.hide_widget_list.remove("menuitem_upload_limit") self.hide_widget_list.remove("separatormenuitem3") @@ -200,7 +204,7 @@ class SystemTray(component.Component): def shutdown(self): if self.config["enable_system_tray"]: - if appindicator: + if appindicator and self.config["enable_appindicator"]: self.indicator.set_status(appindicator.STATUS_PASSIVE) else: self.tray.set_visible(False) @@ -236,7 +240,7 @@ class SystemTray(component.Component): return # Tool tip text not available for appindicator - if appindicator: + if appindicator and self.config["enable_appindicator"]: return # Set the tool tip text @@ -285,13 +289,17 @@ class SystemTray(component.Component): submenu_bwupset.show_all() # Re-set the menu to partly work around Launchpad bug #608219 - if appindicator: + if appindicator and self.config["enable_appindicator"]: self.indicator.set_menu(self.tray_menu) - def disable(self): + def disable(self,invert_app_ind_conf=False): """Disables the system tray icon or appindicator.""" try: - if appindicator: + if invert_app_ind_conf: + app_ind_conf = not self.config["enable_appindicator"] + else: + app_ind_conf = self.config["enable_appindicator"] + if appindicator and app_ind_conf: if hasattr(self, "_sig_win_hide"): self.window.window.disconnect(self._sig_win_hide) self.window.window.disconnect(self._sig_win_show) @@ -323,6 +331,13 @@ class SystemTray(component.Component): else: self.disable() + def on_enable_appindicator_set(self, key, value): + """Called whenever the 'enable_appindicator' config key is modified""" + if self.__enabled_set_once: + self.disable(True) + self.enable() + self.__enabled_set_once = True + def on_tray_clicked(self, icon): """Called when the tray icon is left clicked.""" self.blink(False) From 298b85c368d1a409562bc01c33d841303c273ae7 Mon Sep 17 00:00:00 2001 From: John Garland Date: Wed, 23 Mar 2011 23:38:41 +1100 Subject: [PATCH 142/329] Improve autoadd filename matching (fixes #1614) --- deluge/core/autoadd.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py index 911b560ce..acab22097 100644 --- a/deluge/core/autoadd.py +++ b/deluge/core/autoadd.py @@ -76,12 +76,12 @@ class AutoAdd(component.Component): return for filename in os.listdir(self.config["autoadd_location"]): - if filename.split(".")[-1] == "torrent": - try: - filepath = os.path.join(self.config["autoadd_location"], filename) - except UnicodeDecodeError, e: - log.error("Unable to auto add torrent due to inproper filename encoding: %s", e) - continue + try: + filepath = os.path.join(self.config["autoadd_location"], filename) + except UnicodeDecodeError, e: + log.error("Unable to auto add torrent due to improper filename encoding: %s", e) + continue + if os.path.isfile(filepath) and filename.endswith(".torrent"): try: filedump = self.load_torrent(filepath) except (RuntimeError, Exception), e: From 45ccd3b84afff8df3b787b0d0cf31c5af75c8c34 Mon Sep 17 00:00:00 2001 From: John Garland Date: Wed, 23 Mar 2011 23:41:44 +1100 Subject: [PATCH 143/329] Fix libtorrent not compiling with boost libs 1.46 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6f9c60aac..2a41bfbce 100644 --- a/setup.py +++ b/setup.py @@ -67,6 +67,7 @@ _extra_compile_args = [ "-D_FILE_OFFSET_BITS=64", "-DNDEBUG", "-DTORRENT_USE_OPENSSL=1", + "-DBOOST_FILESYSTEM_VERSION=2", "-O2", ] From fd248eb1fd770553bf73aef224272e9fbd30b486 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Mon, 28 Mar 2011 16:50:47 +0100 Subject: [PATCH 144/329] split the auto_add_trackers textfield otherwise it breaks the label plugin --- deluge/plugins/label/label/data/label.js | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/plugins/label/label/data/label.js b/deluge/plugins/label/label/data/label.js index 57d0dda0d..8ae0584bc 100644 --- a/deluge/plugins/label/label/data/label.js +++ b/deluge/plugins/label/label/data/label.js @@ -330,6 +330,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, { onOkClick: function() { var values = this.form.getForm().getFieldValues(); + values['auto_add_trackers'] = values['auto_add_trackers'].split('\n'); deluge.client.label.set_options(this.label, values); this.hide(); }, From 0d560bcd6fcfb4e89f23b2d11fe4bd6d3a5ec015 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 29 Mar 2011 14:39:13 +0200 Subject: [PATCH 145/329] Add update-tracker/reannounce command for command-line/legacy interface --- deluge/ui/console/commands/update-tracker.py | 65 ++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 deluge/ui/console/commands/update-tracker.py diff --git a/deluge/ui/console/commands/update-tracker.py b/deluge/ui/console/commands/update-tracker.py new file mode 100644 index 000000000..a4aa880e1 --- /dev/null +++ b/deluge/ui/console/commands/update-tracker.py @@ -0,0 +1,65 @@ +# +# rm.py +# +# Copyright (C) 2008-2009 Ido Abramovich +# Copyright (C) 2009 Andrew Resch +# +# 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 +# statement from all source files in the program, then also delete it here. +# +# +from deluge.ui.console.main import BaseCommand +import deluge.ui.console.colors as colors +from deluge.ui.client import client +import deluge.component as component + +from optparse import make_option + + +class Command(BaseCommand): + """Update tracker for torrent(s)""" + usage = "Usage: update-tracker [ * | [ ...] ]" + aliases = ['reannounce'] + + def handle(self, *args, **options): + self.console = component.get("ConsoleUI") + if len(args) == 0: + self.console.write(self.usage) + return + if len(args) > 0 and args[0].lower() == '*': + args = [""] + + torrent_ids = [] + for arg in args: + torrent_ids.extend(self.console.match_torrent(arg)) + + client.core.force_reannounce(torrent_ids) + + def complete(self, line): + # We use the ConsoleUI torrent tab complete method + return component.get("ConsoleUI").tab_complete_torrent(line) From 19799d74b44f0feb6d5188cf174c5f097d132e48 Mon Sep 17 00:00:00 2001 From: John Garland Date: Sat, 9 Apr 2011 22:34:23 +1000 Subject: [PATCH 146/329] Include gif pixmaps in the package data --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 2a41bfbce..d5f13b11f 100644 --- a/setup.py +++ b/setup.py @@ -463,6 +463,7 @@ setup( "data/pixmaps/*.png", "data/pixmaps/*.svg", "data/pixmaps/*.ico", + "data/pixmaps/*.gif", "data/pixmaps/flags/*.png", "plugins/*.egg", "i18n/*.pot", From bb0746c3e8b657d85492be84cffd09f3a57ae3df Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 13 Apr 2011 11:52:03 +0200 Subject: [PATCH 147/329] use os.sep and strip what's already in input box from complete options --- deluge/ui/console/modes/input_popup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 8c52f11a6..ed00f2140 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -42,7 +42,7 @@ try: except ImportError: pass -import logging,os.path +import logging,os,os.path from popup import Popup @@ -476,7 +476,8 @@ class TextInput(InputField): self.cursor = len(prefix) if len(opts) > 1 and second_hit: # display multiple options on second tab hit - self.opts = " ".join(opts) + sp = self.value.rfind(os.sep)+1 + self.opts = " ".join([o[sp:] for o in opts]) # Cursor movement elif c == curses.KEY_LEFT: @@ -519,6 +520,7 @@ class TextInput(InputField): self.value = self.value[:self.cursor] + uchar + self.value[self.cursor:] # Move the cursor forward self.cursor+=1 + def complete(self,line): line = os.path.abspath(os.path.expanduser(line)) @@ -534,7 +536,7 @@ class TextInput(InputField): continue f = os.path.join(line, f) if os.path.isdir(f): - f += "/" + f += os.sep ret.append(f) else: # This is a file, but we could be looking for another file that @@ -552,9 +554,8 @@ class TextInput(InputField): p = os.path.join(os.path.dirname(line), f) if os.path.isdir(p): - p += "/" + p += os.sep ret.append(p) - return ret From 42e1e2fd20f014d9c5d7b756210718d35182d623 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 13 Apr 2011 12:54:59 +0100 Subject: [PATCH 148/329] Include proper Date header in email notifications. --- deluge/plugins/notifications/notifications/core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/plugins/notifications/notifications/core.py b/deluge/plugins/notifications/notifications/core.py index 2139de257..92c61461d 100644 --- a/deluge/plugins/notifications/notifications/core.py +++ b/deluge/plugins/notifications/notifications/core.py @@ -38,6 +38,7 @@ # import smtplib +from datetime import datetime from twisted.internet import defer, threads from deluge import component from deluge.event import known_events @@ -118,11 +119,13 @@ class CoreNotifications(CustomNotifications): From: %(smtp_from)s To: %(smtp_recipients)s Subject: %(subject)s +Date: %(date)s """ % {'smtp_from': self.config['smtp_from'], 'subject': subject, - 'smtp_recipients': to_addrs} + 'smtp_recipients': to_addrs, + 'date': datetime.utcnow().strftime('%a, %d %b %Y %H:%M:%S +0000').strip()} message = '\r\n'.join((headers + message).splitlines()) From 5bc304470c8dfc8cccaeaefb17271d84ab2bb47f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 14 Apr 2011 09:29:40 +0100 Subject: [PATCH 149/329] Let's use what the stdlib provides us. Use `email.utils.formatdate` instead of `strftime()` a `datetime` object. --- deluge/plugins/notifications/notifications/core.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deluge/plugins/notifications/notifications/core.py b/deluge/plugins/notifications/notifications/core.py index 92c61461d..29cb6c3c9 100644 --- a/deluge/plugins/notifications/notifications/core.py +++ b/deluge/plugins/notifications/notifications/core.py @@ -38,7 +38,7 @@ # import smtplib -from datetime import datetime +from email.utils import formatdate from twisted.internet import defer, threads from deluge import component from deluge.event import known_events @@ -125,7 +125,8 @@ Date: %(date)s """ % {'smtp_from': self.config['smtp_from'], 'subject': subject, 'smtp_recipients': to_addrs, - 'date': datetime.utcnow().strftime('%a, %d %b %Y %H:%M:%S +0000').strip()} + 'date': formatdate() + } message = '\r\n'.join((headers + message).splitlines()) From bcb636dda4715f0e31e676535b37ad702d843418 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Wed, 20 Apr 2011 18:32:55 +0100 Subject: [PATCH 150/329] improve the core tests to use a built in webserver --- deluge/tests/common.py | 5 ++ deluge/tests/test_core.py | 61 ++++++++++++++++-- deluge/tests/test_httpdownloader.py | 6 +- .../ubuntu-9.04-desktop-i386.iso.torrent | Bin 0 -> 28184 bytes 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 deluge/tests/ubuntu-9.04-desktop-i386.iso.torrent diff --git a/deluge/tests/common.py b/deluge/tests/common.py index 4c9f1769e..84722c560 100644 --- a/deluge/tests/common.py +++ b/deluge/tests/common.py @@ -1,3 +1,5 @@ +import os + import tempfile import deluge.configmanager @@ -10,6 +12,9 @@ def set_tmp_config_dir(): deluge.configmanager.set_config_dir(config_directory) return config_directory +def rpath(*args): + return os.path.join(os.path.dirname(__file__), *args) + import gettext import locale import pkg_resources diff --git a/deluge/tests/test_core.py b/deluge/tests/test_core.py index f56a95772..57991681c 100644 --- a/deluge/tests/test_core.py +++ b/deluge/tests/test_core.py @@ -1,5 +1,10 @@ from twisted.trial import unittest +from twisted.internet import reactor from twisted.python.failure import Failure +from twisted.web.http import FORBIDDEN +from twisted.web.resource import Resource +from twisted.web.server import Site +from twisted.web.static import File try: from hashlib import sha1 as sha @@ -8,19 +13,62 @@ except ImportError: import os import common +rpath = common.rpath from deluge.core.rpcserver import RPCServer from deluge.core.core import Core +from deluge.ui.web.common import compress import deluge.component as component import deluge.error +class TestCookieResource(Resource): + + def render(self, request): + if request.getCookie("password") != "deluge": + request.setResponseCode(FORBIDDEN) + return + + request.setHeader("Content-Type", "application/x-bittorrent") + return open(rpath("ubuntu-9.04-desktop-i386.iso.torrent")).read() + +class TestPartialDownload(Resource): + + def render(self, request): + data = open(rpath("ubuntu-9.04-desktop-i386.iso.torrent")).read() + request.setHeader("Content-Type", len(data)) + request.setHeader("Content-Type", "application/x-bittorrent") + if request.requestHeaders.hasHeader("accept-encoding"): + return compress(data, request) + return data + +class TestRedirectResource(Resource): + + def render(self, request): + request.redirect("/ubuntu-9.04-desktop-i386.iso.torrent") + return "" + +class TopLevelResource(Resource): + + addSlash = True + + def __init__(self): + Resource.__init__(self) + self.putChild("cookie", TestCookieResource()) + self.putChild("partial", TestPartialDownload()) + self.putChild("redirect", TestRedirectResource()) + self.putChild("ubuntu-9.04-desktop-i386.iso.torrent", File(common.rpath("ubuntu-9.04-desktop-i386.iso.torrent"))) + class CoreTestCase(unittest.TestCase): def setUp(self): common.set_tmp_config_dir() self.rpcserver = RPCServer(listen=False) self.core = Core() - d = component.start() - return d + return component.start().addCallback(self.startWebserver) + + def startWebserver(self, result): + self.website = Site(TopLevelResource()) + self.webserver = reactor.listenTCP(51242, self.website) + return result def tearDown(self): @@ -28,6 +76,7 @@ class CoreTestCase(unittest.TestCase): component._ComponentRegistry.components = {} del self.rpcserver del self.core + return self.webserver.stopListening() return component.shutdown().addCallback(on_shutdown) @@ -44,7 +93,7 @@ class CoreTestCase(unittest.TestCase): self.assertEquals(torrent_id, info_hash) def test_add_torrent_url(self): - url = "http://deluge-torrent.org/ubuntu-9.04-desktop-i386.iso.torrent" + url = "http://localhost:51242/ubuntu-9.04-desktop-i386.iso.torrent" options = {} info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" @@ -53,7 +102,7 @@ class CoreTestCase(unittest.TestCase): return d def test_add_torrent_url_with_cookie(self): - url = "http://deluge-torrent.org/test_torrent.php?test=cookie" + url = "http://localhost:51242/cookie" options = {} headers = { "Cookie" : "password=deluge" } info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" @@ -67,7 +116,7 @@ class CoreTestCase(unittest.TestCase): return d def test_add_torrent_url_with_redirect(self): - url = "http://deluge-torrent.org/test_torrent.php?test=redirect" + url = "http://localhost:51242/redirect" options = {} info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" @@ -77,7 +126,7 @@ class CoreTestCase(unittest.TestCase): return d def test_add_torrent_url_with_partial_download(self): - url = "http://deluge-torrent.org/test_torrent.php?test=partial" + url = "http://localhost:51242/partial" options = {} info_hash = "60d5d82328b4547511fdeac9bf4d0112daa0ce00" diff --git a/deluge/tests/test_httpdownloader.py b/deluge/tests/test_httpdownloader.py index edcbeccdb..7715cc6bf 100644 --- a/deluge/tests/test_httpdownloader.py +++ b/deluge/tests/test_httpdownloader.py @@ -13,8 +13,8 @@ from deluge.ui.web.common import compress from email.utils import formatdate -def rpath(*paths): - return os.path.join(os.path.dirname(__file__), *paths) +import common +rpath = common.rpath class TestRedirectResource(Resource): @@ -26,7 +26,7 @@ class TestRenameResource(Resource): def render(self, request): filename = request.args.get("filename", ["renamed_file"])[0] request.setHeader("Content-Type", "text/plain") - request.setHeader("Content-Disposition", "attachment; filename=" + + request.setHeader("Content-Disposition", "attachment; filename=" filename) return "This file should be called " + filename diff --git a/deluge/tests/ubuntu-9.04-desktop-i386.iso.torrent b/deluge/tests/ubuntu-9.04-desktop-i386.iso.torrent new file mode 100644 index 0000000000000000000000000000000000000000..b55c9aec1b427fe6477a1cccc53e332edf057c8c GIT binary patch literal 28184 zcmYeXuu9C!%P-AKPBpf)$|xx*u+rBr$uBBO%`4F>O)AYRDb-8P&$TkMG_%x)sWi7r z&d<$F%_}jov(y??Pd{zkO?c&>Mz?1E)(TkSvSH3=VdXpWD>ejr zgq;0j<>PCkYkc(Sw49o~N_wdV*Ar8!HoUL1YUi7S*+9cuUK$OyJl|0)QFwiCJ4-$zUJSbs0&XwPv zvn+!pQ}bo|KQz9q`x$S)x|3x_(8HC#Jua@8(O7D?plNlm^_vyj>O7ZtuFali@IXL$ z!HbA#cGv!WDdi|tdb=mRmLae>!pv~_DVbAlpL}MpIN$O5DHpRw_QjB6w0xz0spr_%`lBDF*XJl#p54qF=EiIEI`CG*RbIx8S6HtpRW;Y% z+q3(b*RlMg1vWA#mLI$@`-?*S%wJLgk4^5}JCem$*|gYOX>!xXU+$6b*Up@MS1WEw zpML243Xa_|8M-}>7JKg4mzNo_-Mo!|OWbdcA0iD3rS1A#=1;oApP! zvcl7JH$5-aXQ?o+Ts+Oca;Kz?>+U;#Ix0Vy-2@h_^|YJWb?2RHhx@F>meo3^MPFUs z{<{0bF8fz^)xL4;TrJhEir7qk5uUzyb% zx|px|ZrOU-E8JH^_xY`MnrPa#KL4wUz>NBBe&5~-aX&q75m2$kbyd% zsLQQO$EVuFJ}(nI`ez3F_ueZ%_Wyov;dA$Jh5t@hzw2{710S{IbFBTY^o4cy!6^Rh zyPkh^WD}y!FZp{e%lE~OuS(DM6!87aSp3rcAk%{z7L#MN&nhko=jL@Q-dwy>)2+30 z|D{{%0jHiuv$h=i%eHmPHM!|iBi8aaFzJ3TGi_4X`+n}>qdE(0c9mNfm#pky(!G|u z`RbNSU&J$OvNk63o|aDY$a%8z%Br(Vf5u6#DA9?}bE{~zDe=x+yr=v^s?Fr}1$WDy zXEA$-%=dE-ulduwStdbp`+E7NaO)z8nNv6n=l4iguDrKbH|1dJ9EqLP#q+j!v?U!9 zj9J$&ad|hZq~OYrLADA}%lG`B=FlKo;P6rW@RQjyI)D5ZSsfoAu((3CakA2>X$AM( z7HNLE#68tGyP4y_D{qr8nHwMUPtgtZc)q(}o{U)Wt0QaeC(2xY(lgEFh;GTIu5E5N zQtMNv@y?6X+z{Y;LBV*^6ULIc3mF3Evd_L0*U56)Wh?*6%`Q6id&>|0Kixm`du6=S zxkc<^yTd59Z$s^yKr8YLuB>BcYcxQE@su;Rn6*lnp4v8;_}T08?W{(-5Iq{G(hf! z%hza=H$gFPb>rWB%h~R5)V};&UReIW66u3SD~e|9w+osks&K!ccG~61XVpDQD~`2! zlyO)a{nb%&tzgODD!*0onAA4I-?@SZofdS*GaX%jSh(i0noIJK`QKuMNoj(@>kt%N|m$nTp|F1ITDFyph) z*SJ)6_ojsUk&o|V6j$zY4b@umV!eIAtM@Y^7I3bd5`8`G;^_}8%WSmGinhgPNgqC# zeaDYcbKez-um^PyZ*IEk$(b+eVE00A!KI$d`{U|FKcCMt7m;^LE}!&z&eIQ%w4Z1d z$4I?e#waFSbZO^Rk>)cTPLrw&I@Kp1nV6}nJ^L%)D$j=5Y@vr$C(L0?-+X8?$J_Ns z`H$cAS8$G+Ta?8ge<cR%OP6+T3aer{0H(`&UPOzr0@UwTMRcUBS4^*LYqmO-~o#-uOE6x5TaBehs$r z!rO^4%eX4me(&lppS9?AgiLbr6N}hA>ti+@`R3n$B;=5|YHHP||GU>ed2;)RHdl$n zkJE?EwAvCm76{b@d#zw^E2R2Q(2dM*_A6^+x58|(r+w&c%0+;x@yD8EcN${C;e)=wm>VS zNjYujpV$@QcK@$d+2}9cC@XvJ`m#8+hs;gw7VgzSe|;t^KAL^~5!>?%o5HWZ5;8l% zJM~YIaiR61Saaq4EnRC@TBar1`Pgf;<#x_q({uEl>AWRY6BUL3&Qbm_%?ch4+^mIEr7lK0GlaMcXp2a1P_lMX%39^|3gd z6l&Hib%f&aKb=V1a|y#79aY{joJkm$_Z1t*^FUSH1Q@@TArc zy2|-kwqL|goXpwzN?gMGqrJAPTxXRz)4E5(>W}7(Tk^9`{HgOfYmu{H@4SF;x1ff|=0CBs>qY-vzGwUTQwdYA z`5I~c>3@q>oNHOKQ)W$r;;EE#@>(__j!-^44oTx$cLl{-gv|wwvOlMszuX3{kQre zx7R}Gy311MWR~N0E6?e8)%VGqn&`Ighxai#4wuf=Nk2Dp?)FRnB)(nJ@3ha|(_6#* zy7T6}ov4xfeQl3DdqY?nr*i#qgI9Hv7F~IGS3hS{jsMy#HKxk6j+&$V2L-Bki@337 z8aNo_HWYAKmUP-?9WCGAWmP|g{rUPco@sp#qC2L!D(Bk%Jli1nB;}hMQB=xzugr{t z5&fs{IR|eM53*Ke_g)_v5p&4Az%f|WdjIcDj~_ez3zNF`;bmvk^u<}%Q-yS|U-{h| z9-VbEFXO^CUWR)U_q;h~(Cnj_YpEA-(cRry^1XLj%YC`pGX1QyMq|?+^K7~N1Ya5U z6n35KGrb<4nrYYjc;-&+DVx)u>`mNO%yZGIPV2F>KxAe}63cdz<+JYYRej{uuzJF^ z#^;N*n9Jw4AC&V;i+#4KczOT|J9Z{H(u-Um=aGx~G9u?CK6O<<3lm4)K&t}2e4|@aWA7Dw%oVY(a?0ZJS zgcF%of@kjTuKVef&nnV;Ldo@zUMl-`$#*@+W;g5q65gG&wTw%7)4zG=RC)hzWKT`Z zPB@yay!_UWg}owN#-m&~encV7JeKb`9i3L2cYmHa9=@9#nn#hG&oT9vkn1im%>^W@Ak zM%690(spNpl3prLWw`G2Zn}le9vxYaV{uYpSY;FJQUJZUfUgesPA z4~*Yz{~d3Ao6W5^?ZIDxqwT$F>WMcWnx>?w#%%Rz-?Z%chPCHTPqaN(5^}*AQDLxS{Ojoq){r1Z=cDaCb?j_E=2?`(#kX^%2l?0UaG zd%zYlbz4FI`HSW(40rUey`B*$^K@#+qEKFriwm739zS?{d&-LL&dGwCj%;2ae*N#6 zC$H)Syt=7B*XYs{iFZGC)vjvw%CGg0 zc=TIqX8iep|C6#(zJ zwKObR_31`-D87E{yilQT-9T^~c`c zbCKl}(pGQsKIy$jbJd|#wVF#w{x>S7&wBKB*`&Z3Cw;9f8&#&UgiU-Q_^{@)U(l?3 z*(;`eth&ebY@_oHj;`z9UgK)Hy|H#m-%Y0_#Rhjj70NX&*m9nyoWG-pH=e_yT*c3kZFT&CJ=+`G zI@Ono%`-65s}_87_1*eq`sukV9iQ)fk)y7<{DWGAH(Qu)2B-QyuQN>*g=%~XMf=q+ zM@Z~=Dr<$gP}(y>tuW7wRq95EZo=cW&6Epi!)jm5zr~LQdnYop7}jC^Sj(0 zzc&8g@Nwl?N1FrxPc6Na@^0O4$5nMo0z$XSPQO+(@>7_s6TR`s^<5F(@A|p+eOa}G z#k=3&Oi9)2xLZy~r+B2^TFTk6`w`=(lB<2&?`B;Q+b*{##p>@xkHF?%XPeCD^c>hH zaD0}1?#hP-m-sHnZ2VetdF{369eTx=B&J0!m>w#1RBu-8qe&hf4*UO}FF&7t{X)sS zZ3fY;CUeTq96k4Lt)HJ@(b2tMFO;_M&C`9>%AxahX1?{*<$i?*Z{wHDke}!(c&Fpe zx7xDDKUjDR(q?U2k8Qb-dXWR|Jk;_UiL?5 z7VE_=-I0cx_g0q5DSkV!=`x>o$<(fIM?d8kO??wKFKYJ!mL|JI21Tnij57rd0y^0b zD%b^Fudn@K+^|l+P9@gb+JC=FOId*?a?5qPZ!S)J&yrWyXRjyu?aI>od6HKH?`?GI zQxdQJWySy7QEK;cEteGsI8R;raX`fBZS8X-IX&~q-FC0?7kRw>V;tvEQY^OUgR1yWL>F!FXR;Uh%{2qrZf*7?OhT6~39)$n()hKzd2k zbV>Q+i|*>pd39BcmE+jSCksPwXjS$;cwa3Oey2OH**8D=x_$cn1yYZjQki>q_22Zbf?@6syJTjtm`AP7-_AK}lAs$1Ef8!MhV1U$^?Q>lFLp6y%tzPFJ~r=1s8`~7oZ-8}LC zMzP;6?*FgwB-O3^us^i)(9zvX{U&x;{n^FO$h2^7#C?aYxwYPYl|6f{V^j9bW=Y;3 zkusy=!1guo95US2Ja{R7Vw&__?gpMup8Kx{{#D))R$}DJJYFxEe%r*fQzxp_uh}e0`V`^v$JNNk^?(sm z^N%SuF1x-z(9La|Bl}XgxANuW;QNNNexH42Aak--L2K@tv{<9x%L5rJdS>)pPddeZ z?x$m6g}}-5``CV6tFr|FtpR!tA-9|yq)3Qr9KaRS@yJ3Ss#h+5HWWQHx&tDnV9nYNY`bFjV z4!z&stsnTU;}5h@oV#f4xsAU{&-m0-HW!-Nnpb&Aso%Ncr77pDduzj=brSb3Co$h= zPx`iIRf^TJ%IzF`jF#2!*&BZ{W6zPF`ECD;`$KqFCWgrO&HSsI^yIaYY0ZKMZCn2t zsmv75@wory?53w3$3oUvYUh4!QxUrKWX8sbubb*~`y7g{Gu+CZsg}EPdohpot_1&# z+*>CPd|D%(_oci!#6L=gr(RC&`o5KSc5!aEuQ~JGr>N*k8?%~Orkj& zW49DOQF-^Ifj`tC@A|gr$k=zYCQjYF?#SJPyLPI6S@4AO-K38;f`2DY&O2+)KBKYA zW&?M~&b9j{CmPmGNvmBoqh>?Y)Ay_Arre%fTd~?`zW4{;jlw*9Gb5&VdCP}zh>Cvx z+N2nhz1^!I@U7;j%r9>02J?39>@~`*t2)Tz8+x=Q5iLw)6m=3l#nO!gT5Gyi*) z$70U=n};(0-m&9%taRUR%RfneLi3S1iA^W3>vO#Lk|DQe*9!+z!NvQ2{h!mslY3#R z=F>^jCT8F6*lnIADY(PtURZEsK;QP?$8Gmn`hL28Wm(}a?;X2#Yqqp}){ByQ)X_MV zZ(oG%3lXD<(O3SQnR3bVNdo)Ti5hdYE^j;G!=ANW%;eF|-GAo4)=7BDc593GbIXTE zDq5M2a5JoW9(tdV+4lLGBWZIR4@{~^zWTmlSN5ah*1y=U`v^=3w7XLAWrvZ<<=>m? z4Xig`ul(fhrQ#EKT|M~L<0t#RS=>B#_UH@mY_~%a(LWy*9_B4{R6JetFHc2XQRlkn z8rCYc^QW8Lb`?rLbKS;rWR;EmYU>%Z&Iq0^DEhJPMAApAW$TTK-;g^)2sT{c6BX{A(RnIf`dnhk(7BD;XOOX913tQ8b?6;{BE8@EJUdK($ z&YUkbXTsH=AJP@}Z@HAQ)b#$iXZb1)T{Vq3aoYIMY@c0`dAq-~KAGcclegmB z%C0~DQyX=Y(?(1WlCRwHNSU)?@^WBnVr}QioEjQSE>nQBv`ZhyB;oRIC zURxW~?{aK2+?e^;URL)`^PDrG8v_{@E;jpTbXNHFubexPzHimtWfo2s5n|lBOO3bw z)5ZKFzSC{&^(@s(^>bH=xNTaq!bU`5^NHK#TfI-H9DF-?f?4L4=9{PfaBPKTfI@l#8VD{{Ph)7!pVtY7%jvb#6#-w*NOoqFz;a^_rBy(g)k?t6Kf zes*ThjF``I%j2kwXzmvEn2eZ90x_$d-d3jKCUp1AtoU{{ya*9#pkZZY%s z{qj@!bpp% zFF#Wsn7X>;!`7QEi>sc#_Yt0-{p0@mB6n%2bGco&IJ_feS@h;-2m(BU` z{T|!y3o%&mfhv$i{A?@8BP_>xXh52E2a^1 zzn4$s+p|sBH8$Qm^o-(uW&@aPJ?;O6~oUX8IAyZ_0KbM2U z<#ng)cI$ti^VRvlU+(6&3=%zEB?oWqKFs5pU+c@ZSw13Ms;Tfpj$&hQiP=HZf14z$ ze-)M6Bp=^-=)=}f{jkd`%B^)Y%UFulzEybdoUwLs#P10=4pkTB@9t;~bv_oVli-~C zGr}Up=b%%-s*v|H1>c+4_s9OdbHXOd!Za!C>a;7n9-jA&xIU40#bmzCtY)(OB~7pX zort?Ae{cJ;;{m7F%vjuW@f%;TWR=pnCsK{>CC&#GzeqJ7-OK+d8cU!M08@w0lu^tk0#e3(hEFY^nb7ur8`zUV(~KYOJkl>f z&x&m7tPzh^I%Xvvl)7T$go=%iKJ1wP?n&E6?ddre)h`s=GEaPQ`JcOvsM4wZr?V!i z-3wKpw)X3W_+yMgjpsKn|8S*1*PH!`)BT+<+J$ZV_gs7<9LeZ(TP$I!`a zUagyT)TL+Ho$8xqJCAG;lhm^_Iw83&tU_Jf%X9BpEkUg;+x2N5=50RNw&uj<6=FSH zCtl1mQd_$FtJfyCO)q5|qmuS|yjv^lG=JVFp&LS4k=H}NUYHWOI`P=Oz(tA~OFg%< zv%ibHp($@Wr!TSNU*o@*3m!M#ezbMb*A3+kGNnIz^44bDWlnf`{+5|^+e@n*TjIX{ z_RN@gS#_rG7NglZWyWVuyy#bB$niJ6`ge`+x;@d0W6s@S-w<~{p=8&AQby_Cn+aWU z>2g~SzGaMjXlS~w)mC!p694s2a`JObF1E0p75sT_#bWJ~EX%%XemQRx_M%V4MC;eJ z)Jyu$8-rZEf9+{i@hkY0B^BN!uvJDXHZ1kHv2)_lJrC+;1kYOf%;ABI`u!`->ozm0 zJ&fM+On>Hh9cm6rQ&Yk5MHB-KP zXK`vjI$`a${q?hA^tdCQJ=o<^9_l>*_WYh%^^-qb`t*z^f0?a_mj{Cg*Gb*2=VYhy z@<;CX(>P?b@=C#Oi@u5nHw5>J9#P*SC>nh5%iHHUudcLSzR)A}k9CWozRsfq4hIu? zn(Ul@yBMgS5Xrfu@a@10^X8sRzmRfOmYl3(J9^cuo^5P#3%jMlQ~1X7h?%alzuFbC zDet?^?0)m%->t`o#V2}967jlqKQijif-KQ@6W+f4bME9!ZtsvSVTy^If;JNc`o1a` z#fDdVKM9K8I4?(SV@{aQ!9|^)*d-RLJv4PbQ{o#{nYKK}R)6bqDG&8^F5V2!s!eqc z?K{){bnidwoYQZa-(Au>R_W@%`1kIMh0DDbS%+-gdz9zPC!gT&2J2;GAK1K7-1^$b zbk)(Iu3*Ii{%1Z`x23F%oD4m-eQ!1V`QTUbV{4`lUXLC+s)*LHI_%qbKzpO7b-iGb z|J+}a8){}a{@O9I@^FvnX_wpf>o2?Q3tXh|#PCU_|HX&JzNxX#ayqM(l~(X<7PIB- zO|_{$;wzvQ_<@C8)2^xGe8QX$6LXjRaJwtD@pshhjdP1G*HnnU zpS*{e?PBf;SLKjdVKoJ+y&9LiUA{-T-P#l65d1`YZ`(uWoSWy|@3!zoe`wrxNa&)O z;#uP7BbIce{~oq=Q|zSlzWveyQ-KE&e$zkf3kXC z=xbKDyLVdRa=b zQdj+XfBT~T+S~={em9j59#0NPTB7&o;vzqr3BG;{>ZXa9xb?)Cuanl6JR$wgCuzCq zIwqr-y?fT^-x7U)NL9k*Tz%+#`KT~u%Tt>aXa8R?)9rOX*W&%Fj>pO;SlT?ynYe#F zqt#I!W8a+Kvi)5Xf6Y$JajbT^c)Rj*nXwd~6?ff*&vk3>Otj0%$qPC*AK1F6_`U24HcrQgmT(ftwfNBZhA1wxlSUVQeCluSbET1oHD4V|+d zTwy;j|CPf*)k)%#e;;HE#|28V*U3t*e{B|&x+C85MpmVnMZaQif*G&Ke0zl>TwxdX zuKB>V?U1&ra`?aPzk5IIwi4K;k@jWNANf7u&E0bK%dQ!I^k!6h{>bjk_jQv}w9ZsJ zDE+@|d#^K?v2~Wl0_DitUkn;dm3q5(vZ{U+Q?NMCTfXTvo5qyWPYd>JdzKXN^_hv% zdY2!cO(<1?E*Nb^qh;ouu$kxIyB>spW|Vh5IKyet+npf2x+YK=$cBH=Z7`5)q3&Qh21Q zdu3pQj?$J#ntU5eMa(37*OV=fcxWLaY_s$9<6_y%?{CEF|9hHoV}AJgAii0j5}ZTB zn!c@nrCU^e$#rj(+q`7y>8jhMO}bWBd(I0nQQkW%{p0WJ*(C+tk0w8hTEh2x=P!#8 z_TRB#4Dm-)Cmyt(@ceR})B5uI?GINyZh4`1YgMOGVr=<#AFt*q2M*u2F=&5L?yut> zC_8-y>++TEdzf3Mt=ND2^Tng;qTQ>`&ho!q{_E;3HhB-mI@Px<&sR<8Jk`EPGWC}n z>#K>09VdJLUp?*7=(cV`7OVZeb&hq)=acqTbf{ZsZS6nL;C*3w+3M??C;aU#*>X_B zucRv={<;dsI!l&S%eQDawthR=>iXRIj;~Gqy25>NCb14S7R6tV$v0l`sdjPJ36zpH zleiTb`(N_rK8y9~OW(xIp7PX7DzLlIpY7bU8QnSe*Pi-2+oX3{;)fsA5@$CqJI1R0 zS4H5N&xJDy^Y7#>JSn?8!@HbOqoTVt{owO+T_uGl*#C9p9^5ob~ioX z+@O-%@+4@|+@tX|PgH95X1`l#uKUq=O2%U{@&-nyMLR;0Z?CxGva|Gs z(DT*;p3}++-Ex;3PEF?R%av~3PM{(aFik6jDztmFS>I{(V8;@AmV%uubl+^vsv(!WR{KUe;)= zVf@!(-MwVxp7JRhHRq-I%w+z@)Vsuex?)4fDpjf3Un&^4On7(j^y$pHUuPetym_cl zGNFa-&A!*lw>L_#?ED$2JL$~lZ#Ncd@3}JNuF;QV-uH{r3^?m;V!U2^cUxSSzBsca zb15Ttfi<&W=XTW(yoqZY94~#Iak$mGYkm}`MF&e)^p@9Ug~l482YACvpK!mnx&MBl zLyiBd7zUd(>6Hhs2gDw~&huzZe2vECTJ49=x2BZV-u+f{;icZkpc1(&9zBg>_qWZs z=~WrD=hWff3J;uYyQUjx?Qr{0?A7$9l#Bo6Ujfb4M$a@}TfN-Bd7WZ?sJv9@jJ@xx zJ5Ig$^;1>cGJJjhWQRT1Jmgwp%?^IznxPu-o!@=#63xJL>DZM*4uYSi9ZjF?;=H$! zvEl98Ppyy!={6{_Gu=OX4xM%?DkZ#2gf=jn`eMtEivIUX)_9@6)3L zvw0h@mmjYVTgIPYQJKQ1ej)Yj9Igic+m4pS$7Te!-ObN&G)lWId1jMMQ-gAxT66a; z6$v4=<+(c()@DjAg^7nd~k5|2$BCsoXQFvXlQ2XIUwJ)|PJ)hwIGjQkC{7Fwt z)b1zEJ=?Qq`2oEN%j@3ED$<`Tf7Ie$?R}Bc;_FYpJHscr^VS9*(~ofy24n z^6`{yNqdBr2TNN%W^i2;YJSR>VcP5Txs}>ew(V$rXI_TpZvBI-JJL}yp^gKqxN6>yISm9r$ zTJKHe>fuuf`pfyw)7<{A$ks2<4OZ8m6MbwdEf;@ahUv@>##FS zn8vf>nVH17l`~?@ILe)m*@REDf3+}`Bc3$o%kU*fFy==PvJ2y(zG($?Wi74yN``QLGus%%1!`>;)aarwPyN z%Z{|a^6Zjf+p=RGe?3HcWaIYNB%Zyj!@EyFT`l6_&Ue1Ik4Ew3@ZMtE!8KF1YV-cM zPpj=X#C4|Sv7f6rp_*wQdgpm!`}fGxrkp{1^JcvIXf{PcTgG30L;f1y04Ftz{Pjss zOB`+ZIrlR(Ec{ig*CPk^fjsd_t*l1XRnkO@Skv8l(}M!?rqi39S6$Gt&Zwy zE^67oH1cm~PVxP32WpE_TmJL~ZoH|_{&N41Hy>;k2T6OL{S|+*e`WnWi@!4j$pH6!pQ<)mA zxp(Odv2}}9cJE)9ygaS;$DQSR3sQe{_&Yz?AXey;)NLx!Dd4#55L>9!1ku|^(?4(O zcwA~Oxldbn;_2f%Q=9aDxE1ieU95TRw8gHkGlN-YZGH1$)si%Oy{Ao4;pPW!ZsC*) z?c#XsYrKC|zhX+K|GBW!(ZP0+Z@;Ofn?(m`2S1Tkuz4gAs&V1plJ#m^XI~0y*tO4y zDLCYh`j%q_Yu6iwPfmIrtk?8>y6?stk-qyDJ}kG*M7E_yYaXQ}=;@!?qvNo2W?@gwbUB+K+kJ);8gnftUiXdrxP(np?b!Ai zl~VW49r(Q9#cqRN*OzZR=3cz=k;1NPaW&SQ6PM33EJ=70^x;VAze@||z87cbBKfj!??)vHHOJ+{5Q4>xxi`eabWkXQ#LbqC(fDMiJ?K^gEqZR-8YW%8BvA1Gw#ymSzWnW8u+;F>I=dJFKc$0%xyl1I@Zdp%b<+Oy7p6>742~@7j@ltd?(RD=+w8qsc3O1Z zl%safEoAfmxShW|wdU8Xc zrF`zKXVbPUsC0bG{kAUY!-JU(LHwJSaew9{@vA2#&C&}F$1m|Qn*5Z_nDh9Xof`A}o4;K=EYPr?-_G|>`g_TfvyzJf zD;guVOjTdE;{5Xa0XZcN*EWl-CZEhZhUE$b}Q4|gX+i9cCA-Z`V)8X;I>9( zl`oId1bSA!(pkS@;=e^(?pt^qsrti`)A9N$b~? zh+MpT@}PY9os$iXVNtm^>x%9&u2NuH5Wa3@+ku6Xr;6)wRZjV{+1hFCC3Oe06{d5a zpZU?TA~$v_SLTL=)BO8O`aTF5|FK~fWB46nH?3MvFeT{g)Y^qIyR^?d_+Peb>YK77 zToUdNM0U*-ib<1lCu)|$ zoe;y(G)1AouHm54ou=~fo#1geXk-0)_G;C=_O}f#T-u$@J@d&NzRe4QUQMpL{V^ogbl=qrQ|_uh_d6l+ zz*P5{@25Gci>o%u1^rYM*xchgC*Vo=)`fq(FH4KA58WcRDPKnF;wo@Cxz^5ngzE*0gngA1>>=Rzy@T^KRa1 zb5-o()Rzg9YEG;TFOV0pSzP$UKlzCD*SOsd#hSm4^~NzUoxk_*sP;UWqu!hB!zPq5 zeJHid6x>(kWVCo@Xotr2$$QeiUe%m=z}e|(&5qfx7wFFY$@Khi$G!g^c~eeJ2xeHi zbS}&F?`y(3Wn{zjF7=gMnOIr7Bd$qTmi60R;}xNEAKl(CeX{EAoZ8#B<~&Q*nD4ZV zVM3^vFYnZQZF~9k^V7eC_bIt1JQQkG)IHV1&C&Pg%L&vP!U@5FuFT z#CiE7W4OdxvxwtH0lwv-IScI*Z}e1X-fSsh|97mVTO!MVO>TwoTt(3s^F%7U-Uz$XMPYo4 z4w@Y?{IX~D=cC8leKg{77p*RulpOHP>ire%{Vq-K-fkb89@pOsj;}qY_xpZ` z@dN*OaX-5sfeYk&bH08(t#hfMBvIsfVd@5!MRW4=TCe5jW%Rr{cslKOs@&4cXO~Eu z9GDR9ogf2mvx)#^+Xx3w8X~nL$8Al-CDK!&I2)v?X?np(-%LHbJu=X8?#V0 z*5SZ!=0{7{M17xIvBf>a#2~BDQ6%Bvo_0fra?|}61AP_>s2eZZE++kwkz+z|T+qH3 z?ml^<3zM_$KF`{ovzc|z3iZq&t?3bKo9cP~#ZHnEz1yV}`YmE{8MA2}68`v%F8ic2dr+Np+&fHRgGI63u+4fp9y^8 zxjr!J<1J05%vbss1lP^m#`CNBy>uI&jxSe$!1B!|ceY809%_CoEE4jw#p=b{UV*4{ z^LFriPFr=|#?Q8|aL-nzSPmCERTrJN7IppcJOAJ8xcN}#(c7tvx2Hbj?biDIEmuo1 z-1yI9OJi9trJYaNzZJf%k*zowte5fK%vB<+KkUOb_gJ<`mA11cw5z@<7M2nN3&mq z&HW(HIRDx9-D}S-TR&++=98msTRDTC+7?)z(#+WU=x_Pl@3)N=WFl`?*3DiNa&Q;7 zb=QQ*RgChUj2BX7-fFnZ^DN`)<$FqT2G8fHG+s&WIdTBx%6Jj<(98~;t+yM(7F zhr4yjA9LZ*rM8o2o?K9v_jpokdI;;JCFd4yyV<>a-q)^(8!WlnmPvWr1(kct^7!sE z9A54_C1*W%?PbQiM#2IY%SHIi6Z?m4E{&$DJpi{@HJ?A~um{U4sJx=ZKs=pH1z4`X(569Pkc+bh| zmEZef?hB>PNBovgcP@`up=BhgG>W>xmBpO%NFxXP|%bzdo)v(G-&qq{IxdXAj7oY`va&{v6d~)eGXnISzcx{`+}r>{S8V zLp_={9&>-LkqGx@+J9}K@QkJBY`jjskTU!>jce}m8Lfu-b2eHp*#G6RuwXIMg4==H zTAnuvT$ilLIASnezGvn1iN;$~CeNxAE6(_Q`KDich^OFWX60>@ueKT@>to*eXs_ULdFF zjOE7nANlL*H<#w8N93GU5m|eO@vzFDGrs%3HwmThuRf}~&*lO{_{vtgPW0(Vv;uhOH}GkyzjypqZH6SRgCbRK$H}V@XR<;hCoso+kQ78nDQi zkNEPk%4tdG7!I-HA*Vjj&6x&x2jQNle)IL0#*@=5&#VRl)NbHM5E@)qTo8wAYWX z{l=ltz6Zx=+_~T~PfgrKuxafY=a4l=MDNtZeK@wXE#OO;L&4#A-a~iZtebagi3N}7 zyBtrMXSI4yzcydJHA~=kfluGxM=-u?C}VEQV%ngy0DMb@S#Jzsw22|Cjs_cSX1=r-%jOB}Z*h$_o4#`t&t z+WOmgYm0qw)4T~0)n%7>I2fPUZ)mY#{Sf$Pj@iYOAB}2t&%K=dviQqv^K-klu40~k z>C`u&j$-$ZPiIw%#;LKLR<+xv`HH1A?*Xf<$9%__;sR6NQpvwdWY2H^xR&Eo-pm{K zL%%dK8P&3Mgl@1{IZttQ%axe>b=8Z0+A9>6TAMaiRr~2WBr)t(@Cvisrh9Tta+%2g zdGAEj*S5;ujL7+U-FxBN49DW{n{y7hCf};?diOWxx0<7pYjN}2CI7yqOyBievPfmh zao0%IYog(^e`i{_?^=9HO6&Iek`8H^bBx>EZZ2YGdOUO6!YSgnZ!P*O6ZbWhy?n{# z+q?;^T4$y|oVT2*{s1FCU*!V!7}eVU;t82s-E}5&&tfs0+t;?Fg_F(l53BUriW*zF z?bD*FS3WW_tbb*CI6lJr!hy3!{^@H~>+YKs-Fhy1i#t!@s?54Og_@=FcW+;N zKX6=q()r_;-KTcdWv-Mj2#M@`8+4+8puU2@ar!XOWqSCCR$xG_q z^yifFZr&KpxJO}L*Y&RASH=4coXxAO9_7q?|NnsD#INNOJBpt!T>a@!OiV-E`r?2@u)2Xw@NaxXdg9FmO z1^=RW6ixb77j!;xyL_N*TWj2d`Lb0fN;jX4U9@T8#s5jHnxC}1NDNS+0 zN~y|P*Oqa;)`>Z@Xx5a&3s*AC7v8fg?2-J#iH7T2geF~?!`$auTCe}{c+Ygzbor>v z){uYla~r0waCTap#=AK9kij)ZNr7PATZXGU*GICw+)|woF6DZ;Yk_Lb4!N$Q+fIvr zOPbr@UT52|>2Rq@G_Mvn$15gLlc0QFqZ={{KXvqW@HD!0&OiH??cH1d!hH9cC!Xcs zNXwGE;QiC`>K%=1KbD{9oxpVY_3`f~WwxCVIcoQbzwvh4^yi1)d2dYIJ7@2#-U`pT zsjm#ruQ1=Cn>lHP?u#_*Z{dZH-dR0)^T=v-qWtpiwhfVU`1O4rdTg4=mpCn2e4o~j zS8^sPYqEt{dS~k{{=Me=;)a^1Ri+2NY0T!k``NScP*&adta^QgM!VXm%__&6>J`6U zkdex~X0~pnb?%W(K{xd$XY>B+Uv89e$oZDb{miNMIW`joJQVMxo|j(s?Dpe3ulx%( z7=GWgMLKeiWX?+NoOMi>LMK`7e#-a!EB`#1Bfl-Qk~ZqO$F;WwUFEVb(%_%7)MJJO zSFpj!#ubsj!)5x;x-WIj-X&v`_^b5OU5hJjqCQcsQj*VRCnOb>FPpVK?pIIKr{z0( z9T=sVrj|#%JJe}#JbCYTk84w2K2B0i?9XIA;CZ=C$uHzrr&ti%*|v2h*JkiNH%a$( zkJjgWIQ@WtNwvYDbhb-(W>hd~#x8%Rdh+%6%l>m}Bn@7LwzPC^zgaE$TWFcn)1bW_ zM`ETQ^?T}h+1Rb?)#7+th1Hzr=AVyduPd&*Bo(i6gV*p)$oVIIlIcHh$Lsi&xl~Hj ziw4`c%Df1l+UmuA()PebOYu z#aDL)$Lx51 zEyDQU=lPcZUwW_RKin5}B6oLKu&2VT$r{r$r1!4<8MW?o=>F~*rWyzNPaRS5mQ1?d zS+savmv-4DT4%^dkscko`OJd(WpLnqHXzGXM^3p}APgk4w9(|Rk zRO0zIcAbU9+uCr4i!VF`awZs^QK=Q_(_OFTn)ux`SY7DezUeFGWkvL*#4)}S^z3{Q z`;Kur$5W|Qo%2#Z`2_sg<7*HoA#gYFz?(I<-?n)FT>B;T(UZy?6p5@19r>!aapRc@m^NGFd`e}2yDz(p%|Z=PdZdtzt)<)yY79tB@peXahm@!x5FcqeIjiF^ffR`=J)6}Ptc?-HChM_}Wd zW1l%a{(073HQ$>Mlc?d>C}3Yf6Tc0&5{rJHjll;)2%JCTexdMwO!rUIc#6oH=R6R0+wQhq^c)PCuP)`1G*bqRh|RZWgh2hKNt( zXnycyf$Y?yuZ24}A}#KPNp2OHDD40K;z1*OiG?3;GM@8ZvTVh=Wo8fWt~~mAQg+nO zrxEwEtfp?xdUgKxzdJYTC;25m-K-b5B5;Rf`qvy4tAD?Cf7-8gTd;mUKz9Wqu=){ z{a;*gWaX@%&h<#2ySBQ=P36i0)4%6JciGJ>_?e^NQ<51fEws>+W4pz_lFiXVF~M8z zA9Y#q;qV>BS?SZbr%s)eDaN#s_mD;D`!{<7=W~u1lcsC!|E^H^_~XA|=E>gn%TnL7JJnar<9N;g?&=fOAG?jG-@dnBfY+E+ zaGTET;@^o&R$VMNuU?(@;Ivz#$qTIsp1vkmq-Uo5xxoF3ZPxVf?K0`#jNay$nku!F zF+Y2`@qEmr-jZO3NckMwr@f3bmaVwDv-0Yy2S;z+Y}+7RS=i`0SMmn8%;l&9>-yxL z-01a9O}07c8rFT@CNuoehnw9i9HxFw3Akpa&T)3ud{&n$&$cI>cx~YoA*Y*i;!|+Q zqejLxUv4e>^CCpRE~bener{1%v;0U?q4WXOrk%glg$*2p=WV*Y z?^9n=?8}3O*Ccd)_pshFz0h*u*~$i~P>;P_Jey}+OX^(l?jkeq=e;~qM|O36*SWr5 z=3=GqF<+adERl0gBytIcSS!Bz=oTgZq&Zq@{UqZm;nSOnubx&od`eyVPv=GPmh%bc zc+~yB+;}p9Z9@NFY2JpT>m4L&%7o77yKDM#M&vb?T$=L#NS*La(~7LX+J6ggGAgC& z-P7LpMN(33@|nX2{9V-Etx{Wm)ideeLZiF+OTWv8Id_{Xd9lq1B*GI?c; zTn}U}&*8H^qQ>erLB@J>9~0+`DfYFMp*IZHP5xBT!NdGCHnb*X-Q$wLQ$khqCvnJ# zJ`3YF%TLx;Ixvs@Kj#dVtsA6t0z-vh0Ad6*C+;`nqhtT<;ztjd2jqi!PO#e(w}1LwE6r&0OV%CUdkU@HU+)V& ze3pMlq5N+f@m)e?>DwG0Cm+w;HHT5p>*3i#uhX0|EtQ!wANezc-hD4HFZ16+#rBT- zyC<*uUEy%=!t7P?vutY06s85RADdYJm($Ng;&9m38`D;M&T5=^JK?X?sl3RoJ|A}S z+5U>aO!Tau1;1l``%_*Bi`YC}&~?u;Fo48GZ(7hmpPC-~y`^EVgH&M-+_ zWB5rx?Z6g2bJhFeS5{6H_m1j zops^*=1Z%rs!VlUnGRQ94tCdU3BB%Z*c&#B&p&m|>!AA6kH6*Ld&>KP<>OyhOAoCR z&%WsCo6rBJwl6b##qRqLf;bY}A6DJ;JEQY|gA1>5nzxSHP5A;{r#-en!Ic2oy^Jk-$jd>%H2ZBllB*F(~EQIZoNMB|Dt^Ym!)RM zS!`6aiR{?CWjAGCL;l=Kg zXTMVQGo0_N68BT*e;P};;hv!7y*HycuF1sfE(q_J@YODSvinci`kme_`z9oBHq~7_ zeRrv+xa{7iZ{?HEUf*{9p{dWj#|-Z_D@mCPsBM4ey*NHCZGmC^)>Sgx6-mA?7TsFv zEUJ0>{I}Tly%jRAT9>;_@u}5*v0PKeb7D}-Rn3~$={Eg;dP^tFOx8Bd-KCW9OK^+G zit-aRWzUvZJ9WM9$>C99J@>_zzwv)p;hNm2$;+(n1nGP^(zrJ%ytrtWozUbAm0K-+ zZ$rNP3O(*N=a=bH7NHCF21UxV%}h;slJc8&eY;v%+IN5BEUAxwbbq~ne1URKPI{~NyH+iFAIJqA8Ud3|;$o#UCw?Qm%Cn%#4ojE}Xwj*!k@ zKABB6HtWwjzLhB(3wAbF{xsCzs@LUJyw}V4@WIVCe(N0~uX?I&nsIrLTgV&sJ{L~O z9mm;L*OqMlCDQ+r=f6YVQ(?*SjF_ou4U#oe-411LxWy~+O!0OY+h)H*o`DT|TMV1d zJ1lm{Z{SyZq<8*z*z*pD_45jkoLU%UQgh_I{&A)=tap@iR%o8S_S~l6*|U3Ghc`{H z*5qC7%JjizBbR~49JaR2Tdq!Au!yH@-r?YfcP8GNpuXb_N7t)s-xhg&xxpp=-N#!a zEkkTuDBslfn?6~WV~ieNDs_GEg0HZM*ZrqT!UnE>JD;1flfL?iwO`cU{gS^-$YYkk zzAY@}^Ui1czAIH=az0~w$?A8#@4tl~Qtqt#bhA0>>;21XElPjs-o1H9TU1%<)K!-EuP*-G4j@QP|t{--@LyB{PUv)$Ls@qB6y z%P+H=X)mrddfmSKem~E;{YFK)a(r7Pu5tb^EU09ORhC zRe9R~SnW>J&W#u6Kipmr{poK|l<~39^}*`}yzWk7o-+OF?yJ&GGf%y(I4`xfE~#UM z*@@Jbee0h`|SPI~@LCl)_lb*XKwknkCiSm{gFdaqp% z+*laZX#3^I9G5-bOJ_>&kY95ljrF?ahRTiFE{hxD1i$@z@}^Z#Gdp3=qe&|TiWg)> zOtX7(;Zm?!gM-JC@9&e;KkMl!-d$BMtMa=W%(-+l+w^ifCkDTjY*Ly(PJ#SM#_f*e>Gj`ImuRC&C%37@|;*oni z@97Oa4YjYb^S^daTF7CqcKhtLYvP{zn_M2wJ$Sxh#b?b|t4$VF%`=!TxOIY(zN!jXE8^6uq zHR3-y+y6bsq7$XpCj9SOel()X>&w9>m!`}QWZ4$;W!Z0)waZrKPc|}cT|T2QQ2lL` zsHWGikgdlSmex4@*x=%B87)wsv4dr*$%f$iZGUd4Zrd&yaEnFjwkk(*|oVtv}@(Y<7&NS#)ylk2M~ zD~^Y8Im@Za|Ga*O{b|Crs%a&Q7!Ar_*k-*>f4(Yc6@45J9TjPpEIF_Q~2CpPtILA=cLTr2M@!#7l~i^r>NDs%JEB1*%MA-4|(q( zt7wsl{ECi#lVq=pN!Xw)mW9V~k2Mlf(Zf+k5VKZMnUSPw~RG&=*w~otMYX zHqQymSjkfHC+Xzu1*T_LFVoBY%^C1Hv*E=8v54RNBF9g@Iv{D5b60(_>fr)`sndOX zmOY)mVFA~!6J91BI~0$(uxK59TF6#md;Qr$Z(uF{=3x6jajah zA9*cLvz2YmeP3fAQ++B|pFcJI z%zJI~o}Wj~72aN7<2i5NpYQoI*#l-c`Ak~fmFr%pnX~D>%!jkaH;+WI_NXe)p4L)j z7T=sL^Eh94i`vA1pWg&!)sGsem8DDhy|4>vVVLa9*fQO+rAUB7U`vtfJo_D=A|5}v z-K60be&~VW|Gnq>FU)pbW3DAE`Y2?YX!G2MkGnM#+}AYbs%`HqD5|@0;@s}N$A8~i z(cf}+CGXs6qBfa-#MB$TeLu`MXDZ1&%+ zM_A6ZmIgG1sl7Bf`t3Z=mcOe_oq0RI@o0SMJ%80-Z)VHSlnbYmGP$?;^{jK8YPT@{ zWQ^Elaf2p~c+dN$FFXCeQ=~OkL#`Z928Cc;S{AI}~kCCa<<< zxV(?kBxcR_mA5i9c5YQIcVa5xN;zTZXT0db)6U8gy^584{;OSI`}DEN`t4csN~()L zwOxAQdtF~!`Dgr_2akPfcm7p-=6Y<~i;aarSFYIniTvt#r2d-e3|R|5rytB>m(X*m>}07xp&v1>;DSaZJp986`XN6f5m^k$biM$ z-~Mmg{66l?GL=cEoyzprYgaGLaXj_)_~T7SR_I+l&+%Z+)Bq`onF&#E82$5^R@gqO zKONzHjlKSf_H>cj`|jW0JPH);fAFWnw*P6vqHUf0M~-rQ3IF&^UZLpRwwxmtm0nv` zJi6%cPo**~FyKOaJ}KNLH}0y>|5XZ z+1wLei%kCE$IrsV^JMNDA0I8((jrCCTNXdNw%a*{&z*E`(hJXEF`*~Xi`@T4ov3Yl zroZODZPe{mb5DH}vPvomTb?X3^&ThRouao`VkCQ4 zA7z+hJK1!}H_qa}ANKv=Pul(S;CY?;zj5~NeIniNf|a+oeOMeiYx0%&i1$C^uU9QQ zy?*7MbK5&_n|}VYpjxyr(5uSL-FyH4cIh{o z`#|R&Q~53D-!6Nj70$d#jawM&sGl}bCVBO8@hz!MR|{XO{~B9+gQrPghIdzMT38(0@EFxgu6dHL*{ zcC1^?TzT5#OCQu5t9#va{q^)|{4K_>ELKl7KA(;b{Nl}XO|Es;J;mzta*CGG|0X!6 zbpCpDPG;`6-$AvkNB6GS;mYmjuKOufxclqo!(4{BN26;pO@G$vEV-G_b48h$l1$2KhA zu|Re09`8l!mR}>h3f}(R|D;#o+U?6B!pUz9Ue4C)Go19WyHx14?#dI7s*3vM?*H>l z3^{zws7kO)?}+rx=#n=VzLkAtvMav$?C~951D(=<6VobZdADU3tX)o3b%Pk{$QLT+G@F_|L03CwQQ^Q)=r@#8)dIJ z`lpm;wmJ*!$&Zo|{?;M=Gj#70vo90<-dvMpc+<`NX@ZE+BF=&zZxnvhCD$}NxO*MKt-${6^C(AUmSo%j# zY^-zn!xOSEm`tU%#GWvbl`hJe%GcE7?9TYr)-{how>VFH^OO9F)3@(@Xc1cCw08n; zZQ#NcVwyK4Kbvn5~ zX|k&7gI3v&^(%hv;P6*mCa`VwoP-UY6MkEq`g-_6TPxRh_Swzc=Wh6UaonG~JM`&? z3e5wP^o{&W-^@8v7oaH;siAaNQM@C5Rqe_0iw`fZ^hwP*tvIv!&dIkX+xnI!-c(_> zU80(Ke}4On7LW83QY)v0&hy&Gx;LHMaKe#bFWI+Rl{0U0_y4JzBb6+e(B}4BMECIb zGD9Kv#Rqlwok~btUHkGx^mBzL9AR@!D@~WMd_LIQ<{E$EaF}0>e&t?0ot?r*MUDiA zZ+)e*)#^rjEQp=N>n~$s)|N5b`{--cM|1u6SIo+uXtXPEq zia)8&Xv+>Ld0)l-WagpdlZl7EPe>`SV*9hF`GQ(k)mxhz!CrDLH-%$2+lJ~-@ITbJ zNjWs6q_k$~lB_ICy{4_JmTfbZ>0{aM$o?upkp0T=dPHOf=$^49Wr#!SynO;38utEJE!2DLeAxB*dl=sLXasOCWnaXkZdhrM zRcfeevf@(3fBO}wv8TTqGcSujqU>sWh$;Sd&yO3L>aSSeE8gmFHmh&*nP_uO<;sb6 zvAbF37Mi~j4J>kR9r|cpn0VnaTbx85*CV;4%Tqr~{*<|CUM?sf%gX7JwQNmD0SvZ!J6>xo&N>zdVV}8pYia%>h4!k z>fsIRS4;>#!uf1!nJ!D~=j9GZc3qn`vFu3(hvg-?REx+NQyZHK?o4vO={#{~N)7Xm z%aPR!zRq%&YfUaM&nb;Pyl&T`&;>Vo&X$`q`@q@+hif(LKsq%@T?cTXsuI1r!dtOZa&tb;SyIkDoYFF@d_w|Q!)_+M`rBM`c zVEg)y(zDkESYBv8u<(T5C3A;8>eDoOChu|C#&e@qk7L%}r|EW?^5z;vvs7*zQ#mGh zNABUCI2LV<n+bSk|f|3>k?$*-bw{imGhT$0_@F>QJ8dBbeM4EsEVd_mqDpL6UuB>V8o-(PH!AaN{F>7Yr-3jYg&)Tx&ol5Ed>pkCoELpWOpLxyu=A~|FkKa8H>bcvi zE)x2%i|hQ#uf~U)b>3Wm^~7$I3FnFxXYL5C{CARJ`MyPyW_~{LdXGiDhFJ86lvQmF ztD+}-H*h@FbFJpywmS~_yUyK;pKYvHUSEz~@#IcnRnVt(i7SN{rk>lmrV{o0^# z`A@v8tN2;=Jxj!I`FSX=_5ZxCJ8|c&!^#5neWkDRn5({vD}2jH{r5d!jXbU z+?^19Ywrn#8OAeB*54D_U;6p;)i;*RuU8)HG?y(ElDFHV8u|2#O2eUO=U(|cJIjnY zCRDgxYtTCCzw%+g^}Op=)6}-VPJa7i(H>c6>v|)-t?$i`iknZ^{6tm8a%JK~k;UvH zWlg+XjUOZ5CL3{iw64DYZp|a3DplhP_q3g7KK!Z4|M1v8$&Ns;^F3T~In!%bTnLNR zev`a7>zS^wvyOO<-x1BXSL*I+mzS)sN zImw`tHRPR;=A{jW_dhbqw@5ID%`t0?QcvF1@iw{O%M*==*hkw0pIgtmZdTvY7pi$D z@^@vmZ_vWL!jLda&x=*7Ep%B_tM-;w9Y6lU$!)@>14cqmnokMJ=3IK?wk3r>u8P-t zKO_563&SG^0<6-Flw+e0W<2VCzqn49^`h#AFAVATHm>goSoHbXzU#bt@%}4<`)2In zTId!v<0zAR+fRP0)8%FUso#Qr)f_nfv2R)B*_9!$&Gr{1_*v=r?UFjwb1!<~ZR`C0 z`y!IBjx77R<)nK0mf3gCExtT!dQn{QdWYy~r%WDnXt~at)AlG=+*;$v3M;eeiEQej zkFxEKW^@TArDaIJ47r^kcf|FS|HZ<%tP4_0_I;n2*p+f~s`_n{2ZBZE0)BN?W;6C| zSaJUbpW&LD8>d?erT9qsPW*lO$|G?F!JAtSmCrL&dsMh%vUbP3Q+4|})&+E{)GPgX zx#RGftN_WBsxy*--=D5O`J&?gJl)E+$yzKARV>s#hN@nhv@xFF??Cr<=KoGB7fr0n zw3c78^cZ)eV~63@=7ksgzjCe;Dk_LB{G$+|^|#LO;y7 zy(B!7oqDXukO2du61~Qzol(+MbfX>bE%F z`fVz#-s)`ra3=qpOv!cP%NN`@TQytm&Jvq*owsz1-04r;OKwnhmciY0^av?C@pQUxqwFUnQgzH}jN*(lNTI=ZO zx%ocVqR#n;+5A7%$<#$3X5Z)W)KbQO^FiGSbw(D=k<&#bj?C5&)2`}fIT=3tvepi} z^cR;TA4F?ycz62Axox!v?4L~g$iDIHlyBU2q0f3hI4#UPdGUJIUK@j_sh@;PZ)RPu z`)<4UbkDqHXAG-uvT|)Mkd6|(|GsOz*3O_wH+PrpOK@1T(Mnjm_CWOe`#MqE&K+t= zo0YdvrQt%qVYb_c$O-o@TQ1xfQ(-=5gU{0g5)H4S?*58%p=NXTGF{&#w6=U>^%u#6L(60)=Cm9*%EmT(Im7bTypM&Ld6XkAt-o!l6FhV7 z|4XfBSSwff$*y?WwCz(_1$WxVM%`PIk0!2Z>n+NDr69~KzGPN}s(ZsGnSC>N70PqY zYI#->&X_&jX4S$}&OfqOukVw)TdwbQeyTN>n!<^l>Yv|jn$55`F2zYhO7*wO|6K+Q zho3yVrl)X7adMjV!~IP+DmHSRSMBV)QN8^7;hUk)Hp@@7GmKTP)|l+YS7N&>jeSUscJUU*onYpvLvHXntzS&>lAERfAIhBFrk8f*bN$ObOWq$fy}4q>#C4XJrzT3R&gQ+G z;W&=$B zXK0`JWl}TqHxYq9#~Yt%wXAebn=_n+v`Jcc`Dqz3s4eQ-RLWcX@1ge$G?aee+fJ zWOj8aD}#-j`+tY2m90|#x%F#<-fFjKQHy@DQ*XA{%!o}Wo31loj>&&*67VZh_T>71I6@{j?Y!#L zmmz1aI;u748Z33+6|kgnu~%w(@;~;8&%azb#1zH9O2JCX_-i}2;-bP+Leg9pf4Ha> z96DfeK553fdqOTJ8WnE)g)G%HT&Hx`I$z4ct$FvQx*KmkN#D0z5b^N)eif}#&%49h zCI+@;13CF`g?wQjz2#+&cn`Ge1Tu!&VwPc4!Yy(xCUD{1zL#s5?uh;M3`SlMxN zrybWi8K=)vi-Z4E>@}NR^LO({HSM`#SqtSKurIe~)U$V7`}mC1&xDMonKheYh2E#W zTe0C*TwZP2&8<$~{yge!iqYaRN?P^z&&BRorrGbkLTC15K78P@);8ee%m0_v`MDW7 z?^_=`m-A#+rSRtUakdXx)-5?)w(raZfww+xpOd&ImK+pbZM>F8eOIaB{6Dk26RzHy zbe;Q{)B6YS=IFBX*RlIum>ur%Y=PYl{+D5A8C(me%kwohio8&ME<90%^R3~J`>S@Y zR#=>{usNb?x4PSpxDWjsH~ZfD#pWB`CV#VwMdn+`70J9g^VZIB`IlR)$T7DMn8hwR5pC74BqFr;>p~`;ssmZ)FiyoUa2H~ zyws<4*K42J$y@h5-MLXbFGJC>RX0MZzVqyPW_ literal 0 HcmV?d00001 From d18becc861a0ad809f281e0675e3d72f3463e7e2 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Wed, 20 Apr 2011 18:37:39 +0100 Subject: [PATCH 151/329] fix bug due to vim stripping regex being wrong --- deluge/tests/test_httpdownloader.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deluge/tests/test_httpdownloader.py b/deluge/tests/test_httpdownloader.py index 7715cc6bf..4dbed91e2 100644 --- a/deluge/tests/test_httpdownloader.py +++ b/deluge/tests/test_httpdownloader.py @@ -17,7 +17,7 @@ import common rpath = common.rpath class TestRedirectResource(Resource): - + def render(self, request): request.redirect("http://localhost:51242/") @@ -26,7 +26,7 @@ class TestRenameResource(Resource): def render(self, request): filename = request.args.get("filename", ["renamed_file"])[0] request.setHeader("Content-Type", "text/plain") - request.setHeader("Content-Disposition", "attachment; filename=" + request.setHeader("Content-Disposition", "attachment; filename=" + filename) return "This file should be called " + filename @@ -107,14 +107,14 @@ class DownloadFileTestCase(unittest.TestCase): return d def test_download_without_required_cookies(self): - url = "http://localhost:51242/cookie" + url = "http://localhost:51242/cookie" d = download_file(url, "none") d.addCallback(self.fail) d.addErrback(self.assertIsInstance, Failure) return d def test_download_with_required_cookies(self): - url = "http://localhost:51242/cookie" + url = "http://localhost:51242/cookie" cookie = { "cookie" : "password=deluge" } d = download_file(url, "monster", headers=cookie) d.addCallback(self.assertEqual, "monster") @@ -150,13 +150,13 @@ class DownloadFileTestCase(unittest.TestCase): return d def test_download_with_gzip_encoding(self): - url = "http://localhost:51242/gzip?msg=success" + url = "http://localhost:51242/gzip?msg=success" d = download_file(url, "gzip_encoded") d.addCallback(self.assertContains, "success") return d def test_download_with_gzip_encoding_disabled(self): - url = "http://localhost:51242/gzip?msg=fail" + url = "http://localhost:51242/gzip?msg=fail" d = download_file(url, "gzip_encoded", allow_compression=False) d.addCallback(self.failIfContains, "fail") return d From 98f80c0eb6f2a83baee860d22bd2517af2b232a4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Apr 2011 00:42:36 +0100 Subject: [PATCH 152/329] Restore column order from state. On the TorrentView's treeview, the column's position stored on state was being ignored, but event if that info was not being ignored and passed to the several `add_column`'s the order could not be added because the order the columns are added does not(might not) match what was stored in state. So, we now restore the ordering once all columns are added. --- deluge/ui/gtkui/listview.py | 18 ++++++++++++++++++ deluge/ui/gtkui/torrentview.py | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index 9a2aed9a6..4185c1445 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -607,3 +607,21 @@ class ListView: def on_keypress_search_by_name(self, model, columnn, key, iter): TORRENT_NAME_COL = 5 return not model[iter][TORRENT_NAME_COL].lower().startswith(key.lower()) + + def restore_columns_order_from_state(self): + columns = self.treeview.get_columns() + def find_column(header): + for column in columns: + if column.get_title() == header: + return column + + for col_state in self.state: + column_at_position = columns[col_state.position] + if col_state.name == column_at_position.get_title(): + # It's in the right position + continue + column = find_column(col_state.name) + self.treeview.move_column_after(column, column_at_position) + # Get columns again to keep reordering since positions have changed + columns = self.treeview.get_columns() + self.create_new_liststore() diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 46d9dbcc3..bd0d970c6 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -245,6 +245,7 @@ class TorrentView(listview.ListView, component.Component): self.add_text_column(_("Save Path"), status_field=["save_path"]) self.add_text_column(_("Owner"), status_field=["owner"]) self.add_bool_column(_("Public"), status_field=["public"]) + self.restore_columns_order_from_state() # Set filter to None for now self.filter = None @@ -264,6 +265,7 @@ class TorrentView(listview.ListView, component.Component): self.treeview.connect("drag-drop", self.on_drag_drop) self.treeview.connect("key-press-event", self.on_key_press_event) + self.treeview.connect("columns-changed", self.on_columns_changed_event) client.register_event_handler("TorrentStateChangedEvent", self.on_torrentstatechanged_event) client.register_event_handler("TorrentAddedEvent", self.on_torrentadded_event) @@ -521,6 +523,10 @@ class TorrentView(listview.ListView, component.Component): def on_drag_drop(self, widget, drag_context, x, y, timestamp): widget.stop_emission("drag-drop") + def on_columns_changed_event(self, treeview): + log.debug("Treeview Columns Changed") + self.save_state() + def on_torrentadded_event(self, torrent_id, from_state): self.add_row(torrent_id) self.mark_dirty(torrent_id) From 796109649d2d2a505e0ca875620fbe55e54d5549 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Thu, 21 Apr 2011 10:41:00 +0100 Subject: [PATCH 153/329] fix the client tests albeit in an ultra hacky way --- deluge/tests/test_client.py | 46 +++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py index 79ff38376..1bd0a896b 100644 --- a/deluge/tests/test_client.py +++ b/deluge/tests/test_client.py @@ -1,6 +1,10 @@ -import tempfile import os +import sys +import time import signal +import tempfile + +from subprocess import Popen, PIPE import common @@ -8,20 +12,48 @@ from twisted.trial import unittest from deluge.ui.client import client -# Start a daemon to test with and wait a couple seconds to make sure it's started -config_directory = common.set_tmp_config_dir() -client.start_daemon(58847, config_directory) -import time -time.sleep(2) +CWD = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) +DAEMON_SCRIPT = """ +import sys +import deluge.main + +sys.argv.extend(['-d', '-c', '%s', '-Linfo']) + +deluge.main.start_daemon() +""" class ClientTestCase(unittest.TestCase): + + def setUp(self): + config_directory = common.set_tmp_config_dir() + + fp = tempfile.TemporaryFile() + fp.write(DAEMON_SCRIPT % config_directory) + fp.seek(0) + + self.core = Popen([sys.executable], cwd=CWD, + stdin=fp, stdout=PIPE, stderr=PIPE) + + listening = False + while not listening: + line = self.core.stderr.readline() + if "Factory starting on 58846" in line: + listening = True + time.sleep(0.1) # Slight pause just incase + break + + + def tearDown(self): + self.core.terminate() + def test_connect_no_credentials(self): - d = client.connect("localhost", 58847) + d = client.connect("localhost", 58846) d.addCallback(self.assertEquals, 10) def on_connect(result): self.addCleanup(client.disconnect) return result + d.addCallback(on_connect) return d From b9a688013f554d71db8eb3f5e6f984202ce08907 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Apr 2011 18:29:59 +0100 Subject: [PATCH 154/329] Fix #1786: Don't reorder duplicate columns, need to dig how duplicate columns got into the state file, and also skip non visible columns. --- deluge/ui/gtkui/listview.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index 4185c1445..b96ca1ad2 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -615,7 +615,15 @@ class ListView: if column.get_title() == header: return column + restored_columns = [] for col_state in self.state: + if col_state.name in restored_columns: + # Duplicate column in state!?!?!? + continue + elif not col_state.visible: + # Column is not visible, no need to reposition + continue + column_at_position = columns[col_state.position] if col_state.name == column_at_position.get_title(): # It's in the right position @@ -624,4 +632,5 @@ class ListView: self.treeview.move_column_after(column, column_at_position) # Get columns again to keep reordering since positions have changed columns = self.treeview.get_columns() + restored_columns.append(col_state.name) self.create_new_liststore() From 49d5ed6bdef748992da6071f3a8ca8e730ef99e6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 21 Apr 2011 20:55:01 +0100 Subject: [PATCH 155/329] Hopefully, final fix for #1786: We now make sure that a state file exists when trying to restore an order from it. The best effort to restore the previous order is made, though, in some cases, since we're matching against names which are translatable, a match might not be found, in that case, continue the effort though skip the non matching column name. On next load, everything should be fine since the state file will include the, now in use, translation. --- deluge/ui/gtkui/listview.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index b96ca1ad2..35c7b7655 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -609,6 +609,9 @@ class ListView: return not model[iter][TORRENT_NAME_COL].lower().startswith(key.lower()) def restore_columns_order_from_state(self): + if self.state is None: + # No state file exists, so, no reordering can be done + return columns = self.treeview.get_columns() def find_column(header): for column in columns: @@ -629,6 +632,14 @@ class ListView: # It's in the right position continue column = find_column(col_state.name) + if not column: + log.debug("Could not find column matching \"%s\" on state." % + col_state.name) + # The cases where I've found that the column could not be found + # is when not using the english locale, ie, the default one, or + # when changing locales between runs. + # On the next load, all should be fine + continue self.treeview.move_column_after(column, column_at_position) # Get columns again to keep reordering since positions have changed columns = self.treeview.get_columns() From 5ad3a1666c7c6f60aa0a4a6bc6fbf04f173724ac Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sun, 12 Dec 2010 09:58:28 -0800 Subject: [PATCH 156/329] Update the ErrorDialog --- deluge/ui/gtkui/dialogs.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index cf1cf910c..9409513c1 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -147,13 +147,16 @@ class ErrorDialog(BaseDialog): When run(), it will return a gtk.RESPONSE_CLOSE. """ - def __init__(self, header, text, parent=None, details=None): + def __init__(self, header, text, parent=None, details=None, traceback=False): """ :param header: see `:class:BaseDialog` :param text: see `:class:BaseDialog` :param parent: see `:class:BaseDialog` - :param details: str, extra information that will be displayed in a + :param details: extra information that will be displayed in a scrollable textview + :type details: string + :param traceback: show the traceback information in the details area + :type traceback: bool """ super(ErrorDialog, self).__init__( header, @@ -162,6 +165,16 @@ class ErrorDialog(BaseDialog): (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE), parent) + if traceback: + import traceback + import sys + tb = sys.exc_info() + tb = traceback.format_exc(tb[2]) + if details: + details += "\n" + tb + else: + details = tb + if details: self.set_default_size(500, 400) textview = gtk.TextView() From bfc221fc18fc7424ac6bfbcb4ca1193032491b14 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sun, 12 Dec 2010 09:59:25 -0800 Subject: [PATCH 157/329] Begin work on fixing up the Preference dialog Split up the glade file for each individual page --- .../gtkui/glade/preferences/bandwidth.glade | 490 +++++++ deluge/ui/gtkui/glade/preferences/cache.glade | 474 +++++++ .../ui/gtkui/glade/preferences/daemon.glade | 174 +++ .../gtkui/glade/preferences/downloads.glade | 393 ++++++ .../gtkui/glade/preferences/interface.glade | 322 +++++ .../ui/gtkui/glade/preferences/network.glade | 799 +++++++++++ deluge/ui/gtkui/glade/preferences/other.glade | 273 ++++ .../ui/gtkui/glade/preferences/plugins.glade | 367 +++++ deluge/ui/gtkui/glade/preferences/proxy.glade | 874 ++++++++++++ deluge/ui/gtkui/glade/preferences/queue.glade | 449 +++++++ deluge/ui/gtkui/preferences.py | 1194 +++++------------ 11 files changed, 4943 insertions(+), 866 deletions(-) create mode 100644 deluge/ui/gtkui/glade/preferences/bandwidth.glade create mode 100644 deluge/ui/gtkui/glade/preferences/cache.glade create mode 100644 deluge/ui/gtkui/glade/preferences/daemon.glade create mode 100644 deluge/ui/gtkui/glade/preferences/downloads.glade create mode 100644 deluge/ui/gtkui/glade/preferences/interface.glade create mode 100644 deluge/ui/gtkui/glade/preferences/network.glade create mode 100644 deluge/ui/gtkui/glade/preferences/other.glade create mode 100644 deluge/ui/gtkui/glade/preferences/plugins.glade create mode 100644 deluge/ui/gtkui/glade/preferences/proxy.glade create mode 100644 deluge/ui/gtkui/glade/preferences/queue.glade diff --git a/deluge/ui/gtkui/glade/preferences/bandwidth.glade b/deluge/ui/gtkui/glade/preferences/bandwidth.glade new file mode 100644 index 000000000..6349e4376 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/bandwidth.glade @@ -0,0 +1,490 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + vertical + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 2 + 15 + + + True + True + ● + 1 + True + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + True + True + ● + 1 + True + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + 0 + Maximum Connection Attempts per Second: + + + 5 + 6 + GTK_FILL + + + + + True + 0 + Maximum Half-Open Connections: + + + 4 + 5 + GTK_FILL + + + + + True + 0 + Maximum Upload Speed (KiB/s): + + + 3 + 4 + GTK_FILL + + + + + True + 0 + Maximum Connections: + + + GTK_FILL + + + + + True + 0 + Maximum Upload Slots: + + + 1 + 2 + GTK_FILL + + + + + True + True + 4 + ● + 1 + 1 + True + True + if-valid + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Maximum Download Speed (KiB/s): + + + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + 1 + 1 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True + ● + 1 + 1 + 1 + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + True + True + ● + 1 + 1 + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + 0 + + + + + True + 5 + + + Ignore limits on local network + True + True + False + True + True + + + + + 1 + + + + + True + 5 + + + Rate limit IP overhead + True + True + False + True + True + + + + + 2 + + + + + + + + + True + <b>Global Bandwidth Usage</b> + True + + + + + False + False + 5 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 2 + 15 + + + True + True + ● + 1 + 1 + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + ● + 1 + True + True + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Connections: + + + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Upload Slots: + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Download Speed (KiB/s): + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Upload Speed (KiB/s): + + + 3 + 4 + GTK_FILL + + + + + True + True + ● + 1 + 1 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + True + ● + 1 + 1 + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Per Torrent Bandwidth Usage</b> + True + + + + + False + 5 + 1 + + + + + + + -1 + 9000 + 1 + 10 + + + -1 + 9000 + 1 + 10 + + + -1 + 9000 + 1 + 10 + + + -1 + 9000 + 1 + 10 + + + -1 + 9000 + 1 + 10 + + + -1 + 60000 + 1 + 10 + + + -1 + 60000 + 1 + 10 + + + -1 + 9000 + 1 + 10 + + + -1 + 9999 + 1 + 10 + + + -1 + 9999 + 1 + 10 + + diff --git a/deluge/ui/gtkui/glade/preferences/cache.glade b/deluge/ui/gtkui/glade/preferences/cache.glade new file mode 100644 index 000000000..f57e22597 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/cache.glade @@ -0,0 +1,474 @@ + + + + + + + + True + vertical + + + True + 0 + none + + + True + 5 + 12 + + + True + 2 + 2 + 5 + + + True + 0 + Cache Size (16 KiB blocks): + + + GTK_FILL + + + + + True + 0 + Cache Expiry (seconds): + + + 1 + 2 + GTK_FILL + + + + + True + True + ● + 1 + True + if-valid + + + 1 + 2 + + + + + + True + True + 5 + ● + 5 + 1 + + + 1 + 2 + 1 + 2 + + + + + + + + + + True + <b>Settings</b> + True + + + + + False + False + 5 + 0 + + + + + True + 0 + none + + + True + 5 + 12 + + + True + vertical + + + True + 0 + none + + + True + 12 + + + True + 3 + 2 + 5 + + + True + 0 + Blocks Written: + + + GTK_FILL + + + + + True + 0 + Writes: + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Write Cache Hit Ratio: + + + 2 + 3 + GTK_FILL + + + + + True + 1 + + + 1 + 2 + + + + + + True + 1 + + + 1 + 2 + 1 + 2 + + + + + + True + 1 + + + 1 + 2 + 2 + 3 + + + + + + + + + + True + <b>Write</b> + True + + + + + 0 + + + + + True + 0 + none + + + True + 12 + + + True + 4 + 2 + 5 + + + True + 0 + Blocks Read: + + + GTK_FILL + + + + + True + 0 + Blocks Read Hit: + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Read Cache Hit Ratio: + + + 3 + 4 + GTK_FILL + + + + + True + 1 + + + 1 + 2 + + + + + + True + 1 + + + 1 + 2 + 1 + 2 + + + + + + True + 1 + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + Reads: + + + 2 + 3 + GTK_FILL + + + + + True + + + 1 + 2 + 2 + 3 + + + + + + + + + + True + <b>Read</b> + True + + + + + 1 + + + + + True + 0 + none + + + True + 12 + + + True + 2 + 2 + 5 + + + True + 0 + Cache Size: + + + GTK_FILL + + + + + True + 0 + Read Cache Size: + + + 1 + 2 + GTK_FILL + + + + + True + 1 + + + 1 + 2 + + + + + + True + 1 + + + 1 + 2 + 1 + 2 + + + + + + + + + + True + <b>Size</b> + True + + + + + 2 + + + + + True + start + + + gtk-refresh + True + True + True + True + + + False + False + 0 + + + + + 3 + + + + + + + + + True + <b>Status</b> + True + + + + + False + False + 5 + 1 + + + + + + + 1 + 32000 + 1 + 10 + + + 99999 + 1 + 10 + + diff --git a/deluge/ui/gtkui/glade/preferences/daemon.glade b/deluge/ui/gtkui/glade/preferences/daemon.glade new file mode 100644 index 000000000..d7ed1f25f --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/daemon.glade @@ -0,0 +1,174 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Daemon port: + + + False + False + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + + + False + False + 1 + + + + + False + False + 0 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Port</b> + True + + + + + False + False + 5 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 10 + + + Allow Remote Connections + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Connections</b> + True + + + + + False + False + 5 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 10 + + + Periodically check the website for new releases + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Other</b> + True + + + + + False + False + 5 + 2 + + + + + + + 65535 + 1 + 10 + + diff --git a/deluge/ui/gtkui/glade/preferences/downloads.glade b/deluge/ui/gtkui/glade/preferences/downloads.glade new file mode 100644 index 000000000..afd228bfc --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/downloads.glade @@ -0,0 +1,393 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + 5 + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + select-folder + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + + + + + + + 1 + 2 + 2 + 3 + + + + + True + + + True + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + select-folder + Select A Folder + + + 0 + + + + + True + ● + + + 1 + + + + + + + 1 + 2 + 1 + 2 + + + + + Auto add .torrents from: + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 2 + 3 + GTK_FILL + + + + + Move completed to: + True + True + False + True + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + select-folder + Select A Folder + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + + + + + 1 + 2 + + + + + True + 0 + Download to: + + + GTK_FILL + + + + + Copy of .torrent files to: + True + True + False + True + + + 3 + 4 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + select-folder + Select A Folder + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + + + + + + + 1 + 2 + 3 + 4 + + + + + Delete copy of torrent file on remove + True + True + False + True + + + 2 + 4 + 5 + 15 + + + + + + + + + True + <b>Folders</b> + True + + + + + False + False + 5 + 0 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 + + + Use Full Allocation + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + False + False + 0 + + + + + Use Compact Allocation + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + radio_full_allocation + + + False + False + 1 + + + + + + + + + True + <b>Allocation</b> + True + + + + + False + False + 5 + 1 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + vertical + + + Prioritize first and last pieces of torrent + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + 0 + + + + + Add torrents in Paused state + True + True + False + True + + + 1 + + + + + + + + + True + <b>Options</b> + True + + + + + False + False + 5 + 2 + + + + + + diff --git a/deluge/ui/gtkui/glade/preferences/interface.glade b/deluge/ui/gtkui/glade/preferences/interface.glade new file mode 100644 index 000000000..69ed50acc --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/interface.glade @@ -0,0 +1,322 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 2 + 12 + + + Enable + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Classic Mode</b> + True + + + + + False + False + 5 + 0 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + Show session speed in titlebar + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 0 + + + + + + + + + True + <b>Main Window</b> + True + + + + + False + False + 5 + 1 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + Always show + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + Bring the dialog to focus + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + 1 + + + + + + + + + True + <b>Add Torrents Dialog</b> + True + + + + + False + False + 5 + 2 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + vertical + + + Enable system tray icon + True + True + False + True + True + + + 0 + + + + + True + 10 + + + Minimize to tray on close + True + False + True + False + True + True + + + + + 1 + + + + + True + 10 + + + Start in tray + True + False + True + False + True + True + + + + + 2 + + + + + True + 3 + 10 + + + Password protect system tray + True + False + True + False + True + True + + + + + False + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + + + True + 5 + + + True + False + 0 + Password: + + + False + 0 + + + + + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ● + 16 + ******** + + + False + 1 + + + + + + + 4 + + + + + + + + + True + <b>System Tray</b> + True + + + + + False + 5 + 3 + + + + + + diff --git a/deluge/ui/gtkui/glade/preferences/network.glade b/deluge/ui/gtkui/glade/preferences/network.glade new file mode 100644 index 000000000..b1e45f703 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/network.glade @@ -0,0 +1,799 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + + + Use Random Ports + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + 5 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 1 + Active Port: + right + + + False + 5 + 0 + + + + + True + 0 + 0000 + 5 + + + False + 5 + 1 + + + + + False + 5 + 1 + + + + + 5 + 0 + + + + + True + + + True + From: + + + False + 0 + + + + + True + False + True + 5 + ● + 1 + adjustment28 + 1 + True + True + + + False + 5 + 1 + + + + + True + 5 + To: + + + False + False + 2 + + + + + True + False + True + 5 + ● + 1 + adjustment27 + 1 + True + True + + + False + 5 + 3 + + + + + Test Active Port + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + False + 4 + + + + + True + 5 + + + gtk-missing-image + + + + + False + 5 + + + + + 5 + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Incoming Ports</b> + True + + + + + False + 5 + 0 + + + + + True + 0 + none + + + True + 5 + 12 + + + True + vertical + 5 + + + Use Random Ports + True + True + False + True + + + False + False + 0 + + + + + True + 5 + + + True + From: + + + False + False + 0 + + + + + True + False + True + 5 + ● + 1 + adjustment26 + 1 + True + True + + + False + 5 + 1 + + + + + True + To: + + + False + False + 2 + + + + + True + False + True + 5 + ● + 1 + adjustment25 + 1 + True + True + + + False + 5 + 3 + + + + + 1 + + + + + + + + + True + <b>Outgoing Ports</b> + True + + + + + False + False + 1 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + + + True + True + 60 + ● + 30 + + + False + False + 0 + + + + + + + + + + + + True + <b>Interface</b> + True + + + + + False + False + 2 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + vertical + + + True + 5 + + + True + Peer TOS Byte: + + + False + False + 0 + + + + + True + True + ● + 4 + 0x00 + + + False + False + 1 + + + + + 0 + + + + + + + + + True + <b>TOS</b> + True + + + + + False + 5 + 3 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + 2 + 3 + 5 + + + UPnP + True + True + False + True + True + True + + + GTK_FILL + + + + + NAT-PMP + True + True + False + True + True + True + + + 1 + 2 + GTK_FILL + + + + + Peer Exchange + True + True + False + True + True + True + + + 2 + 3 + GTK_FILL + + + + + LSD + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 1 + 2 + GTK_FILL + + + + + DHT + True + True + False + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + + + + + + + True + <b>Network Extras</b> + True + + + + + False + 5 + 4 + + + + + True + 0 + none + + + True + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + 1 + Inbound: + + + 0 + + + + + True + 0 + Level: + + + 1 + + + + + False + False + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + liststore7 + + + + 0 + + + + + 0 + + + + + True + liststore6 + + + + 0 + + + + + 1 + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 1 + Outbound: + + + False + False + 0 + + + + + True + liststore5 + + + + 0 + + + + + False + 1 + + + + + 0 + + + + + Encrypt entire stream + True + True + False + True + True + + + False + 3 + 1 + + + + + 2 + + + + + + + + + True + <b>Encryption</b> + True + + + + + False + False + 5 + 5 + + + + + + + + + + + + + Forced + + + Enabled + + + Disabled + + + + + + + + + + + Handshake + + + Full Stream + + + Either + + + + + + + + + + + Forced + + + Enabled + + + Disabled + + + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + diff --git a/deluge/ui/gtkui/glade/preferences/other.glade b/deluge/ui/gtkui/glade/preferences/other.glade new file mode 100644 index 000000000..ecb9145a0 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/other.glade @@ -0,0 +1,273 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + Be alerted about new releases + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + False + 0 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Updates</b> + True + + + + + False + False + 5 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. + True + + + False + False + 2 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 + + + Yes, please send anonymous statistics + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + False + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>System Information</b> + True + + + + + False + False + 5 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + 5 + + + True + Location: + + + False + False + 0 + + + + + True + True + ● + + + 1 + + + + + + + False + False + 0 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>GeoIP Database</b> + True + + + + + False + False + 5 + 2 + + + + + True + 12 + + + True + start + + + True + True + True + + + True + 2 + + + True + gtk-missing-image + + + 0 + + + + + True + Associate Magnet links with Deluge + + + 1 + + + + + + + False + False + 0 + + + + + + + False + False + 3 + + + + + + diff --git a/deluge/ui/gtkui/glade/preferences/plugins.glade b/deluge/ui/gtkui/glade/preferences/plugins.glade new file mode 100644 index 000000000..3981e9520 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/plugins.glade @@ -0,0 +1,367 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 1 + + + True + True + automatic + automatic + in + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + False + True + + + + + True + True + automatic + automatic + + + True + queue + none + + + True + 0 + none + + + True + 12 + + + True + 5 + 2 + 5 + + + True + 0 + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + + + 1 + 2 + + + + + + True + 0 + 0 + Details: + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + 0 + Version: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Author: + + + GTK_FILL + + + + + + True + 0 + Homepage: + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + Author Email: + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + 0 + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + + + 1 + 2 + 2 + 3 + + + + + + + + + + True + <b>Info</b> + True + + + + + + + + + False + False + + + + + 0 + + + + + True + center + + + True + True + True + + + True + 5 + + + True + gtk-add + + + False + False + 0 + + + + + True + _Install Plugin + True + True + + + False + False + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + 5 + + + True + gtk-refresh + + + False + False + 0 + + + + + True + _Rescan Plugins + True + True + + + False + False + 1 + + + + + + + False + False + 1 + + + + + False + False + 1 + + + + + True + + + True + True + True + + + True + 5 + + + True + gtk-find + + + False + False + 0 + + + + + True + _Find More Plugins + True + True + + + False + False + 1 + + + + + + + False + False + 0 + + + + + False + False + 2 + + + + + + diff --git a/deluge/ui/gtkui/glade/preferences/proxy.glade b/deluge/ui/gtkui/glade/preferences/proxy.glade new file mode 100644 index 000000000..dc220dd1b --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/proxy.glade @@ -0,0 +1,874 @@ + + + + + + + + True + vertical + 5 + + + True + 0 + none + + + True + 12 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 2 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Password: + + + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 + GTK_FILL + + + + + True + 0 + 0 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Type: + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 + GTK_FILL + + + + + + + + + True + <b>Peer</b> + True + + + + + False + False + 0 + + + + + True + 0 + none + + + True + 12 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 2 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Password: + + + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 + GTK_FILL + + + + + True + 0 + 0 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Type: + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 + GTK_FILL + + + + + + + + + True + <b>Web Seed</b> + True + + + + + False + False + 1 + + + + + True + 0 + none + + + True + 12 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 2 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Password: + + + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 + GTK_FILL + + + + + True + 0 + 0 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Type: + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 + GTK_FILL + + + + + + + + + True + <b>Tracker</b> + True + + + + + False + False + 2 + + + + + True + 0 + none + + + True + 12 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 2 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Password: + + + 2 + 3 + GTK_FILL + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ● + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + 0 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + 0 + + + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Type: + + + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 + GTK_FILL + + + + + + + + + + True + <b>DHT</b> + True + + + + + False + False + 3 + + + + + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + + + + + + + + None + + + Socksv4 + + + Socksv5 + + + Socksv5 W/ Auth + + + HTTP + + + HTTP W/ Auth + + + + + + + + + + + None + + + Socksv4 + + + Socksv5 + + + Socksv5 W/ Auth + + + HTTP + + + HTTP W/ Auth + + + + + + + + + + + None + + + Socksv4 + + + Socksv5 + + + Socksv5 W/ Auth + + + HTTP + + + HTTP W/ Auth + + + + + + + + + + + None + + + Socksv4 + + + Socksv5 + + + Socksv5 W/ Auth + + + HTTP + + + HTTP W/ Auth + + + + diff --git a/deluge/ui/gtkui/glade/preferences/queue.glade b/deluge/ui/gtkui/glade/preferences/queue.glade new file mode 100644 index 000000000..017022a64 --- /dev/null +++ b/deluge/ui/gtkui/glade/preferences/queue.glade @@ -0,0 +1,449 @@ + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + + + Queue new torrents to top + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 0 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>General</b> + True + + + + + False + False + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 12 + + + True + vertical + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 2 + 10 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + True + True + + + 1 + 2 + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Total active seeding: + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Total active: + + + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Total active downloading: + + + 1 + 2 + GTK_FILL + + + + + 0 + + + + + Do not count slow torrents + True + True + False + True + + + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Active Torrents</b> + True + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + 3 + 2 + 10 + + + True + 0 + Share Ratio Limit: + + + GTK_FILL + + + + + True + 0 + Seed Time Ratio: + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Seed Time (m): + + + 2 + 3 + GTK_FILL + + + + + True + True + ● + 6 + 1 + 2 + + + 1 + 2 + + + + + + True + True + ● + 6 + 1 + 2 + + + 1 + 2 + 1 + 2 + + + + + + True + True + ● + 6 + 1 + + + 1 + 2 + 2 + 3 + + + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + Stop seeding when share ratio reaches: + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + 1 + 2 + True + + + False + False + 1 + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 + + + Remove torrent when share ratio reached + True + False + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + 2 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Seeding</b> + True + + + + + False + False + 2 + + + + + + + 0.5 + 100 + 0.10000000000000001 + 1 + + + -1 + 10000 + 1 + 10 + + + -1 + 100 + 0.10000000000000001 + 10 + + + -1 + 100 + 0.10000000000000001 + 10 + + + -1 + 9999 + 1 + 10 + + + -1 + 9999 + 1 + 10 + + + -1 + 9999 + 1 + 10 + + diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index a13937a2d..6eb0063c4 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -1,7 +1,7 @@ # # preferences.py # -# Copyright (C) 2007, 2008 Andrew Resch +# Copyright (C) 2007-2010 Andrew Resch # # Deluge is free software. # @@ -33,99 +33,59 @@ # # - -import pygtk -pygtk.require('2.0') +import os import gtk -import gtk.glade + import logging import pkg_resources +from twisted.internet.defer import maybeDeferred import deluge.component as component +import dialogs from deluge.ui.client import client import deluge.common import deluge.error import common -from deluge.configmanager import ConfigManager -import deluge.configmanager log = logging.getLogger(__name__) -class Preferences(component.Component): +class PreferencePage(object): + """ + Must set a name and widget prior to adding to them Preferences dialog. + """ def __init__(self): - component.Component.__init__(self, "Preferences") - self.window = component.get("MainWindow") - self.glade = gtk.glade.XML(pkg_resources.resource_filename( - "deluge.ui.gtkui", "glade/preferences_dialog.glade" - )) - self.pref_dialog = self.glade.get_widget("pref_dialog") - self.pref_dialog.set_icon(common.get_deluge_icon()) - self.treeview = self.glade.get_widget("treeview") - self.notebook = self.glade.get_widget("notebook") - self.gtkui_config = ConfigManager("gtkui.conf") + self.name = "" + self.widget = None + self.builder = None - self.glade.get_widget("image_magnet").set_from_file( - deluge.common.get_pixmap("magnet.png")) + # Set the core widgets and their config keys + # {widget: (accessor, core_key, non_localhost_widget), ...} + self.core_widgets = {} + # Likewise for local widgets + self.local_widgets = {} - # Setup the liststore for the categories (tab pages) - self.liststore = gtk.ListStore(int, str) - self.treeview.set_model(self.liststore) - render = gtk.CellRendererText() - column = gtk.TreeViewColumn(_("Categories"), render, text=1) - self.treeview.append_column(column) - # Add the default categories - i = 0 - for category in [_("Downloads"), _("Network"), _("Bandwidth"), - _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), - _("Cache"), _("Plugins")]: - self.liststore.append([i, category]) - i += 1 + def show(self): + """ + Called when the page needs to have it's values updated. + """ + raise NotImplementedError - # Setup plugin tab listview - self.plugin_liststore = gtk.ListStore(str, bool) - self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) - self.plugin_listview = self.glade.get_widget("plugin_listview") - self.plugin_listview.set_model(self.plugin_liststore) - render = gtk.CellRendererToggle() - render.connect("toggled", self.on_plugin_toggled) - render.set_property("activatable", True) - self.plugin_listview.append_column( - gtk.TreeViewColumn(_("Enabled"), render, active=1)) - self.plugin_listview.append_column( - gtk.TreeViewColumn(_("Plugin"), gtk.CellRendererText(), text=0)) + def apply(self): + """ + Called when the settings need to be saved. This method needs to be + defined by the subclass. + """ + raise NotImplementedError - # Connect to the 'changed' event of TreeViewSelection to get selection - # changes. - self.treeview.get_selection().connect("changed", - self.on_selection_changed) + def set_widget(self, widget): + """ + Creates a scrolled window with a proper header for the widget. The + widget is likely a gtk.VBox or similar container. - self.plugin_listview.get_selection().connect("changed", - self.on_plugin_selection_changed) + :param widget: the container widget for all the pref widgets + :type widget: gtk.Widget - self.glade.signal_autoconnect({ - "on_pref_dialog_delete_event": self.on_pref_dialog_delete_event, - "on_button_ok_clicked": self.on_button_ok_clicked, - "on_button_apply_clicked": self.on_button_apply_clicked, - "on_button_cancel_clicked": self.on_button_cancel_clicked, - "on_toggle": self.on_toggle, - "on_test_port_clicked": self.on_test_port_clicked, - "on_button_plugin_install_clicked": self._on_button_plugin_install_clicked, - "on_button_rescan_plugins_clicked": self._on_button_rescan_plugins_clicked, - "on_button_find_plugins_clicked": self._on_button_find_plugins_clicked, - "on_button_cache_refresh_clicked": self._on_button_cache_refresh_clicked, - "on_combo_proxy_type_changed": self._on_combo_proxy_type_changed, - "on_button_associate_magnet_clicked": self._on_button_associate_magnet_clicked - }) - - # These get updated by requests done to the core - self.all_plugins = [] - self.enabled_plugins = [] - - def __del__(self): - del self.gtkui_config - - def add_page(self, name, widget): - """Add a another page to the notebook""" + """ # Create a header and scrolled window for the preferences tab parent = widget.get_parent() if parent: @@ -133,7 +93,7 @@ class Preferences(component.Component): vbox = gtk.VBox() label = gtk.Label() label.set_use_markup(True) - label.set_markup("" + name + "") + label.set_markup("" + self.name + "") label.set_alignment(0.00, 0.50) label.set_padding(10, 10) vbox.pack_start(label, False, True, 0) @@ -150,814 +110,316 @@ class Preferences(component.Component): viewport.add(vbox) scrolled.add(viewport) scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - scrolled.show_all() + self.widget = scrolled + + def set_widget_from_file(self, xmlfile, obj): + """ + Sets the widget from an object in a gtkBuilder xml file. + + :param xmlfile: the path to the xml file + :type xmlfile: string + :param obj: the object name to use + :type obj: string + + """ + builder = gtk.Builder() + builder.add_from_file(xmlfile) + self.set_widget(builder.get_object(obj)) + + +class GtkUIPreferencePage(PreferencePage): + def __init__(self, name, xml, widget): + super(GtkUIPreferencePage, self).__init__() + self.name = name + self.set_widget_from_file(xml, widget) + + def show(self): + """ + Called when the page needs to have it's values updated. + """ + if self.core_widgets: + coreconfig = component.get("CoreConfig") + for name, (accessor, key, non_localhost) in self.core_widgets.items(): + widget = self.builder.get_object(name) + getattr(widget, "set_" + accessor)(coreconfig[key]) + if client.is_localhost(): + # Hide any non_localhost widgets + if non_localhost: + self.builder.get_object(non_localhost).hide() + widget.show() + else: + if non_localhost: + # Hide this widget because it should only be shown + # if core is a localhost, but show its non_localhost widget + self.builder.get_object(non_localhost).show() + widget.hide() + + +class DownloadsPreferencePage(GtkUIPreferencePage): + def __init__(self, name, xml, widget): + super(DownloadsPreferencePage, self).__init__(name, xml, widget) + self.core_widgets = { + "download_path_button": ("current_folder", "download_location", "entry_download_path"), + "entry_download_path": ("text", "download_location", ""), + "chk_move_completed": ("active", "move_completed", ""), + "move_completed_path_button": ("current_folder", "move_completed_path", "entry_move_completed_path"), + "entry_move_completed_path": ("text", "move_completed_path", ""), + "chk_autoadd": ("active", "autoadd_enable", ""), + "folder_autoadd": ("current_folder", "autoadd_location", "entry_autoadd"), + "entry_autoadd": ("text", "autoadd_location", ""), + "chk_copy_torrent_file": ("active", "copy_torrent_file", ""), + "torrent_files_button": ("current_folder", "torrentfiles_location", "entry_torrents_path"), + "entry_torrents_path": ("text", "torrentfiles_location", ""), + "chk_del_copy_torrent_file": ("active", "del_copy_torrent_file", ""), + "radio_compact_allocation": ("active", "compact_allocation", ""), + "radio_full_allocation": ("active", "compact_allocation", ""), + "chk_prioritize_first_last_pieces": ("active", "prioritize_first_last_pieces", ""), + "chk_add_paused": ("active", "add_paused", "") + } + +class NetworkPreferencePage(PreferencePage): + pass + +class BandwidthPreferencePage(PreferencePage): + def __init__(self): + self.name = _("Bandwidth") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/bandwidth.glade") + xml = "glade/preferences/bandwidth.glade" + self.set_widget_from_file(xml, "bandwidth_prefs_page") + + def update(self): + pass + +class InterfacePreferencePage(PreferencePage): + def __init__(self): + self.name = _("Interface") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/interface.glade") + xml = "glade/preferences/interface.glade" + self.set_widget_from_file(xml, "interface_prefs_page") + + def update(self): + pass + +class OtherPreferencePage(PreferencePage): + def __init__(self): + self.name = _("Other") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/other.glade") + xml = "glade/preferences/other.glade" + self.set_widget_from_file(xml, "other_prefs_page") + + def update(self): + pass + +class DaemonPreferencePage(PreferencePage): + def __init__(self): + self.name = _("Daemon") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/daemon.glade") + xml = "glade/preferences/daemon.glade" + self.set_widget_from_file(xml, "daemon_prefs_page") + + def update(self): + pass + +class QueuePreferencePage(PreferencePage): + def __init__(self): + self.name = _("Queue") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/queue.glade") + xml = "glade/preferences/queue.glade" + self.set_widget_from_file(xml, "queue_prefs_page") + + def update(self): + pass + +class ProxyPreferencePage(PreferencePage): + def __init__(self): + self.name = _("Proxy") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/proxy.glade") + xml = "glade/preferences/proxy.glade" + self.set_widget_from_file(xml, "proxy_prefs_page") + + def update(self): + pass + +class CachePreferencePage(PreferencePage): + def __init__(self): + self.name = _("Cache") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/cache.glade") + xml = "glade/preferences/cache.glade" + self.set_widget_from_file(xml, "cache_prefs_page") + + def update(self): + pass + +class PluginsPreferencePage(PreferencePage): + def __init__(self): + self.name = _("Plugins") + #xml = pkg_resources.resource_filename("deluge.ui.gtkui", + # "glade/preferences/plugins.glade") + xml = "glade/preferences/plugins.glade" + self.set_widget_from_file(xml, "plugins_prefs_page") + + def update(self): + pass + +class Preferences(component.Component): + def __init__(self): + component.Component.__init__(self, "Preferences") + + self.dialog = gtk.Dialog(_("Preferences")) + self.dialog.set_default_size(560, 530) + #self.dialog.set_transient_for(component.get("MainWindow").window) + + # Set the buttons for the dialog + self.button_cancel = self.dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) + self.button_apply = self.dialog.add_button(gtk.STOCK_APPLY, gtk.RESPONSE_APPLY) + self.button_ok = self.dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK) + + # Setup the content area + self.dialog_hpaned = gtk.HPaned() + vp = gtk.Viewport() + self.listview = gtk.TreeView() + vp.add(self.listview) + self.dialog_hpaned.pack1(vp) + + self.notebook = gtk.Notebook() + self.notebook.set_show_tabs(False) + self.dialog_hpaned.pack2(self.notebook) + self.dialog.get_content_area().pack_start(self.dialog_hpaned) + + # Setup the listview for the preference categories + self.liststore = gtk.ListStore(str) + render = gtk.CellRendererText() + column = gtk.TreeViewColumn(_("Categories"), render, text=0) + self.listview.append_column(column) + self.listview.set_model(self.liststore) + + self.listview.get_selection().connect("changed", self._on_selection_changed) + + # Store the PreferencePages currently in the Preferences dialog + self.pages = {} + + self.add_page(DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page")) + + + def add_page(self, page): + """ + Add a Preference page. + + :param page: the preference page to add + :type page: PreferencePage + + """ + if not isinstance(page, PreferencePage): + raise ValueError("Must be a PreferencePage!") + # Add this page to the notebook - index = self.notebook.append_page(scrolled) - self.liststore.append([index, name]) - return name + index = self.notebook.append_page(page.widget) + self.liststore.append([page.name]) + self.pages[index] = page + return page.name def remove_page(self, name): - """Removes a page from the notebook""" - self.page_num_to_remove = None - self.iter_to_remove = None + """ + Removes a Preference page. - def check_row(model, path, iter, user_data): - row_name = model.get_value(iter, 1) - if row_name == user_data: - # This is the row we need to remove - self.page_num_to_remove = model.get_value(iter, 0) - self.iter_to_remove = iter - return + :param name: the name of the preference page + :type name: string + """ + index = self.get_page_index(name) + if index: + del self.liststore[index] + self.notebook.remove_page(index) - self.liststore.foreach(check_row, name) - # Remove the page and row - if self.page_num_to_remove != None: - self.notebook.remove_page(self.page_num_to_remove) - if self.iter_to_remove != None: - self.liststore.remove(self.iter_to_remove) + def get_page_index(self, page): + """ + Returns the index for the page. + + :param page: the name of the preference page + :type page: string + + :returns: the index + :rtype: int + + """ + for index, row in enumerate(self.liststore): + if page == row[0]: + return index + + return None # We need to re-adjust the index values for the remaining pages for i, (index, name) in enumerate(self.liststore): self.liststore[i][0] = i def show(self, page=None): - """Page should be the string in the left list.. ie, 'Network' or - 'Bandwidth'""" - if page != None: - for (index, string) in self.liststore: - if page == string: - self.treeview.get_selection().select_path(index) - break - - component.get("PluginManager").run_on_show_prefs() - - # Update the preferences dialog to reflect current config settings - self.core_config = {} - if client.connected(): - def _on_get_config(config): - self.core_config = config - client.core.get_available_plugins().addCallback(_on_get_available_plugins) - - def _on_get_available_plugins(plugins): - self.all_plugins = plugins - client.core.get_enabled_plugins().addCallback(_on_get_enabled_plugins) - - def _on_get_enabled_plugins(plugins): - self.enabled_plugins = plugins - client.core.get_listen_port().addCallback(_on_get_listen_port) - - def _on_get_listen_port(port): - self.active_port = port - client.core.get_cache_status().addCallback(_on_get_cache_status) - - def _on_get_cache_status(status): - self.cache_status = status - self._show() - - # This starts a series of client.core requests prior to showing the window - client.core.get_config().addCallback(_on_get_config) - else: - self._show() - - def _show(self): - if self.core_config != {} and self.core_config != None: - core_widgets = { - "download_path_button": \ - ("filename", self.core_config["download_location"]), - "chk_move_completed": \ - ("active", self.core_config["move_completed"]), - "move_completed_path_button": \ - ("filename", self.core_config["move_completed_path"]), - "chk_copy_torrent_file": \ - ("active", self.core_config["copy_torrent_file"]), - "chk_del_copy_torrent_file": \ - ("active", self.core_config["del_copy_torrent_file"]), - "torrent_files_button": \ - ("filename", self.core_config["torrentfiles_location"]), - "chk_autoadd": \ - ("active", self.core_config["autoadd_enable"]), - "folder_autoadd": \ - ("filename", self.core_config["autoadd_location"]), - "radio_compact_allocation": \ - ("active", self.core_config["compact_allocation"]), - "radio_full_allocation": \ - ("not_active", self.core_config["compact_allocation"]), - "chk_prioritize_first_last_pieces": \ - ("active", - self.core_config["prioritize_first_last_pieces"]), - "chk_add_paused": ("active", self.core_config["add_paused"]), - "spin_port_min": ("value", self.core_config["listen_ports"][0]), - "spin_port_max": ("value", self.core_config["listen_ports"][1]), - "active_port_label": ("text", str(self.active_port)), - "chk_random_port": ("active", self.core_config["random_port"]), - "spin_outgoing_port_min": ("value", self.core_config["outgoing_ports"][0]), - "spin_outgoing_port_max": ("value", self.core_config["outgoing_ports"][1]), - "chk_random_outgoing_ports": ("active", self.core_config["random_outgoing_ports"]), - "entry_interface": ("text", self.core_config["listen_interface"]), - "entry_peer_tos": ("text", self.core_config["peer_tos"]), - "chk_dht": ("active", self.core_config["dht"]), - "chk_upnp": ("active", self.core_config["upnp"]), - "chk_natpmp": ("active", self.core_config["natpmp"]), - "chk_utpex": ("active", self.core_config["utpex"]), - "chk_lsd": ("active", self.core_config["lsd"]), - "chk_new_releases": ("active", self.core_config["new_release_check"]), - "chk_send_info": ("active", self.core_config["send_info"]), - "entry_geoip": ("text", self.core_config["geoip_db_location"]), - "combo_encin": ("active", self.core_config["enc_in_policy"]), - "combo_encout": ("active", self.core_config["enc_out_policy"]), - "combo_enclevel": ("active", self.core_config["enc_level"]), - "chk_pref_rc4": ("active", self.core_config["enc_prefer_rc4"]), - "spin_max_connections_global": \ - ("value", self.core_config["max_connections_global"]), - "spin_max_download": \ - ("value", self.core_config["max_download_speed"]), - "spin_max_upload": \ - ("value", self.core_config["max_upload_speed"]), - "spin_max_upload_slots_global": \ - ("value", self.core_config["max_upload_slots_global"]), - "spin_max_half_open_connections": \ - ("value", self.core_config["max_half_open_connections"]), - "spin_max_connections_per_second": \ - ("value", self.core_config["max_connections_per_second"]), - "chk_ignore_limits_on_local_network": \ - ("active", self.core_config["ignore_limits_on_local_network"]), - "chk_rate_limit_ip_overhead": \ - ("active", self.core_config["rate_limit_ip_overhead"]), - "spin_max_connections_per_torrent": \ - ("value", self.core_config["max_connections_per_torrent"]), - "spin_max_upload_slots_per_torrent": \ - ("value", self.core_config["max_upload_slots_per_torrent"]), - "spin_max_download_per_torrent": \ - ("value", self.core_config["max_download_speed_per_torrent"]), - "spin_max_upload_per_torrent": \ - ("value", self.core_config["max_upload_speed_per_torrent"]), - "spin_daemon_port": \ - ("value", self.core_config["daemon_port"]), - "chk_allow_remote_connections": \ - ("active", self.core_config["allow_remote"]), - "spin_active": ("value", self.core_config["max_active_limit"]), - "spin_seeding": ("value", self.core_config["max_active_seeding"]), - "spin_downloading": ("value", self.core_config["max_active_downloading"]), - "chk_dont_count_slow_torrents": ("active", self.core_config["dont_count_slow_torrents"]), - "chk_queue_new_top": ("active", self.core_config["queue_new_to_top"]), - "spin_share_ratio_limit": ("value", self.core_config["share_ratio_limit"]), - "spin_seed_time_ratio_limit": \ - ("value", self.core_config["seed_time_ratio_limit"]), - "spin_seed_time_limit": ("value", self.core_config["seed_time_limit"]), - "chk_seed_ratio": ("active", self.core_config["stop_seed_at_ratio"]), - "spin_share_ratio": ("value", self.core_config["stop_seed_ratio"]), - "chk_remove_ratio": ("active", self.core_config["remove_seed_at_ratio"]), - "spin_cache_size": ("value", self.core_config["cache_size"]), - "spin_cache_expiry": ("value", self.core_config["cache_expiry"]) - } - # Add proxy stuff - for t in ("peer", "web_seed", "tracker", "dht"): - core_widgets["spin_proxy_port_%s" % t] = ("value", self.core_config["proxies"][t]["port"]) - core_widgets["combo_proxy_type_%s" % t] = ("active", self.core_config["proxies"][t]["type"]) - core_widgets["txt_proxy_server_%s" % t] = ("text", self.core_config["proxies"][t]["hostname"]) - core_widgets["txt_proxy_username_%s" % t] = ("text", self.core_config["proxies"][t]["username"]) - core_widgets["txt_proxy_password_%s" % t] = ("text", self.core_config["proxies"][t]["password"]) - - # Change a few widgets if we're connected to a remote host - if not client.is_localhost(): - self.glade.get_widget("entry_download_path").show() - self.glade.get_widget("download_path_button").hide() - core_widgets.pop("download_path_button") - core_widgets["entry_download_path"] = ("text", self.core_config["download_location"]) - - self.glade.get_widget("entry_move_completed_path").show() - self.glade.get_widget("move_completed_path_button").hide() - core_widgets.pop("move_completed_path_button") - core_widgets["entry_move_completed_path"] = ("text", self.core_config["move_completed_path"]) - - self.glade.get_widget("entry_torrents_path").show() - self.glade.get_widget("torrent_files_button").hide() - core_widgets.pop("torrent_files_button") - core_widgets["entry_torrents_path"] = ("text", self.core_config["torrentfiles_location"]) - - self.glade.get_widget("entry_autoadd").show() - self.glade.get_widget("folder_autoadd").hide() - core_widgets.pop("folder_autoadd") - core_widgets["entry_autoadd"] = ("text", self.core_config["autoadd_location"]) - else: - self.glade.get_widget("entry_download_path").hide() - self.glade.get_widget("download_path_button").show() - self.glade.get_widget("entry_move_completed_path").hide() - self.glade.get_widget("move_completed_path_button").show() - self.glade.get_widget("entry_torrents_path").hide() - self.glade.get_widget("torrent_files_button").show() - self.glade.get_widget("entry_autoadd").hide() - self.glade.get_widget("folder_autoadd").show() - - # Update the widgets accordingly - for key in core_widgets.keys(): - modifier = core_widgets[key][0] - value = core_widgets[key][1] - widget = self.glade.get_widget(key) - if type(widget) == gtk.FileChooserButton: - for child in widget.get_children(): - child.set_sensitive(True) - widget.set_sensitive(True) - - if modifier == "filename": - if value: - try: - widget.set_current_folder(value) - except Exception, e: - log.debug("Unable to set_current_folder: %s", e) - elif modifier == "active": - widget.set_active(value) - elif modifier == "not_active": - widget.set_active(not value) - elif modifier == "value": - widget.set_value(float(value)) - elif modifier == "text": - widget.set_text(value) - - for key in core_widgets.keys(): - widget = self.glade.get_widget(key) - # Update the toggle status if necessary - self.on_toggle(widget) - else: - core_widget_list = [ - "download_path_button", - "chk_move_completed", - "move_completed_path_button", - "chk_copy_torrent_file", - "chk_del_copy_torrent_file", - "torrent_files_button", - "chk_autoadd", - "folder_autoadd", - "radio_compact_allocation", - "radio_full_allocation", - "chk_prioritize_first_last_pieces", - "chk_add_paused", - "spin_port_min", - "spin_port_max", - "active_port_label", - "chk_random_port", - "spin_outgoing_port_min", - "spin_outgoing_port_max", - "chk_random_outgoing_ports", - "entry_interface", - "entry_peer_tos", - "chk_dht", - "chk_upnp", - "chk_natpmp", - "chk_utpex", - "chk_lsd", - "chk_send_info", - "chk_new_releases", - "entry_geoip", - "combo_encin", - "combo_encout", - "combo_enclevel", - "chk_pref_rc4", - "spin_max_connections_global", - "spin_max_download", - "spin_max_upload", - "spin_max_upload_slots_global", - "spin_max_half_open_connections", - "spin_max_connections_per_second", - "chk_ignore_limits_on_local_network", - "chk_rate_limit_ip_overhead", - "spin_max_connections_per_torrent", - "spin_max_upload_slots_per_torrent", - "spin_max_download_per_torrent", - "spin_max_upload_per_torrent", - "spin_daemon_port", - "chk_allow_remote_connections", - "spin_seeding", - "spin_downloading", - "spin_active", - "chk_dont_count_slow_torrents", - "chk_queue_new_top", - "chk_seed_ratio", - "spin_share_ratio", - "chk_remove_ratio", - "spin_share_ratio_limit", - "spin_seed_time_ratio_limit", - "spin_seed_time_limit", - "spin_cache_size", - "spin_cache_expiry", - "button_cache_refresh", - "btn_testport" - ] - for t in ("peer", "web_seed", "tracker", "dht"): - core_widget_list.append("spin_proxy_port_%s" % t) - core_widget_list.append("combo_proxy_type_%s" % t) - core_widget_list.append("txt_proxy_username_%s" % t) - core_widget_list.append("txt_proxy_password_%s" % t) - core_widget_list.append("txt_proxy_server_%s" % t) - - # We don't appear to be connected to a daemon - for key in core_widget_list: - widget = self.glade.get_widget(key) - if type(widget) == gtk.FileChooserButton: - for child in widget.get_children(): - child.set_sensitive(False) - widget.set_sensitive(False) - - ## Downloads tab ## - self.glade.get_widget("chk_show_dialog").set_active( - self.gtkui_config["interactive_add"]) - self.glade.get_widget("chk_focus_dialog").set_active( - self.gtkui_config["focus_add_dialog"]) - - ## Interface tab ## - self.glade.get_widget("chk_use_tray").set_active( - self.gtkui_config["enable_system_tray"]) - self.glade.get_widget("chk_min_on_close").set_active( - self.gtkui_config["close_to_tray"]) - self.glade.get_widget("chk_start_in_tray").set_active( - self.gtkui_config["start_in_tray"]) - self.glade.get_widget("chk_enable_appindicator").set_active( - self.gtkui_config["enable_appindicator"]) - self.glade.get_widget("chk_lock_tray").set_active( - self.gtkui_config["lock_tray"]) - self.glade.get_widget("chk_classic_mode").set_active( - self.gtkui_config["classic_mode"]) - self.glade.get_widget("chk_show_rate_in_title").set_active( - self.gtkui_config["show_rate_in_title"]) - - ## Other tab ## - self.glade.get_widget("chk_show_new_releases").set_active( - self.gtkui_config["show_new_releases"]) - - - ## Cache tab ## - if client.connected(): - self.__update_cache_status() - - ## Plugins tab ## - all_plugins = self.all_plugins - enabled_plugins = self.enabled_plugins - # Clear the existing list so we don't duplicate entries. - self.plugin_liststore.clear() - # Iterate through the lists and add them to the liststore - for plugin in all_plugins: - if plugin in enabled_plugins: - enabled = True - else: - enabled = False - row = self.plugin_liststore.append() - self.plugin_liststore.set_value(row, 0, plugin) - self.plugin_liststore.set_value(row, 1, enabled) - - # Now show the dialog - self.pref_dialog.show() - - def set_config(self, hide=False): """ - Sets all altered config values in the core. + Shows the Preferences dialog. + + :param page: the name of the page to show initially + :type page: string - :param hide: bool, if True, will not re-show the dialog and will hide it instead """ - try: - from hashlib import sha1 as sha_hash - except ImportError: - from sha import new as sha_hash - - # Get the values from the dialog - new_core_config = {} - new_gtkui_config = {} - - ## Downloads tab ## - new_gtkui_config["interactive_add"] = \ - self.glade.get_widget("chk_show_dialog").get_active() - new_gtkui_config["focus_add_dialog"] = \ - self.glade.get_widget("chk_focus_dialog").get_active() - new_core_config["copy_torrent_file"] = \ - self.glade.get_widget("chk_copy_torrent_file").get_active() - new_core_config["del_copy_torrent_file"] = \ - self.glade.get_widget("chk_del_copy_torrent_file").get_active() - new_core_config["move_completed"] = \ - self.glade.get_widget("chk_move_completed").get_active() - if client.is_localhost(): - new_core_config["download_location"] = \ - self.glade.get_widget("download_path_button").get_filename() - new_core_config["move_completed_path"] = \ - self.glade.get_widget("move_completed_path_button").get_filename() - new_core_config["torrentfiles_location"] = \ - self.glade.get_widget("torrent_files_button").get_filename() + if page: + index = self.get_page_index(page) + if index: + self.pages[index].show() + self.listview.get_selection().select_path(index) else: - new_core_config["download_location"] = \ - self.glade.get_widget("entry_download_path").get_text() - new_core_config["move_completed_path"] = \ - self.glade.get_widget("entry_move_completed_path").get_text() - new_core_config["torrentfiles_location"] = \ - self.glade.get_widget("entry_torrents_path").get_text() + self.listview.get_selection().select_path(0) - new_core_config["autoadd_enable"] = \ - self.glade.get_widget("chk_autoadd").get_active() - if client.is_localhost(): - new_core_config["autoadd_location"] = \ - self.glade.get_widget("folder_autoadd").get_filename() - else: - new_core_config["autoadd_location"] = \ - self.glade.get_widget("entry_autoadd").get_text() + self.dialog.show_all() - new_core_config["compact_allocation"] = \ - self.glade.get_widget("radio_compact_allocation").get_active() - new_core_config["prioritize_first_last_pieces"] = \ - self.glade.get_widget( - "chk_prioritize_first_last_pieces").get_active() - new_core_config["add_paused"] = \ - self.glade.get_widget("chk_add_paused").get_active() - - ## Network tab ## - listen_ports = ( - self.glade.get_widget("spin_port_min").get_value_as_int(), - self.glade.get_widget("spin_port_max").get_value_as_int() - ) - new_core_config["listen_ports"] = listen_ports - new_core_config["random_port"] = \ - self.glade.get_widget("chk_random_port").get_active() - outgoing_ports = ( - self.glade.get_widget("spin_outgoing_port_min").get_value_as_int(), - self.glade.get_widget("spin_outgoing_port_max").get_value_as_int() - ) - new_core_config["outgoing_ports"] = outgoing_ports - new_core_config["random_outgoing_ports"] = \ - self.glade.get_widget("chk_random_outgoing_ports").get_active() - new_core_config["listen_interface"] = self.glade.get_widget("entry_interface").get_text() - new_core_config["peer_tos"] = self.glade.get_widget("entry_peer_tos").get_text() - new_core_config["dht"] = self.glade.get_widget("chk_dht").get_active() - new_core_config["upnp"] = self.glade.get_widget("chk_upnp").get_active() - new_core_config["natpmp"] = \ - self.glade.get_widget("chk_natpmp").get_active() - new_core_config["utpex"] = \ - self.glade.get_widget("chk_utpex").get_active() - new_core_config["lsd"] = \ - self.glade.get_widget("chk_lsd").get_active() - new_core_config["enc_in_policy"] = \ - self.glade.get_widget("combo_encin").get_active() - new_core_config["enc_out_policy"] = \ - self.glade.get_widget("combo_encout").get_active() - new_core_config["enc_level"] = \ - self.glade.get_widget("combo_enclevel").get_active() - new_core_config["enc_prefer_rc4"] = \ - self.glade.get_widget("chk_pref_rc4").get_active() - - ## Bandwidth tab ## - new_core_config["max_connections_global"] = \ - self.glade.get_widget( - "spin_max_connections_global").get_value_as_int() - new_core_config["max_download_speed"] = \ - self.glade.get_widget("spin_max_download").get_value() - new_core_config["max_upload_speed"] = \ - self.glade.get_widget("spin_max_upload").get_value() - new_core_config["max_upload_slots_global"] = \ - self.glade.get_widget( - "spin_max_upload_slots_global").get_value_as_int() - new_core_config["max_half_open_connections"] = \ - self.glade.get_widget("spin_max_half_open_connections").get_value_as_int() - new_core_config["max_connections_per_second"] = \ - self.glade.get_widget( - "spin_max_connections_per_second").get_value_as_int() - new_core_config["max_connections_per_torrent"] = \ - self.glade.get_widget( - "spin_max_connections_per_torrent").get_value_as_int() - new_core_config["max_upload_slots_per_torrent"] = \ - self.glade.get_widget( - "spin_max_upload_slots_per_torrent").get_value_as_int() - new_core_config["max_upload_speed_per_torrent"] = \ - self.glade.get_widget( - "spin_max_upload_per_torrent").get_value() - new_core_config["max_download_speed_per_torrent"] = \ - self.glade.get_widget( - "spin_max_download_per_torrent").get_value() - new_core_config["ignore_limits_on_local_network"] = \ - self.glade.get_widget("chk_ignore_limits_on_local_network").get_active() - new_core_config["rate_limit_ip_overhead"] = \ - self.glade.get_widget("chk_rate_limit_ip_overhead").get_active() - - ## Interface tab ## - new_gtkui_config["enable_system_tray"] = \ - self.glade.get_widget("chk_use_tray").get_active() - new_gtkui_config["close_to_tray"] = \ - self.glade.get_widget("chk_min_on_close").get_active() - new_gtkui_config["start_in_tray"] = \ - self.glade.get_widget("chk_start_in_tray").get_active() - new_gtkui_config["enable_appindicator"] = \ - self.glade.get_widget("chk_enable_appindicator").get_active() - new_gtkui_config["lock_tray"] = \ - self.glade.get_widget("chk_lock_tray").get_active() - passhex = sha_hash(\ - self.glade.get_widget("txt_tray_password").get_text()).hexdigest() - if passhex != "c07eb5a8c0dc7bb81c217b67f11c3b7a5e95ffd7": - new_gtkui_config["tray_password"] = passhex - new_gtkui_config["classic_mode"] = \ - self.glade.get_widget("chk_classic_mode").get_active() - new_gtkui_config["show_rate_in_title"] = \ - self.glade.get_widget("chk_show_rate_in_title").get_active() - - ## Other tab ## - new_gtkui_config["show_new_releases"] = \ - self.glade.get_widget("chk_show_new_releases").get_active() - new_core_config["send_info"] = \ - self.glade.get_widget("chk_send_info").get_active() - new_core_config["geoip_db_location"] = \ - self.glade.get_widget("entry_geoip").get_text() - - ## Daemon tab ## - new_core_config["daemon_port"] = \ - self.glade.get_widget("spin_daemon_port").get_value_as_int() - new_core_config["allow_remote"] = \ - self.glade.get_widget("chk_allow_remote_connections").get_active() - new_core_config["new_release_check"] = \ - self.glade.get_widget("chk_new_releases").get_active() - - ## Proxy tab ## - new_core_config["proxies"] = {} - for t in ("peer", "web_seed", "tracker", "dht"): - new_core_config["proxies"][t] = {} - new_core_config["proxies"][t]["type"] = \ - self.glade.get_widget("combo_proxy_type_%s" % t).get_active() - new_core_config["proxies"][t]["port"] = \ - self.glade.get_widget("spin_proxy_port_%s" % t).get_value_as_int() - new_core_config["proxies"][t]["username"] = \ - self.glade.get_widget("txt_proxy_username_%s" % t).get_text() - new_core_config["proxies"][t]["password"] = \ - self.glade.get_widget("txt_proxy_password_%s" % t).get_text() - new_core_config["proxies"][t]["hostname"] = \ - self.glade.get_widget("txt_proxy_server_%s" % t).get_text() - - ## Queue tab ## - new_core_config["queue_new_to_top"] = \ - self.glade.get_widget("chk_queue_new_top").get_active() - new_core_config["max_active_seeding"] = \ - self.glade.get_widget("spin_seeding").get_value_as_int() - new_core_config["max_active_downloading"] = \ - self.glade.get_widget("spin_downloading").get_value_as_int() - new_core_config["max_active_limit"] = \ - self.glade.get_widget("spin_active").get_value_as_int() - new_core_config["dont_count_slow_torrents"] = \ - self.glade.get_widget("chk_dont_count_slow_torrents").get_active() - new_core_config["stop_seed_at_ratio"] = \ - self.glade.get_widget("chk_seed_ratio").get_active() - new_core_config["remove_seed_at_ratio"] = \ - self.glade.get_widget("chk_remove_ratio").get_active() - new_core_config["stop_seed_ratio"] = \ - self.glade.get_widget("spin_share_ratio").get_value() - new_core_config["share_ratio_limit"] = \ - self.glade.get_widget("spin_share_ratio_limit").get_value() - new_core_config["seed_time_ratio_limit"] = \ - self.glade.get_widget("spin_seed_time_ratio_limit").get_value() - new_core_config["seed_time_limit"] = \ - self.glade.get_widget("spin_seed_time_limit").get_value() - - ## Cache tab ## - new_core_config["cache_size"] = \ - self.glade.get_widget("spin_cache_size").get_value_as_int() - new_core_config["cache_expiry"] = \ - self.glade.get_widget("spin_cache_expiry").get_value_as_int() - - # Run plugin hook to apply preferences - component.get("PluginManager").run_on_apply_prefs() - - # GtkUI - for key in new_gtkui_config.keys(): - # The values do not match so this needs to be updated - if self.gtkui_config[key] != new_gtkui_config[key]: - self.gtkui_config[key] = new_gtkui_config[key] - - # Core - if client.connected(): - # Only do this if we're connected to a daemon - config_to_set = {} - for key in new_core_config.keys(): - # The values do not match so this needs to be updated - if self.core_config[key] != new_core_config[key]: - config_to_set[key] = new_core_config[key] - - if config_to_set: - # Set each changed config value in the core - client.core.set_config(config_to_set) - client.force_call(True) - # Update the configuration - self.core_config.update(config_to_set) - - if hide: - self.hide() - else: - # Re-show the dialog to make sure everything has been updated - self.show() - - def hide(self): - self.glade.get_widget("port_img").hide() - self.pref_dialog.hide() - - def __update_cache_status(self): - # Updates the cache status labels with the info in the dict - for widget in self.glade.get_widget_prefix("label_cache_"): - key = widget.get_name()[len("label_cache_"):] - value = self.cache_status[key] - if type(value) == float: - value = "%.2f" % value - else: - value = str(value) - - widget.set_text(value) - - def _on_button_cache_refresh_clicked(self, widget): - def on_get_cache_status(status): - self.cache_status = status - self.__update_cache_status() - - client.core.get_cache_status().addCallback(on_get_cache_status) - - def on_pref_dialog_delete_event(self, widget, event): - self.hide() - return True - - def on_toggle(self, widget): - """Handles widget sensitivity based on radio/check button values.""" - try: - value = widget.get_active() - except: - return - - dependents = { - "chk_show_dialog": {"chk_focus_dialog": True}, - "chk_random_port": {"spin_port_min": False, - "spin_port_max": False}, - "chk_random_outgoing_ports": {"spin_outgoing_port_min": False, - "spin_outgoing_port_max": False}, - "chk_use_tray": {"chk_min_on_close": True, - "chk_start_in_tray": True, - "chk_enable_appindicator": True, - "chk_lock_tray": True}, - "chk_lock_tray": {"txt_tray_password": True, - "password_label": True}, - "radio_open_folder_custom": {"combo_file_manager": False, - "txt_open_folder_location": True}, - "chk_move_completed" : {"move_completed_path_button" : True}, - "chk_copy_torrent_file" : {"torrent_files_button" : True, - "chk_del_copy_torrent_file" : True}, - "chk_autoadd" : {"folder_autoadd" : True}, - "chk_seed_ratio" : {"spin_share_ratio": True, - "chk_remove_ratio" : True} - } - - def update_dependent_widgets(name, value): - dependency = dependents[name] - for dep in dependency.keys(): - depwidget = self.glade.get_widget(dep) - sensitive = [not value, value][dependency[dep]] - depwidget.set_sensitive(sensitive) - if dep in dependents: - update_dependent_widgets(dep, depwidget.get_active() and sensitive) - - for key in dependents.keys(): - if widget != self.glade.get_widget(key): - continue - update_dependent_widgets(key, value) - - def on_button_ok_clicked(self, data): - log.debug("on_button_ok_clicked") - self.set_config(hide=True) - return True - - def on_button_apply_clicked(self, data): - log.debug("on_button_apply_clicked") - self.set_config() - - def on_button_cancel_clicked(self, data): - log.debug("on_button_cancel_clicked") - self.hide() - return True - - def on_selection_changed(self, treeselection): - # Show the correct notebook page based on what row is selected. + def _on_selection_changed(self, treeselection): + """ + This is called when the preference page changes or when it's initially + showed. We must call the page's update() method prior to showing the + page. + """ (model, row) = treeselection.get_selected() + index = self.get_page_index(model[row][0]) + if index is None: + return + + def on_page_show(result): + self.notebook.set_current_page(index) try: - self.notebook.set_current_page(model.get_value(row, 0)) - except TypeError: - pass + maybeDeferred(self.pages[index].show).addCallback(on_page_show) + except Exception, e: + dialogs.ErrorDialog( + _("Error with preference page"), + _("Could not show preference page correctly."), + self.dialog, + traceback=True).run() - def on_test_port_clicked(self, data): - log.debug("on_test_port_clicked") - def on_get_test(status): - if status: - self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_YES, 4) - self.glade.get_widget("port_img").show() - else: - self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_DIALOG_WARNING, 4) - self.glade.get_widget("port_img").show() - client.core.test_listen_port().addCallback(on_get_test) - self.glade.get_widget("port_img").set_from_file( - deluge.common.get_pixmap('loading.gif') - ) - self.glade.get_widget("port_img").show() - client.force_call() +if __name__ == "__main__": + p = Preferences() + d = DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page") + p.add_page(d) + #d2 = NetworkPreferencePage(_("Network"), "glade/preferences/network.glade", "network_prefs_page") + #p.add_page(d2) + ##d3 = BandwidthPreferencePage() + ##p.add_page(d3) + ##d4 = InterfacePreferencePage() + ##p.add_page(d4) + ##d5 = OtherPreferencePage() + ##p.add_page(d5) + ##d6 = DaemonPreferencePage() + ##p.add_page(d6) + ##d7 = QueuePreferencePage() + ##p.add_page(d7) + ##d8 = ProxyPreferencePage() + ##p.add_page(d8) + ##d9 = CachePreferencePage() + ##p.add_page(d9) + ##d10 = PluginsPreferencePage() + ##p.add_page(d10) + p.show() + gtk.main() - def on_plugin_toggled(self, renderer, path): - log.debug("on_plugin_toggled") - row = self.plugin_liststore.get_iter_from_string(path) - name = self.plugin_liststore.get_value(row, 0) - value = self.plugin_liststore.get_value(row, 1) - self.plugin_liststore.set_value(row, 1, not value) - if not value: - client.core.enable_plugin(name) - else: - client.core.disable_plugin(name) - component.get("PluginManager").disable_plugin(name) - - def on_plugin_selection_changed(self, treeselection): - log.debug("on_plugin_selection_changed") - (model, itr) = treeselection.get_selected() - if not itr: - return - name = model[itr][0] - plugin_info = component.get("PluginManager").get_plugin_info(name) - self.glade.get_widget("label_plugin_author").set_text(plugin_info["Author"]) - self.glade.get_widget("label_plugin_version").set_text(plugin_info["Version"]) - self.glade.get_widget("label_plugin_email").set_text(plugin_info["Author-email"]) - self.glade.get_widget("label_plugin_homepage").set_text(plugin_info["Home-page"]) - self.glade.get_widget("label_plugin_details").set_text(plugin_info["Description"]) - - def _on_button_plugin_install_clicked(self, widget): - log.debug("_on_button_plugin_install_clicked") - chooser = gtk.FileChooserDialog(_("Select the Plugin"), - self.pref_dialog, - gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, - gtk.RESPONSE_OK)) - - chooser.set_transient_for(self.pref_dialog) - chooser.set_select_multiple(False) - chooser.set_property("skip-taskbar-hint", True) - - file_filter = gtk.FileFilter() - file_filter.set_name(_("Plugin Eggs")) - file_filter.add_pattern("*." + "egg") - chooser.add_filter(file_filter) - - # Run the dialog - response = chooser.run() - - if response == gtk.RESPONSE_OK: - filepath = chooser.get_filename() - else: - chooser.destroy() - return - - import base64 - import shutil - import os.path - filename = os.path.split(filepath)[1] - shutil.copyfile( - filepath, - os.path.join(deluge.configmanager.get_config_dir(), "plugins", filename)) - - component.get("PluginManager").scan_for_plugins() - - if not client.is_localhost(): - # We need to send this plugin to the daemon - filedump = base64.encodestring(open(filepath, "rb").read()) - client.core.upload_plugin(filename, filedump) - - client.core.rescan_plugins() - chooser.destroy() - # We need to re-show the preferences dialog to show the new plugins - self.show() - - def _on_button_rescan_plugins_clicked(self, widget): - component.get("PluginManager").scan_for_plugins() - if client.connected(): - client.core.rescan_plugins() - self.show() - - def _on_button_find_plugins_clicked(self, widget): - deluge.common.open_url_in_browser("http://dev.deluge-torrent.org/wiki/Plugins") - - def _on_combo_proxy_type_changed(self, widget): - name = widget.get_name().replace("combo_proxy_type_", "") - proxy_type = widget.get_model()[widget.get_active()][0] - - prefixes = ["txt_proxy_", "label_proxy_", "spin_proxy_"] - hides = [] - shows = [] - - if proxy_type == "None": - hides.extend(["password", "username", "server", "port"]) - elif proxy_type in ("Socksv4", "Socksv5", "HTTP"): - hides.extend(["password", "username"]) - shows.extend(["server", "port"]) - elif proxy_type in ("Socksv5 W/ Auth", "HTTP W/ Auth"): - shows.extend(["password", "username", "server", "port"]) - - for h in hides: - for p in prefixes: - w = self.glade.get_widget(p + h + "_" + name) - if w: - w.hide() - for s in shows: - for p in prefixes: - w = self.glade.get_widget(p + s + "_" + name) - if w: - w.show() - - def _on_button_associate_magnet_clicked(self, widget): - common.associate_magnet_links(True) From b08a4679dec1e71f0d737203748d113ce07cd058 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 12 Dec 2010 18:19:51 +0000 Subject: [PATCH 158/329] Respect the torrents ownership and unless the logged in user is an admin, only return his own torrents plus all other public torrents. --- deluge/core/torrentmanager.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 269fe0213..5eb6268c2 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -52,6 +52,7 @@ from deluge.event import * from deluge.error import * import deluge.component as component from deluge.configmanager import ConfigManager, get_config_dir +from deluge.core.authmanager import AUTH_LEVEL_ADMIN from deluge.core.torrent import Torrent from deluge.core.torrent import TorrentOptions import deluge.core.oldstateupgrader @@ -279,7 +280,16 @@ class TorrentManager(component.Component): def get_torrent_list(self): """Returns a list of torrent_ids""" - return self.torrents.keys() + torrent_ids = self.torrents.keys() + if component.get("RPCServer").get_session_auth_level() == AUTH_LEVEL_ADMIN: + return torrent_ids + + current_user = component.get("RPCServer").get_session_user() + for torrent_id in torrent_ids[:]: + torrent_status = self[torrent_id].get_status(["owner", "public"]) + if torrent_status["owner"] != current_user and torrent_status["public"] == False: + torrent_ids.pop(torrent_ids.index(torrent_id)) + return torrent_ids def get_torrent_info_from_file(self, filepath): """Returns a torrent_info for the file specified or None""" From 1794f09b212ce25a19ca74b689a2ac8e29f1c10e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 14 Dec 2010 17:52:32 +0000 Subject: [PATCH 159/329] Make branch runnable. --- deluge/ui/gtkui/preferences.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 6eb0063c4..8ca90a623 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -122,11 +122,12 @@ class PreferencePage(object): :type obj: string """ - builder = gtk.Builder() - builder.add_from_file(xmlfile) - self.set_widget(builder.get_object(obj)) - - + if not os.path.isfile(xmlfile): + xmlfile = os.path.join(os.path.dirname(__file__), xmlfile) + self.builder = gtk.Builder() + self.builder.add_from_file(xmlfile) + self.set_widget(self.builder.get_object(obj)) + class GtkUIPreferencePage(PreferencePage): def __init__(self, name, xml, widget): super(GtkUIPreferencePage, self).__init__() From 6c9920482871342ab4ef4f61669f897d53b24614 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 Dec 2010 17:45:34 +0000 Subject: [PATCH 160/329] The GtkUi's connection manager now has the ability to edit existing host entries besides adding and deleting them. It also asks for a password prior to attemting to connect in case the password is null, this alows host entries not to store the passwords on file like it has done so far. NOTE: This is not yet the desired behaviour, ie, the daemon should simply complain if the authentication details are incomplete and the client should act accordingly. I had an issue with this though, I catched the errback the daemon was sending, asked the user for the password and re-tried to authenticate again. However, twisted always locked when I tried this. I'm investigating it. --- deluge/core/authmanager.py | 25 ++- deluge/core/rpcserver.py | 20 +- deluge/ui/client.py | 53 +++++ deluge/ui/gtkui/connectionmanager.py | 85 +++++++- .../ui/gtkui/glade/connection_manager.glade | 204 ++++++++++++++---- 5 files changed, 337 insertions(+), 50 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 106351b43..120481c3c 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -54,6 +54,9 @@ AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL class BadLoginError(deluge.error.DelugeError): pass +class PasswordRequired(BadLoginError): + pass + class AuthManager(component.Component): def __init__(self): component.Component.__init__(self, "AuthManager") @@ -68,6 +71,16 @@ class AuthManager(component.Component): def shutdown(self): pass + def peek(self, username): + if username not in self.__auth: + # Let's try to re-load the file.. Maybe it's been updated + self.__load_auth_file() + if username not in self.__auth: + raise BadLoginError("Username does not exist") + + return int(self.__auth[username][1]) + + def authorize(self, username, password): """ Authorizes users based on username and password @@ -80,16 +93,12 @@ class AuthManager(component.Component): :raises BadLoginError: if the username does not exist or password does not match """ - - if username not in self.__auth: - # Let's try to re-load the file.. Maybe it's been updated - self.__load_auth_file() - if username not in self.__auth: - raise BadLoginError("Username does not exist") - + auth_level = self.peek(username) if self.__auth[username][0] == password: # Return the users auth level - return int(self.__auth[username][1]) + return auth_level + elif not password and self.__auth[username][0]: + raise PasswordRequired("Password is required") else: raise BadLoginError("Password does not match") diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index e309f7bda..9620c7b81 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -253,9 +253,25 @@ class DelugeRPCProtocol(Protocol): "".join(traceback.format_tb(exceptionTraceback))) )) - if method == "daemon.login": + if method == "daemon.peek": + try: + ret = component.get("AuthManager").peek(*args, **kwargs) + if ret: + self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0]) + self.factory.session_protocols[self.transport.sessionno] = self + except Exception, e: + sendError() + log.exception(e) + else: + self.sendData((RPC_RESPONSE, request_id, ret)) + if not ret: + self.transport.loseConnection() + finally: + return + elif method == "daemon.login": # This is a special case and used in the initial connection process # We need to authenticate the user here + log.debug("RPC dispatch daemon.login") try: ret = component.get("AuthManager").authorize(*args, **kwargs) if ret: @@ -271,6 +287,7 @@ class DelugeRPCProtocol(Protocol): finally: return elif method == "daemon.set_event_interest" and self.transport.sessionno in self.factory.authorized_sessions: + log.debug("RPC dispatch daemon.set_event_interest") # This special case is to allow clients to set which events they are # interested in receiving. # We are expecting a sequence from the client. @@ -286,6 +303,7 @@ class DelugeRPCProtocol(Protocol): return if method in self.factory.methods and self.transport.sessionno in self.factory.authorized_sessions: + log.debug("RPC dispatch %s", method) try: method_auth_requirement = self.factory.methods[method]._rpcserver_auth_level auth_level = self.factory.authorized_sessions[self.transport.sessionno][0] diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 1a45e7d19..13a7be87c 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -261,6 +261,26 @@ class DaemonSSLProxy(DaemonProxy): self.disconnect_deferred = None self.disconnect_callback = None + def peek(self, host, port, username): + self.host = host + self.port = port + self.__connector = reactor.connectSSL(self.host, self.port, self.__factory, ssl.ClientContextFactory()) + self.connect_deferred = defer.Deferred() + self.peek_deferred = defer.Deferred() + + def on_connect(result, username): + self.__login_deferred = self.call("daemon.peek", username) + self.__login_deferred.addCallback(self.__on_peek, username) + self.__login_deferred.addErrback(self.__on_peek_fail) + + def on_connect_fail(reason): + log.debug("connect_fail: %s", reason) + self.peek_deferred.errback(reason) + + self.connect_deferred.addCallback(on_connect, username) + self.connect_deferred.addErrback(on_connect_fail) + return self.peek_deferred + def connect(self, host, port, username, password): """ Connects to a daemon at host:port @@ -273,6 +293,7 @@ class DaemonSSLProxy(DaemonProxy): :returns: twisted.Deferred """ + log.debug("sslproxy.connect()") self.host = host self.port = port self.__connector = reactor.connectSSL(self.host, self.port, self.__factory, ssl.ClientContextFactory()) @@ -286,6 +307,7 @@ class DaemonSSLProxy(DaemonProxy): return self.login_deferred def disconnect(self): + log.debug("sslproxy.disconnect()") self.disconnect_deferred = defer.Deferred() self.__connector.disconnect() return self.disconnect_deferred @@ -397,15 +419,18 @@ class DaemonSSLProxy(DaemonProxy): return error_data def __on_connect(self, result, username, password): + log.debug("__on_connect called") self.__login_deferred = self.call("daemon.login", username, password) self.__login_deferred.addCallback(self.__on_login, username) self.__login_deferred.addErrback(self.__on_login_fail) def __on_connect_fail(self, reason): + log.debug("__on_connect_fail called") log.debug("connect_fail: %s", reason) self.login_deferred.errback(reason) def __on_login(self, result, username): + log.debug("__on_login called") self.username = username # We need to tell the daemon what events we're interested in receiving if self.__factory.event_handlers: @@ -416,6 +441,15 @@ class DaemonSSLProxy(DaemonProxy): log.debug("_on_login_fail(): %s", result) self.login_deferred.errback(result) + def __on_peek(self, result, username): + log.debug("__on_peek called. result: %s", result) + self.username = username + self.peek_deferred.callback(result) + + def __on_peek_fail(self, result): + log.debug("__on_peek_fail called. result: %s", result) + self.peek_deferred.errback(result) + def set_disconnect_callback(self, cb): """ Set a function to be called when the connection to the daemon is lost @@ -531,6 +565,7 @@ class Client(object): :returns: a Deferred object that will be called once the connection has been established or fails """ + log.debug("real client connect") if not username and host in ("127.0.0.1", "localhost"): # No username was provided and it's the localhost, so we can try # to grab the credentials from the auth file. @@ -548,6 +583,24 @@ class Client(object): d.addErrback(on_connect_fail) return d + def peek(self, host="127.0.0.1", port=58846, username=""): + if not username and host in ("127.0.0.1", "localhost"): + # No username was provided and it's the localhost, so we can try + # to grab the credentials from the auth file. + import common + username, password = common.get_localhost_auth() + + self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) + self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) + d = self._daemon_proxy.peek(host, port, username) + def on_connect_fail(result): + log.debug("on_connect_fail: %s", result) + self.disconnect() + return result + + d.addErrback(on_connect_fail) + return d + def disconnect(self): """ Disconnects from the daemon. diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 2ea302e76..5014a437a 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -133,6 +133,11 @@ class ConnectionManager(component.Component): self.glade.get_widget("image1").set_from_pixbuf(common.get_logo(32)) + self.askpassword_dialog = self.glade.get_widget("askpassword_dialog") + self.askpassword_dialog.set_transient_for(self.connection_manager) + self.askpassword_dialog.set_icon(common.get_deluge_icon()) + self.askpassword_dialog_entry = self.glade.get_widget("askpassword_dialog_entry") + self.hostlist = self.glade.get_widget("hostlist") # Create status pixbufs @@ -317,7 +322,7 @@ class ConnectionManager(component.Component): # Create a new Client instance c = deluge.ui.client.Client() - d = c.connect(host, port, user, password) + d = c.peek(host, port, user) d.addCallback(on_connect, c, host_id) d.addErrback(on_connect_failed, host_id) @@ -352,8 +357,11 @@ class ConnectionManager(component.Component): model, row = self.hostlist.get_selection().get_selected() if not row: + self.glade.get_widget("button_edithost").set_sensitive(False) return + self.glade.get_widget("button_edithost").set_sensitive(True) + # Get some values about the selected host status = model[row][HOSTLIST_COL_STATUS] host = model[row][HOSTLIST_COL_HOST] @@ -428,6 +436,7 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( # Signal handlers def __on_connected(self, connector, host_id): + log.debug("__on_connected called") if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id @@ -450,6 +459,10 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( user = model[row][HOSTLIST_COL_USER] password = model[row][HOSTLIST_COL_PASS] + if not password: + self.askpassword_dialog.run() + password = self.askpassword_dialog_entry.get_text() + if status == _("Offline") and self.glade.get_widget("chk_autostart").get_active() and\ host in ("127.0.0.1", "localhost"): # We need to start this localhost @@ -475,7 +488,9 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( def do_connect(*args): - client.connect(host, port, user, password).addCallback(self.__on_connected, host_id) + d = client.connect(host, port, user, password) + d.addCallback(self.__on_connected, host_id) + d.addErrback(self.__on_connected_failed, host_id, host, port, user) if client.connected(): client.disconnect().addCallback(do_connect) @@ -496,6 +511,10 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( port_spinbutton = self.glade.get_widget("spinbutton_port") username_entry = self.glade.get_widget("entry_username") password_entry = self.glade.get_widget("entry_password") + button_addhost_save = self.glade.get_widget("button_addhost_save") + button_addhost_save.hide() + button_addhost_add = self.glade.get_widget("button_addhost_add") + button_addhost_add.show() response = dialog.run() if response == 1: username = username_entry.get_text() @@ -515,6 +534,54 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( port_spinbutton.set_value(58846) dialog.hide() + def on_button_edithost_clicked(self, widget=None): + log.debug("on_button_edithost_clicked") + model, row = self.hostlist.get_selection().get_selected() + status = model[row][HOSTLIST_COL_STATUS] + if status == _("Connected"): + def on_disconnect(reason): + self.__update_list() + client.disconnect().addCallback(on_disconnect) + return + + dialog = self.glade.get_widget("addhost_dialog") + dialog.set_transient_for(self.connection_manager) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + hostname_entry = self.glade.get_widget("entry_hostname") + port_spinbutton = self.glade.get_widget("spinbutton_port") + username_entry = self.glade.get_widget("entry_username") + password_entry = self.glade.get_widget("entry_password") + button_addhost_save = self.glade.get_widget("button_addhost_save") + button_addhost_save.show() + button_addhost_add = self.glade.get_widget("button_addhost_add") + button_addhost_add.hide() + + username_entry.set_text(self.liststore[row][HOSTLIST_COL_USER]) + password_entry.set_text(self.liststore[row][HOSTLIST_COL_PASS]) + hostname_entry.set_text(self.liststore[row][HOSTLIST_COL_HOST]) + port_spinbutton.set_value(self.liststore[row][HOSTLIST_COL_PORT]) + + response = dialog.run() + + if response == 2: + self.liststore[row][HOSTLIST_COL_HOST] = hostname_entry.get_text() + self.liststore[row][HOSTLIST_COL_PORT] = port_spinbutton.get_value_as_int() + self.liststore[row][HOSTLIST_COL_USER] = username_entry.get_text() + self.liststore[row][HOSTLIST_COL_PASS] = password_entry.get_text() + self.liststore[row][HOSTLIST_COL_STATUS] = _("Offline") + + # Save the host list to file + self.__save_hostlist() + + # Update the status of the hosts + self.__update_list() + + username_entry.set_text("") + password_entry.set_text("") + hostname_entry.set_text("") + port_spinbutton.set_value(58846) + dialog.hide() + def on_button_removehost_clicked(self, widget): log.debug("on_button_removehost_clicked") # Get the selected rows @@ -579,3 +646,17 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( def on_hostlist_selection_changed(self, treeselection): self.__update_buttons() + + def on_askpassword_dialog_connect_button_clicked(self, widget): + log.debug("on on_askpassword_dialog_connect_button_clicked") + self.askpassword_dialog.response(gtk.RESPONSE_OK) + + def on_askpassword_dialog_entry_activate(self, entry): + self.askpassword_dialog.response(gtk.RESPONSE_OK) + + def __on_connected_failed(self, reason, host_id, host, port, user): + log.exception(reason) + log.debug(reason.value) + log.debug(reason.value.__dict__) + dialogs.ErrorDialog(_("Failed To Authenticate"), + reason.value.exception_msg).run() diff --git a/deluge/ui/gtkui/glade/connection_manager.glade b/deluge/ui/gtkui/glade/connection_manager.glade index af4129507..fa93556dc 100644 --- a/deluge/ui/gtkui/glade/connection_manager.glade +++ b/deluge/ui/gtkui/glade/connection_manager.glade @@ -1,15 +1,15 @@ - - - + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Add Host True - GTK_WIN_POS_CENTER + center True - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False @@ -30,6 +30,7 @@ False False + 0 @@ -159,38 +160,59 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END + end + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel True - 0 + + False + False + 0 + + gtk-add + 1 True True True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add True - 1 + False + False 1 + + + gtk-save + 2 + True + True + True + + + False + False + 2 + + False - GTK_PACK_END + end + 0 @@ -203,11 +225,11 @@ 5 Connection Manager True - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent 350 300 True - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False @@ -228,6 +250,7 @@ False False + 0 @@ -258,14 +281,14 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_RESIZE_QUEUE + queue True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + automatic + automatic True @@ -277,6 +300,9 @@ + + 0 + @@ -286,48 +312,69 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_START + start + gtk-add True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add True - 0 + + False + False + 0 + + + + + gtk-edit + True + False + True + True + True + + + + False + False + 1 + + gtk-remove True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-remove True - 0 - 1 + False + False + 2 False False + 0 + gtk-refresh True True True - gtk-refresh True - 0 @@ -342,7 +389,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 @@ -355,6 +401,9 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-execute + + 0 + @@ -373,7 +422,7 @@ False False - GTK_PACK_END + end 1 @@ -409,22 +458,25 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Automatically connect to selected host on start-up True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Automatically connect to selected host on start-up - 0 True + + 0 + + Automatically start localhost if needed True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Automatically start localhost if needed - 0 True @@ -434,11 +486,11 @@ + Do not show this dialog on start-up True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Do not show this dialog on start-up - 0 True @@ -469,31 +521,30 @@ True - GTK_BUTTONBOX_END + end + gtk-close True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close True - -7 False False + 0 + gtk-connect True True True - gtk-connect True - 0 @@ -513,12 +564,87 @@ False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END + end False False - GTK_PACK_END + end + 0 + + + + + + + 5 + Password Required + True + center-on-parent + 320 + True + dialog + True + False + + + True + 2 + + + True + + + True + gtk-dialog-authentication + 6 + + + 0 + + + + + True + True + False + ● + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-connect + 1 + True + True + True + True + + + + False + False + 0 + + + + + False + end + 0 From d44f59a0e7bf247b02d8f0907d1cb7492fbe00db Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 Dec 2010 18:27:47 +0000 Subject: [PATCH 161/329] Add some docstrings. --- deluge/core/authmanager.py | 10 ++++++++++ deluge/core/rpcserver.py | 3 +++ 2 files changed, 13 insertions(+) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 120481c3c..ad1f09de8 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -72,6 +72,16 @@ class AuthManager(component.Component): pass def peek(self, username): + """ + Peeks users based on username and returns their auth level + + :param username: str, username + :returns: int, the auth level for this user + :rtype: int + + :raises BadLoginError: if the username does not exist or password does not match + + """ if username not in self.__auth: # Let's try to re-load the file.. Maybe it's been updated self.__load_auth_file() diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 9620c7b81..7d6033e24 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -254,6 +254,9 @@ class DelugeRPCProtocol(Protocol): )) if method == "daemon.peek": + # This is a special case and used in the initial connection process + # We need to peek the user here in order to get an auth level back + # and see if the user exists. try: ret = component.get("AuthManager").peek(*args, **kwargs) if ret: From 249398489e13b156363471e64d1a5ee25b0f5453 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 Dec 2010 21:14:49 +0000 Subject: [PATCH 162/329] Removed problematic code. GTK2Reactor takes care of all that. --- deluge/ui/gtkui/gtkui.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 1efbda3ba..1d0208d14 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -205,10 +205,6 @@ class GtkUI(object): self.queuedtorrents = QueuedTorrents() self.ipcinterface = IPCInterface(args) - # Initialize gdk threading - gtk.gdk.threads_init() - gobject.threads_init() - # We make sure that the UI components start once we get a core URI client.set_disconnect_callback(self.__on_disconnect) @@ -238,11 +234,8 @@ class GtkUI(object): rpc_stats.start(10) reactor.callWhenRunning(self._on_reactor_start) - # Start the gtk main loop - gtk.gdk.threads_enter() + reactor.addSystemEventTrigger("before", "shutdown", self.shutdown) reactor.run() - self.shutdown() - gtk.gdk.threads_leave() def shutdown(self, *args, **kwargs): log.debug("gtkui shutting down..") From e17c0355216565ed73aed1b7d4db665c7c40375f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 16 Dec 2010 01:18:40 +0000 Subject: [PATCH 163/329] Cleaned up previous commit regarding threads and the GTK2Reactor. Now a dialog apears if the daemon complains about a missing password in order to authenticate. Asks the password from the user and retries to connect. --- deluge/ui/gtkui/connectionmanager.py | 51 +++++++++++++++------------- deluge/ui/gtkui/dialogs.py | 24 +++++++++++++ deluge/ui/gtkui/gtkui.py | 10 +++++- 3 files changed, 61 insertions(+), 24 deletions(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 5014a437a..a97029fc1 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -435,13 +435,40 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( details=traceback.format_exc(tb[2])).run() # Signal handlers + def __connect(self, host_id, host, port, user, password): + def do_connect(*args): + d = client.connect(host, port, user, password) + d.addCallback(self.__on_connected, host_id) + d.addErrback(self.__on_connected_failed, host_id, host, port, user) + return d + + if client.connected(): + return client.disconnect().addCallback(do_connect) + else: + return do_connect() + def __on_connected(self, connector, host_id): log.debug("__on_connected called") if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id + self.connection_manager.response(gtk.RESPONSE_OK) + component.start() + def __on_connected_failed(self, reason, host_id, host, port, user): + if reason.value.exception_type == "PasswordRequired": + log.debug("PasswordRequired exception") + dialog = dialogs.AuthenticationDialog(reason.value.exception_msg) + def dialog_finished(response_id, host, port, user): + if response_id == gtk.RESPONSE_OK: + self.__connect(host_id, host, port, user, + dialog.password.get_text()) + d = dialog.run().addCallback(dialog_finished, host, port, user) + return d + dialogs.ErrorDialog(_("Failed To Authenticate"), + reason.value.exception_msg).run() + def on_button_connect_clicked(self, widget=None): model, row = self.hostlist.get_selection().get_selected() if not row: @@ -459,10 +486,6 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( user = model[row][HOSTLIST_COL_USER] password = model[row][HOSTLIST_COL_PASS] - if not password: - self.askpassword_dialog.run() - password = self.askpassword_dialog_entry.get_text() - if status == _("Offline") and self.glade.get_widget("chk_autostart").get_active() and\ host in ("127.0.0.1", "localhost"): # We need to start this localhost @@ -486,18 +509,7 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( do_retry_connect(6) - - def do_connect(*args): - d = client.connect(host, port, user, password) - d.addCallback(self.__on_connected, host_id) - d.addErrback(self.__on_connected_failed, host_id, host, port, user) - - if client.connected(): - client.disconnect().addCallback(do_connect) - else: - do_connect() - - self.connection_manager.response(gtk.RESPONSE_OK) + return self.__connect(host_id, host, port, user, password) def on_button_close_clicked(self, widget): self.connection_manager.response(gtk.RESPONSE_CLOSE) @@ -653,10 +665,3 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( def on_askpassword_dialog_entry_activate(self, entry): self.askpassword_dialog.response(gtk.RESPONSE_OK) - - def __on_connected_failed(self, reason, host_id, host, port, user): - log.exception(reason) - log.debug(reason.value) - log.debug(reason.value.__dict__) - dialogs.ErrorDialog(_("Failed To Authenticate"), - reason.value.exception_msg).run() diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index 9409513c1..d4be76e08 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -189,3 +189,27 @@ class ErrorDialog(BaseDialog): self.vbox.pack_start(label, False, False) self.vbox.pack_start(sw) self.vbox.show_all() + +class AuthenticationDialog(BaseDialog): + """ + Displays a dialog with an entry field asking for a password. + + When run(), it will return either a gtk.RESPONSE_CANCEL or a + gtk.RESPONSE_OK. + """ + def __init__(self, err_msg="", parent=None): + """ + :param err_msg: the error message we got back from the server + :type err_msg: string + """ + super(AuthenticationDialog, self).__init__( + _("Authenticate"), err_msg, + gtk.STOCK_DIALOG_AUTHENTICATION, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_CONNECT, gtk.RESPONSE_OK), + parent) + + self.password = gtk.Entry() + self.password.set_visibility(False) + self.vbox.pack_start(self.password, False, False) + self.set_focus(self.password) + self.show_all() diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 1d0208d14..6ba21e1ae 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -205,6 +205,10 @@ class GtkUI(object): self.queuedtorrents = QueuedTorrents() self.ipcinterface = IPCInterface(args) + # Initialize gdk threading + gtk.gdk.threads_init() + + # We make sure that the UI components start once we get a core URI client.set_disconnect_callback(self.__on_disconnect) @@ -234,8 +238,12 @@ class GtkUI(object): rpc_stats.start(10) reactor.callWhenRunning(self._on_reactor_start) - reactor.addSystemEventTrigger("before", "shutdown", self.shutdown) + + # Initialize gdk threading + gtk.gdk.threads_enter() reactor.run() + self.shutdown() + gtk.gdk.threads_leave() def shutdown(self, *args, **kwargs): log.debug("gtkui shutting down..") From b2a16a024089d42265b487e59251d47f408e9ede Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 20 Dec 2010 22:47:40 +0000 Subject: [PATCH 164/329] Move deluge errors to the errors module, they will be reused later on other parts of code. Now, calling connect on client has two behaviours, if username/password is passed the client connects, authenticates and returns daemon info, if username/password is not passed, only the daemon info is returned. This might change a bit later on though. --- deluge/core/daemon.py | 2 + deluge/core/rpcserver.py | 34 ++----- deluge/error.py | 11 +++ deluge/ui/client.py | 133 +++++++++++++++------------ deluge/ui/gtkui/connectionmanager.py | 34 +++++-- 5 files changed, 125 insertions(+), 89 deletions(-) diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index 5cad58af0..968534900 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -198,6 +198,8 @@ class Daemon(object): :returns: str, the version number """ + print '\n\ndaemon.info called\n\n' + return deluge.common.get_version() @export() diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 7d6033e24..9beb2c201 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -55,7 +55,8 @@ except ImportError: import deluge.component as component import deluge.configmanager -from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT +from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN +from deluge.error import DelugeError, NotAuthorizedError RPC_RESPONSE = 1 RPC_ERROR = 2 @@ -117,12 +118,6 @@ def format_request(call): else: return s -class DelugeError(Exception): - pass - -class NotAuthorizedError(DelugeError): - pass - class ServerContextFactory(object): def getContext(self): """ @@ -253,24 +248,10 @@ class DelugeRPCProtocol(Protocol): "".join(traceback.format_tb(exceptionTraceback))) )) - if method == "daemon.peek": + if method == "daemon.info": # This is a special case and used in the initial connection process - # We need to peek the user here in order to get an auth level back - # and see if the user exists. - try: - ret = component.get("AuthManager").peek(*args, **kwargs) - if ret: - self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0]) - self.factory.session_protocols[self.transport.sessionno] = self - except Exception, e: - sendError() - log.exception(e) - else: - self.sendData((RPC_RESPONSE, request_id, ret)) - if not ret: - self.transport.loseConnection() - finally: - return + self.sendData((RPC_RESPONSE, request_id, deluge.common.get_version())) + return elif method == "daemon.login": # This is a special case and used in the initial connection process # We need to authenticate the user here @@ -374,6 +355,7 @@ class RPCServer(component.Component): # Holds the interested event list for the sessions self.factory.interested_events = {} + self.listen = listen if not listen: return @@ -458,6 +440,8 @@ class RPCServer(component.Component): :rtype: string """ + if not self.listen: + return "localclient" session_id = self.get_session_id() if session_id > -1 and session_id in self.factory.authorized_sessions: return self.factory.authorized_sessions[session_id][1] @@ -472,6 +456,8 @@ class RPCServer(component.Component): :returns: the auth level :rtype: int """ + if not self.listen: + return AUTH_LEVEL_ADMIN return self.factory.authorized_sessions[self.get_session_id()][0] def get_rpc_auth_level(self, rpc): diff --git a/deluge/error.py b/deluge/error.py index 24c1e8352..eed5309f4 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -48,3 +48,14 @@ class InvalidTorrentError(DelugeError): class InvalidPathError(DelugeError): pass + +class NotAuthorizedError(DelugeError): + pass + +class BadLoginError(DelugeError): + pass + +class AuthenticationRequired(BadLoginError): + def __init__(self, message, username): + super(AuthenticationRequired, self).__init__(message) + self.username = username diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 13a7be87c..f71956175 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -261,27 +261,7 @@ class DaemonSSLProxy(DaemonProxy): self.disconnect_deferred = None self.disconnect_callback = None - def peek(self, host, port, username): - self.host = host - self.port = port - self.__connector = reactor.connectSSL(self.host, self.port, self.__factory, ssl.ClientContextFactory()) - self.connect_deferred = defer.Deferred() - self.peek_deferred = defer.Deferred() - - def on_connect(result, username): - self.__login_deferred = self.call("daemon.peek", username) - self.__login_deferred.addCallback(self.__on_peek, username) - self.__login_deferred.addErrback(self.__on_peek_fail) - - def on_connect_fail(reason): - log.debug("connect_fail: %s", reason) - self.peek_deferred.errback(reason) - - self.connect_deferred.addCallback(on_connect, username) - self.connect_deferred.addErrback(on_connect_fail) - return self.peek_deferred - - def connect(self, host, port, username, password): + def connect(self, host, port): """ Connects to a daemon at host:port @@ -298,13 +278,13 @@ class DaemonSSLProxy(DaemonProxy): self.port = port self.__connector = reactor.connectSSL(self.host, self.port, self.__factory, ssl.ClientContextFactory()) self.connect_deferred = defer.Deferred() - self.login_deferred = defer.Deferred() + self.daemon_info_deferred = defer.Deferred() # Upon connect we do a 'daemon.login' RPC - self.connect_deferred.addCallback(self.__on_connect, username, password) + self.connect_deferred.addCallback(self.__on_connect) self.connect_deferred.addErrback(self.__on_connect_fail) - return self.login_deferred + return self.daemon_info_deferred def disconnect(self): log.debug("sslproxy.disconnect()") @@ -418,19 +398,37 @@ class DaemonSSLProxy(DaemonProxy): log.error(msg) return error_data - def __on_connect(self, result, username, password): + def __on_connect(self, result): log.debug("__on_connect called") - self.__login_deferred = self.call("daemon.login", username, password) - self.__login_deferred.addCallback(self.__on_login, username) - self.__login_deferred.addErrback(self.__on_login_fail) + + def on_info(daemon_info): + self.daemon_info = daemon_info + log.debug("Got info from daemon: %s", daemon_info) + self.daemon_info_deferred.callback(daemon_info) + + def on_info_fail(reason): + log.debug("Failed to get info from daemon: %s", reason) + self.daemon_info_deferred.errback(reason) + + self.call("daemon.info").addCallback(on_info).addErrback(on_info_fail) + return self.daemon_info_deferred def __on_connect_fail(self, reason): log.debug("__on_connect_fail called") log.debug("connect_fail: %s", reason) - self.login_deferred.errback(reason) + log.exception(reason) + self.daemon_info_deferred.errback(reason) + + def authenticate(self, username, password): + log.debug("%s.authenticate: %s", self.__class__.__name__, username) + self.login_deferred = defer.Deferred() + d = self.call("daemon.login", username, password) + d.addCallback(self.__on_login, username) + d.addErrback(self.__on_login_fail) + return self.login_deferred def __on_login(self, result, username): - log.debug("__on_login called") + log.debug("__on_login called: %s %s", username, result) self.username = username # We need to tell the daemon what events we're interested in receiving if self.__factory.event_handlers: @@ -441,15 +439,6 @@ class DaemonSSLProxy(DaemonProxy): log.debug("_on_login_fail(): %s", result) self.login_deferred.errback(result) - def __on_peek(self, result, username): - log.debug("__on_peek called. result: %s", result) - self.username = username - self.peek_deferred.callback(result) - - def __on_peek_fail(self, result): - log.debug("__on_peek_fail called. result: %s", result) - self.peek_deferred.errback(result) - def set_disconnect_callback(self, cb): """ Set a function to be called when the connection to the daemon is lost @@ -471,7 +460,10 @@ class DaemonClassicProxy(DaemonProxy): self.connected = True self.host = "localhost" self.port = 58846 + # Running in classic mode, it's safe to import auth level + from deluge.core.authmanager import AUTH_LEVEL_ADMIN self.username = "localclient" + self.authentication_level = AUTH_LEVEL_ADMIN # Register the event handlers for event in event_handlers: for handler in event_handlers[event]: @@ -574,32 +566,55 @@ class Client(object): self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) - d = self._daemon_proxy.connect(host, port, username, password) + d = self._daemon_proxy.connect(host, port) def on_connect_fail(result): log.debug("on_connect_fail: %s", result) self.disconnect() return result - d.addErrback(on_connect_fail) + + if username or password: + auth_deferred = defer.Deferred() + + def on_authenticate(result, daemon_info): + log.debug("Authentication sucessfull: %s", result) + self.authentication_level = result + auth_deferred.callback(daemon_info) + + def on_authenticate_fail(reason): + log.debug("Failed to authenticate") + log.exception(reason) + auth_deferred.errback(reason) + + def on_connected(daemon_version): + log.debug("Client.connect.on_connected: %s", daemon_version) + print 1234, self._daemon_proxy + d = self._daemon_proxy.authenticate(username, password) + print 1234, d + d.addCallback(on_authenticate, daemon_version) + d.addErrback(on_authenticate_fail) +# return d + + d.addCallback(on_connected) + return auth_deferred return d - def peek(self, host="127.0.0.1", port=58846, username=""): - if not username and host in ("127.0.0.1", "localhost"): - # No username was provided and it's the localhost, so we can try - # to grab the credentials from the auth file. - import common - username, password = common.get_localhost_auth() - self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) - self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) - d = self._daemon_proxy.peek(host, port, username) - def on_connect_fail(result): - log.debug("on_connect_fail: %s", result) - self.disconnect() - return result - - d.addErrback(on_connect_fail) - return d +# def authenticate(self, username="", password=""): +# if not self.connected(): +# raise Exception("You first need to call connect") +# if not username and self._daemon_proxy.host in ("127.0.0.1", "localhost"): +# # No username was provided and it's the localhost, so we can try +# # to grab the credentials from the auth file. +# import common +# username, password = common.get_localhost_auth() +# +# def on_authenticate_fail(reason): +# log.debug("Failed to authenticate %s@%s:%s") +# +# d = self._daemon_proxy.authenticate(username, password) +# d.addErrback(on_authenticate_fail) +# return d def disconnect(self): """ @@ -646,6 +661,10 @@ class Client(object): else: return True + def daemon_info(self): + return self._daemon_proxy.daemon_info_deferred + return defer.succeed(self._daemon_proxy.daemon_info or None) + def is_localhost(self): """ Checks if the current connected host is a localhost or not. diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index a97029fc1..5066c067c 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -300,6 +300,7 @@ class ConnectionManager(component.Component): row = self.__get_host_row(host_id) if row: row[HOSTLIST_COL_STATUS] = _("Offline") +# row[HOSTLIST_COL_VERSION] = "" self.__update_buttons() for row in self.liststore: @@ -307,22 +308,30 @@ class ConnectionManager(component.Component): host = row[HOSTLIST_COL_HOST] port = row[HOSTLIST_COL_PORT] user = row[HOSTLIST_COL_USER] - password = row[HOSTLIST_COL_PASS] if client.connected() and \ (host, port, "localclient" if not user and host in ("127.0.0.1", "localhost") else user) == client.connection_info(): def on_info(info): + log.debug("\n\nClient connected, query info: %s:%s\n\n", info, self.running) if not self.running: return row[HOSTLIST_COL_VERSION] = info self.__update_buttons() + print row[HOSTLIST_COL_ID], row[HOSTLIST_COL_HOST], row[HOSTLIST_COL_PORT], row[HOSTLIST_COL_USER], row[HOSTLIST_COL_VERSION] + + def on_info_fail(reason): + print '\n\n' + log.exception(reason) + print '\n\n' + row[HOSTLIST_COL_STATUS] = _("Connected") - client.daemon.info().addCallback(on_info) + log.debug("\n\nquery daemons info\n\n") + client.daemon.info().addCallback(on_info).addErrback(on_info_fail) continue # Create a new Client instance c = deluge.ui.client.Client() - d = c.peek(host, port, user) + d = c.connect(host, port) d.addCallback(on_connect, c, host_id) d.addErrback(on_connect_failed, host_id) @@ -435,11 +444,11 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( details=traceback.format_exc(tb[2])).run() # Signal handlers - def __connect(self, host_id, host, port, user, password): + def __connect(self, host_id, host, port, username, password): def do_connect(*args): - d = client.connect(host, port, user, password) + d = client.connect(host, port, username, password) d.addCallback(self.__on_connected, host_id) - d.addErrback(self.__on_connected_failed, host_id, host, port, user) + d.addErrback(self.__on_connected_failed, host_id, host, port, username) return d if client.connected(): @@ -447,16 +456,25 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( else: return do_connect() - def __on_connected(self, connector, host_id): - log.debug("__on_connected called") + def __on_connected(self, daemon_info, host_id): +# log.debug("__on_connected called for hostid: %s connector: %s", +# host_id, daemon_info) if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id +# row = self.__get_host_row(host_id) +# row[HOSTLIST_COL_STATUS] = _("Connected") +# row[HOSTLIST_COL_VERSION] = daemon_info +# +# # Update the status of the hosts +# self.__update_list() + self.connection_manager.response(gtk.RESPONSE_OK) component.start() def __on_connected_failed(self, reason, host_id, host, port, user): + log.exception(reason) if reason.value.exception_type == "PasswordRequired": log.debug("PasswordRequired exception") dialog = dialogs.AuthenticationDialog(reason.value.exception_msg) From 67ff83360f748e0b20fa19967de517b59068d632 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Dec 2010 02:54:53 +0000 Subject: [PATCH 165/329] Use the exceptions from `deluge.errors`. --- deluge/core/authmanager.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index ad1f09de8..8ad62b34f 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -40,7 +40,7 @@ import logging import deluge.component as component import deluge.configmanager as configmanager -import deluge.error +from deluge.error import BadLoginError, AuthenticationRequired log = logging.getLogger(__name__) @@ -51,12 +51,6 @@ AUTH_LEVEL_ADMIN = 10 AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL -class BadLoginError(deluge.error.DelugeError): - pass - -class PasswordRequired(BadLoginError): - pass - class AuthManager(component.Component): def __init__(self): component.Component.__init__(self, "AuthManager") @@ -108,7 +102,7 @@ class AuthManager(component.Component): # Return the users auth level return auth_level elif not password and self.__auth[username][0]: - raise PasswordRequired("Password is required") + raise AuthenticationRequired("Password is required", username) else: raise BadLoginError("Password does not match") From b3870ad6ddcf05f7a2a850ec5f4ab89b906360a9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Dec 2010 02:58:06 +0000 Subject: [PATCH 166/329] Use a specific response code for authentication requests. Recreate authentication request exceptions on the client end. --- deluge/core/daemon.py | 11 -------- deluge/core/rpcserver.py | 5 +++- deluge/error.py | 17 +++++++++++ deluge/ui/client.py | 21 ++++++++++++-- deluge/ui/gtkui/connectionmanager.py | 42 ++++++++++++---------------- deluge/ui/gtkui/dialogs.py | 2 +- 6 files changed, 59 insertions(+), 39 deletions(-) diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index 968534900..383264dbd 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -191,17 +191,6 @@ class Daemon(object): except twisted.internet.error.ReactorNotRunning: log.debug("Tried to stop the reactor but it is not running..") - @export() - def info(self): - """ - Returns some info from the daemon. - - :returns: str, the version number - """ - print '\n\ndaemon.info called\n\n' - - return deluge.common.get_version() - @export() def get_method_list(self): """ diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 9beb2c201..60e190593 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -56,11 +56,12 @@ except ImportError: import deluge.component as component import deluge.configmanager from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN -from deluge.error import DelugeError, NotAuthorizedError +from deluge.error import DelugeError, NotAuthorizedError, AuthenticationRequired RPC_RESPONSE = 1 RPC_ERROR = 2 RPC_EVENT = 3 +RPC_EVENT_AUTH = 4 log = logging.getLogger(__name__) @@ -261,6 +262,8 @@ class DelugeRPCProtocol(Protocol): if ret: self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0]) self.factory.session_protocols[self.transport.sessionno] = self + except AuthenticationRequired, err: + self.sendData((RPC_EVENT_AUTH, request_id, err.message, args[0])) except Exception, e: sendError() log.exception(e) diff --git a/deluge/error.py b/deluge/error.py index eed5309f4..055d6b338 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -56,6 +56,23 @@ class BadLoginError(DelugeError): pass class AuthenticationRequired(BadLoginError): + def _get_message(self): + return self._message + def _set_message(self, message): + self._message = message + message = property(_get_message, _set_message) + del _get_message, _set_message + + def _get_username(self): + return self._username + def _set_username(self, username): + self._username = username + username = property(_get_username, _set_username) + del _get_username, _set_username + + def __init__(self, message, username): super(AuthenticationRequired, self).__init__(message) + self.message = message self.username = username + diff --git a/deluge/ui/client.py b/deluge/ui/client.py index f71956175..60e51dbf0 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -46,6 +46,8 @@ import zlib import deluge.common import deluge.component as component from deluge.log import LOG as log +from deluge.error import AuthenticationRequired +from deluge.event import known_events if deluge.common.windows_check(): import win32api @@ -55,6 +57,7 @@ else: RPC_RESPONSE = 1 RPC_ERROR = 2 RPC_EVENT = 3 +RPC_EVENT_AUTH = 4 log = logging.getLogger(__name__) @@ -184,6 +187,8 @@ class DelugeRPCProtocol(Protocol): if message_type == RPC_RESPONSE: # Run the callbacks registered with this Deferred object d.callback(request[2]) + elif message_type == RPC_EVENT_AUTH: + d.errback(AuthenticationRequired(request[2], request[3])) elif message_type == RPC_ERROR: # Create the DelugeRPCError to pass to the errback r = self.__rpc_requests[request_id] @@ -382,8 +387,19 @@ class DaemonSSLProxy(DaemonProxy): :param error_data: this is passed from the deferred errback with error.value containing a `:class:DelugeRPCError` object. """ + try: + if error_data.check(AuthenticationRequired): + print error_data.value.__dict__ + return error_data + except: + pass + +# print 1234567, error_data # Get the DelugeRPCError object from the error_data error = error_data.value + +# if error.exception_type == "AuthenticationRequired": +# return # Create a delugerpcrequest to print out a nice RPCRequest string r = DelugeRPCRequest() r.method = error.method @@ -545,7 +561,8 @@ class Client(object): self.disconnect_callback = None self.__started_in_classic = False - def connect(self, host="127.0.0.1", port=58846, username="", password=""): + def connect(self, host="127.0.0.1", port=58846, username="", password="", + skip_authentication=False): """ Connects to a daemon process. @@ -573,7 +590,7 @@ class Client(object): return result d.addErrback(on_connect_fail) - if username or password: + if not skip_authentication: auth_deferred = defer.Deferred() def on_authenticate(result, daemon_info): diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 5066c067c..7af987bd9 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -48,6 +48,8 @@ from deluge.ui.client import client import deluge.ui.client import deluge.ui.common from deluge.configmanager import ConfigManager +from deluge.error import AuthenticationRequired +from deluge.log import LOG as log import dialogs log = logging.getLogger(__name__) @@ -234,7 +236,11 @@ class ConnectionManager(component.Component): # Grab the hosts from the liststore self.config["hosts"] = [] for row in self.liststore: - self.config["hosts"].append((row[HOSTLIST_COL_ID], row[HOSTLIST_COL_HOST], row[HOSTLIST_COL_PORT], row[HOSTLIST_COL_USER], row[HOSTLIST_COL_PASS])) + self.config["hosts"].append((row[HOSTLIST_COL_ID], + row[HOSTLIST_COL_HOST], + row[HOSTLIST_COL_PORT], + row[HOSTLIST_COL_USER], + row[HOSTLIST_COL_PASS])) self.config.save() @@ -250,6 +256,7 @@ class ConnectionManager(component.Component): self.liststore[new_row][HOSTLIST_COL_USER] = host[3] self.liststore[new_row][HOSTLIST_COL_PASS] = host[4] self.liststore[new_row][HOSTLIST_COL_STATUS] = _("Offline") + self.liststore[new_row][HOSTLIST_COL_VERSION] = "" def __get_host_row(self, host_id): """ @@ -300,7 +307,7 @@ class ConnectionManager(component.Component): row = self.__get_host_row(host_id) if row: row[HOSTLIST_COL_STATUS] = _("Offline") -# row[HOSTLIST_COL_VERSION] = "" + row[HOSTLIST_COL_VERSION] = "" self.__update_buttons() for row in self.liststore: @@ -312,21 +319,15 @@ class ConnectionManager(component.Component): if client.connected() and \ (host, port, "localclient" if not user and host in ("127.0.0.1", "localhost") else user) == client.connection_info(): def on_info(info): - log.debug("\n\nClient connected, query info: %s:%s\n\n", info, self.running) if not self.running: return + log.debug("Client connected, query info: %s", info) row[HOSTLIST_COL_VERSION] = info self.__update_buttons() - print row[HOSTLIST_COL_ID], row[HOSTLIST_COL_HOST], row[HOSTLIST_COL_PORT], row[HOSTLIST_COL_USER], row[HOSTLIST_COL_VERSION] - - def on_info_fail(reason): - print '\n\n' - log.exception(reason) - print '\n\n' row[HOSTLIST_COL_STATUS] = _("Connected") log.debug("\n\nquery daemons info\n\n") - client.daemon.info().addCallback(on_info).addErrback(on_info_fail) + client.daemon.info().addCallback(on_info) continue # Create a new Client instance @@ -446,7 +447,8 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( # Signal handlers def __connect(self, host_id, host, port, username, password): def do_connect(*args): - d = client.connect(host, port, username, password) + d = client.connect(host, port, username, password, + skip_authentication=False) d.addCallback(self.__on_connected, host_id) d.addErrback(self.__on_connected_failed, host_id, host, port, username) return d @@ -457,27 +459,19 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( return do_connect() def __on_connected(self, daemon_info, host_id): -# log.debug("__on_connected called for hostid: %s connector: %s", -# host_id, daemon_info) if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id -# row = self.__get_host_row(host_id) -# row[HOSTLIST_COL_STATUS] = _("Connected") -# row[HOSTLIST_COL_VERSION] = daemon_info -# -# # Update the status of the hosts -# self.__update_list() - self.connection_manager.response(gtk.RESPONSE_OK) - component.start() def __on_connected_failed(self, reason, host_id, host, port, user): - log.exception(reason) - if reason.value.exception_type == "PasswordRequired": + log.exception(reason.value) +# log.debug(reason.__dict__) +# log.debug(reason.value.__dict__) + if reason.check(AuthenticationRequired): log.debug("PasswordRequired exception") - dialog = dialogs.AuthenticationDialog(reason.value.exception_msg) + dialog = dialogs.AuthenticationDialog(reason.value.message) def dialog_finished(response_id, host, port, user): if response_id == gtk.RESPONSE_OK: self.__connect(host_id, host, port, user, diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index d4be76e08..b936c17a7 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -197,7 +197,7 @@ class AuthenticationDialog(BaseDialog): When run(), it will return either a gtk.RESPONSE_CANCEL or a gtk.RESPONSE_OK. """ - def __init__(self, err_msg="", parent=None): + def __init__(self, err_msg="", username=None, parent=None): """ :param err_msg: the error message we got back from the server :type err_msg: string From 86a1b801f572a7a5f1f66ee16f343a8c4ab76d9f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Dec 2010 17:45:45 +0000 Subject: [PATCH 167/329] Now it is possible to not even store the username on the hosts entry in the connection manager, both username and password will be asked to the user. WARNING: No more "localclient" automatic login, ie, username, is mandatory else, it will be asked to the user. --- deluge/core/authmanager.py | 33 +++++++++---------------- deluge/ui/client.py | 10 ++++---- deluge/ui/gtkui/connectionmanager.py | 17 ++++++------- deluge/ui/gtkui/dialogs.py | 36 ++++++++++++++++++++++++---- 4 files changed, 57 insertions(+), 39 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 8ad62b34f..955421814 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -65,26 +65,6 @@ class AuthManager(component.Component): def shutdown(self): pass - def peek(self, username): - """ - Peeks users based on username and returns their auth level - - :param username: str, username - :returns: int, the auth level for this user - :rtype: int - - :raises BadLoginError: if the username does not exist or password does not match - - """ - if username not in self.__auth: - # Let's try to re-load the file.. Maybe it's been updated - self.__load_auth_file() - if username not in self.__auth: - raise BadLoginError("Username does not exist") - - return int(self.__auth[username][1]) - - def authorize(self, username, password): """ Authorizes users based on username and password @@ -97,10 +77,19 @@ class AuthManager(component.Component): :raises BadLoginError: if the username does not exist or password does not match """ - auth_level = self.peek(username) + if not username: + raise AuthenticationRequired("Username and Password are required.", + username) + + if username and username not in self.__auth: + # Let's try to re-load the file.. Maybe it's been updated + self.__load_auth_file() + if username not in self.__auth: + raise BadLoginError("Username does not exist") + if self.__auth[username][0] == password: # Return the users auth level - return auth_level + return int(self.__auth[username][1]) elif not password and self.__auth[username][0]: raise AuthenticationRequired("Password is required", username) else: diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 60e51dbf0..4fc8817ec 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -575,11 +575,11 @@ class Client(object): has been established or fails """ log.debug("real client connect") - if not username and host in ("127.0.0.1", "localhost"): - # No username was provided and it's the localhost, so we can try - # to grab the credentials from the auth file. - import common - username, password = common.get_localhost_auth() +# if not username and host in ("127.0.0.1", "localhost"): +# # No username was provided and it's the localhost, so we can try +# # to grab the credentials from the auth file. +# import common +# username, password = common.get_localhost_auth() self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 7af987bd9..7cf38f643 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -332,7 +332,7 @@ class ConnectionManager(component.Component): # Create a new Client instance c = deluge.ui.client.Client() - d = c.connect(host, port) + d = c.connect(host, port, skip_authentication=True) d.addCallback(on_connect, c, host_id) d.addErrback(on_connect_failed, host_id) @@ -445,10 +445,9 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( details=traceback.format_exc(tb[2])).run() # Signal handlers - def __connect(self, host_id, host, port, username, password): + def __connect(self, host_id, host, port, username, password, skip_authentication=False): def do_connect(*args): - d = client.connect(host, port, username, password, - skip_authentication=False) + d = client.connect(host, port, username, password, skip_authentication) d.addCallback(self.__on_connected, host_id) d.addErrback(self.__on_connected_failed, host_id, host, port, username) return d @@ -471,11 +470,13 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( # log.debug(reason.value.__dict__) if reason.check(AuthenticationRequired): log.debug("PasswordRequired exception") - dialog = dialogs.AuthenticationDialog(reason.value.message) + dialog = dialogs.AuthenticationDialog(reason.value.message, + reason.value.username) def dialog_finished(response_id, host, port, user): if response_id == gtk.RESPONSE_OK: - self.__connect(host_id, host, port, user, - dialog.password.get_text()) + self.__connect(host_id, host, port, + user and user or dialog.get_username(), + dialog.get_password()) d = dialog.run().addCallback(dialog_finished, host, port, user) return d dialogs.ErrorDialog(_("Failed To Authenticate"), @@ -521,7 +522,7 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( do_retry_connect(6) - return self.__connect(host_id, host, port, user, password) + return self.__connect(host_id, host, port, user, password, skip_authentication=False) def on_button_close_clicked(self, widget): self.connection_manager.response(gtk.RESPONSE_CLOSE) diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index b936c17a7..d0e8f7913 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -208,8 +208,36 @@ class AuthenticationDialog(BaseDialog): (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_CONNECT, gtk.RESPONSE_OK), parent) - self.password = gtk.Entry() - self.password.set_visibility(False) - self.vbox.pack_start(self.password, False, False) - self.set_focus(self.password) + table = gtk.Table(2, 2, False) + self.username_label = gtk.Label() + self.username_label.set_markup(_("Username:")) + self.username_label.set_alignment(1.0, 0.5) + self.username_label.set_padding(5, 5) + self.username_entry = gtk.Entry() + table.attach(self.username_label, 0, 1, 0, 1) + table.attach(self.username_entry, 1, 2, 0, 1) + + self.password_label = gtk.Label() + self.password_label.set_markup(_("Password:")) + self.password_label.set_alignment(1.0, 0.5) + self.password_label.set_padding(5, 5) + self.password_entry = gtk.Entry() + self.password_entry.set_visibility(False) + table.attach(self.password_label, 0, 1, 1, 2) + table.attach(self.password_entry, 1, 2, 1, 2) + + self.vbox.pack_start(table, False, False, padding=5) + self.set_focus(self.password_entry) + if username: + self.username_entry.set_text(username) + self.username_entry.set_editable(False) + self.set_focus(self.password_entry) + else: + self.set_focus(self.username_entry) self.show_all() + + def get_username(self): + return self.username_entry.get_text() + + def get_password(self): + return self.password_entry.get_text() From e44cac0eaa2336f8bce3b05883101184b1b12437 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 21 Dec 2010 18:20:21 +0000 Subject: [PATCH 168/329] Since there's no default username for authentication, update hostlist to include the username. Remove debug prints or extreme debugging. Minor code cleanup. Remove un-used imports. --- deluge/core/authmanager.py | 7 +++- deluge/ui/client.py | 55 ++++++++-------------------- deluge/ui/gtkui/connectionmanager.py | 39 +++++++++++--------- deluge/ui/gtkui/dialogs.py | 2 +- 4 files changed, 43 insertions(+), 60 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 955421814..74dcefb9c 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -104,7 +104,8 @@ class AuthManager(component.Component): from hashlib import sha1 as sha_hash except ImportError: from sha import new as sha_hash - return "localclient:" + sha_hash(str(random.random())).hexdigest() + ":" + str(AUTH_LEVEL_ADMIN) + "\n" + return ("localclient:" + sha_hash(str(random.random())).hexdigest() + + ":" + str(AUTH_LEVEL_ADMIN) + "\n") def __load_auth_file(self): auth_file = configmanager.get_config_dir("auth") @@ -135,7 +136,9 @@ class AuthManager(component.Component): continue if len(lsplit) == 2: username, password = lsplit - log.warning("Your auth entry for %s contains no auth level, using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT) + log.warning("Your auth entry for %s contains no auth level, " + "using AUTH_LEVEL_DEFAULT(%s)..", username, + AUTH_LEVEL_DEFAULT) level = AUTH_LEVEL_DEFAULT elif len(lsplit) == 3: username, password, level = lsplit diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 4fc8817ec..4cd44ed15 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -44,7 +44,6 @@ except ImportError: import zlib import deluge.common -import deluge.component as component from deluge.log import LOG as log from deluge.error import AuthenticationRequired from deluge.event import known_events @@ -111,8 +110,10 @@ class DelugeRPCRequest(object): :returns: a properly formated RPCRequest """ - if self.request_id is None or self.method is None or self.args is None or self.kwargs is None: - raise TypeError("You must set the properties of this object before calling format_message!") + if self.request_id is None or self.method is None or self.args is None \ + or self.kwargs is None: + raise TypeError("You must set the properties of this object " + "before calling format_message!") return (self.request_id, self.method, self.args, self.kwargs) @@ -163,7 +164,8 @@ class DelugeRPCProtocol(Protocol): log.debug("Received invalid message: type is not tuple") return if len(request) < 3: - log.debug("Received invalid message: number of items in response is %s", len(3)) + log.debug("Received invalid message: number of items in " + "response is %s", len(3)) return message_type = request[0] @@ -192,7 +194,8 @@ class DelugeRPCProtocol(Protocol): elif message_type == RPC_ERROR: # Create the DelugeRPCError to pass to the errback r = self.__rpc_requests[request_id] - e = DelugeRPCError(r.method, r.args, r.kwargs, request[2][0], request[2][1], request[2][2]) + e = DelugeRPCError(r.method, r.args, r.kwargs, request[2][0], + request[2][1], request[2][2]) # Run the errbacks registered with this Deferred object d.errback(e) @@ -281,7 +284,9 @@ class DaemonSSLProxy(DaemonProxy): log.debug("sslproxy.connect()") self.host = host self.port = port - self.__connector = reactor.connectSSL(self.host, self.port, self.__factory, ssl.ClientContextFactory()) + self.__connector = reactor.connectSSL(self.host, self.port, + self.__factory, + ssl.ClientContextFactory()) self.connect_deferred = defer.Deferred() self.daemon_info_deferred = defer.Deferred() @@ -389,17 +394,13 @@ class DaemonSSLProxy(DaemonProxy): """ try: if error_data.check(AuthenticationRequired): - print error_data.value.__dict__ return error_data except: pass -# print 1234567, error_data # Get the DelugeRPCError object from the error_data error = error_data.value -# if error.exception_type == "AuthenticationRequired": -# return # Create a delugerpcrequest to print out a nice RPCRequest string r = DelugeRPCRequest() r.method = error.method @@ -423,7 +424,8 @@ class DaemonSSLProxy(DaemonProxy): self.daemon_info_deferred.callback(daemon_info) def on_info_fail(reason): - log.debug("Failed to get info from daemon: %s", reason) + log.debug("Failed to get info from daemon") + log.exception(reason) self.daemon_info_deferred.errback(reason) self.call("daemon.info").addCallback(on_info).addErrback(on_info_fail) @@ -431,7 +433,6 @@ class DaemonSSLProxy(DaemonProxy): def __on_connect_fail(self, reason): log.debug("__on_connect_fail called") - log.debug("connect_fail: %s", reason) log.exception(reason) self.daemon_info_deferred.errback(reason) @@ -574,13 +575,6 @@ class Client(object): :returns: a Deferred object that will be called once the connection has been established or fails """ - log.debug("real client connect") -# if not username and host in ("127.0.0.1", "localhost"): -# # No username was provided and it's the localhost, so we can try -# # to grab the credentials from the auth file. -# import common -# username, password = common.get_localhost_auth() - self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) d = self._daemon_proxy.connect(host, port) @@ -604,35 +598,16 @@ class Client(object): auth_deferred.errback(reason) def on_connected(daemon_version): - log.debug("Client.connect.on_connected: %s", daemon_version) - print 1234, self._daemon_proxy + log.debug("Client.connect.on_connected. Daemon version: %s", + daemon_version) d = self._daemon_proxy.authenticate(username, password) - print 1234, d d.addCallback(on_authenticate, daemon_version) d.addErrback(on_authenticate_fail) -# return d d.addCallback(on_connected) return auth_deferred return d - -# def authenticate(self, username="", password=""): -# if not self.connected(): -# raise Exception("You first need to call connect") -# if not username and self._daemon_proxy.host in ("127.0.0.1", "localhost"): -# # No username was provided and it's the localhost, so we can try -# # to grab the credentials from the auth file. -# import common -# username, password = common.get_localhost_auth() -# -# def on_authenticate_fail(reason): -# log.debug("Failed to authenticate %s@%s:%s") -# -# d = self._daemon_proxy.authenticate(username, password) -# d.addErrback(on_authenticate_fail) -# return d - def disconnect(self): """ Disconnects from the daemon. diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 7cf38f643..2cecf69fb 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -41,12 +41,10 @@ import logging from twisted.internet import reactor import deluge.component as component -import deluge.common import common import deluge.configmanager from deluge.ui.client import client import deluge.ui.client -import deluge.ui.common from deluge.configmanager import ConfigManager from deluge.error import AuthenticationRequired from deluge.log import LOG as log @@ -58,7 +56,8 @@ DEFAULT_HOST = "127.0.0.1" DEFAULT_PORT = 58846 DEFAULT_CONFIG = { - "hosts": [(hashlib.sha1(str(time.time())).hexdigest(), DEFAULT_HOST, DEFAULT_PORT, "", "")] + "hosts": [(hashlib.sha1(str(time.time())).hexdigest(), DEFAULT_HOST, + DEFAULT_PORT, "localclient", "")] } HOSTLIST_COL_ID = 0 @@ -145,7 +144,11 @@ class ConnectionManager(component.Component): # Create status pixbufs if not HOSTLIST_PIXBUFS: for stock_id in (gtk.STOCK_NO, gtk.STOCK_YES, gtk.STOCK_CONNECT): - HOSTLIST_PIXBUFS.append(self.connection_manager.render_icon(stock_id, gtk.ICON_SIZE_MENU)) + HOSTLIST_PIXBUFS.append( + self.connection_manager.render_icon( + stock_id, gtk.ICON_SIZE_MENU + ) + ) # Create the host list gtkliststore # id-hash, hostname, port, status, username, password, version @@ -176,7 +179,9 @@ class ConnectionManager(component.Component): # Connect the signals to the handlers self.glade.signal_autoconnect(self) - self.hostlist.get_selection().connect("changed", self.on_hostlist_selection_changed) + self.hostlist.get_selection().connect( + "changed", self.on_hostlist_selection_changed + ) self.__update_list() @@ -208,7 +213,8 @@ class ConnectionManager(component.Component): # Check to see if there is already an entry for this host and return # if thats the case for entry in self.liststore: - if [entry[HOSTLIST_COL_HOST], entry[HOSTLIST_COL_PORT], entry[HOSTLIST_COL_USER]] == [host, port, username]: + if [entry[HOSTLIST_COL_HOST], entry[HOSTLIST_COL_PORT], + entry[HOSTLIST_COL_USER]] == [host, port, username]: raise Exception("Host already in list!") # Host isn't in the list, so lets add it @@ -417,8 +423,7 @@ class ConnectionManager(component.Component): self.glade.get_widget("button_startdaemon").set_sensitive(False) # Make sure label is displayed correctly using mnemonics - self.glade.get_widget("label_startdaemon").set_use_underline( - True) + self.glade.get_widget("label_startdaemon").set_use_underline(True) def start_daemon(self, port, config): """ @@ -431,8 +436,9 @@ class ConnectionManager(component.Component): if e.errno == 2: dialogs.ErrorDialog( _("Unable to start daemon!"), - _("Deluge cannot find the 'deluged' executable, it is likely \ -that you forgot to install the deluged package or it's not in your PATH.")).run() + _("Deluge cannot find the 'deluged' executable, it is " + "likely that you forgot to install the deluged package " + "or it's not in your PATH.")).run() else: raise e except Exception, e: @@ -465,9 +471,7 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( component.start() def __on_connected_failed(self, reason, host_id, host, port, user): - log.exception(reason.value) -# log.debug(reason.__dict__) -# log.debug(reason.value.__dict__) + log.debug("Failed to connect: %s", reason) if reason.check(AuthenticationRequired): log.debug("PasswordRequired exception") dialog = dialogs.AuthenticationDialog(reason.value.message, @@ -499,8 +503,9 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( user = model[row][HOSTLIST_COL_USER] password = model[row][HOSTLIST_COL_PASS] - if status == _("Offline") and self.glade.get_widget("chk_autostart").get_active() and\ - host in ("127.0.0.1", "localhost"): + if status == _("Offline") and \ + self.glade.get_widget("chk_autostart").get_active() and \ + host in ("127.0.0.1", "localhost"): # We need to start this localhost self.start_daemon(port, deluge.configmanager.get_config_dir()) @@ -515,7 +520,6 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( do_retry_connect(try_counter) return result def do_retry_connect(try_counter): - log.debug("user: %s pass: %s", user, password) d = client.connect(host, port, user, password) d.addCallback(self.__on_connected, host_id) d.addErrback(on_connect_fail, try_counter) @@ -548,7 +552,8 @@ that you forgot to install the deluged package or it's not in your PATH.")).run( # We add the host try: - self.add_host(hostname, port_spinbutton.get_value_as_int(), username, password) + self.add_host(hostname, port_spinbutton.get_value_as_int(), + username, password) except Exception, e: from deluge.ui.gtkui.dialogs import ErrorDialog ErrorDialog(_("Error Adding Host"), e).run() diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index d0e8f7913..73928a31b 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -192,7 +192,7 @@ class ErrorDialog(BaseDialog): class AuthenticationDialog(BaseDialog): """ - Displays a dialog with an entry field asking for a password. + Displays a dialog with entry fields asking for username and password. When run(), it will return either a gtk.RESPONSE_CANCEL or a gtk.RESPONSE_OK. From 3e0ea26e5f83bfbffe186a7986f3ace47a7d51a8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 22 Dec 2010 09:12:13 +0000 Subject: [PATCH 169/329] Remove unused method, duplicate log messages and add a method to get the logged in user's authentication level. --- deluge/ui/client.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 4cd44ed15..466b5951c 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -229,14 +229,17 @@ class DelugeRPCClientFactory(ClientFactory): self.bytes_sent = 0 def startedConnecting(self, connector): - log.info("Connecting to daemon at %s:%s..", connector.host, connector.port) + log.info("Connecting to daemon at \"%s:%s\"...", + connector.host, connector.port) def clientConnectionFailed(self, connector, reason): - log.warning("Connection to daemon at %s:%s failed: %s", connector.host, connector.port, reason.value) + log.warning("Connection to daemon at \"%s:%s\" failed: %s", + connector.host, connector.port, reason.value) self.daemon.connect_deferred.errback(reason) def clientConnectionLost(self, connector, reason): - log.info("Connection lost to daemon at %s:%s reason: %s", connector.host, connector.port, reason.value) + log.info("Connection lost to daemon at \"%s:%s\" reason: %s", + connector.host, connector.port, reason.value) self.daemon.host = None self.daemon.port = None self.daemon.username = None @@ -263,6 +266,7 @@ class DaemonSSLProxy(DaemonProxy): self.host = None self.port = None self.username = None + self.authentication_level = 0 self.connected = False @@ -432,8 +436,6 @@ class DaemonSSLProxy(DaemonProxy): return self.daemon_info_deferred def __on_connect_fail(self, reason): - log.debug("__on_connect_fail called") - log.exception(reason) self.daemon_info_deferred.errback(reason) def authenticate(self, username, password): @@ -447,6 +449,7 @@ class DaemonSSLProxy(DaemonProxy): def __on_login(self, result, username): log.debug("__on_login called: %s %s", username, result) self.username = username + self.authentication_level = result # We need to tell the daemon what events we're interested in receiving if self.__factory.event_handlers: self.call("daemon.set_event_interest", self.__factory.event_handlers.keys()) @@ -578,10 +581,9 @@ class Client(object): self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) d = self._daemon_proxy.connect(host, port) - def on_connect_fail(result): - log.debug("on_connect_fail: %s", result) + def on_connect_fail(reason): self.disconnect() - return result + return reason d.addErrback(on_connect_fail) if not skip_authentication: @@ -589,7 +591,6 @@ class Client(object): def on_authenticate(result, daemon_info): log.debug("Authentication sucessfull: %s", result) - self.authentication_level = result auth_deferred.callback(daemon_info) def on_authenticate_fail(reason): @@ -653,10 +654,6 @@ class Client(object): else: return True - def daemon_info(self): - return self._daemon_proxy.daemon_info_deferred - return defer.succeed(self._daemon_proxy.daemon_info or None) - def is_localhost(self): """ Checks if the current connected host is a localhost or not. @@ -761,5 +758,14 @@ class Client(object): """ return self._daemon_proxy.get_bytes_sent() + def get_auth_level(self): + """ + Returns the authentication level the daemon returned upon authentication. + + :returns: the authentication level + :rtype: int + """ + return self._daemon_proxy.authentication_level + # This is the object clients will use client = Client() From 105cb52cb00cfb0480bd342d77d8ae3ac9efa36a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 22 Dec 2010 11:31:30 +0000 Subject: [PATCH 170/329] Add method to return the current authenticated username. --- deluge/ui/client.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 466b5951c..26cef631f 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -758,6 +758,15 @@ class Client(object): """ return self._daemon_proxy.get_bytes_sent() + def get_auth_user(self): + """ + Returns the current authenticated username. + + :returns: the authenticated username + :rtype: str + """ + return self._daemon_proxy.username + def get_auth_level(self): """ Returns the authentication level the daemon returned upon authentication. From e63c33c4967af2b8f70e28486986c7d3fe7b818f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 22 Dec 2010 18:49:27 +0000 Subject: [PATCH 171/329] Allow changing ownership of torrents. In order to achieve this, added `deluge.core.set_torrents_owner()`, `deluge.core.get_known_accounts()`, `deluge.core.authmanager.get_known_accounts() and `deluge.core.torrent.set_owner()`. So far only the GtkUi has this fully implemented. --- ChangeLog | 3 ++ deluge/core/authmanager.py | 27 ++++++++++---- deluge/core/core.py | 24 ++++++++++++ deluge/core/torrent.py | 3 +- deluge/ui/gtkui/menubar.py | 67 ++++++++++++++++++++++++++++++++++ deluge/ui/gtkui/torrentview.py | 8 ++-- 6 files changed, 120 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54111bc71..6e9e52bb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,9 +10,12 @@ * #1247: Fix deluge-gtk from hanging on shutdown * #995: Rewrote tracker_icons * Make the distinction between adding to the session new unmanaged torrents and torrents loaded from state. This will break backwards compatability. + * Pass a copy of an event instead of passing the event arguments to the event handlers. This will break backwards compatability. + * Allow changing ownership of torrents. ==== GtkUI ==== * Fix uncaught exception when closing deluge in classic mode + * Allow changing ownership of torrents ==== WebUI ==== * Migrate to ExtJS 3.1 diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 74dcefb9c..08dd0e8c7 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -74,18 +74,16 @@ class AuthManager(component.Component): :returns: int, the auth level for this user :rtype: int + :raises AuthenticationRequired: if aditional details are required to authenticate :raises BadLoginError: if the username does not exist or password does not match """ if not username: - raise AuthenticationRequired("Username and Password are required.", - username) + raise AuthenticationRequired( + "Username and Password are required.", username + ) - if username and username not in self.__auth: - # Let's try to re-load the file.. Maybe it's been updated - self.__load_auth_file() - if username not in self.__auth: - raise BadLoginError("Username does not exist") + self.__test_existing_account(username) if self.__auth[username][0] == password: # Return the users auth level @@ -95,6 +93,21 @@ class AuthManager(component.Component): else: raise BadLoginError("Password does not match") + def get_known_accounts(self): + """ + Returns a list of known deluge usernames. + """ + self.__load_auth_file() + return self.__auth.keys() + + + def __test_existing_account(self, username): + if username not in self.__auth: + # Let's try to re-load the file.. Maybe it's been updated + self.__load_auth_file() + if username not in self.__auth: + raise BadLoginError("Username does not exist") + def __create_localclient_account(self): """ Returns the string. diff --git a/deluge/core/core.py b/deluge/core/core.py index d0c80fd09..88eda2e13 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -55,6 +55,7 @@ import deluge.common import deluge.component as component from deluge.event import * from deluge.error import * +from deluge.core.authmanager import AUTH_LEVEL_ADMIN from deluge.core.torrentmanager import TorrentManager from deluge.core.pluginmanager import PluginManager from deluge.core.alertmanager import AlertManager @@ -579,6 +580,25 @@ class Core(component.Component): """Sets the path for the torrent to be moved when completed""" return self.torrentmanager[torrent_id].set_move_completed_path(value) + @export(AUTH_LEVEL_ADMIN) + def set_torrents_owner(self, torrent_ids, username): + """Set's the torrent owner. + + :param torrent_id: the torrent_id of the torrent to remove + :type torrent_id: string + :param username: the new owner username + :type username: string + + :raises DelugeError: if the username is not known + """ + if username not in self.authmanager.get_known_accounts(): + raise DelugeError("Username \"%s\" is not known." % username) + if isinstance(torrent_ids, basestring): + torrent_ids = [torrent_ids] + for torrent_id in torrent_ids: + self.torrentmanager[torrent_id].set_owner(username) + return None + @export def get_path_size(self, path): """Returns the size of the file or folder 'path' and -1 if the path is @@ -801,3 +821,7 @@ class Core(component.Component): """ return lt.version + + @export(AUTH_LEVEL_ADMIN) + def get_known_accounts(self): + return self.authmanager.get_known_accounts() diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 21a184e63..b3a2564cc 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -211,12 +211,13 @@ class Torrent(object): for (key, value) in options.items(): if OPTIONS_FUNCS.has_key(key): OPTIONS_FUNCS[key](value) - self.options.update(options) def get_options(self): return self.options + def set_owner(self, account): + self.owner = account def set_max_connections(self, max_connections): self.options["max_connections"] = int(max_connections) diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 901e6b3c6..88b19c9a4 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -100,6 +100,10 @@ class MenuBar(component.Component): self.torrentmenu = self.torrentmenu_glade.get_widget("torrent_menu") self.menu_torrent = self.window.main_glade.get_widget("menu_torrent") + self.menuitem_change_owner = gtk.MenuItem(_("Change Ownership")) + self.torrentmenu_glade.get_widget("options_torrent_menu").append(self.menuitem_change_owner) + + # Attach the torrent_menu to the Torrent file menu self.menu_torrent.set_submenu(self.torrentmenu) @@ -199,10 +203,21 @@ class MenuBar(component.Component): if not self.config["classic_mode"]: self.window.main_glade.get_widget("separatormenuitem").show() self.window.main_glade.get_widget("menuitem_quitdaemon").show() + # Show the Torrent menu because we're connected to a host self.menu_torrent.show() + # Hide the change owner submenu until we get the accounts back from the + # demon. + self.menuitem_change_owner.set_visible(False) + + # Get Known accounts to allow chaning ownership + client.core.get_known_accounts().addCallback(self._on_known_accounts) + def stop(self): + log.debug("MenuBar stopping") + self.menuitem_change_owner.remove_submenu() + for widget in self.change_sensitivity: self.window.main_glade.get_widget(widget).set_sensitive(False) @@ -212,6 +227,7 @@ class MenuBar(component.Component): self.window.main_glade.get_widget("separatormenuitem").hide() self.window.main_glade.get_widget("menuitem_quitdaemon").hide() + def update_menu(self): selected = component.get('TorrentView').get_selected_torrents() if not selected or len(selected) == 0: @@ -465,3 +481,54 @@ class MenuBar(component.Component): for item in items: getattr(self.window.main_glade.get_widget(item), attr)() + + def _on_known_accounts(self, known_accounts): + log.debug("_on_known_accounts: %s", known_accounts) + if len(known_accounts) <= 1: + return + + self.menuitem_change_owner.set_visible(True) + + self.change_owner_submenu = gtk.Menu() + self.change_owner_submenu_items = {} + maingroup = gtk.RadioMenuItem(None, None) + + self.change_owner_submenu_items[None] = gtk.RadioMenuItem(maingroup) + + for account in known_accounts: + self.change_owner_submenu_items[account] = item = gtk.RadioMenuItem(maingroup, account) + self.change_owner_submenu.append(item) + item.connect("toggled", self._on_change_owner_toggled, account) + + self.change_owner_submenu.show_all() + self.change_owner_submenu_items[None].set_active(True) + self.change_owner_submenu_items[None].hide() + self.menuitem_change_owner.connect("activate", self._on_change_owner_submenu_active) + self.menuitem_change_owner.set_submenu(self.change_owner_submenu) + + def _on_known_accounts_fail(self, reason): + self.menuitem_change_owner.set_visible(False) + + def _on_change_owner_submenu_active(self, widget): + log.debug("_on_change_owner_submenu_active") + selected = component.get("TorrentView").get_selected_torrents() + if len(selected) > 1: + self.change_owner_submenu_items[None].set_active(True) + return + + torrent_owner = component.get("TorrentView").get_torrent_status(selected[0])["owner"] + for account, item in self.change_owner_submenu_items.iteritems(): + item.set_active(account == torrent_owner) + + def _on_change_owner_toggled(self, widget, account): + log.debug("_on_change_owner_toggled") + update_torrents = [] + selected = component.get("TorrentView").get_selected_torrents() + for torrent_id in selected: + torrent_status = component.get("TorrentView").get_torrent_status(torrent_id) + if torrent_status["owner"] != account: + update_torrents.append(torrent_id) + if update_torrents: + log.debug("Setting torrent owner \"%s\" on %s", account, update_torrents) + client.core.set_torrents_owner(update_torrents, account) + diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index bd0d970c6..0393325cd 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -197,7 +197,8 @@ class TorrentView(listview.ListView, component.Component): # Register the columns menu with the listview so it gets updated # accordingly. self.register_checklist_menu( - self.window.main_glade.get_widget("menu_columns")) + self.window.main_glade.get_widget("menu_columns") + ) # Add the columns to the listview self.add_text_column("torrent_id", hidden=True) @@ -253,15 +254,14 @@ class TorrentView(listview.ListView, component.Component): ### Connect Signals ### # Connect to the 'button-press-event' to know when to bring up the # torrent menu popup. - self.treeview.connect("button-press-event", - self.on_button_press_event) + self.treeview.connect("button-press-event", self.on_button_press_event) # Connect to the 'key-press-event' to know when the bring up the # torrent menu popup via keypress. self.treeview.connect("key-release-event", self.on_key_press_event) # Connect to the 'changed' event of TreeViewSelection to get selection # changes. self.treeview.get_selection().connect("changed", - self.on_selection_changed) + self.on_selection_changed) self.treeview.connect("drag-drop", self.on_drag_drop) self.treeview.connect("key-press-event", self.on_key_press_event) From fe12552590b384b7920b3a70f4ee2041a193517d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 23 Dec 2010 13:46:32 +0000 Subject: [PATCH 172/329] Now, when the authentication dialog appears, user fills in the password and hits ENTER, the authentication call will be made. Implement tooltips on treeview's headers when adding columns. Renamed the "public" state of a torrent to "shared", ie, shared among other deluge users. Allow changing shared state from clients and currently from the GtkUi. --- deluge/core/core.py | 7 ++ deluge/core/preferencesmanager.py | 7 +- deluge/core/torrent.py | 4 +- deluge/core/torrentmanager.py | 12 +- deluge/ui/gtkui/details_tab.py | 8 +- deluge/ui/gtkui/dialogs.py | 4 + deluge/ui/gtkui/edittrackersdialog.py | 30 ++++- deluge/ui/gtkui/glade/edit_trackers.glade | 129 ++++++++++++++-------- deluge/ui/gtkui/glade/main_window.glade | 83 +++++++------- deluge/ui/gtkui/listview.py | 73 ++++++------ deluge/ui/gtkui/options_tab.py | 39 ++++++- deluge/ui/gtkui/torrentview.py | 3 + 12 files changed, 257 insertions(+), 142 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 88eda2e13..0fb9203c3 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -599,6 +599,13 @@ class Core(component.Component): self.torrentmanager[torrent_id].set_owner(username) return None + @export + def set_torrents_shared(self, torrent_ids, shared): + if isinstance(torrent_ids, basestring): + torrent_ids = [torrent_ids] + for torrent_id in torrent_ids: + self.torrentmanager[torrent_id].set_options({"shared": shared}) + @export def get_path_size(self, path): """Returns the size of the file or folder 'path' and -1 if the path is diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index bc108c007..e22e9cfe5 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -142,7 +142,7 @@ DEFAULT_PREFS = { "geoip_db_location": "/usr/share/GeoIP/GeoIP.dat", "cache_size": 512, "cache_expiry": 60, - "public": False + "shared": False } class PreferencesManager(component.Component): @@ -150,6 +150,11 @@ class PreferencesManager(component.Component): component.Component.__init__(self, "PreferencesManager") self.config = deluge.configmanager.ConfigManager("core.conf", DEFAULT_PREFS) + if 'public' in self.config: + log.debug("Updating configuration file: Renamed torrent's public " + "attribute to shared.") + self.config["shared"] = self.config["public"] + del self.config["public"] def start(self): self.core = component.get("Core") diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index b3a2564cc..0ca8df1be 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -69,7 +69,7 @@ class TorrentOptions(dict): "move_completed": "move_completed", "move_completed_path": "move_completed_path", "add_paused": "add_paused", - "public": "public" + "shared": "shared" } for opt_k, conf_k in options_conf_map.iteritems(): self[opt_k] = config[conf_k] @@ -610,7 +610,7 @@ class Torrent(object): "paused": self.status.paused, "prioritize_first_last": self.options["prioritize_first_last_pieces"], "progress": progress, - "public": self.options["public"], + "shared": self.options["shared"], "remove_at_ratio": self.options["remove_at_ratio"], "save_path": self.options["download_location"], "seeding_time": self.status.seeding_time, diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 5eb6268c2..aeb5068f9 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -86,7 +86,7 @@ class TorrentState: magnet=None, time_added=-1, owner="", - public=False + shared=False ): self.torrent_id = torrent_id self.filename = filename @@ -114,7 +114,7 @@ class TorrentState: self.remove_at_ratio = remove_at_ratio self.move_completed = move_completed self.move_completed_path = move_completed_path - self.public = public + self.shared = shared class TorrentManagerState: def __init__(self): @@ -286,8 +286,8 @@ class TorrentManager(component.Component): current_user = component.get("RPCServer").get_session_user() for torrent_id in torrent_ids[:]: - torrent_status = self[torrent_id].get_status(["owner", "public"]) - if torrent_status["owner"] != current_user and torrent_status["public"] == False: + torrent_status = self[torrent_id].get_status(["owner", "shared"]) + if torrent_status["owner"] != current_user and torrent_status["shared"] == False: torrent_ids.pop(torrent_ids.index(torrent_id)) return torrent_ids @@ -368,7 +368,7 @@ class TorrentManager(component.Component): options["move_completed"] = state.move_completed options["move_completed_path"] = state.move_completed_path options["add_paused"] = state.paused - options["public"] = state.public + options["shared"] = state.shared ti = self.get_torrent_info_from_file( os.path.join(get_config_dir(), @@ -662,7 +662,7 @@ class TorrentManager(component.Component): torrent.magnet, torrent.time_added, torrent.owner, - torrent.options["public"] + torrent.options["shared"] ) state.torrents.append(torrent_state) diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py index 96f39cfbf..4a79f21fc 100644 --- a/deluge/ui/gtkui/details_tab.py +++ b/deluge/ui/gtkui/details_tab.py @@ -66,7 +66,7 @@ class DetailsTab(Tab): (glade.get_widget("summary_hash"), str, ("hash",)), (glade.get_widget("summary_comments"), str, ("comment",)), (glade.get_widget("summary_owner"), str, ("owner",)), - (glade.get_widget("summary_public"), str, ("public",)) + (glade.get_widget("summary_shared"), str, ("shared",)) ] def update(self): @@ -82,9 +82,9 @@ class DetailsTab(Tab): return # Get the torrent status - status_keys = ["name", "total_size", "num_files", - "tracker", "save_path", "message", "hash", "comment", "owner", - "public"] + status_keys = ["name", "total_size", "num_files", "tracker", + "save_path", "message", "hash", "comment", "owner", + "shared"] session = component.get("SessionProxy") session.get_torrent_status(selected, status_keys).addCallback(self._on_get_torrent_status) diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index 73928a31b..633ac3e64 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -223,6 +223,7 @@ class AuthenticationDialog(BaseDialog): self.password_label.set_padding(5, 5) self.password_entry = gtk.Entry() self.password_entry.set_visibility(False) + self.password_entry.connect("activate", self.on_password_activate) table.attach(self.password_label, 0, 1, 1, 2) table.attach(self.password_entry, 1, 2, 1, 2) @@ -241,3 +242,6 @@ class AuthenticationDialog(BaseDialog): def get_password(self): return self.password_entry.get_text() + + def on_password_activate(self, widget): + self.response(gtk.RESPONSE_OK) diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py index 2c9dc73a6..ba39dcbb3 100644 --- a/deluge/ui/gtkui/edittrackersdialog.py +++ b/deluge/ui/gtkui/edittrackersdialog.py @@ -39,6 +39,7 @@ import gtk.glade import logging import pkg_resources +from twisted.internet import defer import deluge.common import common from deluge.ui.client import client @@ -91,6 +92,10 @@ class EditTrackersDialog: self.treeview.set_model(self.liststore) self.liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.dialog.connect("delete-event", self._on_delete_event) + self.dialog.connect("response", self._on_response) + self.changed = False + def run(self): # Make sure we have a torrent_id.. if not just return if self.torrent_id == None: @@ -101,6 +106,18 @@ class EditTrackersDialog: session.get_torrent_status(self.torrent_id, ["trackers"]).addCallback(self._on_get_torrent_status) client.force_call() + self.deferred = defer.Deferred() + return self.deferred + + + def _on_delete_event(self, widget, event): + self.deferred.callback(gtk.RESPONSE_DELETE_EVENT) + self.dialog.destroy() + + def _on_response(self, widget, response): + self.deferred.callback(response) + self.dialog.destroy() + def _on_get_torrent_status(self, status): """Display trackers dialog""" for tracker in status["trackers"]: @@ -111,6 +128,7 @@ class EditTrackersDialog: def add_tracker(self, tier, url): """Adds a tracker to the list""" self.liststore.append([tier, url]) + self.changed = True def get_selected(self): """Returns the selected tracker""" @@ -125,18 +143,21 @@ class EditTrackersDialog: new_tier = tier + 1 # Now change the tier for this tracker self.liststore.set_value(selected, 0, new_tier) + self.changed = True def on_button_add_clicked(self, widget): log.debug("on_button_add_clicked") # Show the add tracker dialog self.add_tracker_dialog.show() self.glade.get_widget("textview_trackers").grab_focus() + self.changed = True def on_button_remove_clicked(self, widget): log.debug("on_button_remove_clicked") selected = self.get_selected() if selected != None: self.liststore.remove(selected) + self.changed = True def on_button_edit_clicked(self, widget): """edits an existing tracker""" @@ -158,6 +179,7 @@ class EditTrackersDialog: tracker = self.glade.get_widget("entry_edit_tracker").get_text() self.liststore.set_value(selected, 1, tracker) self.edit_tracker_entry.hide() + self.changed = True def on_button_down_clicked(self, widget): log.debug("on_button_down_clicked") @@ -170,6 +192,7 @@ class EditTrackersDialog: new_tier = tier - 1 # Now change the tier for this tracker self.liststore.set_value(selected, 0, new_tier) + self.changed = True def on_button_ok_clicked(self, widget): log.debug("on_button_ok_clicked") @@ -182,11 +205,14 @@ class EditTrackersDialog: self.liststore.foreach(each, None) # Set the torrens trackers client.core.set_torrent_trackers(self.torrent_id, self.trackers) - self.dialog.destroy() + if self.changed: + self.dialog.response(gtk.RESPONSE_OK) + else: + self.dialog.response(gtk.RESPONSE_CANCEL) def on_button_cancel_clicked(self, widget): log.debug("on_button_cancel_clicked") - self.dialog.destroy() + self.dialog.response(gtk.RESPONSE_CANCEL) def on_button_add_ok_clicked(self, widget): log.debug("on_button_add_ok_clicked") diff --git a/deluge/ui/gtkui/glade/edit_trackers.glade b/deluge/ui/gtkui/glade/edit_trackers.glade index 2a6269196..14d802a21 100644 --- a/deluge/ui/gtkui/glade/edit_trackers.glade +++ b/deluge/ui/gtkui/glade/edit_trackers.glade @@ -1,16 +1,16 @@ - - - + + + 400 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Edit Trackers - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent 400 True - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False @@ -36,6 +36,7 @@ False False + 0 @@ -57,6 +58,7 @@ False False + 0 @@ -69,9 +71,9 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + automatic + automatic + in True @@ -80,81 +82,92 @@ + + 0 + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 - GTK_BUTTONBOX_CENTER + center + gtk-go-up True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-go-up True - 0 + + False + False + 0 + + gtk-add True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-add True - 0 + False + False 1 + gtk-edit True True True - gtk-edit True - 0 + False + False 2 + gtk-remove True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-remove True - 0 + False + False 3 + gtk-go-down True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-go-down True - 0 + False + False 4 @@ -179,38 +192,45 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END + end + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel True - 0 + + False + False + 0 + + gtk-ok + 1 True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok True - 0 + False + False 1 False - GTK_PACK_END + end + 0 @@ -222,9 +242,9 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Add Tracker - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent True - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False False @@ -251,6 +271,7 @@ False False + 0 @@ -270,6 +291,7 @@ False False + 0 @@ -297,15 +319,16 @@ False + 0 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + automatic + automatic + in True @@ -334,40 +357,48 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END + end + gtk-cancel + -6 True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel True - -6 + + False + False + 0 + + gtk-ok + -5 True True True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok True - -5 + False + False 1 False - GTK_PACK_END + end + 0 @@ -378,9 +409,9 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Edit Tracker - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent True - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False False @@ -407,6 +438,7 @@ False False + 0 @@ -426,6 +458,7 @@ False False + 0 @@ -452,6 +485,7 @@ False False + 0 @@ -483,40 +517,47 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END + end + gtk-cancel True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel True - 0 + + False + False + 0 + + gtk-ok + 1 True True True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok True - 0 + False + False 1 False - GTK_PACK_END + end + 0 diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade index c4ab57cfb..a426b9620 100644 --- a/deluge/ui/gtkui/glade/main_window.glade +++ b/deluge/ui/gtkui/glade/main_window.glade @@ -11,7 +11,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -470,7 +469,6 @@ True - vertical True @@ -674,7 +672,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 5 @@ -1561,9 +1558,10 @@ True + Torrent is shared between other Deluge users or not. 0 1 - <b>Public:</b> + <b>Shared:</b> True @@ -1589,32 +1587,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + True + Torrent is shared between other Deluge users or not. 0 char True @@ -1627,6 +1602,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1990,7 +1989,6 @@ True - vertical Auto Managed @@ -2008,7 +2006,6 @@ True - vertical True @@ -2149,7 +2146,6 @@ True - vertical True @@ -2165,7 +2161,6 @@ True - vertical Private @@ -2173,6 +2168,7 @@ False True False + If checked this torrent won't be shared among trackers, DHT nodes, etc... True @@ -2195,6 +2191,20 @@ 1 + + + Shared + True + True + False + Torrent is shared between other Deluge users or not. + True + + + + 2 + + True @@ -2236,7 +2246,7 @@ False False - 2 + 3 @@ -2275,6 +2285,7 @@ gtk-apply True + False True True True @@ -2357,13 +2368,11 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 2 True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 5 @@ -2555,13 +2564,11 @@ True - vertical 2 True 10 - vertical 5 diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index 35c7b7655..d4741b319 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -427,7 +427,7 @@ class ListView: def add_column(self, header, render, col_types, hidden, position, status_field, sortid, text=0, value=0, pixbuf=0, function=None, - column_type=None, sort_func=None): + column_type=None, sort_func=None, tooltip=None): """Adds a column to the ListView""" # Add the column types to liststore_columns column_indices = [] @@ -504,6 +504,9 @@ class ListView: column.connect('button-press-event', self.on_treeview_header_right_clicked) + if tooltip: + column.get_widget().set_tooltip_markup(tooltip) + # Check for loaded state and apply if self.state != None: for column_state in self.state: @@ -514,7 +517,9 @@ class ListView: column.set_fixed_width(column_state.width) if column_state.sort is not None and column_state.sort > -1: - self.model_filter.set_sort_column_id(column_state.sort, column_state.sort_order) + self.model_filter.set_sort_column_id( + column_state.sort, column_state.sort_order + ) column.set_visible(column_state.visible) position = column_state.position @@ -531,76 +536,66 @@ class ListView: return True - def add_text_column(self, header, col_type=str, hidden=False, - position=None, - status_field=None, - sortid=0, - column_type="text", - sort_func=None): + def add_text_column(self, header, col_type=str, hidden=False, position=None, + status_field=None, sortid=0, column_type="text", + sort_func=None, tooltip=None): """Add a text column to the listview. Only the header name is required. """ render = gtk.CellRendererText() self.add_column(header, render, col_type, hidden, position, - status_field, sortid, column_type=column_type, sort_func=sort_func) + status_field, sortid, column_type=column_type, + sort_func=sort_func, tooltip=tooltip) return True def add_bool_column(self, header, col_type=bool, hidden=False, - position=None, - status_field=None, - sortid=0, - column_type="bool"): + position=None, status_field=None, sortid=0, + column_type="bool", tooltip=None): """Add a bool column to the listview""" render = gtk.CellRendererToggle() self.add_column(header, render, col_type, hidden, position, - status_field, sortid, column_type=column_type) + status_field, sortid, column_type=column_type, + tooltip=tooltip) def add_func_column(self, header, function, col_types, sortid=0, - hidden=False, position=None, status_field=None, - column_type="func", sort_func=None): + hidden=False, position=None, status_field=None, + column_type="func", sort_func=None, tooltip=None): """Add a function column to the listview. Need a header name, the function and the column types.""" render = gtk.CellRendererText() self.add_column(header, render, col_types, hidden, position, - status_field, sortid, column_type=column_type, - function=function, sort_func=sort_func) + status_field, sortid, column_type=column_type, + function=function, sort_func=sort_func, tooltip=tooltip) return True - def add_progress_column(self, header, col_types=[float, str], - sortid=0, - hidden=False, - position=None, - status_field=None, - function=None, - column_type="progress"): + def add_progress_column(self, header, col_types=[float, str], sortid=0, + hidden=False, position=None, status_field=None, + function=None, column_type="progress", + tooltip=None): """Add a progress column to the listview.""" render = gtk.CellRendererProgress() self.add_column(header, render, col_types, hidden, position, - status_field, sortid, function=function, - column_type=column_type, - value=0, text=1) + status_field, sortid, function=function, + column_type=column_type, value=0, text=1, + tooltip=tooltip) return True - def add_texticon_column(self, header, col_types=[str, str], - sortid=1, - hidden=False, - position=None, - status_field=None, - column_type="texticon", - function=None): + def add_texticon_column(self, header, col_types=[str, str], sortid=1, + hidden=False, position=None, status_field=None, + column_type="texticon", function=None, + tooltip=None): """Adds a texticon column to the listview.""" render1 = gtk.CellRendererPixbuf() render2 = gtk.CellRendererText() - self.add_column(header, (render1, render2), col_types, hidden, - position, status_field, sortid, - column_type=column_type, function=function, - pixbuf=0, text=1) + self.add_column(header, (render1, render2), col_types, hidden, position, + status_field, sortid, column_type=column_type, + function=function, pixbuf=0, text=1, tooltip=tooltip) return True diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py index 6ea769171..8f4d5bffa 100644 --- a/deluge/ui/gtkui/options_tab.py +++ b/deluge/ui/gtkui/options_tab.py @@ -60,6 +60,8 @@ class OptionsTab(Tab): self.chk_move_completed = glade.get_widget("chk_move_completed") self.filechooser_move_completed = glade.get_widget("filechooser_move_completed") self.entry_move_completed = glade.get_widget("entry_move_completed") + self.chk_shared = glade.get_widget("chk_shared") + self.button_apply = glade.get_widget("button_apply") self.prev_torrent_id = None self.prev_status = None @@ -68,7 +70,8 @@ class OptionsTab(Tab): "on_button_apply_clicked": self._on_button_apply_clicked, "on_button_edit_trackers_clicked": self._on_button_edit_trackers_clicked, "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled, - "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled + "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled, + "on_chk_shared_toggled": self._on_chk_shared_toggled }) def start(self): @@ -98,8 +101,8 @@ class OptionsTab(Tab): if torrent_id != self.prev_torrent_id: self.prev_status = None - component.get("SessionProxy").get_torrent_status(torrent_id, - ["max_download_speed", + component.get("SessionProxy").get_torrent_status(torrent_id, [ + "max_download_speed", "max_upload_speed", "max_connections", "max_upload_slots", @@ -110,7 +113,9 @@ class OptionsTab(Tab): "stop_ratio", "remove_at_ratio", "move_on_completed", - "move_on_completed_path"]).addCallback(self._on_get_torrent_status) + "move_on_completed_path", + "shared" + ]).addCallback(self._on_get_torrent_status) self.prev_torrent_id = torrent_id def clear(self): @@ -153,6 +158,11 @@ class OptionsTab(Tab): self.filechooser_move_completed.set_current_folder(status["move_on_completed_path"]) else: self.entry_move_completed.set_text(status["move_on_completed_path"]) + if status["shared"] != self.prev_status["shared"]: + self.chk_shared.set_active(status["shared"]) + + if self.button_apply.is_sensitive(): + self.button_apply.set_sensitive(False) self.prev_status = status @@ -183,14 +193,21 @@ class OptionsTab(Tab): else: path = self.entry_move_completed.get_text() client.core.set_torrent_move_completed_path(self.prev_torrent_id, path) - + if self.chk_shared.get_active() != self.prev_status["shared"]: + client.core.set_torrents_shared(self.prev_torrent_id, self.chk_shared.get_active()) + self.button_apply.set_sensitive(False) def _on_button_edit_trackers_clicked(self, button): from edittrackersdialog import EditTrackersDialog dialog = EditTrackersDialog( self.prev_torrent_id, component.get("MainWindow").window) - dialog.run() + + def on_response(result): + if result: + self.button_apply.set_sensitive(True) + dialog.run().addCallback(on_response) + def _on_chk_move_completed_toggled(self, widget): value = self.chk_move_completed.get_active() @@ -201,8 +218,18 @@ class OptionsTab(Tab): widget.set_sensitive(value) + if not self.button_apply.is_sensitive(): + self.button_apply.set_sensitive(True) + def _on_chk_stop_at_ratio_toggled(self, widget): value = widget.get_active() self.spin_stop_ratio.set_sensitive(value) self.chk_remove_at_ratio.set_sensitive(value) + + if not self.button_apply.is_sensitive(): + self.button_apply.set_sensitive(True) + + def _on_chk_shared_toggled(self, widget): + if not self.button_apply.is_sensitive(): + self.button_apply.set_sensitive(True) diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index 0393325cd..2e3a02838 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -247,6 +247,9 @@ class TorrentView(listview.ListView, component.Component): self.add_text_column(_("Owner"), status_field=["owner"]) self.add_bool_column(_("Public"), status_field=["public"]) self.restore_columns_order_from_state() + self.add_bool_column(_("Shared"), status_field=["shared"], + tooltip=_("Torrent is shared between other Deluge " + "users or not.")) # Set filter to None for now self.filter = None From 154688a3e21a77efb298c7c9cd329b44f2196e27 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 23 Dec 2010 18:27:51 +0000 Subject: [PATCH 173/329] Implement `__delitem__` on `deluge.config.Config`. --- deluge/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deluge/config.py b/deluge/config.py index 5dbb68197..ac37b6383 100644 --- a/deluge/config.py +++ b/deluge/config.py @@ -244,6 +244,9 @@ what is currently in the config and it could not convert the value """ return self.get_item(key) + def __delitem__(self, key): + del self.__config[key] + def get_item(self, key): """ Gets the value of item 'key' From 1a6742b1e284d12601bd1d4e227c7489bdd65eb1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 23 Dec 2010 18:56:40 +0000 Subject: [PATCH 174/329] Keep consistency on `deluge.config`. --- deluge/config.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/deluge/config.py b/deluge/config.py index ac37b6383..2e42fa5fc 100644 --- a/deluge/config.py +++ b/deluge/config.py @@ -72,6 +72,7 @@ import logging import shutil import os +from twisted.internet import reactor import deluge.common json = deluge.common.json @@ -219,7 +220,6 @@ what is currently in the config and it could not convert the value self.__config[key] = value # Run the set_function for this key if any - from twisted.internet import reactor try: for func in self.__set_functions[key]: reactor.callLater(0, func, key, value) @@ -244,9 +244,6 @@ what is currently in the config and it could not convert the value """ return self.get_item(key) - def __delitem__(self, key): - del self.__config[key] - def get_item(self, key): """ Gets the value of item 'key' @@ -271,6 +268,30 @@ what is currently in the config and it could not convert the value else: return self.__config[key] + def __delitem__(self, key): + """ + See + :meth:`del_item` + """ + self.del_item(key) + + def del_item(self, key): + """ + Deletes item with a specific key from the configuration. + + :param key: the item which you wish to delete. + :raises KeyError: if 'key' is not in the config dictionary + + **Usage** + >>> config = Config("test.conf", defaults={"test": 5}) + >>> del config["test"] + """ + del self.__config[key] + # We set the save_timer for 5 seconds if not already set + if not self._save_timer or not self._save_timer.active(): + self._save_timer = reactor.callLater(5, self.save) + + def register_change_callback(self, callback): """ Registers a callback function that will be called when a value is changed in the config dictionary From 03325c5f487c9514cdbd9a6c54314b1a5313d64c Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 23 Feb 2011 15:05:54 -0800 Subject: [PATCH 175/329] Add some missing code --- deluge/ui/gtkui/preferences.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 8ca90a623..4dad8d1ff 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -127,7 +127,8 @@ class PreferencePage(object): self.builder = gtk.Builder() self.builder.add_from_file(xmlfile) self.set_widget(self.builder.get_object(obj)) - + + class GtkUIPreferencePage(PreferencePage): def __init__(self, name, xml, widget): super(GtkUIPreferencePage, self).__init__() From 233e81454717f7932baf909cd6c8863d3530df6a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Apr 2011 11:33:45 +0100 Subject: [PATCH 176/329] Late import twisted's reactor, it allows the gtk reactor to be proper installed. --- deluge/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/config.py b/deluge/config.py index 2e42fa5fc..482415c95 100644 --- a/deluge/config.py +++ b/deluge/config.py @@ -72,7 +72,6 @@ import logging import shutil import os -from twisted.internet import reactor import deluge.common json = deluge.common.json @@ -220,6 +219,7 @@ what is currently in the config and it could not convert the value self.__config[key] = value # Run the set_function for this key if any + from twisted.internet import reactor try: for func in self.__set_functions[key]: reactor.callLater(0, func, key, value) @@ -288,6 +288,7 @@ what is currently in the config and it could not convert the value """ del self.__config[key] # We set the save_timer for 5 seconds if not already set + from twisted.internet import reactor if not self._save_timer or not self._save_timer.active(): self._save_timer = reactor.callLater(5, self.save) From 5296fc7d4c936fcdf58389a1c1b886a667d0c80a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Apr 2011 11:42:48 +0100 Subject: [PATCH 177/329] Fix one more possible issue with regard to #1786 --- deluge/ui/gtkui/listview.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py index 35c7b7655..b5c61813a 100644 --- a/deluge/ui/gtkui/listview.py +++ b/deluge/ui/gtkui/listview.py @@ -627,7 +627,13 @@ class ListView: # Column is not visible, no need to reposition continue - column_at_position = columns[col_state.position] + try: + column_at_position = columns[col_state.position] + except IndexError: + # While updating the multiuser branch, which adds a new column + # an IndexError was raised, just continue processing, once + # deluge is restarted, it all should be good + continue if col_state.name == column_at_position.get_title(): # It's in the right position continue From 8195421c9951e70d61c777fa1c673fd6d19456d3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 22 Apr 2011 18:51:51 +0100 Subject: [PATCH 178/329] Some account management work. Not yet complete. --- deluge/core/authmanager.py | 137 +++- deluge/core/core.py | 9 +- deluge/core/rpcserver.py | 6 + deluge/ui/gtkui/preferences.py | 1192 +++++++++++++++++++++++--------- 4 files changed, 988 insertions(+), 356 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 08dd0e8c7..7c2d5c1d2 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -51,10 +51,29 @@ AUTH_LEVEL_ADMIN = 10 AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL +class Account(object): + __slots__ = ('username', 'password', 'auth_level') + def __init__(self, username, password, auth_level): + self.username = username + self.password = password + self.auth_level = auth_level + + def data(self, include_private=True): + rv = self.__dict__.copy() + if not include_private: + rv['password'] = '' + return rv + + def __repr__(self): + return ('' % + self.__dict__) + + class AuthManager(component.Component): def __init__(self): component.Component.__init__(self, "AuthManager") self.__auth = {} + self.__auth_modification_time = None def start(self): self.__load_auth_file() @@ -74,8 +93,10 @@ class AuthManager(component.Component): :returns: int, the auth level for this user :rtype: int - :raises AuthenticationRequired: if aditional details are required to authenticate - :raises BadLoginError: if the username does not exist or password does not match + :raises AuthenticationRequired: if aditional details are required to + authenticate. + :raises BadLoginError: if the username does not exist or password does + not match. """ if not username: @@ -85,21 +106,60 @@ class AuthManager(component.Component): self.__test_existing_account(username) - if self.__auth[username][0] == password: + if self.__auth[username].password == password: # Return the users auth level - return int(self.__auth[username][1]) - elif not password and self.__auth[username][0]: + return self.__auth[username].auth_level + elif not password and self.__auth[username].password: raise AuthenticationRequired("Password is required", username) else: raise BadLoginError("Password does not match") - def get_known_accounts(self): + def get_known_accounts(self, include_private_data=False): """ Returns a list of known deluge usernames. """ self.__load_auth_file() - return self.__auth.keys() + rv = {} + for account in self.__auth.items(): + rv[account.username] = account.data(include_private_data) + return rv + def create_account(self, username, password='', auth_level=AUTH_LEVEL_DEFAULT): + if username in self.__auth: + raise Something() + self.__create_account(username, password, auth_level) + + def update_account(self, username, password='', auth_level=AUTH_LEVEL_DEFAULT): + if username in self.__auth: + raise Something() + self.__create_account(username, password, auth_level) + + def remove_account(self, username): + if username in self.__auth: + raise Something() + del self.__auth[username] + self.write_auth_file() + if component.get("RPCServer").get_session_user() == username: + # Force a client logout by the server + component.get("RPCServer").logout_current_session() + + def write_auth_file(self): + old_auth_file = configmanager.get_config_dir("auth") + new_auth_file = old_auth_file + '.new' + fd = open(new_auth_file, "w") + for account in self.__auth.items(): + fd.write( + "%(username)s:%(password)s:%(auth_level)s\n" % account.__dict__ + ) + fd.flush() + os.fsync(fd.fileno()) + fd.close() + os.rename(new_auth_file, old_auth_file) + self.__load_auth_file() + + def __add_account(self, username, password, auth_level): + self.__auth[username] = Account(username, password, auth_level) + self.write_auth_file() def __test_existing_account(self, username): if username not in self.__auth: @@ -107,6 +167,7 @@ class AuthManager(component.Component): self.__load_auth_file() if username not in self.__auth: raise BadLoginError("Username does not exist") + return True def __create_localclient_account(self): """ @@ -117,25 +178,29 @@ class AuthManager(component.Component): from hashlib import sha1 as sha_hash except ImportError: from sha import new as sha_hash - return ("localclient:" + sha_hash(str(random.random())).hexdigest() + - ":" + str(AUTH_LEVEL_ADMIN) + "\n") + self.__auth["localclient"] = Account( + "localclient", + sha_hash(str(random.random())).hexdigest(), + AUTH_LEVEL_ADMIN + ) def __load_auth_file(self): auth_file = configmanager.get_config_dir("auth") # Check for auth file and create if necessary if not os.path.exists(auth_file): - localclient = self.__create_localclient_account() - fd = open(auth_file, "w") - fd.write(localclient) - fd.flush() - os.fsync(fd.fileno()) - fd.close() - # Change the permissions on the file so only this user can read/write it - os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE) - f = [localclient] - else: - # Load the auth file into a dictionary: {username: password, ...} - f = open(auth_file, "r").readlines() + self.__create_auth_file() + self.__create_localclient_account() + self.write_auth_file() + + auth_file_modification_time = os.stat(auth_file).st_mtime + if self.__auth_modification_time is None: + self.__auth_modification_time = auth_file_modification_time + elif self.__auth_modification_time == auth_file_modification_time: + # File didn't change, no need for re-parsing's + return + + # Load the auth file into a dictionary: {username: Account(...)} + f = open(auth_file, "r").readlines() for line in f: if line.startswith("#"): @@ -152,14 +217,36 @@ class AuthManager(component.Component): log.warning("Your auth entry for %s contains no auth level, " "using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT) - level = AUTH_LEVEL_DEFAULT + auth_level = AUTH_LEVEL_DEFAULT elif len(lsplit) == 3: - username, password, level = lsplit + username, password, auth_level = lsplit else: log.error("Your auth file is malformed: Incorrect number of fields!") continue - self.__auth[username.strip()] = (password.strip(), level) + username = username.strip() + password = password.strip() + try: + auth_level = int(auth_level) + except ValueError: + log.error("Your auth file is malformed: %r is not a valid auth " + "level" % auth_level) + continue + + self.__auth[username] = Account(username, password, auth_level) if "localclient" not in self.__auth: - open(auth_file, "a").write(self.__create_localclient_account()) + self.__create_localclient_account() + self.write_auth_file() + + + def __create_auth_file(self): + auth_file = configmanager.get_config_dir("auth") + # Check for auth file and create if necessary + if not os.path.exists(auth_file): + fd = open(auth_file, "w") + fd.flush() + os.fsync(fd.fileno()) + fd.close() + # Change the permissions on the file so only this user can read/write it + os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE) diff --git a/deluge/core/core.py b/deluge/core/core.py index 0fb9203c3..225979730 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -55,7 +55,7 @@ import deluge.common import deluge.component as component from deluge.event import * from deluge.error import * -from deluge.core.authmanager import AUTH_LEVEL_ADMIN +from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_DEFAULT from deluge.core.torrentmanager import TorrentManager from deluge.core.pluginmanager import PluginManager from deluge.core.alertmanager import AlertManager @@ -829,6 +829,9 @@ class Core(component.Component): """ return lt.version - @export(AUTH_LEVEL_ADMIN) + @export(AUTH_LEVEL_DEFAULT) def get_known_accounts(self): - return self.authmanager.get_known_accounts() + auth_level = component.get("RPCServer").get_session_auth_level() + return self.authmanager.get_known_accounts( + include_private_data=(auth_level==AUTH_LEVEL_ADMIN) + ) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 60e190593..3a6aae27f 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -485,6 +485,12 @@ class RPCServer(component.Component): """ return session_id in self.factory.authorized_sessions + def logout_current_session(self): + """ + Makes the current session invalid logging out the current account + """ + self.factory.protocol.connectionLost("Server logged out client") + def emit_event(self, event): """ Emits the event to interested clients. diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 4dad8d1ff..a13937a2d 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -1,7 +1,7 @@ # # preferences.py # -# Copyright (C) 2007-2010 Andrew Resch +# Copyright (C) 2007, 2008 Andrew Resch # # Deluge is free software. # @@ -33,59 +33,99 @@ # # -import os -import gtk +import pygtk +pygtk.require('2.0') +import gtk +import gtk.glade import logging import pkg_resources -from twisted.internet.defer import maybeDeferred import deluge.component as component -import dialogs from deluge.ui.client import client import deluge.common import deluge.error import common +from deluge.configmanager import ConfigManager +import deluge.configmanager log = logging.getLogger(__name__) -class PreferencePage(object): - """ - Must set a name and widget prior to adding to them Preferences dialog. - """ +class Preferences(component.Component): def __init__(self): - self.name = "" - self.widget = None - self.builder = None + component.Component.__init__(self, "Preferences") + self.window = component.get("MainWindow") + self.glade = gtk.glade.XML(pkg_resources.resource_filename( + "deluge.ui.gtkui", "glade/preferences_dialog.glade" + )) + self.pref_dialog = self.glade.get_widget("pref_dialog") + self.pref_dialog.set_icon(common.get_deluge_icon()) + self.treeview = self.glade.get_widget("treeview") + self.notebook = self.glade.get_widget("notebook") + self.gtkui_config = ConfigManager("gtkui.conf") - # Set the core widgets and their config keys - # {widget: (accessor, core_key, non_localhost_widget), ...} - self.core_widgets = {} - # Likewise for local widgets - self.local_widgets = {} + self.glade.get_widget("image_magnet").set_from_file( + deluge.common.get_pixmap("magnet.png")) - def show(self): - """ - Called when the page needs to have it's values updated. - """ - raise NotImplementedError + # Setup the liststore for the categories (tab pages) + self.liststore = gtk.ListStore(int, str) + self.treeview.set_model(self.liststore) + render = gtk.CellRendererText() + column = gtk.TreeViewColumn(_("Categories"), render, text=1) + self.treeview.append_column(column) + # Add the default categories + i = 0 + for category in [_("Downloads"), _("Network"), _("Bandwidth"), + _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"), + _("Cache"), _("Plugins")]: + self.liststore.append([i, category]) + i += 1 - def apply(self): - """ - Called when the settings need to be saved. This method needs to be - defined by the subclass. - """ - raise NotImplementedError + # Setup plugin tab listview + self.plugin_liststore = gtk.ListStore(str, bool) + self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.plugin_listview = self.glade.get_widget("plugin_listview") + self.plugin_listview.set_model(self.plugin_liststore) + render = gtk.CellRendererToggle() + render.connect("toggled", self.on_plugin_toggled) + render.set_property("activatable", True) + self.plugin_listview.append_column( + gtk.TreeViewColumn(_("Enabled"), render, active=1)) + self.plugin_listview.append_column( + gtk.TreeViewColumn(_("Plugin"), gtk.CellRendererText(), text=0)) - def set_widget(self, widget): - """ - Creates a scrolled window with a proper header for the widget. The - widget is likely a gtk.VBox or similar container. + # Connect to the 'changed' event of TreeViewSelection to get selection + # changes. + self.treeview.get_selection().connect("changed", + self.on_selection_changed) - :param widget: the container widget for all the pref widgets - :type widget: gtk.Widget + self.plugin_listview.get_selection().connect("changed", + self.on_plugin_selection_changed) - """ + self.glade.signal_autoconnect({ + "on_pref_dialog_delete_event": self.on_pref_dialog_delete_event, + "on_button_ok_clicked": self.on_button_ok_clicked, + "on_button_apply_clicked": self.on_button_apply_clicked, + "on_button_cancel_clicked": self.on_button_cancel_clicked, + "on_toggle": self.on_toggle, + "on_test_port_clicked": self.on_test_port_clicked, + "on_button_plugin_install_clicked": self._on_button_plugin_install_clicked, + "on_button_rescan_plugins_clicked": self._on_button_rescan_plugins_clicked, + "on_button_find_plugins_clicked": self._on_button_find_plugins_clicked, + "on_button_cache_refresh_clicked": self._on_button_cache_refresh_clicked, + "on_combo_proxy_type_changed": self._on_combo_proxy_type_changed, + "on_button_associate_magnet_clicked": self._on_button_associate_magnet_clicked + }) + + # These get updated by requests done to the core + self.all_plugins = [] + self.enabled_plugins = [] + + def __del__(self): + del self.gtkui_config + + def add_page(self, name, widget): + """Add a another page to the notebook""" # Create a header and scrolled window for the preferences tab parent = widget.get_parent() if parent: @@ -93,7 +133,7 @@ class PreferencePage(object): vbox = gtk.VBox() label = gtk.Label() label.set_use_markup(True) - label.set_markup("" + self.name + "") + label.set_markup("" + name + "") label.set_alignment(0.00, 0.50) label.set_padding(10, 10) vbox.pack_start(label, False, True, 0) @@ -110,318 +150,814 @@ class PreferencePage(object): viewport.add(vbox) scrolled.add(viewport) scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self.widget = scrolled - - def set_widget_from_file(self, xmlfile, obj): - """ - Sets the widget from an object in a gtkBuilder xml file. - - :param xmlfile: the path to the xml file - :type xmlfile: string - :param obj: the object name to use - :type obj: string - - """ - if not os.path.isfile(xmlfile): - xmlfile = os.path.join(os.path.dirname(__file__), xmlfile) - self.builder = gtk.Builder() - self.builder.add_from_file(xmlfile) - self.set_widget(self.builder.get_object(obj)) - - -class GtkUIPreferencePage(PreferencePage): - def __init__(self, name, xml, widget): - super(GtkUIPreferencePage, self).__init__() - self.name = name - self.set_widget_from_file(xml, widget) - - def show(self): - """ - Called when the page needs to have it's values updated. - """ - if self.core_widgets: - coreconfig = component.get("CoreConfig") - for name, (accessor, key, non_localhost) in self.core_widgets.items(): - widget = self.builder.get_object(name) - getattr(widget, "set_" + accessor)(coreconfig[key]) - if client.is_localhost(): - # Hide any non_localhost widgets - if non_localhost: - self.builder.get_object(non_localhost).hide() - widget.show() - else: - if non_localhost: - # Hide this widget because it should only be shown - # if core is a localhost, but show its non_localhost widget - self.builder.get_object(non_localhost).show() - widget.hide() - - -class DownloadsPreferencePage(GtkUIPreferencePage): - def __init__(self, name, xml, widget): - super(DownloadsPreferencePage, self).__init__(name, xml, widget) - self.core_widgets = { - "download_path_button": ("current_folder", "download_location", "entry_download_path"), - "entry_download_path": ("text", "download_location", ""), - "chk_move_completed": ("active", "move_completed", ""), - "move_completed_path_button": ("current_folder", "move_completed_path", "entry_move_completed_path"), - "entry_move_completed_path": ("text", "move_completed_path", ""), - "chk_autoadd": ("active", "autoadd_enable", ""), - "folder_autoadd": ("current_folder", "autoadd_location", "entry_autoadd"), - "entry_autoadd": ("text", "autoadd_location", ""), - "chk_copy_torrent_file": ("active", "copy_torrent_file", ""), - "torrent_files_button": ("current_folder", "torrentfiles_location", "entry_torrents_path"), - "entry_torrents_path": ("text", "torrentfiles_location", ""), - "chk_del_copy_torrent_file": ("active", "del_copy_torrent_file", ""), - "radio_compact_allocation": ("active", "compact_allocation", ""), - "radio_full_allocation": ("active", "compact_allocation", ""), - "chk_prioritize_first_last_pieces": ("active", "prioritize_first_last_pieces", ""), - "chk_add_paused": ("active", "add_paused", "") - } - -class NetworkPreferencePage(PreferencePage): - pass - -class BandwidthPreferencePage(PreferencePage): - def __init__(self): - self.name = _("Bandwidth") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/bandwidth.glade") - xml = "glade/preferences/bandwidth.glade" - self.set_widget_from_file(xml, "bandwidth_prefs_page") - - def update(self): - pass - -class InterfacePreferencePage(PreferencePage): - def __init__(self): - self.name = _("Interface") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/interface.glade") - xml = "glade/preferences/interface.glade" - self.set_widget_from_file(xml, "interface_prefs_page") - - def update(self): - pass - -class OtherPreferencePage(PreferencePage): - def __init__(self): - self.name = _("Other") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/other.glade") - xml = "glade/preferences/other.glade" - self.set_widget_from_file(xml, "other_prefs_page") - - def update(self): - pass - -class DaemonPreferencePage(PreferencePage): - def __init__(self): - self.name = _("Daemon") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/daemon.glade") - xml = "glade/preferences/daemon.glade" - self.set_widget_from_file(xml, "daemon_prefs_page") - - def update(self): - pass - -class QueuePreferencePage(PreferencePage): - def __init__(self): - self.name = _("Queue") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/queue.glade") - xml = "glade/preferences/queue.glade" - self.set_widget_from_file(xml, "queue_prefs_page") - - def update(self): - pass - -class ProxyPreferencePage(PreferencePage): - def __init__(self): - self.name = _("Proxy") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/proxy.glade") - xml = "glade/preferences/proxy.glade" - self.set_widget_from_file(xml, "proxy_prefs_page") - - def update(self): - pass - -class CachePreferencePage(PreferencePage): - def __init__(self): - self.name = _("Cache") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/cache.glade") - xml = "glade/preferences/cache.glade" - self.set_widget_from_file(xml, "cache_prefs_page") - - def update(self): - pass - -class PluginsPreferencePage(PreferencePage): - def __init__(self): - self.name = _("Plugins") - #xml = pkg_resources.resource_filename("deluge.ui.gtkui", - # "glade/preferences/plugins.glade") - xml = "glade/preferences/plugins.glade" - self.set_widget_from_file(xml, "plugins_prefs_page") - - def update(self): - pass - -class Preferences(component.Component): - def __init__(self): - component.Component.__init__(self, "Preferences") - - self.dialog = gtk.Dialog(_("Preferences")) - self.dialog.set_default_size(560, 530) - #self.dialog.set_transient_for(component.get("MainWindow").window) - - # Set the buttons for the dialog - self.button_cancel = self.dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) - self.button_apply = self.dialog.add_button(gtk.STOCK_APPLY, gtk.RESPONSE_APPLY) - self.button_ok = self.dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK) - - # Setup the content area - self.dialog_hpaned = gtk.HPaned() - vp = gtk.Viewport() - self.listview = gtk.TreeView() - vp.add(self.listview) - self.dialog_hpaned.pack1(vp) - - self.notebook = gtk.Notebook() - self.notebook.set_show_tabs(False) - self.dialog_hpaned.pack2(self.notebook) - self.dialog.get_content_area().pack_start(self.dialog_hpaned) - - # Setup the listview for the preference categories - self.liststore = gtk.ListStore(str) - render = gtk.CellRendererText() - column = gtk.TreeViewColumn(_("Categories"), render, text=0) - self.listview.append_column(column) - self.listview.set_model(self.liststore) - - self.listview.get_selection().connect("changed", self._on_selection_changed) - - # Store the PreferencePages currently in the Preferences dialog - self.pages = {} - - self.add_page(DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page")) - - - def add_page(self, page): - """ - Add a Preference page. - - :param page: the preference page to add - :type page: PreferencePage - - """ - if not isinstance(page, PreferencePage): - raise ValueError("Must be a PreferencePage!") - + scrolled.show_all() # Add this page to the notebook - index = self.notebook.append_page(page.widget) - self.liststore.append([page.name]) - self.pages[index] = page - return page.name + index = self.notebook.append_page(scrolled) + self.liststore.append([index, name]) + return name def remove_page(self, name): - """ - Removes a Preference page. + """Removes a page from the notebook""" + self.page_num_to_remove = None + self.iter_to_remove = None - :param name: the name of the preference page - :type name: string - """ - index = self.get_page_index(name) - if index: - del self.liststore[index] - self.notebook.remove_page(index) + def check_row(model, path, iter, user_data): + row_name = model.get_value(iter, 1) + if row_name == user_data: + # This is the row we need to remove + self.page_num_to_remove = model.get_value(iter, 0) + self.iter_to_remove = iter + return - def get_page_index(self, page): - """ - Returns the index for the page. - - :param page: the name of the preference page - :type page: string - - :returns: the index - :rtype: int - - """ - for index, row in enumerate(self.liststore): - if page == row[0]: - return index - - return None + self.liststore.foreach(check_row, name) + # Remove the page and row + if self.page_num_to_remove != None: + self.notebook.remove_page(self.page_num_to_remove) + if self.iter_to_remove != None: + self.liststore.remove(self.iter_to_remove) # We need to re-adjust the index values for the remaining pages for i, (index, name) in enumerate(self.liststore): self.liststore[i][0] = i def show(self, page=None): - """ - Shows the Preferences dialog. + """Page should be the string in the left list.. ie, 'Network' or + 'Bandwidth'""" + if page != None: + for (index, string) in self.liststore: + if page == string: + self.treeview.get_selection().select_path(index) + break - :param page: the name of the page to show initially - :type page: string + component.get("PluginManager").run_on_show_prefs() - """ - if page: - index = self.get_page_index(page) - if index: - self.pages[index].show() - self.listview.get_selection().select_path(index) + # Update the preferences dialog to reflect current config settings + self.core_config = {} + if client.connected(): + def _on_get_config(config): + self.core_config = config + client.core.get_available_plugins().addCallback(_on_get_available_plugins) + + def _on_get_available_plugins(plugins): + self.all_plugins = plugins + client.core.get_enabled_plugins().addCallback(_on_get_enabled_plugins) + + def _on_get_enabled_plugins(plugins): + self.enabled_plugins = plugins + client.core.get_listen_port().addCallback(_on_get_listen_port) + + def _on_get_listen_port(port): + self.active_port = port + client.core.get_cache_status().addCallback(_on_get_cache_status) + + def _on_get_cache_status(status): + self.cache_status = status + self._show() + + # This starts a series of client.core requests prior to showing the window + client.core.get_config().addCallback(_on_get_config) else: - self.listview.get_selection().select_path(0) + self._show() - self.dialog.show_all() + def _show(self): + if self.core_config != {} and self.core_config != None: + core_widgets = { + "download_path_button": \ + ("filename", self.core_config["download_location"]), + "chk_move_completed": \ + ("active", self.core_config["move_completed"]), + "move_completed_path_button": \ + ("filename", self.core_config["move_completed_path"]), + "chk_copy_torrent_file": \ + ("active", self.core_config["copy_torrent_file"]), + "chk_del_copy_torrent_file": \ + ("active", self.core_config["del_copy_torrent_file"]), + "torrent_files_button": \ + ("filename", self.core_config["torrentfiles_location"]), + "chk_autoadd": \ + ("active", self.core_config["autoadd_enable"]), + "folder_autoadd": \ + ("filename", self.core_config["autoadd_location"]), + "radio_compact_allocation": \ + ("active", self.core_config["compact_allocation"]), + "radio_full_allocation": \ + ("not_active", self.core_config["compact_allocation"]), + "chk_prioritize_first_last_pieces": \ + ("active", + self.core_config["prioritize_first_last_pieces"]), + "chk_add_paused": ("active", self.core_config["add_paused"]), + "spin_port_min": ("value", self.core_config["listen_ports"][0]), + "spin_port_max": ("value", self.core_config["listen_ports"][1]), + "active_port_label": ("text", str(self.active_port)), + "chk_random_port": ("active", self.core_config["random_port"]), + "spin_outgoing_port_min": ("value", self.core_config["outgoing_ports"][0]), + "spin_outgoing_port_max": ("value", self.core_config["outgoing_ports"][1]), + "chk_random_outgoing_ports": ("active", self.core_config["random_outgoing_ports"]), + "entry_interface": ("text", self.core_config["listen_interface"]), + "entry_peer_tos": ("text", self.core_config["peer_tos"]), + "chk_dht": ("active", self.core_config["dht"]), + "chk_upnp": ("active", self.core_config["upnp"]), + "chk_natpmp": ("active", self.core_config["natpmp"]), + "chk_utpex": ("active", self.core_config["utpex"]), + "chk_lsd": ("active", self.core_config["lsd"]), + "chk_new_releases": ("active", self.core_config["new_release_check"]), + "chk_send_info": ("active", self.core_config["send_info"]), + "entry_geoip": ("text", self.core_config["geoip_db_location"]), + "combo_encin": ("active", self.core_config["enc_in_policy"]), + "combo_encout": ("active", self.core_config["enc_out_policy"]), + "combo_enclevel": ("active", self.core_config["enc_level"]), + "chk_pref_rc4": ("active", self.core_config["enc_prefer_rc4"]), + "spin_max_connections_global": \ + ("value", self.core_config["max_connections_global"]), + "spin_max_download": \ + ("value", self.core_config["max_download_speed"]), + "spin_max_upload": \ + ("value", self.core_config["max_upload_speed"]), + "spin_max_upload_slots_global": \ + ("value", self.core_config["max_upload_slots_global"]), + "spin_max_half_open_connections": \ + ("value", self.core_config["max_half_open_connections"]), + "spin_max_connections_per_second": \ + ("value", self.core_config["max_connections_per_second"]), + "chk_ignore_limits_on_local_network": \ + ("active", self.core_config["ignore_limits_on_local_network"]), + "chk_rate_limit_ip_overhead": \ + ("active", self.core_config["rate_limit_ip_overhead"]), + "spin_max_connections_per_torrent": \ + ("value", self.core_config["max_connections_per_torrent"]), + "spin_max_upload_slots_per_torrent": \ + ("value", self.core_config["max_upload_slots_per_torrent"]), + "spin_max_download_per_torrent": \ + ("value", self.core_config["max_download_speed_per_torrent"]), + "spin_max_upload_per_torrent": \ + ("value", self.core_config["max_upload_speed_per_torrent"]), + "spin_daemon_port": \ + ("value", self.core_config["daemon_port"]), + "chk_allow_remote_connections": \ + ("active", self.core_config["allow_remote"]), + "spin_active": ("value", self.core_config["max_active_limit"]), + "spin_seeding": ("value", self.core_config["max_active_seeding"]), + "spin_downloading": ("value", self.core_config["max_active_downloading"]), + "chk_dont_count_slow_torrents": ("active", self.core_config["dont_count_slow_torrents"]), + "chk_queue_new_top": ("active", self.core_config["queue_new_to_top"]), + "spin_share_ratio_limit": ("value", self.core_config["share_ratio_limit"]), + "spin_seed_time_ratio_limit": \ + ("value", self.core_config["seed_time_ratio_limit"]), + "spin_seed_time_limit": ("value", self.core_config["seed_time_limit"]), + "chk_seed_ratio": ("active", self.core_config["stop_seed_at_ratio"]), + "spin_share_ratio": ("value", self.core_config["stop_seed_ratio"]), + "chk_remove_ratio": ("active", self.core_config["remove_seed_at_ratio"]), + "spin_cache_size": ("value", self.core_config["cache_size"]), + "spin_cache_expiry": ("value", self.core_config["cache_expiry"]) + } + # Add proxy stuff + for t in ("peer", "web_seed", "tracker", "dht"): + core_widgets["spin_proxy_port_%s" % t] = ("value", self.core_config["proxies"][t]["port"]) + core_widgets["combo_proxy_type_%s" % t] = ("active", self.core_config["proxies"][t]["type"]) + core_widgets["txt_proxy_server_%s" % t] = ("text", self.core_config["proxies"][t]["hostname"]) + core_widgets["txt_proxy_username_%s" % t] = ("text", self.core_config["proxies"][t]["username"]) + core_widgets["txt_proxy_password_%s" % t] = ("text", self.core_config["proxies"][t]["password"]) - def _on_selection_changed(self, treeselection): + # Change a few widgets if we're connected to a remote host + if not client.is_localhost(): + self.glade.get_widget("entry_download_path").show() + self.glade.get_widget("download_path_button").hide() + core_widgets.pop("download_path_button") + core_widgets["entry_download_path"] = ("text", self.core_config["download_location"]) + + self.glade.get_widget("entry_move_completed_path").show() + self.glade.get_widget("move_completed_path_button").hide() + core_widgets.pop("move_completed_path_button") + core_widgets["entry_move_completed_path"] = ("text", self.core_config["move_completed_path"]) + + self.glade.get_widget("entry_torrents_path").show() + self.glade.get_widget("torrent_files_button").hide() + core_widgets.pop("torrent_files_button") + core_widgets["entry_torrents_path"] = ("text", self.core_config["torrentfiles_location"]) + + self.glade.get_widget("entry_autoadd").show() + self.glade.get_widget("folder_autoadd").hide() + core_widgets.pop("folder_autoadd") + core_widgets["entry_autoadd"] = ("text", self.core_config["autoadd_location"]) + else: + self.glade.get_widget("entry_download_path").hide() + self.glade.get_widget("download_path_button").show() + self.glade.get_widget("entry_move_completed_path").hide() + self.glade.get_widget("move_completed_path_button").show() + self.glade.get_widget("entry_torrents_path").hide() + self.glade.get_widget("torrent_files_button").show() + self.glade.get_widget("entry_autoadd").hide() + self.glade.get_widget("folder_autoadd").show() + + # Update the widgets accordingly + for key in core_widgets.keys(): + modifier = core_widgets[key][0] + value = core_widgets[key][1] + widget = self.glade.get_widget(key) + if type(widget) == gtk.FileChooserButton: + for child in widget.get_children(): + child.set_sensitive(True) + widget.set_sensitive(True) + + if modifier == "filename": + if value: + try: + widget.set_current_folder(value) + except Exception, e: + log.debug("Unable to set_current_folder: %s", e) + elif modifier == "active": + widget.set_active(value) + elif modifier == "not_active": + widget.set_active(not value) + elif modifier == "value": + widget.set_value(float(value)) + elif modifier == "text": + widget.set_text(value) + + for key in core_widgets.keys(): + widget = self.glade.get_widget(key) + # Update the toggle status if necessary + self.on_toggle(widget) + else: + core_widget_list = [ + "download_path_button", + "chk_move_completed", + "move_completed_path_button", + "chk_copy_torrent_file", + "chk_del_copy_torrent_file", + "torrent_files_button", + "chk_autoadd", + "folder_autoadd", + "radio_compact_allocation", + "radio_full_allocation", + "chk_prioritize_first_last_pieces", + "chk_add_paused", + "spin_port_min", + "spin_port_max", + "active_port_label", + "chk_random_port", + "spin_outgoing_port_min", + "spin_outgoing_port_max", + "chk_random_outgoing_ports", + "entry_interface", + "entry_peer_tos", + "chk_dht", + "chk_upnp", + "chk_natpmp", + "chk_utpex", + "chk_lsd", + "chk_send_info", + "chk_new_releases", + "entry_geoip", + "combo_encin", + "combo_encout", + "combo_enclevel", + "chk_pref_rc4", + "spin_max_connections_global", + "spin_max_download", + "spin_max_upload", + "spin_max_upload_slots_global", + "spin_max_half_open_connections", + "spin_max_connections_per_second", + "chk_ignore_limits_on_local_network", + "chk_rate_limit_ip_overhead", + "spin_max_connections_per_torrent", + "spin_max_upload_slots_per_torrent", + "spin_max_download_per_torrent", + "spin_max_upload_per_torrent", + "spin_daemon_port", + "chk_allow_remote_connections", + "spin_seeding", + "spin_downloading", + "spin_active", + "chk_dont_count_slow_torrents", + "chk_queue_new_top", + "chk_seed_ratio", + "spin_share_ratio", + "chk_remove_ratio", + "spin_share_ratio_limit", + "spin_seed_time_ratio_limit", + "spin_seed_time_limit", + "spin_cache_size", + "spin_cache_expiry", + "button_cache_refresh", + "btn_testport" + ] + for t in ("peer", "web_seed", "tracker", "dht"): + core_widget_list.append("spin_proxy_port_%s" % t) + core_widget_list.append("combo_proxy_type_%s" % t) + core_widget_list.append("txt_proxy_username_%s" % t) + core_widget_list.append("txt_proxy_password_%s" % t) + core_widget_list.append("txt_proxy_server_%s" % t) + + # We don't appear to be connected to a daemon + for key in core_widget_list: + widget = self.glade.get_widget(key) + if type(widget) == gtk.FileChooserButton: + for child in widget.get_children(): + child.set_sensitive(False) + widget.set_sensitive(False) + + ## Downloads tab ## + self.glade.get_widget("chk_show_dialog").set_active( + self.gtkui_config["interactive_add"]) + self.glade.get_widget("chk_focus_dialog").set_active( + self.gtkui_config["focus_add_dialog"]) + + ## Interface tab ## + self.glade.get_widget("chk_use_tray").set_active( + self.gtkui_config["enable_system_tray"]) + self.glade.get_widget("chk_min_on_close").set_active( + self.gtkui_config["close_to_tray"]) + self.glade.get_widget("chk_start_in_tray").set_active( + self.gtkui_config["start_in_tray"]) + self.glade.get_widget("chk_enable_appindicator").set_active( + self.gtkui_config["enable_appindicator"]) + self.glade.get_widget("chk_lock_tray").set_active( + self.gtkui_config["lock_tray"]) + self.glade.get_widget("chk_classic_mode").set_active( + self.gtkui_config["classic_mode"]) + self.glade.get_widget("chk_show_rate_in_title").set_active( + self.gtkui_config["show_rate_in_title"]) + + ## Other tab ## + self.glade.get_widget("chk_show_new_releases").set_active( + self.gtkui_config["show_new_releases"]) + + + ## Cache tab ## + if client.connected(): + self.__update_cache_status() + + ## Plugins tab ## + all_plugins = self.all_plugins + enabled_plugins = self.enabled_plugins + # Clear the existing list so we don't duplicate entries. + self.plugin_liststore.clear() + # Iterate through the lists and add them to the liststore + for plugin in all_plugins: + if plugin in enabled_plugins: + enabled = True + else: + enabled = False + row = self.plugin_liststore.append() + self.plugin_liststore.set_value(row, 0, plugin) + self.plugin_liststore.set_value(row, 1, enabled) + + # Now show the dialog + self.pref_dialog.show() + + def set_config(self, hide=False): """ - This is called when the preference page changes or when it's initially - showed. We must call the page's update() method prior to showing the - page. + Sets all altered config values in the core. + + :param hide: bool, if True, will not re-show the dialog and will hide it instead """ - (model, row) = treeselection.get_selected() - index = self.get_page_index(model[row][0]) - if index is None: + try: + from hashlib import sha1 as sha_hash + except ImportError: + from sha import new as sha_hash + + # Get the values from the dialog + new_core_config = {} + new_gtkui_config = {} + + ## Downloads tab ## + new_gtkui_config["interactive_add"] = \ + self.glade.get_widget("chk_show_dialog").get_active() + new_gtkui_config["focus_add_dialog"] = \ + self.glade.get_widget("chk_focus_dialog").get_active() + new_core_config["copy_torrent_file"] = \ + self.glade.get_widget("chk_copy_torrent_file").get_active() + new_core_config["del_copy_torrent_file"] = \ + self.glade.get_widget("chk_del_copy_torrent_file").get_active() + new_core_config["move_completed"] = \ + self.glade.get_widget("chk_move_completed").get_active() + if client.is_localhost(): + new_core_config["download_location"] = \ + self.glade.get_widget("download_path_button").get_filename() + new_core_config["move_completed_path"] = \ + self.glade.get_widget("move_completed_path_button").get_filename() + new_core_config["torrentfiles_location"] = \ + self.glade.get_widget("torrent_files_button").get_filename() + else: + new_core_config["download_location"] = \ + self.glade.get_widget("entry_download_path").get_text() + new_core_config["move_completed_path"] = \ + self.glade.get_widget("entry_move_completed_path").get_text() + new_core_config["torrentfiles_location"] = \ + self.glade.get_widget("entry_torrents_path").get_text() + + new_core_config["autoadd_enable"] = \ + self.glade.get_widget("chk_autoadd").get_active() + if client.is_localhost(): + new_core_config["autoadd_location"] = \ + self.glade.get_widget("folder_autoadd").get_filename() + else: + new_core_config["autoadd_location"] = \ + self.glade.get_widget("entry_autoadd").get_text() + + new_core_config["compact_allocation"] = \ + self.glade.get_widget("radio_compact_allocation").get_active() + new_core_config["prioritize_first_last_pieces"] = \ + self.glade.get_widget( + "chk_prioritize_first_last_pieces").get_active() + new_core_config["add_paused"] = \ + self.glade.get_widget("chk_add_paused").get_active() + + ## Network tab ## + listen_ports = ( + self.glade.get_widget("spin_port_min").get_value_as_int(), + self.glade.get_widget("spin_port_max").get_value_as_int() + ) + new_core_config["listen_ports"] = listen_ports + new_core_config["random_port"] = \ + self.glade.get_widget("chk_random_port").get_active() + outgoing_ports = ( + self.glade.get_widget("spin_outgoing_port_min").get_value_as_int(), + self.glade.get_widget("spin_outgoing_port_max").get_value_as_int() + ) + new_core_config["outgoing_ports"] = outgoing_ports + new_core_config["random_outgoing_ports"] = \ + self.glade.get_widget("chk_random_outgoing_ports").get_active() + new_core_config["listen_interface"] = self.glade.get_widget("entry_interface").get_text() + new_core_config["peer_tos"] = self.glade.get_widget("entry_peer_tos").get_text() + new_core_config["dht"] = self.glade.get_widget("chk_dht").get_active() + new_core_config["upnp"] = self.glade.get_widget("chk_upnp").get_active() + new_core_config["natpmp"] = \ + self.glade.get_widget("chk_natpmp").get_active() + new_core_config["utpex"] = \ + self.glade.get_widget("chk_utpex").get_active() + new_core_config["lsd"] = \ + self.glade.get_widget("chk_lsd").get_active() + new_core_config["enc_in_policy"] = \ + self.glade.get_widget("combo_encin").get_active() + new_core_config["enc_out_policy"] = \ + self.glade.get_widget("combo_encout").get_active() + new_core_config["enc_level"] = \ + self.glade.get_widget("combo_enclevel").get_active() + new_core_config["enc_prefer_rc4"] = \ + self.glade.get_widget("chk_pref_rc4").get_active() + + ## Bandwidth tab ## + new_core_config["max_connections_global"] = \ + self.glade.get_widget( + "spin_max_connections_global").get_value_as_int() + new_core_config["max_download_speed"] = \ + self.glade.get_widget("spin_max_download").get_value() + new_core_config["max_upload_speed"] = \ + self.glade.get_widget("spin_max_upload").get_value() + new_core_config["max_upload_slots_global"] = \ + self.glade.get_widget( + "spin_max_upload_slots_global").get_value_as_int() + new_core_config["max_half_open_connections"] = \ + self.glade.get_widget("spin_max_half_open_connections").get_value_as_int() + new_core_config["max_connections_per_second"] = \ + self.glade.get_widget( + "spin_max_connections_per_second").get_value_as_int() + new_core_config["max_connections_per_torrent"] = \ + self.glade.get_widget( + "spin_max_connections_per_torrent").get_value_as_int() + new_core_config["max_upload_slots_per_torrent"] = \ + self.glade.get_widget( + "spin_max_upload_slots_per_torrent").get_value_as_int() + new_core_config["max_upload_speed_per_torrent"] = \ + self.glade.get_widget( + "spin_max_upload_per_torrent").get_value() + new_core_config["max_download_speed_per_torrent"] = \ + self.glade.get_widget( + "spin_max_download_per_torrent").get_value() + new_core_config["ignore_limits_on_local_network"] = \ + self.glade.get_widget("chk_ignore_limits_on_local_network").get_active() + new_core_config["rate_limit_ip_overhead"] = \ + self.glade.get_widget("chk_rate_limit_ip_overhead").get_active() + + ## Interface tab ## + new_gtkui_config["enable_system_tray"] = \ + self.glade.get_widget("chk_use_tray").get_active() + new_gtkui_config["close_to_tray"] = \ + self.glade.get_widget("chk_min_on_close").get_active() + new_gtkui_config["start_in_tray"] = \ + self.glade.get_widget("chk_start_in_tray").get_active() + new_gtkui_config["enable_appindicator"] = \ + self.glade.get_widget("chk_enable_appindicator").get_active() + new_gtkui_config["lock_tray"] = \ + self.glade.get_widget("chk_lock_tray").get_active() + passhex = sha_hash(\ + self.glade.get_widget("txt_tray_password").get_text()).hexdigest() + if passhex != "c07eb5a8c0dc7bb81c217b67f11c3b7a5e95ffd7": + new_gtkui_config["tray_password"] = passhex + new_gtkui_config["classic_mode"] = \ + self.glade.get_widget("chk_classic_mode").get_active() + new_gtkui_config["show_rate_in_title"] = \ + self.glade.get_widget("chk_show_rate_in_title").get_active() + + ## Other tab ## + new_gtkui_config["show_new_releases"] = \ + self.glade.get_widget("chk_show_new_releases").get_active() + new_core_config["send_info"] = \ + self.glade.get_widget("chk_send_info").get_active() + new_core_config["geoip_db_location"] = \ + self.glade.get_widget("entry_geoip").get_text() + + ## Daemon tab ## + new_core_config["daemon_port"] = \ + self.glade.get_widget("spin_daemon_port").get_value_as_int() + new_core_config["allow_remote"] = \ + self.glade.get_widget("chk_allow_remote_connections").get_active() + new_core_config["new_release_check"] = \ + self.glade.get_widget("chk_new_releases").get_active() + + ## Proxy tab ## + new_core_config["proxies"] = {} + for t in ("peer", "web_seed", "tracker", "dht"): + new_core_config["proxies"][t] = {} + new_core_config["proxies"][t]["type"] = \ + self.glade.get_widget("combo_proxy_type_%s" % t).get_active() + new_core_config["proxies"][t]["port"] = \ + self.glade.get_widget("spin_proxy_port_%s" % t).get_value_as_int() + new_core_config["proxies"][t]["username"] = \ + self.glade.get_widget("txt_proxy_username_%s" % t).get_text() + new_core_config["proxies"][t]["password"] = \ + self.glade.get_widget("txt_proxy_password_%s" % t).get_text() + new_core_config["proxies"][t]["hostname"] = \ + self.glade.get_widget("txt_proxy_server_%s" % t).get_text() + + ## Queue tab ## + new_core_config["queue_new_to_top"] = \ + self.glade.get_widget("chk_queue_new_top").get_active() + new_core_config["max_active_seeding"] = \ + self.glade.get_widget("spin_seeding").get_value_as_int() + new_core_config["max_active_downloading"] = \ + self.glade.get_widget("spin_downloading").get_value_as_int() + new_core_config["max_active_limit"] = \ + self.glade.get_widget("spin_active").get_value_as_int() + new_core_config["dont_count_slow_torrents"] = \ + self.glade.get_widget("chk_dont_count_slow_torrents").get_active() + new_core_config["stop_seed_at_ratio"] = \ + self.glade.get_widget("chk_seed_ratio").get_active() + new_core_config["remove_seed_at_ratio"] = \ + self.glade.get_widget("chk_remove_ratio").get_active() + new_core_config["stop_seed_ratio"] = \ + self.glade.get_widget("spin_share_ratio").get_value() + new_core_config["share_ratio_limit"] = \ + self.glade.get_widget("spin_share_ratio_limit").get_value() + new_core_config["seed_time_ratio_limit"] = \ + self.glade.get_widget("spin_seed_time_ratio_limit").get_value() + new_core_config["seed_time_limit"] = \ + self.glade.get_widget("spin_seed_time_limit").get_value() + + ## Cache tab ## + new_core_config["cache_size"] = \ + self.glade.get_widget("spin_cache_size").get_value_as_int() + new_core_config["cache_expiry"] = \ + self.glade.get_widget("spin_cache_expiry").get_value_as_int() + + # Run plugin hook to apply preferences + component.get("PluginManager").run_on_apply_prefs() + + # GtkUI + for key in new_gtkui_config.keys(): + # The values do not match so this needs to be updated + if self.gtkui_config[key] != new_gtkui_config[key]: + self.gtkui_config[key] = new_gtkui_config[key] + + # Core + if client.connected(): + # Only do this if we're connected to a daemon + config_to_set = {} + for key in new_core_config.keys(): + # The values do not match so this needs to be updated + if self.core_config[key] != new_core_config[key]: + config_to_set[key] = new_core_config[key] + + if config_to_set: + # Set each changed config value in the core + client.core.set_config(config_to_set) + client.force_call(True) + # Update the configuration + self.core_config.update(config_to_set) + + if hide: + self.hide() + else: + # Re-show the dialog to make sure everything has been updated + self.show() + + def hide(self): + self.glade.get_widget("port_img").hide() + self.pref_dialog.hide() + + def __update_cache_status(self): + # Updates the cache status labels with the info in the dict + for widget in self.glade.get_widget_prefix("label_cache_"): + key = widget.get_name()[len("label_cache_"):] + value = self.cache_status[key] + if type(value) == float: + value = "%.2f" % value + else: + value = str(value) + + widget.set_text(value) + + def _on_button_cache_refresh_clicked(self, widget): + def on_get_cache_status(status): + self.cache_status = status + self.__update_cache_status() + + client.core.get_cache_status().addCallback(on_get_cache_status) + + def on_pref_dialog_delete_event(self, widget, event): + self.hide() + return True + + def on_toggle(self, widget): + """Handles widget sensitivity based on radio/check button values.""" + try: + value = widget.get_active() + except: return - def on_page_show(result): - self.notebook.set_current_page(index) + dependents = { + "chk_show_dialog": {"chk_focus_dialog": True}, + "chk_random_port": {"spin_port_min": False, + "spin_port_max": False}, + "chk_random_outgoing_ports": {"spin_outgoing_port_min": False, + "spin_outgoing_port_max": False}, + "chk_use_tray": {"chk_min_on_close": True, + "chk_start_in_tray": True, + "chk_enable_appindicator": True, + "chk_lock_tray": True}, + "chk_lock_tray": {"txt_tray_password": True, + "password_label": True}, + "radio_open_folder_custom": {"combo_file_manager": False, + "txt_open_folder_location": True}, + "chk_move_completed" : {"move_completed_path_button" : True}, + "chk_copy_torrent_file" : {"torrent_files_button" : True, + "chk_del_copy_torrent_file" : True}, + "chk_autoadd" : {"folder_autoadd" : True}, + "chk_seed_ratio" : {"spin_share_ratio": True, + "chk_remove_ratio" : True} + } + + def update_dependent_widgets(name, value): + dependency = dependents[name] + for dep in dependency.keys(): + depwidget = self.glade.get_widget(dep) + sensitive = [not value, value][dependency[dep]] + depwidget.set_sensitive(sensitive) + if dep in dependents: + update_dependent_widgets(dep, depwidget.get_active() and sensitive) + + for key in dependents.keys(): + if widget != self.glade.get_widget(key): + continue + update_dependent_widgets(key, value) + + def on_button_ok_clicked(self, data): + log.debug("on_button_ok_clicked") + self.set_config(hide=True) + return True + + def on_button_apply_clicked(self, data): + log.debug("on_button_apply_clicked") + self.set_config() + + def on_button_cancel_clicked(self, data): + log.debug("on_button_cancel_clicked") + self.hide() + return True + + def on_selection_changed(self, treeselection): + # Show the correct notebook page based on what row is selected. + (model, row) = treeselection.get_selected() try: - maybeDeferred(self.pages[index].show).addCallback(on_page_show) - except Exception, e: - dialogs.ErrorDialog( - _("Error with preference page"), - _("Could not show preference page correctly."), - self.dialog, - traceback=True).run() + self.notebook.set_current_page(model.get_value(row, 0)) + except TypeError: + pass -if __name__ == "__main__": - p = Preferences() - d = DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page") - p.add_page(d) - #d2 = NetworkPreferencePage(_("Network"), "glade/preferences/network.glade", "network_prefs_page") - #p.add_page(d2) - ##d3 = BandwidthPreferencePage() - ##p.add_page(d3) - ##d4 = InterfacePreferencePage() - ##p.add_page(d4) - ##d5 = OtherPreferencePage() - ##p.add_page(d5) - ##d6 = DaemonPreferencePage() - ##p.add_page(d6) - ##d7 = QueuePreferencePage() - ##p.add_page(d7) - ##d8 = ProxyPreferencePage() - ##p.add_page(d8) - ##d9 = CachePreferencePage() - ##p.add_page(d9) - ##d10 = PluginsPreferencePage() - ##p.add_page(d10) - p.show() - gtk.main() + def on_test_port_clicked(self, data): + log.debug("on_test_port_clicked") + def on_get_test(status): + if status: + self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_YES, 4) + self.glade.get_widget("port_img").show() + else: + self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_DIALOG_WARNING, 4) + self.glade.get_widget("port_img").show() + client.core.test_listen_port().addCallback(on_get_test) + self.glade.get_widget("port_img").set_from_file( + deluge.common.get_pixmap('loading.gif') + ) + self.glade.get_widget("port_img").show() + client.force_call() + def on_plugin_toggled(self, renderer, path): + log.debug("on_plugin_toggled") + row = self.plugin_liststore.get_iter_from_string(path) + name = self.plugin_liststore.get_value(row, 0) + value = self.plugin_liststore.get_value(row, 1) + self.plugin_liststore.set_value(row, 1, not value) + if not value: + client.core.enable_plugin(name) + else: + client.core.disable_plugin(name) + component.get("PluginManager").disable_plugin(name) + + def on_plugin_selection_changed(self, treeselection): + log.debug("on_plugin_selection_changed") + (model, itr) = treeselection.get_selected() + if not itr: + return + name = model[itr][0] + plugin_info = component.get("PluginManager").get_plugin_info(name) + self.glade.get_widget("label_plugin_author").set_text(plugin_info["Author"]) + self.glade.get_widget("label_plugin_version").set_text(plugin_info["Version"]) + self.glade.get_widget("label_plugin_email").set_text(plugin_info["Author-email"]) + self.glade.get_widget("label_plugin_homepage").set_text(plugin_info["Home-page"]) + self.glade.get_widget("label_plugin_details").set_text(plugin_info["Description"]) + + def _on_button_plugin_install_clicked(self, widget): + log.debug("_on_button_plugin_install_clicked") + chooser = gtk.FileChooserDialog(_("Select the Plugin"), + self.pref_dialog, + gtk.FILE_CHOOSER_ACTION_OPEN, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, + gtk.RESPONSE_OK)) + + chooser.set_transient_for(self.pref_dialog) + chooser.set_select_multiple(False) + chooser.set_property("skip-taskbar-hint", True) + + file_filter = gtk.FileFilter() + file_filter.set_name(_("Plugin Eggs")) + file_filter.add_pattern("*." + "egg") + chooser.add_filter(file_filter) + + # Run the dialog + response = chooser.run() + + if response == gtk.RESPONSE_OK: + filepath = chooser.get_filename() + else: + chooser.destroy() + return + + import base64 + import shutil + import os.path + filename = os.path.split(filepath)[1] + shutil.copyfile( + filepath, + os.path.join(deluge.configmanager.get_config_dir(), "plugins", filename)) + + component.get("PluginManager").scan_for_plugins() + + if not client.is_localhost(): + # We need to send this plugin to the daemon + filedump = base64.encodestring(open(filepath, "rb").read()) + client.core.upload_plugin(filename, filedump) + + client.core.rescan_plugins() + chooser.destroy() + # We need to re-show the preferences dialog to show the new plugins + self.show() + + def _on_button_rescan_plugins_clicked(self, widget): + component.get("PluginManager").scan_for_plugins() + if client.connected(): + client.core.rescan_plugins() + self.show() + + def _on_button_find_plugins_clicked(self, widget): + deluge.common.open_url_in_browser("http://dev.deluge-torrent.org/wiki/Plugins") + + def _on_combo_proxy_type_changed(self, widget): + name = widget.get_name().replace("combo_proxy_type_", "") + proxy_type = widget.get_model()[widget.get_active()][0] + + prefixes = ["txt_proxy_", "label_proxy_", "spin_proxy_"] + hides = [] + shows = [] + + if proxy_type == "None": + hides.extend(["password", "username", "server", "port"]) + elif proxy_type in ("Socksv4", "Socksv5", "HTTP"): + hides.extend(["password", "username"]) + shows.extend(["server", "port"]) + elif proxy_type in ("Socksv5 W/ Auth", "HTTP W/ Auth"): + shows.extend(["password", "username", "server", "port"]) + + for h in hides: + for p in prefixes: + w = self.glade.get_widget(p + h + "_" + name) + if w: + w.hide() + for s in shows: + for p in prefixes: + w = self.glade.get_widget(p + s + "_" + name) + if w: + w.show() + + def _on_button_associate_magnet_clicked(self, widget): + common.associate_magnet_links(True) From 6ed3136c8e8499f3de443fedc97abb0939279147 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 24 Apr 2011 17:19:57 +0100 Subject: [PATCH 179/329] No server side logouts. Do not try to for a disconnect on this branch, maybe on another one. --- deluge/core/rpcserver.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 3a6aae27f..60e190593 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -485,12 +485,6 @@ class RPCServer(component.Component): """ return session_id in self.factory.authorized_sessions - def logout_current_session(self): - """ - Makes the current session invalid logging out the current account - """ - self.factory.protocol.connectionLost("Server logged out client") - def emit_event(self, event): """ Emits the event to interested clients. From 43e3fe2a1a366a0312e976a0b4133853ad385840 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 24 Apr 2011 17:38:35 +0100 Subject: [PATCH 180/329] Account Management Implemented. Account management is now implemented for the GTK UI. Some changes to the core were required since the clients need to know which authentication levels exist, and, to expose account creation, update, and removal to the clients. The best effort is done to try not to compromise the auth file. --- deluge/core/authmanager.py | 128 ++++++---- deluge/core/core.py | 63 +++-- deluge/error.py | 18 +- deluge/ui/client.py | 63 +++-- deluge/ui/gtkui/dialogs.py | 86 ++++++- .../ui/gtkui/glade/preferences_dialog.glade | 203 ++++++++++------ deluge/ui/gtkui/menubar.py | 62 +++-- deluge/ui/gtkui/preferences.py | 220 +++++++++++++++++- 8 files changed, 661 insertions(+), 182 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 7c2d5c1d2..bed8ec0c2 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -2,6 +2,7 @@ # authmanager.py # # Copyright (C) 2009 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -40,7 +41,7 @@ import logging import deluge.component as component import deluge.configmanager as configmanager -from deluge.error import BadLoginError, AuthenticationRequired +from deluge.error import AuthManagerError, AuthenticationRequired, BadLoginError log = logging.getLogger(__name__) @@ -51,21 +52,35 @@ AUTH_LEVEL_ADMIN = 10 AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL +AUTH_LEVELS_MAPPING = { + 'NONE': AUTH_LEVEL_NONE, + 'READONLY': AUTH_LEVEL_READONLY, + 'DEFAULT': AUTH_LEVEL_NORMAL, + 'NORMAL': AUTH_LEVEL_DEFAULT, + 'ADMIN': AUTH_LEVEL_ADMIN +} + +AUTH_LEVELS_MAPPING_REVERSE = {} +for key, value in AUTH_LEVELS_MAPPING.iteritems(): + AUTH_LEVELS_MAPPING_REVERSE[value] = key + class Account(object): - __slots__ = ('username', 'password', 'auth_level') - def __init__(self, username, password, auth_level): + __slots__ = ('username', 'password', 'authlevel') + def __init__(self, username, password, authlevel): self.username = username self.password = password - self.auth_level = auth_level + self.authlevel = authlevel - def data(self, include_private=True): - rv = self.__dict__.copy() - if not include_private: - rv['password'] = '' - return rv + def data(self): + return { + 'username': self.username, + 'password': self.password, + 'authlevel': AUTH_LEVELS_MAPPING_REVERSE[self.authlevel], + 'authlevel_int': self.authlevel + } def __repr__(self): - return ('' % + return ('' % self.__dict__) @@ -104,52 +119,71 @@ class AuthManager(component.Component): "Username and Password are required.", username ) - self.__test_existing_account(username) + if username not in self.__auth: + # Let's try to re-load the file.. Maybe it's been updated + self.__load_auth_file() + if username not in self.__auth: + raise BadLoginError("Username does not exist", username) if self.__auth[username].password == password: # Return the users auth level - return self.__auth[username].auth_level + return self.__auth[username].authlevel elif not password and self.__auth[username].password: raise AuthenticationRequired("Password is required", username) else: - raise BadLoginError("Password does not match") + raise BadLoginError("Password does not match", username) - def get_known_accounts(self, include_private_data=False): + def get_known_accounts(self): """ Returns a list of known deluge usernames. """ self.__load_auth_file() - rv = {} - for account in self.__auth.items(): - rv[account.username] = account.data(include_private_data) - return rv + return [account.data() for account in self.__auth.values()] - def create_account(self, username, password='', auth_level=AUTH_LEVEL_DEFAULT): + def create_account(self, username, password, authlevel): if username in self.__auth: - raise Something() - self.__create_account(username, password, auth_level) + raise AuthManagerError("Username in use.", username) + try: + self.__auth[username] = Account(username, password, + AUTH_LEVELS_MAPPING[authlevel]) + self.write_auth_file() + return True + except Exception, err: + log.exception(err) + raise err - def update_account(self, username, password='', auth_level=AUTH_LEVEL_DEFAULT): - if username in self.__auth: - raise Something() - self.__create_account(username, password, auth_level) + def update_account(self, username, password, authlevel): + if username not in self.__auth: + raise AuthManagerError("Username not known", username) + try: + self.__auth[username].username = username + self.__auth[username].password = password + self.__auth[username].authlevel = AUTH_LEVELS_MAPPING[authlevel] + self.write_auth_file() + return True + except Exception, err: + log.exception(err) + raise err def remove_account(self, username): - if username in self.__auth: - raise Something() + if username not in self.__auth: + raise AuthManagerError("Username not known", username) + elif username == component.get("RPCServer").get_session_user(): + raise AuthManagerError( + "You cannot delete your own account while logged in!", username + ) + del self.__auth[username] self.write_auth_file() - if component.get("RPCServer").get_session_user() == username: - # Force a client logout by the server - component.get("RPCServer").logout_current_session() + return True def write_auth_file(self): old_auth_file = configmanager.get_config_dir("auth") new_auth_file = old_auth_file + '.new' fd = open(new_auth_file, "w") - for account in self.__auth.items(): + for account in self.__auth.values(): fd.write( - "%(username)s:%(password)s:%(auth_level)s\n" % account.__dict__ + "%(username)s:%(password)s:%(authlevel_int)s\n" % account.data() ) fd.flush() os.fsync(fd.fileno()) @@ -157,18 +191,6 @@ class AuthManager(component.Component): os.rename(new_auth_file, old_auth_file) self.__load_auth_file() - def __add_account(self, username, password, auth_level): - self.__auth[username] = Account(username, password, auth_level) - self.write_auth_file() - - def __test_existing_account(self, username): - if username not in self.__auth: - # Let's try to re-load the file.. Maybe it's been updated - self.__load_auth_file() - if username not in self.__auth: - raise BadLoginError("Username does not exist") - return True - def __create_localclient_account(self): """ Returns the string. @@ -217,23 +239,27 @@ class AuthManager(component.Component): log.warning("Your auth entry for %s contains no auth level, " "using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT) - auth_level = AUTH_LEVEL_DEFAULT + authlevel = AUTH_LEVEL_DEFAULT elif len(lsplit) == 3: - username, password, auth_level = lsplit + username, password, authlevel = lsplit else: - log.error("Your auth file is malformed: Incorrect number of fields!") + log.error("Your auth file is malformed: " + "Incorrect number of fields!") continue username = username.strip() password = password.strip() try: - auth_level = int(auth_level) + authlevel = int(authlevel) except ValueError: - log.error("Your auth file is malformed: %r is not a valid auth " - "level" % auth_level) + try: + authlevel = AUTH_LEVELS_MAPPING[authlevel] + except KeyError: + log.error("Your auth file is malformed: %r is not a valid auth " + "level" % authlevel) continue - self.__auth[username] = Account(username, password, auth_level) + self.__auth[username] = Account(username, password, authlevel) if "localclient" not in self.__auth: self.__create_localclient_account() diff --git a/deluge/core/core.py b/deluge/core/core.py index 225979730..6586fff05 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -2,6 +2,7 @@ # core.py # # Copyright (C) 2007-2009 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -43,8 +44,6 @@ import threading import tempfile from urlparse import urljoin -from twisted.internet import reactor, defer -from twisted.internet.task import LoopingCall import twisted.web.client import twisted.web.error @@ -55,7 +54,8 @@ import deluge.common import deluge.component as component from deluge.event import * from deluge.error import * -from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_DEFAULT +from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_NONE +from deluge.core.authmanager import AUTH_LEVELS_MAPPING, AUTH_LEVELS_MAPPING_REVERSE from deluge.core.torrentmanager import TorrentManager from deluge.core.pluginmanager import PluginManager from deluge.core.alertmanager import AlertManager @@ -77,7 +77,8 @@ class Core(component.Component): log.info("Starting libtorrent %s session..", lt.version) # Create the client fingerprint - version = [int(value.split("-")[0]) for value in deluge.common.get_version().split(".")] + version = [int(value.split("-")[0]) for value in + deluge.common.get_version().split(".")] while len(version) < 4: version.append(0) @@ -147,16 +148,16 @@ class Core(component.Component): def __save_session_state(self): """Saves the libtorrent session state""" try: - open(deluge.configmanager.get_config_dir("session.state"), "wb").write( - lt.bencode(self.session.state())) + session_state = deluge.configmanager.get_config_dir("session.state") + open(session_state, "wb").write(lt.bencode(self.session.state())) except Exception, e: log.warning("Failed to save lt state: %s", e) def __load_session_state(self): """Loads the libtorrent session state""" try: - self.session.load_state(lt.bdecode( - open(deluge.configmanager.get_config_dir("session.state"), "rb").read())) + session_state = deluge.configmanager.get_config_dir("session.state") + self.session.load_state(lt.bdecode(open(session_state, "rb").read())) except Exception, e: log.warning("Failed to load lt state: %s", e) @@ -212,7 +213,9 @@ class Core(component.Component): log.exception(e) try: - torrent_id = self.torrentmanager.add(filedump=filedump, options=options, filename=filename) + torrent_id = self.torrentmanager.add( + filedump=filedump, options=options, filename=filename + ) except Exception, e: log.error("There was an error adding the torrent file %s", filename) log.exception(e) @@ -245,16 +248,23 @@ class Core(component.Component): os.remove(filename) except Exception, e: log.warning("Couldn't remove temp file: %s", e) - return self.add_torrent_file(filename, base64.encodestring(data), options) + return self.add_torrent_file( + filename, base64.encodestring(data), options + ) def on_download_fail(failure): if failure.check(twisted.web.error.PageRedirect): new_url = urljoin(url, failure.getErrorMessage().split(" to ")[1]) - result = download_file(new_url, tempfile.mkstemp()[1], headers=headers, force_filename=True) + result = download_file( + new_url, tempfile.mkstemp()[1], headers=headers, + force_filename=True + ) result.addCallbacks(on_download_success, on_download_fail) elif failure.check(twisted.web.client.PartialDownloadError): - result = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True, - allow_compression=False) + result = download_file( + url, tempfile.mkstemp()[1], headers=headers, + force_filename=True, allow_compression=False + ) result.addCallbacks(on_download_success, on_download_fail) else: # Log the error and pass the failure onto the client @@ -263,7 +273,9 @@ class Core(component.Component): result = failure return result - d = download_file(url, tempfile.mkstemp()[1], headers=headers, force_filename=True) + d = download_file( + url, tempfile.mkstemp()[1], headers=headers, force_filename=True + ) d.addCallbacks(on_download_success, on_download_fail) return d @@ -829,9 +841,22 @@ class Core(component.Component): """ return lt.version - @export(AUTH_LEVEL_DEFAULT) + @export(AUTH_LEVEL_ADMIN) def get_known_accounts(self): - auth_level = component.get("RPCServer").get_session_auth_level() - return self.authmanager.get_known_accounts( - include_private_data=(auth_level==AUTH_LEVEL_ADMIN) - ) + return self.authmanager.get_known_accounts() + + @export(AUTH_LEVEL_NONE) + def get_auth_levels_mappings(self): + return (AUTH_LEVELS_MAPPING, AUTH_LEVELS_MAPPING_REVERSE) + + @export(AUTH_LEVEL_ADMIN) + def create_account(self, username, password, authlevel): + return self.authmanager.create_account(username, password, authlevel) + + @export(AUTH_LEVEL_ADMIN) + def update_account(self, username, password, authlevel): + return self.authmanager.update_account(username, password, authlevel) + + @export(AUTH_LEVEL_ADMIN) + def remove_account(self, username): + return self.authmanager.remove_account(username) diff --git a/deluge/error.py b/deluge/error.py index 055d6b338..cdb67091a 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -2,6 +2,7 @@ # error.py # # Copyright (C) 2008 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -52,10 +53,9 @@ class InvalidPathError(DelugeError): class NotAuthorizedError(DelugeError): pass -class BadLoginError(DelugeError): - pass -class AuthenticationRequired(BadLoginError): +class _UsernameBasedException(DelugeError): + def _get_message(self): return self._message def _set_message(self, message): @@ -70,9 +70,17 @@ class AuthenticationRequired(BadLoginError): username = property(_get_username, _set_username) del _get_username, _set_username - def __init__(self, message, username): - super(AuthenticationRequired, self).__init__(message) + super(_UsernameBasedException, self).__init__(message) self.message = message self.username = username + +class BadLoginError(_UsernameBasedException): + pass + +class AuthenticationRequired(BadLoginError): + pass + +class AuthManagerError(_UsernameBasedException): + pass diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 26cef631f..049595383 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -2,6 +2,7 @@ # client.py # # Copyright (C) 2009 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -76,6 +77,20 @@ class DelugeRPCError(object): self.exception_msg = exception_msg self.traceback = traceback + def logable(self): + # Create a delugerpcrequest to print out a nice RPCRequest string + r = DelugeRPCRequest() + r.method = self.method + r.args = self.args + r.kwargs = self.kwargs + msg = "RPCError Message Received!" + msg += "\n" + "-" * 80 + msg += "\n" + "RPCRequest: " + r.__repr__() + msg += "\n" + "-" * 80 + msg += "\n" + self.traceback + "\n" + self.exception_type + ": " + self.exception_msg + msg += "\n" + "-" * 80 + return msg + class DelugeRPCRequest(object): """ This object is created whenever there is a RPCRequest to be sent to the @@ -118,6 +133,7 @@ class DelugeRPCRequest(object): return (self.request_id, self.method, self.args, self.kwargs) class DelugeRPCProtocol(Protocol): + def connectionMade(self): self.__rpc_requests = {} self.__buffer = None @@ -273,6 +289,9 @@ class DaemonSSLProxy(DaemonProxy): self.disconnect_deferred = None self.disconnect_callback = None + self.auth_levels_mapping = None + self.auth_levels_mapping_reverse = None + def connect(self, host, port): """ Connects to a daemon at host:port @@ -402,21 +421,8 @@ class DaemonSSLProxy(DaemonProxy): except: pass - # Get the DelugeRPCError object from the error_data - error = error_data.value - - # Create a delugerpcrequest to print out a nice RPCRequest string - r = DelugeRPCRequest() - r.method = error.method - r.args = error.args - r.kwargs = error.kwargs - msg = "RPCError Message Received!" - msg += "\n" + "-" * 80 - msg += "\n" + "RPCRequest: " + r.__repr__() - msg += "\n" + "-" * 80 - msg += "\n" + error.traceback + "\n" + error.exception_type + ": " + error.exception_msg - msg += "\n" + "-" * 80 - log.error(msg) + if error_data.value.exception_type != 'AuthManagerError': + log.error(error_data.value.logable()) return error_data def __on_connect(self, result): @@ -452,13 +458,24 @@ class DaemonSSLProxy(DaemonProxy): self.authentication_level = result # We need to tell the daemon what events we're interested in receiving if self.__factory.event_handlers: - self.call("daemon.set_event_interest", self.__factory.event_handlers.keys()) + self.call("daemon.set_event_interest", + self.__factory.event_handlers.keys()) + + self.call("core.get_auth_levels_mappings").addCallback( + self.__on_auth_levels_mappings + ) + self.login_deferred.callback(result) def __on_login_fail(self, result): log.debug("_on_login_fail(): %s", result) self.login_deferred.errback(result) + def __on_auth_levels_mappings(self, result): + auth_levels_mapping, auth_levels_mapping_reverse = result + self.auth_levels_mapping = auth_levels_mapping + self.auth_levels_mapping_reverse = auth_levels_mapping_reverse + def set_disconnect_callback(self, cb): """ Set a function to be called when the connection to the daemon is lost @@ -481,9 +498,13 @@ class DaemonClassicProxy(DaemonProxy): self.host = "localhost" self.port = 58846 # Running in classic mode, it's safe to import auth level - from deluge.core.authmanager import AUTH_LEVEL_ADMIN + from deluge.core.authmanager import (AUTH_LEVEL_ADMIN, + AUTH_LEVELS_MAPPING, + AUTH_LEVELS_MAPPING_REVERSE) self.username = "localclient" self.authentication_level = AUTH_LEVEL_ADMIN + self.auth_levels_mapping = AUTH_LEVELS_MAPPING + self.auth_levels_mapping_reverse = AUTH_LEVELS_MAPPING_REVERSE # Register the event handlers for event in event_handlers: for handler in event_handlers[event]: @@ -776,5 +797,13 @@ class Client(object): """ return self._daemon_proxy.authentication_level + @property + def auth_levels_mapping(self): + return self._daemon_proxy.auth_levels_mapping + + @property + def auth_levels_mapping_reverse(self): + return self._daemon_proxy.auth_levels_mapping_reverse + # This is the object clients will use client = Client() diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index 633ac3e64..d0c23471b 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -176,7 +176,7 @@ class ErrorDialog(BaseDialog): details = tb if details: - self.set_default_size(500, 400) + self.set_default_size(600, 400) textview = gtk.TextView() textview.set_editable(False) textview.get_buffer().set_text(details) @@ -245,3 +245,87 @@ class AuthenticationDialog(BaseDialog): def on_password_activate(self, widget): self.response(gtk.RESPONSE_OK) + +class AccountDialog(BaseDialog): + def __init__(self, username=None, password=None, authlevel=None, + levels_mapping=None, parent=None): + if username: + super(AccountDialog, self).__init__( + _("Edit Account"), + _("Edit existing account"), + gtk.STOCK_DIALOG_INFO, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_APPLY, gtk.RESPONSE_OK), + parent) + else: + super(AccountDialog, self).__init__( + _("New Account"), + _("Create a new account"), + gtk.STOCK_DIALOG_INFO, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_ADD, gtk.RESPONSE_OK), + parent) + + self.levels_mapping = levels_mapping + + table = gtk.Table(2, 3, False) + self.username_label = gtk.Label() + self.username_label.set_markup(_("Username:")) + self.username_label.set_alignment(1.0, 0.5) + self.username_label.set_padding(5, 5) + self.username_entry = gtk.Entry() + table.attach(self.username_label, 0, 1, 0, 1) + table.attach(self.username_entry, 1, 2, 0, 1) + + self.authlevel_label = gtk.Label() + self.authlevel_label.set_markup(_("Authentication Level:")) + self.authlevel_label.set_alignment(1.0, 0.5) + self.authlevel_label.set_padding(5, 5) + + self.authlevel_combo = gtk.combo_box_new_text() + active_idx = None + for idx, level in enumerate(levels_mapping.keys()): + self.authlevel_combo.append_text(level) + if authlevel and authlevel==level: + active_idx = idx + elif not authlevel and level == 'DEFAULT': + active_idx = idx + + print 'aidx', active_idx + if active_idx is not None: + self.authlevel_combo.set_active(active_idx) + + table.attach(self.authlevel_label, 0, 1, 1, 2) + table.attach(self.authlevel_combo, 1, 2, 1, 2) + + self.password_label = gtk.Label() + self.password_label.set_markup(_("Password:")) + self.password_label.set_alignment(1.0, 0.5) + self.password_label.set_padding(5, 5) + self.password_entry = gtk.Entry() + self.password_entry.set_visibility(False) + table.attach(self.password_label, 0, 1, 2, 3) + table.attach(self.password_entry, 1, 2, 2, 3) + + self.vbox.pack_start(table, False, False, padding=5) + if username: + self.username_entry.set_text(username) + self.username_entry.set_editable(False) + else: + self.set_focus(self.username_entry) + + if password: + self.password_entry.set_text(username) + + self.show_all() + + def get_username(self): + return self.username_entry.get_text() + + def get_password(self): + return self.password_entry.get_text() + + def get_authlevel(self): + combobox = self.authlevel_combo + level = combobox.get_model()[combobox.get_active()][0] + return level diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index 76c71ce58..9383846a0 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -1,4 +1,4 @@ - + @@ -11,13 +11,11 @@ 530 True dialog - False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 2 @@ -50,7 +48,7 @@ False True - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -66,7 +64,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -294,7 +291,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● + ● 1 @@ -501,7 +498,7 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -517,7 +514,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -557,7 +553,6 @@ True - vertical True @@ -755,7 +750,6 @@ True - vertical 5 @@ -880,7 +874,7 @@ True Enter the IP address of the interface to listen for incoming bittorrent connections on. Leave this empty if you want to use the default. 60 - ● + ● 30 @@ -927,7 +921,6 @@ True - vertical True @@ -1127,7 +1120,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -1159,7 +1151,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -1193,7 +1184,6 @@ Either True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -1291,7 +1281,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1307,7 +1297,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -1347,7 +1336,6 @@ Disabled True - vertical 5 @@ -1361,7 +1349,7 @@ Disabled True True 1 - -1 -1 9999 1 10 0 + 0 -1 9999 1 10 0 True @@ -1377,7 +1365,7 @@ Disabled True True 1 - -1 -1 9999 1 10 0 + 0 -1 9999 1 10 0 True @@ -1456,7 +1444,7 @@ Disabled The maximum number of connections allowed. Set -1 for unlimited. 4 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 1 True True @@ -1488,7 +1476,7 @@ Disabled GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK The maximum download speed for all torrents. Set -1 for unlimited. 1 - -1 -1 60000 1 10 0 + 0 -1 60000 1 10 0 1 1 True @@ -1507,7 +1495,7 @@ Disabled True The maximum upload speed for all torrents. Set -1 for unlimited. 1 - -1 -1 60000 1 10 0 + 0 -1 60000 1 10 0 1 1 True @@ -1526,7 +1514,7 @@ Disabled True The maximum upload slots for all torrents. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 1 True True @@ -1631,7 +1619,7 @@ Disabled True The maximum upload slots per torrent. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 1 True True @@ -1650,7 +1638,7 @@ Disabled True The maximum number of connections per torrent. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 True True @@ -1716,7 +1704,7 @@ Disabled True The maximum number of connections per torrent. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 1 True @@ -1734,7 +1722,7 @@ Disabled True The maximum number of connections per torrent. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 + 0 -1 9000 1 10 0 1 True @@ -1790,7 +1778,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1806,7 +1794,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -1892,7 +1879,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical Show session speed in titlebar @@ -1943,7 +1929,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical Always show @@ -2013,7 +1998,6 @@ Disabled True - vertical Enable system tray icon @@ -2196,7 +2180,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2212,7 +2196,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2254,7 +2237,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2316,7 +2298,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2392,7 +2373,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2417,7 +2397,7 @@ Disabled True True If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country. - ● + ● 1 @@ -2530,7 +2510,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2546,7 +2526,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2588,7 +2567,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2736,6 +2714,111 @@ Disabled 4 + + + True + 0 + none + + + True + 12 + + + True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 0 + + + + + True + 5 + True + start + + + gtk-add + True + True + True + True + + + + False + False + 0 + + + + + gtk-edit + True + False + True + True + True + + + + False + False + 1 + + + + + gtk-delete + True + False + True + True + True + + + + False + False + 2 + + + + + False + 4 + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 10 + 10 + <b>Accounts</b> + True + + + label_item + + + + + 5 + + @@ -2757,7 +2840,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2773,7 +2856,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -2803,7 +2885,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 5 @@ -2821,7 +2902,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical Queue new torrents to top @@ -2872,7 +2952,6 @@ Disabled True - vertical 5 @@ -3024,7 +3103,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical 2 @@ -3234,7 +3312,7 @@ Disabled - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3250,7 +3328,6 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -3278,7 +3355,6 @@ Disabled True - vertical 5 @@ -3372,7 +3448,7 @@ Disabled True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8080 0 65535 1 10 0 + 100 0 65535 1 10 0 True @@ -3556,7 +3632,7 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8080 0 65535 1 10 0 + 100 0 65535 1 10 0 True @@ -3740,7 +3816,7 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8080 0 65535 1 10 0 + 100 0 65535 1 10 0 True @@ -3927,7 +4003,7 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8080 0 65535 1 10 0 + 100 0 65535 1 10 0 True @@ -4042,7 +4118,7 @@ HTTP W/ Auth - + True True automatic @@ -4055,7 +4131,6 @@ HTTP W/ Auth True - vertical True @@ -4087,7 +4162,6 @@ HTTP W/ Auth True - vertical True @@ -4132,9 +4206,9 @@ HTTP W/ Auth True True - ● + ● 1 - 512 0 99999 1 10 0 + 100 0 99999 1 10 0 True if-valid @@ -4149,7 +4223,7 @@ HTTP W/ Auth True True 5 - ● + ● 5 1 60 1 32000 1 10 0 @@ -4197,7 +4271,6 @@ HTTP W/ Auth True - vertical True @@ -4590,7 +4663,7 @@ HTTP W/ Auth - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -4606,7 +4679,6 @@ HTTP W/ Auth True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -4637,7 +4709,6 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical True @@ -4996,7 +5067,7 @@ HTTP W/ Auth - 9 + 2 diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 88b19c9a4..6026f1387 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -2,6 +2,7 @@ # menubar.py # # Copyright (C) 2007, 2008 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -212,7 +213,9 @@ class MenuBar(component.Component): self.menuitem_change_owner.set_visible(False) # Get Known accounts to allow chaning ownership - client.core.get_known_accounts().addCallback(self._on_known_accounts) + client.core.get_known_accounts().addCallback( + self._on_known_accounts).addErrback(self._on_known_accounts_fail + ) def stop(self): log.debug("MenuBar stopping") @@ -354,9 +357,9 @@ class MenuBar(component.Component): def show_move_storage_dialog(self, status): log.debug("show_move_storage_dialog") - glade = gtk.glade.XML( - pkg_resources.resource_filename("deluge.ui.gtkui", - "glade/move_storage_dialog.glade")) + glade = gtk.glade.XML(pkg_resources.resource_filename( + "deluge.ui.gtkui", "glade/move_storage_dialog.glade" + )) dialog = glade.get_widget("move_storage_dialog") dialog.set_transient_for(self.window.window) entry = glade.get_widget("entry_destination") @@ -439,10 +442,21 @@ class MenuBar(component.Component): } # widget: (header, type_str, image_stockid, image_filename, default) other_dialog_info = { - "menuitem_down_speed": (_("Set Maximum Download Speed"), "KiB/s", None, "downloading.svg", -1.0), - "menuitem_up_speed": (_("Set Maximum Upload Speed"), "KiB/s", None, "seeding.svg", -1.0), - "menuitem_max_connections": (_("Set Maximum Connections"), "", gtk.STOCK_NETWORK, None, -1), - "menuitem_upload_slots": (_("Set Maximum Upload Slots"), "", gtk.STOCK_SORT_ASCENDING, None, -1) + "menuitem_down_speed": ( + _("Set Maximum Download Speed"), + "KiB/s", None, "downloading.svg", -1.0 + ), + "menuitem_up_speed": ( + _("Set Maximum Upload Speed"), + "KiB/s", None, "seeding.svg", -1.0 + ), + "menuitem_max_connections": ( + _("Set Maximum Connections"), "", gtk.STOCK_NETWORK, None, -1 + ), + "menuitem_upload_slots": ( + _("Set Maximum Upload Slots"), + "", gtk.STOCK_SORT_ASCENDING, None, -1 + ) } # Show the other dialog @@ -483,7 +497,15 @@ class MenuBar(component.Component): getattr(self.window.main_glade.get_widget(item), attr)() def _on_known_accounts(self, known_accounts): - log.debug("_on_known_accounts: %s", known_accounts) + known_accounts_to_log = [] + for account in known_accounts: + account_to_log = {} + for key, value in account.copy().iteritems(): + if key == 'password': + value = '*' * len(value) + account_to_log[key] = value + known_accounts_to_log.append(account_to_log) + log.debug("_on_known_accounts: %s", known_accounts_to_log) if len(known_accounts) <= 1: return @@ -496,14 +518,18 @@ class MenuBar(component.Component): self.change_owner_submenu_items[None] = gtk.RadioMenuItem(maingroup) for account in known_accounts: - self.change_owner_submenu_items[account] = item = gtk.RadioMenuItem(maingroup, account) + username = account["username"] + item = gtk.RadioMenuItem(maingroup, username) + self.change_owner_submenu_items[username] = item self.change_owner_submenu.append(item) - item.connect("toggled", self._on_change_owner_toggled, account) + item.connect("toggled", self._on_change_owner_toggled, username) self.change_owner_submenu.show_all() self.change_owner_submenu_items[None].set_active(True) self.change_owner_submenu_items[None].hide() - self.menuitem_change_owner.connect("activate", self._on_change_owner_submenu_active) + self.menuitem_change_owner.connect( + "activate", self._on_change_owner_submenu_active + ) self.menuitem_change_owner.set_submenu(self.change_owner_submenu) def _on_known_accounts_fail(self, reason): @@ -517,18 +543,18 @@ class MenuBar(component.Component): return torrent_owner = component.get("TorrentView").get_torrent_status(selected[0])["owner"] - for account, item in self.change_owner_submenu_items.iteritems(): - item.set_active(account == torrent_owner) + for username, item in self.change_owner_submenu_items.iteritems(): + item.set_active(username == torrent_owner) - def _on_change_owner_toggled(self, widget, account): + def _on_change_owner_toggled(self, widget, username): log.debug("_on_change_owner_toggled") update_torrents = [] selected = component.get("TorrentView").get_selected_torrents() for torrent_id in selected: torrent_status = component.get("TorrentView").get_torrent_status(torrent_id) - if torrent_status["owner"] != account: + if torrent_status["owner"] != username: update_torrents.append(torrent_id) if update_torrents: - log.debug("Setting torrent owner \"%s\" on %s", account, update_torrents) - client.core.set_torrents_owner(update_torrents, account) + log.debug("Setting torrent owner \"%s\" on %s", username, update_torrents) + client.core.set_torrents_owner(update_torrents, username) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index a13937a2d..508effa4a 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -2,6 +2,7 @@ # preferences.py # # Copyright (C) 2007, 2008 Andrew Resch +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # @@ -46,11 +47,14 @@ from deluge.ui.client import client import deluge.common import deluge.error import common +import dialogs from deluge.configmanager import ConfigManager import deluge.configmanager log = logging.getLogger(__name__) +ACCOUNTS_USERNAME, ACCOUNTS_LEVEL, ACCOUNTS_PASSWORD = range(3) + class Preferences(component.Component): def __init__(self): component.Component.__init__(self, "Preferences") @@ -81,6 +85,35 @@ class Preferences(component.Component): self.liststore.append([i, category]) i += 1 + # Setup accounts tab lisview + self.accounts_levels_mapping = None + self.accounts_authlevel = self.glade.get_widget("accounts_authlevel") + self.accounts_liststore = gtk.ListStore(str, str, str, int) + self.accounts_liststore.set_sort_column_id(ACCOUNTS_USERNAME, + gtk.SORT_ASCENDING) + self.accounts_listview = self.glade.get_widget("accounts_listview") + self.accounts_listview.append_column( + gtk.TreeViewColumn( + _("Username"), gtk.CellRendererText(), text=ACCOUNTS_USERNAME + ) + ) + self.accounts_listview.append_column( + gtk.TreeViewColumn( + _("Level"), gtk.CellRendererText(), text=ACCOUNTS_LEVEL + ) + ) + password_column = gtk.TreeViewColumn( + 'password', gtk.CellRendererText(), text=ACCOUNTS_PASSWORD + ) + self.accounts_listview.append_column(password_column) + password_column.set_visible(False) + self.accounts_listview.set_model(self.accounts_liststore) + + self.accounts_listview.get_selection().connect( + "changed", self._on_accounts_selection_changed + ) + self.accounts_frame = self.glade.get_widget("AccountsFrame") + # Setup plugin tab listview self.plugin_liststore = gtk.ListStore(str, bool) self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING) @@ -96,11 +129,13 @@ class Preferences(component.Component): # Connect to the 'changed' event of TreeViewSelection to get selection # changes. - self.treeview.get_selection().connect("changed", - self.on_selection_changed) + self.treeview.get_selection().connect( + "changed", self.on_selection_changed + ) - self.plugin_listview.get_selection().connect("changed", - self.on_plugin_selection_changed) + self.plugin_listview.get_selection().connect( + "changed", self.on_plugin_selection_changed + ) self.glade.signal_autoconnect({ "on_pref_dialog_delete_event": self.on_pref_dialog_delete_event, @@ -114,7 +149,10 @@ class Preferences(component.Component): "on_button_find_plugins_clicked": self._on_button_find_plugins_clicked, "on_button_cache_refresh_clicked": self._on_button_cache_refresh_clicked, "on_combo_proxy_type_changed": self._on_combo_proxy_type_changed, - "on_button_associate_magnet_clicked": self._on_button_associate_magnet_clicked + "on_button_associate_magnet_clicked": self._on_button_associate_magnet_clicked, + "on_accounts_add_clicked": self._on_accounts_add_clicked, + "on_accounts_delete_clicked": self._on_accounts_delete_clicked, + "on_accounts_edit_clicked": self._on_accounts_edit_clicked }) # These get updated by requests done to the core @@ -191,9 +229,12 @@ class Preferences(component.Component): component.get("PluginManager").run_on_show_prefs() + # Update the preferences dialog to reflect current config settings self.core_config = {} if client.connected(): + self._get_accounts_tab_data() + def _on_get_config(config): self.core_config = config client.core.get_available_plugins().addCallback(_on_get_available_plugins) @@ -832,6 +873,9 @@ class Preferences(component.Component): # Show the correct notebook page based on what row is selected. (model, row) = treeselection.get_selected() try: + if model.get_value(row, 1) == _("Daemon"): + # Let's see update the accounts related stuff + self._get_accounts_tab_data() self.notebook.set_current_page(model.get_value(row, 0)) except TypeError: pass @@ -961,3 +1005,169 @@ class Preferences(component.Component): def _on_button_associate_magnet_clicked(self, widget): common.associate_magnet_links(True) + + + def _get_accounts_tab_data(self): + def on_ok(accounts): + self.accounts_frame.show() + self._on_get_known_accounts(accounts) + + def on_fail(failure): + if failure.value.exception_type == 'NotAuthorizedError': + self.accounts_frame.hide() + else: + dialogs.ErrorDialog( + _("Server Side Error"), + _("An error ocurred on the server"), + self.pref_dialog, details=failure.value.logable() + ).run() + client.core.get_known_accounts().addCallback(on_ok).addErrback(on_fail) + + def _on_get_known_accounts(self, known_accounts): + known_accounts_to_log = [] + for account in known_accounts: + account_to_log = {} + for key, value in account.copy().iteritems(): + if key == 'password': + value = '*' * len(value) + account_to_log[key] = value + known_accounts_to_log.append(account_to_log) + log.debug("_on_known_accounts: %s", known_accounts_to_log) + + self.accounts_liststore.clear() + + for account in known_accounts: + iter = self.accounts_liststore.append() + self.accounts_liststore.set_value( + iter, ACCOUNTS_USERNAME, account['username'] + ) + self.accounts_liststore.set_value( + iter, ACCOUNTS_LEVEL, account['authlevel'] + ) + self.accounts_liststore.set_value( + iter, ACCOUNTS_PASSWORD, account['password'] + ) + + def _on_accounts_selection_changed(self, treeselection): + log.debug("_on_accounts_selection_changed") + (model, itr) = treeselection.get_selected() + if not itr: + return + username = model[itr][0] + if username: + self.glade.get_widget("accounts_edit").set_sensitive(True) + self.glade.get_widget("accounts_delete").set_sensitive(True) + else: + self.glade.get_widget("accounts_edit").set_sensitive(False) + self.glade.get_widget("accounts_delete").set_sensitive(False) + + def _on_accounts_add_clicked(self, widget): + dialog = dialogs.AccountDialog( + levels_mapping=client.auth_levels_mapping, + parent=self.pref_dialog + ) + + def dialog_finished(response_id): + username = dialog.get_username() + password = dialog.get_password() + authlevel = dialog.get_authlevel() + + def add_ok(rv): + iter = self.accounts_liststore.append() + self.accounts_liststore.set_value( + iter, ACCOUNTS_USERNAME, username + ) + self.accounts_liststore.set_value( + iter, ACCOUNTS_LEVEL, authlevel + ) + self.accounts_liststore.set_value( + iter, ACCOUNTS_PASSWORD, password + ) + + def add_fail(failure): + if failure.value.exception_type == 'AuthManagerError': + dialogs.ErrorDialog( + _("Error Adding Account"), + failure.value.exception_msg + ).run() + else: + dialogs.ErrorDialog( + _("Error Adding Account"), + _("An error ocurred while adding account"), + self.pref_dialog, details=failure.value.logable() + ).run() + + if response_id == gtk.RESPONSE_OK: + client.core.create_account( + username, password, authlevel + ).addCallback(add_ok).addErrback(add_fail) + + dialog.run().addCallback(dialog_finished) + + def _on_accounts_edit_clicked(self, widget): + (model, itr) = self.accounts_listview.get_selection().get_selected() + if not itr: + return + + dialog = dialogs.AccountDialog( + model[itr][ACCOUNTS_USERNAME], + model[itr][ACCOUNTS_PASSWORD], + model[itr][ACCOUNTS_LEVEL], + levels_mapping=client.auth_levels_mapping, + parent=self.pref_dialog + ) + + def dialog_finished(response_id): + + def update_ok(rc): + model.set_value(itr, ACCOUNTS_PASSWORD, dialog.get_username()) + model.set_value(itr, ACCOUNTS_LEVEL, dialog.get_authlevel()) + + def update_fail(failure): + dialogs.ErrorDialog( + _("Error Updating Account"), + _("An error ocurred while updating account"), + self.pref_dialog, details=failure.value.logable() + ).run() + + if response_id == gtk.RESPONSE_OK: + client.core.update_account( + dialog.get_username(), + dialog.get_password(), + dialog.get_authlevel() + ).addCallback(update_ok).addErrback(update_fail) + + dialog.run().addCallback(dialog_finished) + + def _on_accounts_delete_clicked(self, widget): + (model, itr) = self.accounts_listview.get_selection().get_selected() + if not itr: + return + + username = model[itr][0] + header = _("Remove Account") + text = _("Are you sure you wan't do remove the account with the " + "username \"%(username)s\"?" % dict(username=username)) + dialog = dialogs.YesNoDialog(header, text, parent=self.pref_dialog) + + def dialog_finished(response_id): + def remove_ok(rc): + model.remove(itr) + + def remove_fail(failure): + if failure.value.exception_type == 'AuthManagerError': + dialogs.ErrorDialog( + _("Error Removing Account"), + failure.value.exception_msg + ).run() + else: + dialogs.ErrorDialog( + _("Error Removing Account"), + _("An error ocurred while removing account"), + self.pref_dialog, details=failure.value.logable() + ).run() + if response_id == gtk.RESPONSE_YES: + client.core.remove_account( + username + ).addCallback(remove_ok).addErrback(remove_fail) + dialog.run().addCallback(dialog_finished) From 936bd925d98bd518fc483e16477a708cb5d47b21 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 08:12:46 +0100 Subject: [PATCH 181/329] Some changes were left behind on last commit. --- deluge/core/authmanager.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index bed8ec0c2..4e07089c8 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -37,6 +37,7 @@ import os import random import stat +import shutil import logging import deluge.component as component @@ -133,6 +134,9 @@ class AuthManager(component.Component): else: raise BadLoginError("Password does not match", username) + def has_account(self, username): + return username in self.__auth + def get_known_accounts(self): """ Returns a list of known deluge usernames. @@ -180,15 +184,25 @@ class AuthManager(component.Component): def write_auth_file(self): old_auth_file = configmanager.get_config_dir("auth") new_auth_file = old_auth_file + '.new' - fd = open(new_auth_file, "w") - for account in self.__auth.values(): - fd.write( - "%(username)s:%(password)s:%(authlevel_int)s\n" % account.data() - ) - fd.flush() - os.fsync(fd.fileno()) - fd.close() - os.rename(new_auth_file, old_auth_file) + bak_auth_file = old_auth_file + '.bak' + # Let's first create a backup + shutil.copy2(old_auth_file, bak_auth_file) + + try: + fd = open(new_auth_file, "w") + for account in self.__auth.values(): + fd.write( + "%(username)s:%(password)s:%(authlevel_int)s\n" % + account.data() + ) + fd.flush() + os.fsync(fd.fileno()) + fd.close() + os.rename(new_auth_file, old_auth_file) + except: + # Something failed, let's restore the previous file + os.rename(bak_auth_file, old_auth_file) + self.__load_auth_file() def __create_localclient_account(self): From 78e966946feb49c70ff635508aa33602a1526ef1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 09:13:45 +0100 Subject: [PATCH 182/329] Allow setting torrent ownership when adding new torrents. --- deluge/core/torrentmanager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index aeb5068f9..ad2033588 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -329,7 +329,8 @@ class TorrentManager(component.Component): log.warning("Unable to delete the fastresume file: %s", e) def add(self, torrent_info=None, state=None, options=None, save_state=True, - filedump=None, filename=None, magnet=None, resume_data=None): + filedump=None, filename=None, magnet=None, resume_data=None, + owner='localclient'): """Add a torrent to the manager and returns it's torrent_id""" if torrent_info is None and state is None and filedump is None and magnet is None: @@ -447,7 +448,10 @@ class TorrentManager(component.Component): # Set auto_managed to False because the torrent is paused handle.auto_managed(False) # Create a Torrent object - owner = state.owner if state else component.get("RPCServer").get_session_user() + owner = state.owner if state else (owner if owner else component.get("RPCServer").get_session_user()) + account_exists = component.get("AuthManager").has_account(owner) + if not account_exists: + owner = 'localclient' torrent = Torrent(handle, options, state, filename, magnet, owner) # Add the torrent object to the dictionary self.torrents[torrent.torrent_id] = torrent From 51b5b23f7684bed29d266e60d376e8cbe5610156 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 13:12:18 +0100 Subject: [PATCH 183/329] Remove debug printing. --- deluge/ui/gtkui/dialogs.py | 1 - 1 file changed, 1 deletion(-) diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py index d0c23471b..805398bd7 100644 --- a/deluge/ui/gtkui/dialogs.py +++ b/deluge/ui/gtkui/dialogs.py @@ -291,7 +291,6 @@ class AccountDialog(BaseDialog): elif not authlevel and level == 'DEFAULT': active_idx = idx - print 'aidx', active_idx if active_idx is not None: self.authlevel_combo.set_active(active_idx) From fb5005e3f6446dac261ac4480742540984f1fd5e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 13:16:11 +0100 Subject: [PATCH 184/329] The AutoAdd plugin now supports multiusers. --- deluge/plugins/autoadd/autoadd/core.py | 100 ++++----- .../autoadd/data/autoadd_options.glade | 143 ++++++++++--- deluge/plugins/autoadd/autoadd/gtkui.py | 197 +++++++++++++----- deluge/plugins/autoadd/setup.py | 5 +- 4 files changed, 314 insertions(+), 131 deletions(-) diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py index 99c0d3a28..ce6d88240 100644 --- a/deluge/plugins/autoadd/autoadd/core.py +++ b/deluge/plugins/autoadd/autoadd/core.py @@ -2,6 +2,7 @@ # core.py # # Copyright (C) 2009 GazpachoKing +# Copyright (C) 2011 Pedro Algarvio # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken @@ -59,7 +60,7 @@ OPTIONS_AVAILABLE = { #option: builtin "enabled":False, "path":False, "append_extension":False, - "abspath":False, + "abspath":False, "download_location":True, "max_download_speed":True, "max_upload_speed":True, @@ -74,7 +75,8 @@ OPTIONS_AVAILABLE = { #option: builtin "move_completed_path":True, "label":False, "add_paused":True, - "queue_to_top":False + "queue_to_top":False, + "owner": "localclient" } MAX_NUM_ATTEMPTS = 10 @@ -90,29 +92,17 @@ def CheckInput(cond, message): class Core(CorePluginBase): def enable(self): - + #reduce typing, assigning some values to self... self.config = deluge.configmanager.ConfigManager("autoadd.conf", DEFAULT_PREFS) + self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2) + self.config.save() self.watchdirs = self.config["watchdirs"] - self.core_cfg = deluge.configmanager.ConfigManager("core.conf") # Dict of Filename:Attempts self.invalid_torrents = {} # Loopingcall timers for each enabled watchdir self.update_timers = {} - # If core autoadd folder is enabled, move it to the plugin - if self.core_cfg.config.get('autoadd_enable'): - # Disable core autoadd - self.core_cfg['autoadd_enable'] = False - self.core_cfg.save() - # Check if core autoadd folder is already added in plugin - for watchdir in self.watchdirs: - if os.path.abspath(self.core_cfg['autoadd_location']) == watchdir['abspath']: - watchdir['enabled'] = True - break - else: - # didn't find core watchdir, add it - self.add({'path':self.core_cfg['autoadd_location'], 'enabled':True}) deferLater(reactor, 5, self.enable_looping) def enable_looping(self): @@ -129,34 +119,38 @@ class Core(CorePluginBase): def update(self): pass - + @export() def set_options(self, watchdir_id, options): """Update the options for a watch folder.""" watchdir_id = str(watchdir_id) options = self._make_unicode(options) - CheckInput(watchdir_id in self.watchdirs , _("Watch folder does not exist.")) + CheckInput( + watchdir_id in self.watchdirs, _("Watch folder does not exist.") + ) if options.has_key('path'): options['abspath'] = os.path.abspath(options['path']) - CheckInput(os.path.isdir(options['abspath']), _("Path does not exist.")) + CheckInput( + os.path.isdir(options['abspath']), _("Path does not exist.") + ) for w_id, w in self.watchdirs.iteritems(): if options['abspath'] == w['abspath'] and watchdir_id != w_id: raise Exception("Path is already being watched.") for key in options.keys(): - if not key in OPTIONS_AVAILABLE: - if not key in [key2+'_toggle' for key2 in OPTIONS_AVAILABLE.iterkeys()]: + if key not in OPTIONS_AVAILABLE: + if key not in [key2+'_toggle' for key2 in OPTIONS_AVAILABLE.iterkeys()]: raise Exception("autoadd: Invalid options key:%s" % key) #disable the watch loop if it was active if watchdir_id in self.update_timers: self.disable_watchdir(watchdir_id) - + self.watchdirs[watchdir_id].update(options) #re-enable watch loop if appropriate if self.watchdirs[watchdir_id]['enabled']: self.enable_watchdir(watchdir_id) self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) - + def load_torrent(self, filename): try: log.debug("Attempting to open %s for add.", filename) @@ -173,7 +167,7 @@ class Core(CorePluginBase): info = lt.torrent_info(lt.bdecode(filedump)) return filedump - + def update_watchdir(self, watchdir_id): """Check the watch folder for new torrents to add.""" watchdir_id = str(watchdir_id) @@ -187,12 +181,12 @@ class Core(CorePluginBase): log.warning("Invalid AutoAdd folder: %s", watchdir["abspath"]) self.disable_watchdir(watchdir_id) return - + # Generate options dict for watchdir opts = {} if 'stop_at_ratio_toggle' in watchdir: watchdir['stop_ratio_toggle'] = watchdir['stop_at_ratio_toggle'] - # We default to True wher reading _toggle values, so a config + # We default to True when reading _toggle values, so a config # without them is valid, and applies all its settings. for option, value in watchdir.iteritems(): if OPTIONS_AVAILABLE.get(option): @@ -203,7 +197,8 @@ class Core(CorePluginBase): try: filepath = os.path.join(watchdir["abspath"], filename) except UnicodeDecodeError, e: - log.error("Unable to auto add torrent due to inproper filename encoding: %s", e) + log.error("Unable to auto add torrent due to improper " + "filename encoding: %s", e) continue try: filedump = self.load_torrent(filepath) @@ -222,7 +217,10 @@ class Core(CorePluginBase): continue # The torrent looks good, so lets add it to the session. - torrent_id = component.get("TorrentManager").add(filedump=filedump, filename=filename, options=opts) + torrent_id = component.get("TorrentManager").add( + filedump=filedump, filename=filename, options=opts, + owner=watchdir.get("owner", "localclient") + ) # If the torrent added successfully, set the extra options. if torrent_id: if 'Label' in component.get("CorePluginManager").get_enabled_plugins(): @@ -247,32 +245,35 @@ class Core(CorePluginBase): def on_update_watchdir_error(self, failure, watchdir_id): """Disables any watch folders with unhandled exceptions.""" self.disable_watchdir(watchdir_id) - log.error("Disabling '%s', error during update: %s" % (self.watchdirs[watchdir_id]["path"], failure)) - + log.error("Disabling '%s', error during update: %s", + self.watchdirs[watchdir_id]["path"], failure) + @export def enable_watchdir(self, watchdir_id): - watchdir_id = str(watchdir_id) + w_id = str(watchdir_id) # Enable the looping call - if watchdir_id not in self.update_timers or not self.update_timers[watchdir_id].running: - self.update_timers[watchdir_id] = LoopingCall(self.update_watchdir, watchdir_id) - self.update_timers[watchdir_id].start(5).addErrback(self.on_update_watchdir_error, watchdir_id) + if w_id not in self.update_timers or not self.update_timers[w_id].running: + self.update_timers[w_id] = LoopingCall(self.update_watchdir, w_id) + self.update_timers[w_id].start(5).addErrback( + self.on_update_watchdir_error, w_id + ) # Update the config - if not self.watchdirs[watchdir_id]['enabled']: - self.watchdirs[watchdir_id]['enabled'] = True + if not self.watchdirs[w_id]['enabled']: + self.watchdirs[w_id]['enabled'] = True self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) - + @export def disable_watchdir(self, watchdir_id): - watchdir_id = str(watchdir_id) + w_id = str(watchdir_id) # Disable the looping call - if watchdir_id in self.update_timers: - if self.update_timers[watchdir_id].running: - self.update_timers[watchdir_id].stop() - del self.update_timers[watchdir_id] + if w_id in self.update_timers: + if self.update_timers[w_id].running: + self.update_timers[w_id].stop() + del self.update_timers[w_id] # Update the config - if self.watchdirs[watchdir_id]['enabled']: - self.watchdirs[watchdir_id]['enabled'] = False + if self.watchdirs[w_id]['enabled']: + self.watchdirs[w_id]['enabled'] = False self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) @@ -289,7 +290,7 @@ class Core(CorePluginBase): def get_config(self): """Returns the config dictionary.""" return self.config.config - + @export() def get_watchdirs(self): return self.watchdirs.keys() @@ -321,7 +322,7 @@ class Core(CorePluginBase): self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) return watchdir_id - + @export def remove(self, watchdir_id): """Remove a watch folder.""" @@ -332,3 +333,8 @@ class Core(CorePluginBase): del self.watchdirs[watchdir_id] self.config.save() component.get("EventManager").emit(AutoaddOptionsChangedEvent()) + + def __migrate_config_1_to_2(self, config): + for watchdir_id in config['watchdirs'].iterkeys(): + config['watchdirs'][watchdir_id]['owner'] = 'localclient' + return config diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade index 3ec79b716..5c8bab041 100644 --- a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade +++ b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade @@ -1,4 +1,4 @@ - + @@ -83,11 +83,9 @@ True - vertical True - vertical True @@ -96,7 +94,6 @@ True 6 - vertical True @@ -109,7 +106,6 @@ True - vertical True @@ -117,7 +113,7 @@ True True - ● + ● 0 @@ -174,6 +170,37 @@ 0 + + + True + 0 + none + + + True + 12 + + + True + + + + + + + True + <b>Owner</b> + True + + + label_item + + + + + 1 + + True @@ -189,15 +216,14 @@ True - vertical Delete .torrent after adding True True False - True True + 0 @@ -224,7 +250,7 @@ True True - • + • .added @@ -236,6 +262,75 @@ 1 + + + True + 2 + 2 + + + Copy of .torrent files to: + True + True + False + True + isnt_append_extension + + + + + + True + + + True + True + • + + + 0 + + + + + True + select-folder + True + Select A Folder + + + 1 + + + + + 1 + 2 + + + + + Delete copy of torrent file on remove + True + True + False + True + Delete the copy of the torrent file +created when the torrent is removed + True + + + 2 + 1 + 2 + 15 + + + + + 2 + + @@ -254,7 +349,7 @@ - 1 + 2 @@ -269,7 +364,6 @@ True - vertical Set download location @@ -293,7 +387,7 @@ True True - ● + ● 0 @@ -332,7 +426,7 @@ False - 2 + 3 @@ -347,7 +441,6 @@ True - vertical Set move completed location @@ -371,7 +464,7 @@ True True - ● + ● 0 @@ -425,7 +518,7 @@ False - 3 + 4 @@ -456,10 +549,8 @@ - + True - True - ● 1 @@ -481,7 +572,7 @@ - 4 + 5 @@ -500,7 +591,6 @@ True 6 - vertical @@ -574,7 +664,7 @@ True True - -1 -1 10000 1 10 0 + 0 -1 10000 1 10 0 1 1 @@ -588,7 +678,7 @@ True True - -1 -1 10000 1 10 0 + 0 -1 10000 1 10 0 1 1 @@ -604,7 +694,7 @@ True True - -1 -1 10000 1 10 0 + 0 -1 10000 1 10 0 1 @@ -619,7 +709,7 @@ True True - -1 -1 10000 1 10 0 + 0 -1 10000 1 10 0 1 @@ -814,7 +904,7 @@ True True - ● + ● 2 0 100 0.10000000149 10 0 1 1 @@ -1050,7 +1140,6 @@ True - vertical 1 diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py index e71fb3b2f..53e2fc9ef 100644 --- a/deluge/plugins/autoadd/autoadd/gtkui.py +++ b/deluge/plugins/autoadd/autoadd/gtkui.py @@ -53,9 +53,12 @@ log = getPluginLogger(__name__) class OptionsDialog(): spin_ids = ["max_download_speed", "max_upload_speed", "stop_ratio"] spin_int_ids = ["max_upload_slots", "max_connections"] - chk_ids = ["stop_at_ratio", "remove_at_ratio", "move_completed", "add_paused", "auto_managed", "queue_to_top"] + chk_ids = ["stop_at_ratio", "remove_at_ratio", "move_completed", + "add_paused", "auto_managed", "queue_to_top"] + def __init__(self): - pass + self.accounts = gtk.ListStore(str) + self.labels = gtk.ListStore(str) def show(self, options={}, watchdir_id=None): self.glade = gtk.glade.XML(get_resource("autoadd_options.glade")) @@ -72,6 +75,7 @@ class OptionsDialog(): self.dialog.set_transient_for(component.get("Preferences").pref_dialog) self.err_dialog = self.glade.get_widget("error_dialog") self.err_dialog.set_transient_for(self.dialog) + if watchdir_id: #We have an existing watchdir_id, we are editing self.glade.get_widget('opts_add_button').hide() @@ -84,15 +88,40 @@ class OptionsDialog(): self.watchdir_id = None self.load_options(options) + + # Not implemented feateures present in UI + self.glade.get_widget("copy_torrent_toggle").hide() + self.glade.get_widget("copy_torrent_entry").hide() + self.glade.get_widget("copy_torrent_chooser").hide() + self.glade.get_widget("delete_copy_torrent_toggle").hide() + self.dialog.run() def load_options(self, options): self.glade.get_widget('enabled').set_active(options.get('enabled', False)) - self.glade.get_widget('append_extension_toggle').set_active(options.get('append_extension_toggle', False)) - self.glade.get_widget('append_extension').set_text(options.get('append_extension', '.added')) - self.glade.get_widget('download_location_toggle').set_active(options.get('download_location_toggle', False)) - self.glade.get_widget('label').set_text(options.get('label', '')) + self.glade.get_widget('append_extension_toggle').set_active( + options.get('append_extension_toggle', False) + ) + self.glade.get_widget('append_extension').set_text( + options.get('append_extension', '.added') + ) + self.glade.get_widget('download_location_toggle').set_active( + options.get('download_location_toggle', False) + ) + self.accounts.clear() + self.labels.clear() + combobox = self.glade.get_widget('OwnerCombobox') + combobox_render = gtk.CellRendererText() + combobox.pack_start(combobox_render, True) + combobox.add_attribute(combobox_render, 'text', 0) + combobox.set_model(self.accounts) + + label_widget = self.glade.get_widget('label') + label_widget.child.set_text(options.get('label', '')) + label_widget.set_model(self.labels) + label_widget.set_text_column(0) self.glade.get_widget('label_toggle').set_active(options.get('label_toggle', False)) + for id in self.spin_ids + self.spin_int_ids: self.glade.get_widget(id).set_value(options.get(id, 0)) self.glade.get_widget(id+'_toggle').set_active(options.get(id+'_toggle', False)) @@ -105,32 +134,66 @@ class OptionsDialog(): self.glade.get_widget('isnt_queue_to_top').set_active(True) if not options.get('auto_managed', True): self.glade.get_widget('isnt_auto_managed').set_active(True) - for field in ['move_completed_path', 'path', 'download_location']: + for field in ['move_completed_path', 'path', 'download_location', + 'copy_torrent']: if client.is_localhost(): - self.glade.get_widget(field+"_chooser").set_filename(options.get(field, os.path.expanduser("~"))) + self.glade.get_widget(field+"_chooser").set_filename( + options.get(field, os.path.expanduser("~")) + ) self.glade.get_widget(field+"_chooser").show() self.glade.get_widget(field+"_entry").hide() else: - self.glade.get_widget(field+"_entry").set_text(options.get(field, "")) + self.glade.get_widget(field+"_entry").set_text( + options.get(field, "") + ) self.glade.get_widget(field+"_entry").show() self.glade.get_widget(field+"_chooser").hide() self.set_sensitive() - + + def on_accounts(accounts, owner): + log.debug("Got Accounts") + selected_idx = None + for idx, account in enumerate(accounts): + iter = self.accounts.append() + self.accounts.set_value( + iter, 0, account['username'] + ) + if account['username'] == owner: + selected_idx = idx + self.glade.get_widget('OwnerCombobox').set_active(selected_idx) + + def on_labels(labels): + log.debug("Got Labels: %s", labels) + for label in labels: + self.labels.set_value(self.labels.append(), 0, label) + label_widget = self.glade.get_widget('label') + label_widget.set_model(self.labels) + label_widget.set_text_column(0) + + def on_failure(failure): + log.exception(failure) + def on_get_enabled_plugins(result): - if 'Label' in result: + if 'Label' in result: self.glade.get_widget('label_frame').show() + client.label.get_labels().addCallback(on_labels).addErrback(on_failure) else: self.glade.get_widget('label_frame').hide() self.glade.get_widget('label_toggle').set_active(False) - + client.core.get_enabled_plugins().addCallback(on_get_enabled_plugins) - + client.core.get_known_accounts().addCallback( + on_accounts, options.get('owner', 'localclient') + ).addErrback(on_failure) + def set_sensitive(self): - maintoggles = ['download_location', 'append_extension', 'move_completed', 'label', \ - 'max_download_speed', 'max_upload_speed', 'max_connections', \ - 'max_upload_slots', 'add_paused', 'auto_managed', 'stop_at_ratio', 'queue_to_top'] + maintoggles = ['download_location', 'append_extension', + 'move_completed', 'label', 'max_download_speed', + 'max_upload_speed', 'max_connections', + 'max_upload_slots', 'add_paused', 'auto_managed', + 'stop_at_ratio', 'queue_to_top', 'copy_torrent'] [self.on_toggle_toggled(self.glade.get_widget(x+'_toggle')) for x in maintoggles] - + def on_toggle_toggled(self, tb): toggle = str(tb.name).replace("_toggle", "") isactive = tb.get_active() @@ -139,6 +202,10 @@ class OptionsDialog(): self.glade.get_widget('download_location_entry').set_sensitive(isactive) elif toggle == 'append_extension': self.glade.get_widget('append_extension').set_sensitive(isactive) + elif toggle == 'copy_torrent': + self.glade.get_widget('copy_torrent_entry').set_sensitive(isactive) + self.glade.get_widget('copy_torrent_chooser').set_sensitive(isactive) + self.glade.get_widget('delete_copy_torrent_toggle').set_sensitive(isactive) elif toggle == 'move_completed': self.glade.get_widget('move_completed_path_chooser').set_sensitive(isactive) self.glade.get_widget('move_completed_path_entry').set_sensitive(isactive) @@ -168,29 +235,31 @@ class OptionsDialog(): self.glade.get_widget('stop_at_ratio').set_active(isactive) self.glade.get_widget('stop_ratio').set_sensitive(isactive) self.glade.get_widget('remove_at_ratio').set_sensitive(isactive) - + def on_apply(self, Event=None): - client.autoadd.set_options(str(self.watchdir_id), self.generate_opts()).addCallbacks(self.on_added, self.on_error_show) - + client.autoadd.set_options( + str(self.watchdir_id), self.generate_opts() + ).addCallbacks(self.on_added, self.on_error_show) + def on_error_show(self, result): self.glade.get_widget('error_label').set_text(result.value.exception_msg) self.err_dialog = self.glade.get_widget('error_dialog') self.err_dialog.set_transient_for(self.dialog) result.cleanFailure() self.err_dialog.show() - + def on_added(self, result): self.dialog.destroy() - + def on_error_ok(self, Event=None): self.err_dialog.hide() - + def on_add(self, Event=None): client.autoadd.add(self.generate_opts()).addCallbacks(self.on_added, self.on_error_show) - + def on_cancel(self, Event=None): self.dialog.destroy() - + def generate_opts(self): # generate options dict based on gtk objects options = {} @@ -203,10 +272,14 @@ class OptionsDialog(): options['path'] = self.glade.get_widget('path_entry').get_text() options['download_location'] = self.glade.get_widget('download_location_entry').get_text() options['move_completed_path'] = self.glade.get_widget('move_completed_path_entry').get_text() + + options['owner'] = self.accounts[ + self.glade.get_widget('OwnerCombobox').get_active()][0] + options['append_extension_toggle'] = self.glade.get_widget('append_extension_toggle').get_active() options['append_extension'] = self.glade.get_widget('append_extension').get_text() options['download_location_toggle'] = self.glade.get_widget('download_location_toggle').get_active() - options['label'] = self.glade.get_widget('label').get_text().lower() + options['label'] = self.glade.get_widget('label').child.get_text().lower() options['label_toggle'] = self.glade.get_widget('label_toggle').get_active() for id in self.spin_ids: @@ -219,11 +292,11 @@ class OptionsDialog(): options[id] = self.glade.get_widget(id).get_active() options[id+'_toggle'] = self.glade.get_widget(id+'_toggle').get_active() return options - + class GtkUI(GtkPluginBase): def enable(self): - + self.glade = gtk.glade.XML(get_resource("config.glade")) self.glade.signal_autoconnect({ "on_add_button_clicked": self.on_add_button_clicked, @@ -231,18 +304,18 @@ class GtkUI(GtkPluginBase): "on_remove_button_clicked": self.on_remove_button_clicked }) self.opts_dialog = OptionsDialog() - + component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs) client.register_event_handler("AutoaddOptionsChangedEvent", self.on_options_changed_event) - + self.watchdirs = {} - + vbox = self.glade.get_widget("watchdirs_vbox") sw = gtk.ScrolledWindow() sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - + vbox.pack_start(sw, True, True, 0) self.store = self.create_model() @@ -258,65 +331,76 @@ class GtkUI(GtkPluginBase): component.get("Preferences").add_page("AutoAdd", self.glade.get_widget("prefs_box")) self.on_show_prefs() - + def disable(self): component.get("Preferences").remove_page("AutoAdd") component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs) component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs) - + def create_model(self): - - store = gtk.ListStore(str, bool, str) + store = gtk.ListStore(str, bool, str, str) for watchdir_id, watchdir in self.watchdirs.iteritems(): - store.append([watchdir_id, watchdir['enabled'], watchdir['path']]) + store.append([ + watchdir_id, watchdir['enabled'], + watchdir.get('owner', 'localclient'), watchdir['path'] + ]) return store - + def create_columns(self, treeView): rendererToggle = gtk.CellRendererToggle() - column = gtk.TreeViewColumn("On", rendererToggle, activatable=True, active=1) - column.set_sort_column_id(1) + column = gtk.TreeViewColumn( + _("Active"), rendererToggle, activatable=True, active=1 + ) + column.set_sort_column_id(1) treeView.append_column(column) tt = gtk.Tooltip() - tt.set_text('Double-click to toggle') + tt.set_text(_('Double-click to toggle')) treeView.set_tooltip_cell(tt, None, None, rendererToggle) - + rendererText = gtk.CellRendererText() - column = gtk.TreeViewColumn("Path", rendererText, text=2) + column = gtk.TreeViewColumn(_("Owner"), rendererText, text=2) column.set_sort_column_id(2) treeView.append_column(column) tt2 = gtk.Tooltip() - tt2.set_text('Double-click to edit') - #treeView.set_tooltip_cell(tt2, None, column, None) + tt2.set_text(_('Double-click to edit')) + treeView.set_has_tooltip(True) + + rendererText = gtk.CellRendererText() + column = gtk.TreeViewColumn(_("Path"), rendererText, text=3) + column.set_sort_column_id(3) + treeView.append_column(column) + tt2 = gtk.Tooltip() + tt2.set_text(_('Double-click to edit')) treeView.set_has_tooltip(True) def load_watchdir_list(self): pass - + def add_watchdir_entry(self): pass - + def on_add_button_clicked(self, Event=None): #display options_window self.opts_dialog.show() - + def on_remove_button_clicked(self, Event=None): tree, tree_id = self.treeView.get_selection().get_selected() watchdir_id = str(self.store.get_value(tree_id, 0)) if watchdir_id: client.autoadd.remove(watchdir_id) - + def on_edit_button_clicked(self, Event=None, a=None, col=None): tree, tree_id = self.treeView.get_selection().get_selected() watchdir_id = str(self.store.get_value(tree_id, 0)) if watchdir_id: - if col and col.get_title() == 'On': + if col and col.get_title() == _("Active"): if self.watchdirs[watchdir_id]['enabled']: client.autoadd.disable_watchdir(watchdir_id) else: client.autoadd.enable_watchdir(watchdir_id) else: self.opts_dialog.show(self.watchdirs[watchdir_id], watchdir_id) - + def on_listitem_activated(self, treeview): tree, tree_id = self.treeView.get_selection().get_selected() if tree_id: @@ -325,7 +409,7 @@ class GtkUI(GtkPluginBase): else: self.glade.get_widget('edit_button').set_sensitive(False) self.glade.get_widget('remove_button').set_sensitive(False) - + def on_apply_prefs(self): log.debug("applying prefs for AutoAdd") for watchdir_id, watchdir in self.watchdirs.iteritems(): @@ -333,7 +417,7 @@ class GtkUI(GtkPluginBase): def on_show_prefs(self): client.autoadd.get_config().addCallback(self.cb_get_config) - + def on_options_changed_event(self): client.autoadd.get_config().addCallback(self.cb_get_config) @@ -342,8 +426,11 @@ class GtkUI(GtkPluginBase): self.watchdirs = config.get('watchdirs', {}) self.store.clear() for watchdir_id, watchdir in self.watchdirs.iteritems(): - self.store.append([watchdir_id, watchdir['enabled'], watchdir['path']]) + self.store.append([ + watchdir_id, watchdir['enabled'], + watchdir.get('owner', 'localclient'), watchdir['path'] + ]) # Disable the remove and edit buttons, because nothing in the store is selected self.glade.get_widget('remove_button').set_sensitive(False) self.glade.get_widget('edit_button').set_sensitive(False) - + diff --git a/deluge/plugins/autoadd/setup.py b/deluge/plugins/autoadd/setup.py index 11c0e1158..6a509e3ca 100644 --- a/deluge/plugins/autoadd/setup.py +++ b/deluge/plugins/autoadd/setup.py @@ -2,6 +2,7 @@ # setup.py # # Copyright (C) 2009 GazpachoKing +# Copyright (C) 2011 Pedro Algarvio # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken @@ -40,8 +41,8 @@ from setuptools import setup __plugin_name__ = "AutoAdd" -__author__ = "Chase Sterling" -__author_email__ = "chase.sterling@gmail.com" +__author__ = "Chase Sterling, Pedro Algarvio" +__author_email__ = "chase.sterling@gmail.com, ufs@ufsoft.org" __version__ = "1.02" __url__ = "http://forum.deluge-torrent.org/viewtopic.php?f=9&t=26775" __license__ = "GPLv3" From f1730dc4d492ab3928da7a18ad4fe9be7d6e484a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 13:44:27 +0100 Subject: [PATCH 185/329] Removed leftovers from the core autoadd. All autoadd features are now addressed by the AutoAdd plugin. NOTE: Console UI and Web UI should also remove the core auto add stuff. --- deluge/core/autoadd.py | 137 ------------------ deluge/core/preferencesmanager.py | 2 - .../ui/gtkui/glade/preferences_dialog.glade | 36 +---- deluge/ui/gtkui/gtkui.py | 3 - deluge/ui/gtkui/preferences.py | 23 --- 5 files changed, 5 insertions(+), 196 deletions(-) delete mode 100644 deluge/core/autoadd.py diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py deleted file mode 100644 index acab22097..000000000 --- a/deluge/core/autoadd.py +++ /dev/null @@ -1,137 +0,0 @@ -# -# autoadd.py -# -# Copyright (C) 2008 Andrew Resch -# -# 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 -# statement from all source files in the program, then also delete it here. -# -# - - -import os -import logging - -from deluge._libtorrent import lt - -import deluge.component as component -from deluge.configmanager import ConfigManager - -MAX_NUM_ATTEMPTS = 10 - -log = logging.getLogger(__name__) - -class AutoAdd(component.Component): - def __init__(self): - component.Component.__init__(self, "AutoAdd", depend=["TorrentManager"], interval=5) - # Get the core config - self.config = ConfigManager("core.conf") - - # A list of filenames - self.invalid_torrents = [] - # Filename:Attempts - self.attempts = {} - - # Register set functions - self.config.register_set_function("autoadd_enable", - self._on_autoadd_enable, apply_now=True) - self.config.register_set_function("autoadd_location", - self._on_autoadd_location) - - def update(self): - if not self.config["autoadd_enable"]: - # We shouldn't be updating because autoadd is not enabled - component.pause("AutoAdd") - return - - # Check the auto add folder for new torrents to add - if not os.path.isdir(self.config["autoadd_location"]): - log.warning("Invalid AutoAdd folder: %s", self.config["autoadd_location"]) - component.pause("AutoAdd") - return - - for filename in os.listdir(self.config["autoadd_location"]): - try: - filepath = os.path.join(self.config["autoadd_location"], filename) - except UnicodeDecodeError, e: - log.error("Unable to auto add torrent due to improper filename encoding: %s", e) - continue - if os.path.isfile(filepath) and filename.endswith(".torrent"): - try: - filedump = self.load_torrent(filepath) - except (RuntimeError, Exception), e: - # If the torrent is invalid, we keep track of it so that we - # can try again on the next pass. This is because some - # torrents may not be fully saved during the pass. - log.debug("Torrent is invalid: %s", e) - if filename in self.invalid_torrents: - self.attempts[filename] += 1 - if self.attempts[filename] >= MAX_NUM_ATTEMPTS: - os.rename(filepath, filepath + ".invalid") - del self.attempts[filename] - self.invalid_torrents.remove(filename) - else: - self.invalid_torrents.append(filename) - self.attempts[filename] = 1 - continue - - # The torrent looks good, so lets add it to the session - component.get("TorrentManager").add(filedump=filedump, filename=filename) - - os.remove(filepath) - - def load_torrent(self, filename): - try: - log.debug("Attempting to open %s for add.", filename) - _file = open(filename, "rb") - filedump = _file.read() - if not filedump: - raise RuntimeError, "Torrent is 0 bytes!" - _file.close() - except IOError, e: - log.warning("Unable to open %s: %s", filename, e) - raise e - - # Get the info to see if any exceptions are raised - info = lt.torrent_info(lt.bdecode(filedump)) - - return filedump - - def _on_autoadd_enable(self, key, value): - log.debug("_on_autoadd_enable") - if value: - component.resume("AutoAdd") - else: - component.pause("AutoAdd") - - def _on_autoadd_location(self, key, value): - log.debug("_on_autoadd_location") - # We need to resume the component just incase it was paused due to - # an invalid autoadd location. - if self.config["autoadd_enable"]: - component.resume("AutoAdd") diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index e22e9cfe5..ba1d2294b 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -86,8 +86,6 @@ DEFAULT_PREFS = { "max_upload_speed_per_torrent": -1, "max_download_speed_per_torrent": -1, "enabled_plugins": [], - "autoadd_location": deluge.common.get_default_download_dir(), - "autoadd_enable": False, "add_paused": False, "max_active_seeding": 5, "max_active_downloading": 3, diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index 9383846a0..05ea703ff 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -115,23 +115,10 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - - - 0 - + - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - + @@ -179,22 +166,6 @@ 2 - - - Auto add .torrents from: - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - 2 - 3 - GTK_FILL - - Move completed to: @@ -323,6 +294,9 @@ 15 + + + diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 6ba21e1ae..e3c744d33 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -135,9 +135,6 @@ DEFAULT_PREFS = { "autoconnect": False, "autoconnect_host_id": None, "autostart_localhost": False, - "autoadd_queued": False, - "autoadd_enable": False, - "autoadd_location": "", "choose_directory_dialog_path": deluge.common.get_default_download_dir(), "show_new_releases": True, "signal_port": 40000, diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 508effa4a..83f681f76 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -275,10 +275,6 @@ class Preferences(component.Component): ("active", self.core_config["del_copy_torrent_file"]), "torrent_files_button": \ ("filename", self.core_config["torrentfiles_location"]), - "chk_autoadd": \ - ("active", self.core_config["autoadd_enable"]), - "folder_autoadd": \ - ("filename", self.core_config["autoadd_location"]), "radio_compact_allocation": \ ("active", self.core_config["compact_allocation"]), "radio_full_allocation": \ @@ -375,11 +371,6 @@ class Preferences(component.Component): self.glade.get_widget("torrent_files_button").hide() core_widgets.pop("torrent_files_button") core_widgets["entry_torrents_path"] = ("text", self.core_config["torrentfiles_location"]) - - self.glade.get_widget("entry_autoadd").show() - self.glade.get_widget("folder_autoadd").hide() - core_widgets.pop("folder_autoadd") - core_widgets["entry_autoadd"] = ("text", self.core_config["autoadd_location"]) else: self.glade.get_widget("entry_download_path").hide() self.glade.get_widget("download_path_button").show() @@ -387,8 +378,6 @@ class Preferences(component.Component): self.glade.get_widget("move_completed_path_button").show() self.glade.get_widget("entry_torrents_path").hide() self.glade.get_widget("torrent_files_button").show() - self.glade.get_widget("entry_autoadd").hide() - self.glade.get_widget("folder_autoadd").show() # Update the widgets accordingly for key in core_widgets.keys(): @@ -427,8 +416,6 @@ class Preferences(component.Component): "chk_copy_torrent_file", "chk_del_copy_torrent_file", "torrent_files_button", - "chk_autoadd", - "folder_autoadd", "radio_compact_allocation", "radio_full_allocation", "chk_prioritize_first_last_pieces", @@ -589,15 +576,6 @@ class Preferences(component.Component): new_core_config["torrentfiles_location"] = \ self.glade.get_widget("entry_torrents_path").get_text() - new_core_config["autoadd_enable"] = \ - self.glade.get_widget("chk_autoadd").get_active() - if client.is_localhost(): - new_core_config["autoadd_location"] = \ - self.glade.get_widget("folder_autoadd").get_filename() - else: - new_core_config["autoadd_location"] = \ - self.glade.get_widget("entry_autoadd").get_text() - new_core_config["compact_allocation"] = \ self.glade.get_widget("radio_compact_allocation").get_active() new_core_config["prioritize_first_last_pieces"] = \ @@ -836,7 +814,6 @@ class Preferences(component.Component): "chk_move_completed" : {"move_completed_path_button" : True}, "chk_copy_torrent_file" : {"torrent_files_button" : True, "chk_del_copy_torrent_file" : True}, - "chk_autoadd" : {"folder_autoadd" : True}, "chk_seed_ratio" : {"spin_share_ratio": True, "chk_remove_ratio" : True} } From 89d04a393b986cf862aec85bbb65a31aa36ebb8c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 14:35:01 +0100 Subject: [PATCH 186/329] Upgrade old auth file, save it and reload it. --- deluge/core/authmanager.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 4e07089c8..0d45a8f31 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -221,6 +221,7 @@ class AuthManager(component.Component): ) def __load_auth_file(self): + save_and_reload = False auth_file = configmanager.get_config_dir("auth") # Check for auth file and create if necessary if not os.path.exists(auth_file): @@ -254,6 +255,8 @@ class AuthManager(component.Component): "using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT) authlevel = AUTH_LEVEL_DEFAULT + # This is probably an old auth file + save_and_reload = True elif len(lsplit) == 3: username, password, authlevel = lsplit else: @@ -279,6 +282,10 @@ class AuthManager(component.Component): self.__create_localclient_account() self.write_auth_file() + if save_and_reload: + log.info("Re-writing auth file (upgrade)") + self.write_auth_file() + def __create_auth_file(self): auth_file = configmanager.get_config_dir("auth") From e552c21f668114721390c4628a3db7563fb161de Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 14:43:44 +0100 Subject: [PATCH 187/329] Automatically detect auth file changes and reloading those changes. --- deluge/core/authmanager.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 0d45a8f31..6518c8af2 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -87,7 +87,7 @@ class Account(object): class AuthManager(component.Component): def __init__(self): - component.Component.__init__(self, "AuthManager") + component.Component.__init__(self, "AuthManager", interval=10) self.__auth = {} self.__auth_modification_time = None @@ -100,6 +100,26 @@ class AuthManager(component.Component): def shutdown(self): pass + def update(self): + log.debug("Querying for changed auth file") + auth_file = configmanager.get_config_dir("auth") + # Check for auth file and create if necessary + if not os.path.exists(auth_file): + log.info("Authfile not found, recreating it.") + self.__create_auth_file() + self.__create_localclient_account() + self.write_auth_file() + + auth_file_modification_time = os.stat(auth_file).st_mtime + if self.__auth_modification_time is None: + self.__auth_modification_time = auth_file_modification_time + elif self.__auth_modification_time == auth_file_modification_time: + # File didn't change, no need for re-parsing's + return + + log.info("auth file changed, reloading it!") + self.__load_auth_file() + def authorize(self, username, password): """ Authorizes users based on username and password From c225c045cbb0fc58a50ccd8eb8c6da18a46ec473 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 15:07:07 +0100 Subject: [PATCH 188/329] Better file modification detection. --- deluge/core/authmanager.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 6518c8af2..23c662cf4 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -101,24 +101,17 @@ class AuthManager(component.Component): pass def update(self): - log.debug("Querying for changed auth file") auth_file = configmanager.get_config_dir("auth") # Check for auth file and create if necessary if not os.path.exists(auth_file): log.info("Authfile not found, recreating it.") - self.__create_auth_file() - self.__create_localclient_account() - self.write_auth_file() - - auth_file_modification_time = os.stat(auth_file).st_mtime - if self.__auth_modification_time is None: - self.__auth_modification_time = auth_file_modification_time - elif self.__auth_modification_time == auth_file_modification_time: - # File didn't change, no need for re-parsing's + self.__load_auth_file() return - log.info("auth file changed, reloading it!") - self.__load_auth_file() + auth_file_modification_time = os.stat(auth_file).st_mtime + if self.__auth_modification_time != auth_file_modification_time: + log.info("Auth file changed, reloading it!") + self.__load_auth_file() def authorize(self, username, password): """ @@ -305,6 +298,7 @@ class AuthManager(component.Component): if save_and_reload: log.info("Re-writing auth file (upgrade)") self.write_auth_file() + self.__auth_modification_time = auth_file_modification_time def __create_auth_file(self): From 4432e6e6e3db60ac6d29e233d11d0e3f49dc97e5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 25 Apr 2011 16:38:49 +0100 Subject: [PATCH 189/329] Also handle moving the torrent files after adding them besides renaming or deleting(per whatchdir) --- deluge/plugins/autoadd/autoadd/core.py | 23 +++++++++++++++---- .../autoadd/data/autoadd_options.glade | 1 - deluge/plugins/autoadd/autoadd/gtkui.py | 20 ++++++++-------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py index ce6d88240..17dc2816f 100644 --- a/deluge/plugins/autoadd/autoadd/core.py +++ b/deluge/plugins/autoadd/autoadd/core.py @@ -60,6 +60,7 @@ OPTIONS_AVAILABLE = { #option: builtin "enabled":False, "path":False, "append_extension":False, + "copy_torrent": False, "abspath":False, "download_location":True, "max_download_speed":True, @@ -120,7 +121,7 @@ class Core(CorePluginBase): def update(self): pass - @export() + @export def set_options(self, watchdir_id, options): """Update the options for a watch folder.""" watchdir_id = str(watchdir_id) @@ -192,6 +193,7 @@ class Core(CorePluginBase): if OPTIONS_AVAILABLE.get(option): if watchdir.get(option+'_toggle', True): opts[option] = value + for filename in os.listdir(watchdir["abspath"]): if filename.split(".")[-1] == "torrent": try: @@ -239,6 +241,9 @@ class Core(CorePluginBase): if not watchdir.get('append_extension'): watchdir['append_extension'] = ".added" os.rename(filepath, filepath + watchdir['append_extension']) + elif watchdir.get('copy_torrent_toggle'): + copy_torrent_path = watchdir['copy_torrent'] + os.rename(filepath, copy_torrent_path) else: os.remove(filepath) @@ -291,7 +296,7 @@ class Core(CorePluginBase): """Returns the config dictionary.""" return self.config.config - @export() + @export def get_watchdirs(self): return self.watchdirs.keys() @@ -303,13 +308,16 @@ class Core(CorePluginBase): opts[key] = options[key] return opts - @export() + @export def add(self, options={}): """Add a watch folder.""" options = self._make_unicode(options) abswatchdir = os.path.abspath(options['path']) CheckInput(os.path.isdir(abswatchdir) , _("Path does not exist.")) - CheckInput(os.access(abswatchdir, os.R_OK|os.W_OK), "You must have read and write access to watch folder.") + CheckInput( + os.access(abswatchdir, os.R_OK|os.W_OK), + "You must have read and write access to watch folder." + ) if abswatchdir in [wd['abspath'] for wd in self.watchdirs.itervalues()]: raise Exception("Path is already being watched.") options.setdefault('enabled', False) @@ -327,7 +335,8 @@ class Core(CorePluginBase): def remove(self, watchdir_id): """Remove a watch folder.""" watchdir_id = str(watchdir_id) - CheckInput(watchdir_id in self.watchdirs, "Unknown Watchdir: %s" % self.watchdirs) + CheckInput(watchdir_id in self.watchdirs, + "Unknown Watchdir: %s" % self.watchdirs) if self.watchdirs[watchdir_id]['enabled']: self.disable_watchdir(watchdir_id) del self.watchdirs[watchdir_id] @@ -338,3 +347,7 @@ class Core(CorePluginBase): for watchdir_id in config['watchdirs'].iterkeys(): config['watchdirs'][watchdir_id]['owner'] = 'localclient' return config + + ### XXX: Handle torrent finished / remove torrent file per whatchdir + ### deluge/core/torrentmanager.py: + ### filename = self.torrents[torrent_id].filename diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade index 5c8bab041..58545ebe8 100644 --- a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade +++ b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade @@ -295,7 +295,6 @@ True select-folder - True Select A Folder diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py index 53e2fc9ef..8ee1aff98 100644 --- a/deluge/plugins/autoadd/autoadd/gtkui.py +++ b/deluge/plugins/autoadd/autoadd/gtkui.py @@ -90,9 +90,6 @@ class OptionsDialog(): self.load_options(options) # Not implemented feateures present in UI - self.glade.get_widget("copy_torrent_toggle").hide() - self.glade.get_widget("copy_torrent_entry").hide() - self.glade.get_widget("copy_torrent_chooser").hide() self.glade.get_widget("delete_copy_torrent_toggle").hide() self.dialog.run() @@ -108,6 +105,9 @@ class OptionsDialog(): self.glade.get_widget('download_location_toggle').set_active( options.get('download_location_toggle', False) ) + self.glade.get_widget('copy_torrent_toggle').set_active( + options.get('copy_torrent_toggle', False) + ) self.accounts.clear() self.labels.clear() combobox = self.glade.get_widget('OwnerCombobox') @@ -137,7 +137,7 @@ class OptionsDialog(): for field in ['move_completed_path', 'path', 'download_location', 'copy_torrent']: if client.is_localhost(): - self.glade.get_widget(field+"_chooser").set_filename( + self.glade.get_widget(field+"_chooser").set_current_folder( options.get(field, os.path.expanduser("~")) ) self.glade.get_widget(field+"_chooser").show() @@ -268,19 +268,21 @@ class OptionsDialog(): options['path'] = self.glade.get_widget('path_chooser').get_filename() options['download_location'] = self.glade.get_widget('download_location_chooser').get_filename() options['move_completed_path'] = self.glade.get_widget('move_completed_path_chooser').get_filename() + options['copy_torrent'] = self.glade.get_widget('copy_torrent_chooser').get_filename() else: options['path'] = self.glade.get_widget('path_entry').get_text() options['download_location'] = self.glade.get_widget('download_location_entry').get_text() options['move_completed_path'] = self.glade.get_widget('move_completed_path_entry').get_text() + options['copy_torrent'] = self.glade.get_widget('copy_torrent_entry').get_text() + options['label'] = self.glade.get_widget('label').child.get_text().lower() + options['append_extension'] = self.glade.get_widget('append_extension').get_text() options['owner'] = self.accounts[ self.glade.get_widget('OwnerCombobox').get_active()][0] - options['append_extension_toggle'] = self.glade.get_widget('append_extension_toggle').get_active() - options['append_extension'] = self.glade.get_widget('append_extension').get_text() - options['download_location_toggle'] = self.glade.get_widget('download_location_toggle').get_active() - options['label'] = self.glade.get_widget('label').child.get_text().lower() - options['label_toggle'] = self.glade.get_widget('label_toggle').get_active() + for key in ['append_extension_toggle', 'download_location_toggle', + 'label_toggle', 'copy_torrent_toggle']: + options[key] = self.glade.get_widget(key).get_active() for id in self.spin_ids: options[id] = self.glade.get_widget(id).get_value() From fa20e49a934ed7202513a314b415499f0e8ac768 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Apr 2011 08:37:20 +0100 Subject: [PATCH 190/329] Fixed 2 bugs regarding torrent ownership change. On the core, the code was not adapted to the new AuthManager. On The GtkUI, nothing was being shown to the user when errors occurred while changing ownership. --- deluge/core/core.py | 2 +- deluge/ui/gtkui/menubar.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 6586fff05..e04fe25e5 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -603,7 +603,7 @@ class Core(component.Component): :raises DelugeError: if the username is not known """ - if username not in self.authmanager.get_known_accounts(): + if not self.authmanager.has_account(username): raise DelugeError("Username \"%s\" is not known." % username) if isinstance(torrent_ids, basestring): torrent_ids = [torrent_ids] diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 6026f1387..f73f9cc02 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -47,6 +47,7 @@ import deluge.component as component from deluge.ui.client import client import deluge.common import common +import dialogs from deluge.configmanager import ConfigManager log = logging.getLogger(__name__) @@ -554,7 +555,16 @@ class MenuBar(component.Component): torrent_status = component.get("TorrentView").get_torrent_status(torrent_id) if torrent_status["owner"] != username: update_torrents.append(torrent_id) + if update_torrents: log.debug("Setting torrent owner \"%s\" on %s", username, update_torrents) - client.core.set_torrents_owner(update_torrents, username) + + def failed_change_owner(failure): + dialogs.ErrorDialog( + _("Ownership Change Error"), + _("There was an error while trying changing ownership."), + self.window.window, details=failure.value.logable() + ).run() + client.core.set_torrents_owner( + update_torrents, username).addErrback(failed_change_owner) From 91801e1632d4969ac894effc57b628c056fd44ed Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 26 Apr 2011 10:14:39 +0100 Subject: [PATCH 191/329] Cleanup debug message new lines. --- deluge/ui/gtkui/connectionmanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 2cecf69fb..6a1395a65 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -332,7 +332,7 @@ class ConnectionManager(component.Component): self.__update_buttons() row[HOSTLIST_COL_STATUS] = _("Connected") - log.debug("\n\nquery daemons info\n\n") + log.debug("Query daemon's info") client.daemon.info().addCallback(on_info) continue From 897c2f981f783a5fe7a1045cfd77c7d12f15d8b0 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 26 Apr 2011 12:39:57 +0200 Subject: [PATCH 192/329] Add help to torrent details mode. fixes bug: 1687 --- deluge/ui/console/modes/alltorrents.py | 4 +-- deluge/ui/console/modes/torrentdetail.py | 41 ++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 083bbf6b7..68e8a59df 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -81,7 +81,7 @@ this one) using the up/down arrows. All popup windows can be closed/canceled by hitting the Esc key \ (you might need to wait a second for an Esc to register) -The actions you can perform and the keys to perform them are as follows: \ +The actions you can perform and the keys to perform them are as follows: {!info!}'h'{!normal!} - Show this help @@ -113,7 +113,7 @@ about the currently selected torrent, as well as a view of the \ files in the torrent and the ability to set file priorities. {!info!}Enter{!normal!} - Show torrent actions popup. Here you can do things like \ -pause/resume, remove, recheck and so one. These actions \ +pause/resume, remove, recheck and so on. These actions \ apply to all currently marked torrents. The currently \ selected torrent is automatically marked when you press enter. diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 4c5d41e84..39f77371a 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -59,6 +59,35 @@ except ImportError: import logging log = logging.getLogger(__name__) +# Big help string that gets displayed when the user hits 'h' +HELP_STR = """\ +This screen shows detailed information about a torrent, and also the \ +information about the individual files in the torrent. + +You can navigate the file list with the Up/Down arrows and use space to \ +collapse/expand the file tree. + +All popup windows can be closed/canceled by hitting the Esc key \ +(you might need to wait a second for an Esc to register) + +The actions you can perform and the keys to perform them are as follows: + +{!info!}'h'{!normal!} - Show this help + +{!info!}'a'{!normal!} - Show torrent actions popup. Here you can do things like \ +pause/resume, remove, recheck and so on. + +{!info!}'m'{!normal!} - Mark a file +{!info!}'c'{!normal!} - Un-mark all files + +{!info!}Space{!normal!} - Expand/Collapse currently selected folder + +{!info!}Enter{!normal!} - Show priority popup in which you can set the \ +download priority of selected files. + +{!info!}Left Arrow{!normal!} - Go back to torrent overview. +""" + class TorrentDetail(BaseMode, component.Component): def __init__(self, alltorrentmode, torrentid, stdscr, encoding=None): self.alltorrentmode = alltorrentmode @@ -106,6 +135,8 @@ class TorrentDetail(BaseMode, component.Component): BaseMode.__init__(self, stdscr, encoding) component.Component.__init__(self, "TorrentDetail", 1, depend=["SessionProxy"]) + self.__split_help() + self.column_names = ["Filename", "Size", "Progress", "Priority"] self._update_columns() @@ -137,6 +168,9 @@ class TorrentDetail(BaseMode, component.Component): self.torrent_state = state self.refresh() + def __split_help(self): + self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) + # split file list into directory tree. this function assumes all files in a # particular directory are returned together. it won't work otherwise. # returned list is a list of lists of the form: @@ -288,6 +322,7 @@ class TorrentDetail(BaseMode, component.Component): def on_resize(self, *args): BaseMode.on_resize_norefresh(self, *args) self._update_columns() + self.__split_help() if self.popup: self.popup.handle_resize() self.refresh() @@ -470,10 +505,12 @@ class TorrentDetail(BaseMode, component.Component): if chr(c) == 'm': if self.current_file: self._mark_unmark(self.current_file[1]) - if chr(c) == 'c': + elif chr(c) == 'c': self.marked = {} - if chr(c) == 'a': + elif chr(c) == 'a': torrent_actions_popup(self,[self.torrentid],details=False) return + elif chr(c) == 'h': + self.popup = Popup(self,"Help",init_lines=self.__help_lines) self.refresh() From b1e0dd66ebf75d58531a74f2346764c32b6ba8d5 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 26 Apr 2011 13:53:11 +0200 Subject: [PATCH 193/329] handle files with [ and ] characters in them --- deluge/ui/console/modes/add_util.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/add_util.py b/deluge/ui/console/modes/add_util.py index bdd235e87..b741a6a11 100644 --- a/deluge/ui/console/modes/add_util.py +++ b/deluge/ui/console/modes/add_util.py @@ -43,7 +43,23 @@ import deluge.common import os,base64,glob +import logging +log = logging.getLogger(__name__) +def __bracket_fixup(path): + if (path.find("[") == -1 and + path.find("]") == -1): + return path + sentinal = 256 + while (path.find(unichr(sentinal)) != -1): + sentinal+=1 + if sentinal > 65535: + log.error("Can't fix brackets in path, path contains all possible sentinal characters") + return path + newpath = path.replace("]",unichr(sentinal)) + newpath = newpath.replace("[","[[]") + newpath = newpath.replace(unichr(sentinal),"[]]") + return newpath def add_torrent(t_file, options, success_cb, fail_cb, ress): t_options = {} @@ -57,7 +73,7 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress): if is_url or is_mag: files = [t_file] else: - files = glob.glob(t_file) + files = glob.glob(__bracket_fixup(t_file)) num_files = len(files) ress["total"] = num_files From d05352db65122cd2c79e97343cfa8120095fa40f Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 26 Apr 2011 14:03:49 +0200 Subject: [PATCH 194/329] fix bug for selecting multiple torrents with cursor above last mark (bug 1689) --- deluge/ui/console/modes/alltorrents.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 68e8a59df..53a045415 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -813,8 +813,12 @@ class AllTorrents(BaseMode, component.Component): effected_lines = [self.cursel-1] elif chr(c) == 'M': if self.last_mark >= 0: - self.marked.extend(range(self.last_mark,self.cursel+1)) - effected_lines = range(self.last_mark,self.cursel) + if (self.cursel+1) > self.last_mark: + mrange = range(self.last_mark,self.cursel+1) + else: + mrange = range(self.cursel-1,self.last_mark) + self.marked.extend(mrange[1:]) + effected_lines = mrange else: self._mark_unmark(self.cursel) effected_lines = [self.cursel-1] From e992ac3eab02ec59c68f59fc401600c98c408507 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 26 Apr 2011 14:18:25 +0200 Subject: [PATCH 195/329] ignore key presses that only makes sense when we have a state when we don't have a state --- deluge/ui/console/modes/torrentdetail.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 39f77371a..0b585b5d4 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -482,6 +482,10 @@ class TorrentDetail(BaseMode, component.Component): self.back_to_overview() return + if not self.torrent_state: + # actions below only makes sense if there is a torrent state + return + # Navigate the torrent list if c == curses.KEY_UP: self.file_list_up() From 67a4fd49e94cccc516069d4378beef0dd6ec9e43 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Tue, 26 Apr 2011 22:59:48 +0200 Subject: [PATCH 196/329] fix problem when not showing name,state or queue columns. fix problem if there were no var length cols. --- deluge/ui/console/modes/alltorrents.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 53a045415..1fad76a86 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -274,6 +274,8 @@ class AllTorrents(BaseMode, component.Component): self.__cols_to_show = [pref for pref in column_pref_names if self.config["show_%s"%pref]] self.__columns = [prefs_to_names[col] for col in self.__cols_to_show] self.__status_fields = column.get_required_fields(self.__columns) + for rf in ["state","name","queue"]: # we always need these, even if we're not displaying them + if not rf in self.__status_fields: self.__status_fields.append(rf) self.__update_columns() def __split_help(self): @@ -293,10 +295,11 @@ class AllTorrents(BaseMode, component.Component): else: rem = self.cols - req var_cols = len(filter(lambda x: x < 0,self.column_widths)) - vw = int(rem/var_cols) - for i in range(0, len(self.column_widths)): - if (self.column_widths[i] < 0): - self.column_widths[i] = vw + if (var_cols > 0): + vw = int(rem/var_cols) + for i in range(0, len(self.column_widths)): + if (self.column_widths[i] < 0): + self.column_widths[i] = vw self.column_string = "{!header!}%s"%("".join(["%s%s"%(self.__columns[i]," "*(self.column_widths[i]-len(self.__columns[i]))) for i in range(0,len(self.__columns))])) From f56be6655606ff4fc24bf04df294b97faccf91fc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 13:06:26 +0100 Subject: [PATCH 197/329] Update ChangeLog. --- ChangeLog | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e9e52bb9..2a2083bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ === Deluge 1.3.0 (In Development) === * Improved Logging + * Removed the AutoAdd feature on the core. It's now handled with the AutoAdd + plugin, which is also shipped with Deluge, and it does a better job and + now, it even supports multiple users perfectly. ==== Core ==== * Implement #1063 option to delete torrent file copy on torrent removal - patch from Ghent @@ -9,9 +12,14 @@ * #1112: Fix renaming files in add torrent dialog * #1247: Fix deluge-gtk from hanging on shutdown * #995: Rewrote tracker_icons - * Make the distinction between adding to the session new unmanaged torrents and torrents loaded from state. This will break backwards compatability. - * Pass a copy of an event instead of passing the event arguments to the event handlers. This will break backwards compatability. + * Make the distinction between adding to the session new unmanaged torrents + and torrents loaded from state. This will break backwards compatability. + * Pass a copy of an event instead of passing the event arguments to the + event handlers. This will break backwards compatability. * Allow changing ownership of torrents. + * File modifications on the auth file are now detected and when they happen, + the file is reloaded. Upon finding an old auth file with an old format, an + upgrade to the new format is made, file saved, and reloaded. ==== GtkUI ==== * Fix uncaught exception when closing deluge in classic mode From 2e68e0181c465d62fe6b74ce7c38753aab744728 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 13:18:59 +0100 Subject: [PATCH 198/329] Remove some leftovers from the old `multiuser` branch. --- .../gtkui/glade/preferences/bandwidth.glade | 490 ---------- deluge/ui/gtkui/glade/preferences/cache.glade | 474 ---------- .../ui/gtkui/glade/preferences/daemon.glade | 174 ---- .../gtkui/glade/preferences/downloads.glade | 393 -------- .../gtkui/glade/preferences/interface.glade | 322 ------- .../ui/gtkui/glade/preferences/network.glade | 799 ---------------- deluge/ui/gtkui/glade/preferences/other.glade | 273 ------ .../ui/gtkui/glade/preferences/plugins.glade | 367 -------- deluge/ui/gtkui/glade/preferences/proxy.glade | 874 ------------------ deluge/ui/gtkui/glade/preferences/queue.glade | 449 --------- 10 files changed, 4615 deletions(-) delete mode 100644 deluge/ui/gtkui/glade/preferences/bandwidth.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/cache.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/daemon.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/downloads.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/interface.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/network.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/other.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/plugins.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/proxy.glade delete mode 100644 deluge/ui/gtkui/glade/preferences/queue.glade diff --git a/deluge/ui/gtkui/glade/preferences/bandwidth.glade b/deluge/ui/gtkui/glade/preferences/bandwidth.glade deleted file mode 100644 index 6349e4376..000000000 --- a/deluge/ui/gtkui/glade/preferences/bandwidth.glade +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - vertical - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 2 - 15 - - - True - True - ● - 1 - True - - - 1 - 2 - 5 - 6 - GTK_FILL - - - - - True - True - ● - 1 - True - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - 0 - Maximum Connection Attempts per Second: - - - 5 - 6 - GTK_FILL - - - - - True - 0 - Maximum Half-Open Connections: - - - 4 - 5 - GTK_FILL - - - - - True - 0 - Maximum Upload Speed (KiB/s): - - - 3 - 4 - GTK_FILL - - - - - True - 0 - Maximum Connections: - - - GTK_FILL - - - - - True - 0 - Maximum Upload Slots: - - - 1 - 2 - GTK_FILL - - - - - True - True - 4 - ● - 1 - 1 - True - True - if-valid - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Maximum Download Speed (KiB/s): - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - 1 - 1 - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - True - ● - 1 - 1 - 1 - True - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - True - ● - 1 - 1 - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - 0 - - - - - True - 5 - - - Ignore limits on local network - True - True - False - True - True - - - - - 1 - - - - - True - 5 - - - Rate limit IP overhead - True - True - False - True - True - - - - - 2 - - - - - - - - - True - <b>Global Bandwidth Usage</b> - True - - - - - False - False - 5 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 2 - 15 - - - True - True - ● - 1 - 1 - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - ● - 1 - True - True - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Connections: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Upload Slots: - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Download Speed (KiB/s): - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Upload Speed (KiB/s): - - - 3 - 4 - GTK_FILL - - - - - True - True - ● - 1 - 1 - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - True - ● - 1 - 1 - True - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Per Torrent Bandwidth Usage</b> - True - - - - - False - 5 - 1 - - - - - - - -1 - 9000 - 1 - 10 - - - -1 - 9000 - 1 - 10 - - - -1 - 9000 - 1 - 10 - - - -1 - 9000 - 1 - 10 - - - -1 - 9000 - 1 - 10 - - - -1 - 60000 - 1 - 10 - - - -1 - 60000 - 1 - 10 - - - -1 - 9000 - 1 - 10 - - - -1 - 9999 - 1 - 10 - - - -1 - 9999 - 1 - 10 - - diff --git a/deluge/ui/gtkui/glade/preferences/cache.glade b/deluge/ui/gtkui/glade/preferences/cache.glade deleted file mode 100644 index f57e22597..000000000 --- a/deluge/ui/gtkui/glade/preferences/cache.glade +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - True - vertical - - - True - 0 - none - - - True - 5 - 12 - - - True - 2 - 2 - 5 - - - True - 0 - Cache Size (16 KiB blocks): - - - GTK_FILL - - - - - True - 0 - Cache Expiry (seconds): - - - 1 - 2 - GTK_FILL - - - - - True - True - ● - 1 - True - if-valid - - - 1 - 2 - - - - - - True - True - 5 - ● - 5 - 1 - - - 1 - 2 - 1 - 2 - - - - - - - - - - True - <b>Settings</b> - True - - - - - False - False - 5 - 0 - - - - - True - 0 - none - - - True - 5 - 12 - - - True - vertical - - - True - 0 - none - - - True - 12 - - - True - 3 - 2 - 5 - - - True - 0 - Blocks Written: - - - GTK_FILL - - - - - True - 0 - Writes: - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Write Cache Hit Ratio: - - - 2 - 3 - GTK_FILL - - - - - True - 1 - - - 1 - 2 - - - - - - True - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - 1 - - - 1 - 2 - 2 - 3 - - - - - - - - - - True - <b>Write</b> - True - - - - - 0 - - - - - True - 0 - none - - - True - 12 - - - True - 4 - 2 - 5 - - - True - 0 - Blocks Read: - - - GTK_FILL - - - - - True - 0 - Blocks Read Hit: - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Read Cache Hit Ratio: - - - 3 - 4 - GTK_FILL - - - - - True - 1 - - - 1 - 2 - - - - - - True - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - 1 - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - Reads: - - - 2 - 3 - GTK_FILL - - - - - True - - - 1 - 2 - 2 - 3 - - - - - - - - - - True - <b>Read</b> - True - - - - - 1 - - - - - True - 0 - none - - - True - 12 - - - True - 2 - 2 - 5 - - - True - 0 - Cache Size: - - - GTK_FILL - - - - - True - 0 - Read Cache Size: - - - 1 - 2 - GTK_FILL - - - - - True - 1 - - - 1 - 2 - - - - - - True - 1 - - - 1 - 2 - 1 - 2 - - - - - - - - - - True - <b>Size</b> - True - - - - - 2 - - - - - True - start - - - gtk-refresh - True - True - True - True - - - False - False - 0 - - - - - 3 - - - - - - - - - True - <b>Status</b> - True - - - - - False - False - 5 - 1 - - - - - - - 1 - 32000 - 1 - 10 - - - 99999 - 1 - 10 - - diff --git a/deluge/ui/gtkui/glade/preferences/daemon.glade b/deluge/ui/gtkui/glade/preferences/daemon.glade deleted file mode 100644 index d7ed1f25f..000000000 --- a/deluge/ui/gtkui/glade/preferences/daemon.glade +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Daemon port: - - - False - False - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - - - False - False - 1 - - - - - False - False - 0 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Port</b> - True - - - - - False - False - 5 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 10 - - - Allow Remote Connections - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Connections</b> - True - - - - - False - False - 5 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 10 - - - Periodically check the website for new releases - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Other</b> - True - - - - - False - False - 5 - 2 - - - - - - - 65535 - 1 - 10 - - diff --git a/deluge/ui/gtkui/glade/preferences/downloads.glade b/deluge/ui/gtkui/glade/preferences/downloads.glade deleted file mode 100644 index afd228bfc..000000000 --- a/deluge/ui/gtkui/glade/preferences/downloads.glade +++ /dev/null @@ -1,393 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - 5 - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - - - - - - - 1 - 2 - 2 - 3 - - - - - True - - - True - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - Select A Folder - - - 0 - - - - - True - ● - - - 1 - - - - - - - 1 - 2 - 1 - 2 - - - - - Auto add .torrents from: - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 2 - 3 - GTK_FILL - - - - - Move completed to: - True - True - False - True - - - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - Select A Folder - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - - - - - 1 - 2 - - - - - True - 0 - Download to: - - - GTK_FILL - - - - - Copy of .torrent files to: - True - True - False - True - - - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - select-folder - Select A Folder - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - - - - - - - 1 - 2 - 3 - 4 - - - - - Delete copy of torrent file on remove - True - True - False - True - - - 2 - 4 - 5 - 15 - - - - - - - - - True - <b>Folders</b> - True - - - - - False - False - 5 - 0 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - Use Full Allocation - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - False - False - 0 - - - - - Use Compact Allocation - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - radio_full_allocation - - - False - False - 1 - - - - - - - - - True - <b>Allocation</b> - True - - - - - False - False - 5 - 1 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - vertical - - - Prioritize first and last pieces of torrent - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - 0 - - - - - Add torrents in Paused state - True - True - False - True - - - 1 - - - - - - - - - True - <b>Options</b> - True - - - - - False - False - 5 - 2 - - - - - - diff --git a/deluge/ui/gtkui/glade/preferences/interface.glade b/deluge/ui/gtkui/glade/preferences/interface.glade deleted file mode 100644 index 69ed50acc..000000000 --- a/deluge/ui/gtkui/glade/preferences/interface.glade +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 - 12 - - - Enable - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Classic Mode</b> - True - - - - - False - False - 5 - 0 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - Show session speed in titlebar - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - - - - - True - <b>Main Window</b> - True - - - - - False - False - 5 - 1 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - Always show - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - Bring the dialog to focus - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - 1 - - - - - - - - - True - <b>Add Torrents Dialog</b> - True - - - - - False - False - 5 - 2 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - vertical - - - Enable system tray icon - True - True - False - True - True - - - 0 - - - - - True - 10 - - - Minimize to tray on close - True - False - True - False - True - True - - - - - 1 - - - - - True - 10 - - - Start in tray - True - False - True - False - True - True - - - - - 2 - - - - - True - 3 - 10 - - - Password protect system tray - True - False - True - False - True - True - - - - - False - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 20 - - - True - 5 - - - True - False - 0 - Password: - - - False - 0 - - - - - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - ● - 16 - ******** - - - False - 1 - - - - - - - 4 - - - - - - - - - True - <b>System Tray</b> - True - - - - - False - 5 - 3 - - - - - - diff --git a/deluge/ui/gtkui/glade/preferences/network.glade b/deluge/ui/gtkui/glade/preferences/network.glade deleted file mode 100644 index b1e45f703..000000000 --- a/deluge/ui/gtkui/glade/preferences/network.glade +++ /dev/null @@ -1,799 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 20 - - - Use Random Ports - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - 5 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - 1 - Active Port: - right - - - False - 5 - 0 - - - - - True - 0 - 0000 - 5 - - - False - 5 - 1 - - - - - False - 5 - 1 - - - - - 5 - 0 - - - - - True - - - True - From: - - - False - 0 - - - - - True - False - True - 5 - ● - 1 - adjustment28 - 1 - True - True - - - False - 5 - 1 - - - - - True - 5 - To: - - - False - False - 2 - - - - - True - False - True - 5 - ● - 1 - adjustment27 - 1 - True - True - - - False - 5 - 3 - - - - - Test Active Port - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - False - 4 - - - - - True - 5 - - - gtk-missing-image - - - - - False - 5 - - - - - 5 - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Incoming Ports</b> - True - - - - - False - 5 - 0 - - - - - True - 0 - none - - - True - 5 - 12 - - - True - vertical - 5 - - - Use Random Ports - True - True - False - True - - - False - False - 0 - - - - - True - 5 - - - True - From: - - - False - False - 0 - - - - - True - False - True - 5 - ● - 1 - adjustment26 - 1 - True - True - - - False - 5 - 1 - - - - - True - To: - - - False - False - 2 - - - - - True - False - True - 5 - ● - 1 - adjustment25 - 1 - True - True - - - False - 5 - 3 - - - - - 1 - - - - - - - - - True - <b>Outgoing Ports</b> - True - - - - - False - False - 1 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - - - True - True - 60 - ● - 30 - - - False - False - 0 - - - - - - - - - - - - True - <b>Interface</b> - True - - - - - False - False - 2 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - vertical - - - True - 5 - - - True - Peer TOS Byte: - - - False - False - 0 - - - - - True - True - ● - 4 - 0x00 - - - False - False - 1 - - - - - 0 - - - - - - - - - True - <b>TOS</b> - True - - - - - False - 5 - 3 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - 2 - 3 - 5 - - - UPnP - True - True - False - True - True - True - - - GTK_FILL - - - - - NAT-PMP - True - True - False - True - True - True - - - 1 - 2 - GTK_FILL - - - - - Peer Exchange - True - True - False - True - True - True - - - 2 - 3 - GTK_FILL - - - - - LSD - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 1 - 2 - GTK_FILL - - - - - DHT - True - True - False - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - - - - - - - True - <b>Network Extras</b> - True - - - - - False - 5 - 4 - - - - - True - 0 - none - - - True - 2 - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - 1 - Inbound: - - - 0 - - - - - True - 0 - Level: - - - 1 - - - - - False - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - liststore7 - - - - 0 - - - - - 0 - - - - - True - liststore6 - - - - 0 - - - - - 1 - - - - - False - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - 1 - Outbound: - - - False - False - 0 - - - - - True - liststore5 - - - - 0 - - - - - False - 1 - - - - - 0 - - - - - Encrypt entire stream - True - True - False - True - True - - - False - 3 - 1 - - - - - 2 - - - - - - - - - True - <b>Encryption</b> - True - - - - - False - False - 5 - 5 - - - - - - - - - - - - - Forced - - - Enabled - - - Disabled - - - - - - - - - - - Handshake - - - Full Stream - - - Either - - - - - - - - - - - Forced - - - Enabled - - - Disabled - - - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - diff --git a/deluge/ui/gtkui/glade/preferences/other.glade b/deluge/ui/gtkui/glade/preferences/other.glade deleted file mode 100644 index ecb9145a0..000000000 --- a/deluge/ui/gtkui/glade/preferences/other.glade +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - Be alerted about new releases - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - False - 0 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Updates</b> - True - - - - - False - False - 5 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. - True - - - False - False - 2 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - Yes, please send anonymous statistics - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - False - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>System Information</b> - True - - - - - False - False - 5 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - 5 - - - True - Location: - - - False - False - 0 - - - - - True - True - ● - - - 1 - - - - - - - False - False - 0 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>GeoIP Database</b> - True - - - - - False - False - 5 - 2 - - - - - True - 12 - - - True - start - - - True - True - True - - - True - 2 - - - True - gtk-missing-image - - - 0 - - - - - True - Associate Magnet links with Deluge - - - 1 - - - - - - - False - False - 0 - - - - - - - False - False - 3 - - - - - - diff --git a/deluge/ui/gtkui/glade/preferences/plugins.glade b/deluge/ui/gtkui/glade/preferences/plugins.glade deleted file mode 100644 index 3981e9520..000000000 --- a/deluge/ui/gtkui/glade/preferences/plugins.glade +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - 1 - - - True - True - automatic - automatic - in - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - False - True - - - - - True - True - automatic - automatic - - - True - queue - none - - - True - 0 - none - - - True - 12 - - - True - 5 - 2 - 5 - - - True - 0 - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - - - 1 - 2 - - - - - - True - 0 - 0 - Details: - - - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - 0 - Version: - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Author: - - - GTK_FILL - - - - - - True - 0 - Homepage: - - - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 0 - Author Email: - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - - - 1 - 2 - 2 - 3 - - - - - - - - - - True - <b>Info</b> - True - - - - - - - - - False - False - - - - - 0 - - - - - True - center - - - True - True - True - - - True - 5 - - - True - gtk-add - - - False - False - 0 - - - - - True - _Install Plugin - True - True - - - False - False - 1 - - - - - - - False - False - 0 - - - - - True - True - True - - - True - 5 - - - True - gtk-refresh - - - False - False - 0 - - - - - True - _Rescan Plugins - True - True - - - False - False - 1 - - - - - - - False - False - 1 - - - - - False - False - 1 - - - - - True - - - True - True - True - - - True - 5 - - - True - gtk-find - - - False - False - 0 - - - - - True - _Find More Plugins - True - True - - - False - False - 1 - - - - - - - False - False - 0 - - - - - False - False - 2 - - - - - - diff --git a/deluge/ui/gtkui/glade/preferences/proxy.glade b/deluge/ui/gtkui/glade/preferences/proxy.glade deleted file mode 100644 index dc220dd1b..000000000 --- a/deluge/ui/gtkui/glade/preferences/proxy.glade +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - - - True - vertical - 5 - - - True - 0 - none - - - True - 12 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 2 - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Password: - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - ● - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - 0 - Host: - - - 3 - 4 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - - True - 0 - 0 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - True - - - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Username: - - - 1 - 2 - GTK_FILL - - - - - - - - - True - <b>Peer</b> - True - - - - - False - False - 0 - - - - - True - 0 - none - - - True - 12 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 2 - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Password: - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - ● - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - 0 - Host: - - - 3 - 4 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - - True - 0 - 0 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - True - - - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Username: - - - 1 - 2 - GTK_FILL - - - - - - - - - True - <b>Web Seed</b> - True - - - - - False - False - 1 - - - - - True - 0 - none - - - True - 12 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 2 - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Password: - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - ● - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - 0 - Host: - - - 3 - 4 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - - True - 0 - 0 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - True - - - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Username: - - - 1 - 2 - GTK_FILL - - - - - - - - - True - <b>Tracker</b> - True - - - - - False - False - 2 - - - - - True - 0 - none - - - True - 12 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 2 - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Password: - - - 2 - 3 - GTK_FILL - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - ● - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - 0 - Host: - - - 3 - 4 - GTK_FILL - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - - - True - 0 - 0 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - True - - - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - 0 - - - - - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Username: - - - 1 - 2 - GTK_FILL - - - - - - - - - - True - <b>DHT</b> - True - - - - - False - False - 3 - - - - - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - - - - - - - None - - - Socksv4 - - - Socksv5 - - - Socksv5 W/ Auth - - - HTTP - - - HTTP W/ Auth - - - - - - - - - - - None - - - Socksv4 - - - Socksv5 - - - Socksv5 W/ Auth - - - HTTP - - - HTTP W/ Auth - - - - - - - - - - - None - - - Socksv4 - - - Socksv5 - - - Socksv5 W/ Auth - - - HTTP - - - HTTP W/ Auth - - - - - - - - - - - None - - - Socksv4 - - - Socksv5 - - - Socksv5 W/ Auth - - - HTTP - - - HTTP W/ Auth - - - - diff --git a/deluge/ui/gtkui/glade/preferences/queue.glade b/deluge/ui/gtkui/glade/preferences/queue.glade deleted file mode 100644 index 017022a64..000000000 --- a/deluge/ui/gtkui/glade/preferences/queue.glade +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - - - Queue new torrents to top - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>General</b> - True - - - - - False - False - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 12 - - - True - vertical - 5 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - 10 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - True - True - - - 1 - 2 - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Total active seeding: - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Total active: - - - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Total active downloading: - - - 1 - 2 - GTK_FILL - - - - - 0 - - - - - Do not count slow torrents - True - True - False - True - - - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Active Torrents</b> - True - - - - - False - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - vertical - 2 - - - True - 3 - 2 - 10 - - - True - 0 - Share Ratio Limit: - - - GTK_FILL - - - - - True - 0 - Seed Time Ratio: - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Seed Time (m): - - - 2 - 3 - GTK_FILL - - - - - True - True - ● - 6 - 1 - 2 - - - 1 - 2 - - - - - - True - True - ● - 6 - 1 - 2 - - - 1 - 2 - 1 - 2 - - - - - - True - True - ● - 6 - 1 - - - 1 - 2 - 2 - 3 - - - - - - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - Stop seeding when share ratio reaches: - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - False - False - 0 - - - - - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - 1 - 2 - True - - - False - False - 1 - - - - - False - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - Remove torrent when share ratio reached - True - False - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Seeding</b> - True - - - - - False - False - 2 - - - - - - - 0.5 - 100 - 0.10000000000000001 - 1 - - - -1 - 10000 - 1 - 10 - - - -1 - 100 - 0.10000000000000001 - 10 - - - -1 - 100 - 0.10000000000000001 - 10 - - - -1 - 9999 - 1 - 10 - - - -1 - 9999 - 1 - 10 - - - -1 - 9999 - 1 - 10 - - From 98a8be713160268514b1093460b386e65f3dd861 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Wed, 27 Apr 2011 13:38:23 +0100 Subject: [PATCH 199/329] avoid having the tests hang due to a failing to connect client! --- deluge/tests/test_client.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py index 1bd0a896b..8750d5c06 100644 --- a/deluge/tests/test_client.py +++ b/deluge/tests/test_client.py @@ -35,19 +35,13 @@ class ClientTestCase(unittest.TestCase): self.core = Popen([sys.executable], cwd=CWD, stdin=fp, stdout=PIPE, stderr=PIPE) - listening = False - while not listening: - line = self.core.stderr.readline() - if "Factory starting on 58846" in line: - listening = True - time.sleep(0.1) # Slight pause just incase - break - + time.sleep(2) # Slight pause just incase def tearDown(self): self.core.terminate() def test_connect_no_credentials(self): + return # hack whilst core is broken d = client.connect("localhost", 58846) d.addCallback(self.assertEquals, 10) From 4d8b34209bca252e780e521e1dd0ae69462b7e42 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 27 Apr 2011 13:51:56 +0200 Subject: [PATCH 200/329] fix column trimming a bit --- deluge/ui/console/modes/format_utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 826d5142e..26c48fda5 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -77,7 +77,11 @@ def format_priority(prio): return pstring def trim_string(string, w, have_dbls): - if have_dbls: + if w <= 0: + return "" + elif w == 1: + return "…" + elif have_dbls: # have to do this the slow way chrs = [] width = 4 @@ -92,9 +96,9 @@ def trim_string(string, w, have_dbls): if width != w: chrs.pop() chrs.append('.') - return "%s... "%("".join(chrs)) + return "%s… "%("".join(chrs)) else: - return "%s... "%(string[0:w-4]) + return "%s… "%(string[0:w-2]) def format_column(col, lim): dbls = 0 From cbcf413ffd95941586de5aa1ccbed6219a7be561 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 27 Apr 2011 17:25:22 +0200 Subject: [PATCH 201/329] use callbacks for mode switching when stopping alltorrents component. should fix bug 1686 --- deluge/ui/console/modes/alltorrents.py | 51 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 1fad76a86..b91b11ae2 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -418,10 +418,13 @@ class AllTorrents(BaseMode, component.Component): def show_torrent_details(self,tid): - component.stop(["AllTorrents"]) - self.stdscr.clear() - td = TorrentDetail(self,tid,self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(td) + def dodeets(arg): + if arg and True in arg[0]: + self.stdscr.clear() + component.get("ConsoleUI").set_mode(TorrentDetail(self,tid,self.stdscr,self.encoding)) + else: + self.messages.append(("Error","An error occured trying to display torrent details")) + component.stop(["AllTorrents"]).addCallback(dodeets) def show_preferences(self): def _on_get_config(config): @@ -431,28 +434,38 @@ class AllTorrents(BaseMode, component.Component): client.core.get_cache_status().addCallback(_on_get_cache_status,port,config) def _on_get_cache_status(status,port,config): - component.stop(["AllTorrents"]) - self.stdscr.clear() - prefs = Preferences(self,config,self.config,port,status,self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(prefs) + def doprefs(arg): + if arg and True in arg[0]: + self.stdscr.clear() + component.get("ConsoleUI").set_mode(Preferences(self,config,self.config,port,status,self.stdscr,self.encoding)) + else: + self.messages.append(("Error","An error occured trying to display preferences")) + component.stop(["AllTorrents"]).addCallback(doprefs) client.core.get_config().addCallback(_on_get_config) def __show_events(self): - component.stop(["AllTorrents"]) - self.stdscr.clear() - ev = EventView(self,self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(ev) + def doevents(arg): + if arg and True in arg[0]: + self.stdscr.clear() + component.get("ConsoleUI").set_mode(EventView(self,self.stdscr,self.encoding)) + else: + self.messages.append(("Error","An error occured trying to display events")) + component.stop(["AllTorrents"]).addCallback(doevents) def __legacy_mode(self): - component.stop(["AllTorrents"]) - self.stdscr.clear() - if not self.legacy_mode: - self.legacy_mode = Legacy(self.stdscr,self.encoding) - component.get("ConsoleUI").set_mode(self.legacy_mode) - self.legacy_mode.refresh() - curses.curs_set(2) + def dolegacy(arg): + if arg and True in arg[0]: + self.stdscr.clear() + if not self.legacy_mode: + self.legacy_mode = Legacy(self.stdscr,self.encoding) + component.get("ConsoleUI").set_mode(self.legacy_mode) + self.legacy_mode.refresh() + curses.curs_set(2) + else: + self.messages.append(("Error","An error occured trying to switch to legacy mode")) + component.stop(["AllTorrents"]).addCallback(dolegacy) def _torrent_filter(self, idx, data): if data==FILTER.ALL: From 292929ba5922c94cc17df5af82e8e55ec091850e Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 27 Apr 2011 17:53:11 +0200 Subject: [PATCH 202/329] better handling of keyboard input in int/float spin inputs --- deluge/ui/console/modes/input_popup.py | 46 +++++++++++++++++--------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index ed00f2140..41bf24e3f 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -185,18 +185,23 @@ class IntSpinInput(InputField): self.move_func = move_func self.min_val = min_val self.max_val = max_val + self.need_update = False def render(self, screen, row, width, active, col=1, cursor_offset=0): - if not active and not self.valstr: - self.value = self.initvalue + if not active and self.need_update: + if not self.valstr or self.valstr == '-': + self.value = self.initvalue + else: + self.value = int(self.valstr) self.valstr = "%d"%self.value self.cursor = len(self.valstr) + self.need_update = False if not self.valstr: self.parent.add_string(row,"%s [ ]"%self.message,screen,col,False,True) elif active: - self.parent.add_string(row,"%s [ {!black,white,bold!}%d{!white,black!} ]"%(self.message,self.value),screen,col,False,True) + self.parent.add_string(row,"%s [ {!black,white,bold!}%s{!white,black!} ]"%(self.message,self.valstr),screen,col,False,True) else: - self.parent.add_string(row,"%s [ %d ]"%(self.message,self.value),screen,col,False,True) + self.parent.add_string(row,"%s [ %s ]"%(self.message,self.valstr),screen,col,False,True) if active: self.move_func(row,self.cursor+self.cursoff+cursor_offset) @@ -206,8 +211,12 @@ class IntSpinInput(InputField): def handle_read(self, c): if c == curses.KEY_PPAGE: self.value+=1 + self.valstr = "%d"%self.value + self.cursor = len(self.valstr) elif c == curses.KEY_NPAGE: self.value-=1 + self.valstr = "%d"%self.value + self.cursor = len(self.valstr) elif c == curses.KEY_LEFT: self.cursor = max(0,self.cursor-1) elif c == curses.KEY_RIGHT: @@ -215,25 +224,32 @@ class IntSpinInput(InputField): elif c == curses.KEY_HOME: self.cursor = 0 elif c == curses.KEY_END: - self.cursor = len(self.value) + self.cursor = len(self.valstr) elif c == curses.KEY_BACKSPACE or c == 127: if self.valstr and self.cursor > 0: self.valstr = self.valstr[:self.cursor - 1] + self.valstr[self.cursor:] self.cursor-=1 - if self.valstr: - self.value = int(self.valstr) + self.need_update = True elif c == curses.KEY_DC: if self.valstr and self.cursor < len(self.valstr): self.valstr = self.valstr[:self.cursor] + self.valstr[self.cursor+1:] + self.need_update = True + elif c == 45 and self.cursor == 0 and self.min_val < 0: + minus_place = self.valstr.find('-') + if minus_place >= 0: return + self.valstr = chr(c)+self.valstr + self.cursor += 1 + self.need_update = True elif c > 47 and c < 58: if c == 48 and self.cursor == 0: return + minus_place = self.valstr.find('-') + if self.cursor <= minus_place: return if self.cursor == len(self.valstr): self.valstr += chr(c) - self.value = int(self.valstr) else: # Insert into string self.valstr = self.valstr[:self.cursor] + chr(c) + self.valstr[self.cursor:] - self.value = int(self.valstr) + self.need_update = True # Move the cursor forward self.cursor+=1 @@ -266,14 +282,14 @@ class FloatSpinInput(InputField): self.need_update = False def render(self, screen, row, width, active, col=1, cursor_offset=0): - if not active and not self.valstr: - self.value = self.initvalue - self.valstr = self.fmt%self.value - self.cursor = len(self.valstr) if not active and self.need_update: - self.value = round(float(self.valstr),self.precision) + try: + self.value = round(float(self.valstr),self.precision) + except ValueError: + self.value = self.initvalue self.valstr = self.fmt%self.value self.cursor = len(self.valstr) + self.need_update = False if not self.valstr: self.parent.add_string(row,"%s [ ]"%self.message,screen,col,False,True) elif active: @@ -301,7 +317,7 @@ class FloatSpinInput(InputField): elif c == curses.KEY_HOME: self.cursor = 0 elif c == curses.KEY_END: - self.cursor = len(self.value) + self.cursor = len(self.valstr) elif c == curses.KEY_BACKSPACE or c == 127: if self.valstr and self.cursor > 0: self.valstr = self.valstr[:self.cursor - 1] + self.valstr[self.cursor:] From 47a9b18b89531c5a62bd16eaa80537bed9c93939 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Wed, 27 Apr 2011 17:58:05 +0200 Subject: [PATCH 203/329] enforce min/max values for float/int spin inputs --- deluge/ui/console/modes/input_popup.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py index 41bf24e3f..abe804285 100644 --- a/deluge/ui/console/modes/input_popup.py +++ b/deluge/ui/console/modes/input_popup.py @@ -193,6 +193,10 @@ class IntSpinInput(InputField): self.value = self.initvalue else: self.value = int(self.valstr) + if self.value < self.min_val: + self.value = self.min_val + if self.value > self.max_val: + self.value = self.max_val self.valstr = "%d"%self.value self.cursor = len(self.valstr) self.need_update = False @@ -209,11 +213,11 @@ class IntSpinInput(InputField): return 1 def handle_read(self, c): - if c == curses.KEY_PPAGE: + if c == curses.KEY_PPAGE and self.value < self.max_val: self.value+=1 self.valstr = "%d"%self.value self.cursor = len(self.valstr) - elif c == curses.KEY_NPAGE: + elif c == curses.KEY_NPAGE and self.value > self.min_val: self.value-=1 self.valstr = "%d"%self.value self.cursor = len(self.valstr) @@ -281,10 +285,17 @@ class FloatSpinInput(InputField): self.max_val = max_val self.need_update = False + def __limit_value(self): + if self.value < self.min_val: + self.value = self.min_val + if self.value > self.max_val: + self.value = self.max_val + def render(self, screen, row, width, active, col=1, cursor_offset=0): if not active and self.need_update: try: self.value = round(float(self.valstr),self.precision) + self.__limit_value() except ValueError: self.value = self.initvalue self.valstr = self.fmt%self.value @@ -304,10 +315,12 @@ class FloatSpinInput(InputField): def handle_read(self, c): if c == curses.KEY_PPAGE: self.value+=self.inc_amt + self.__limit_value() self.valstr = self.fmt%self.value self.cursor = len(self.valstr) elif c == curses.KEY_NPAGE: self.value-=self.inc_amt + self.__limit_value() self.valstr = self.fmt%self.value self.cursor = len(self.valstr) elif c == curses.KEY_LEFT: From 81d22eb73017d0e2fff528708e16f63a883dd56c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 15:39:49 +0100 Subject: [PATCH 204/329] When parsing the auth file, if an old format is found(with no auth levels), make sure that the `localclient` always has the ADMIN permission as he should. --- deluge/core/authmanager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 23c662cf4..3ec723b43 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -267,7 +267,10 @@ class AuthManager(component.Component): log.warning("Your auth entry for %s contains no auth level, " "using AUTH_LEVEL_DEFAULT(%s)..", username, AUTH_LEVEL_DEFAULT) - authlevel = AUTH_LEVEL_DEFAULT + if username == 'localclient': + authlevel = AUTH_LEVEL_ADMIN + else: + authlevel = AUTH_LEVEL_DEFAULT # This is probably an old auth file save_and_reload = True elif len(lsplit) == 3: From bb9a8509c85f6f9f0b4626a194e58ab0c5d9ac0c Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Wed, 27 Apr 2011 11:03:43 -0700 Subject: [PATCH 205/329] Fix trying to load the AutoAdd component as it no longer exists in core --- deluge/core/core.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index e04fe25e5..7b44191c4 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -61,7 +61,6 @@ from deluge.core.pluginmanager import PluginManager from deluge.core.alertmanager import AlertManager from deluge.core.filtermanager import FilterManager from deluge.core.preferencesmanager import PreferencesManager -from deluge.core.autoadd import AutoAdd from deluge.core.authmanager import AuthManager from deluge.core.eventmanager import EventManager from deluge.core.rpcserver import export @@ -107,7 +106,6 @@ class Core(component.Component): self.pluginmanager = PluginManager(self) self.torrentmanager = TorrentManager() self.filtermanager = FilterManager(self) - self.autoadd = AutoAdd() self.authmanager = AuthManager() # New release check information From f41f6ad46a8cfd5ed8294798586d6e0925bc3afd Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 19:28:16 +0100 Subject: [PATCH 206/329] Test fixes and #1814 fix. All test were adapted, and some more were added to comply with the new multiuser support in deluge. Regarding #1814, host entries in the Connection Manager UI are now migrated from the old format were automatic localhost logins were possible, which no longer is. --- ChangeLog | 8 +++ deluge/core/rpcserver.py | 38 ++++++++---- deluge/error.py | 27 ++++++--- deluge/tests/common.py | 38 +++++++++++- deluge/tests/test_authmanager.py | 7 ++- deluge/tests/test_client.py | 87 ++++++++++++++++++---------- deluge/tests/test_core.py | 3 + deluge/tests/test_httpdownloader.py | 4 ++ deluge/ui/client.py | 14 +++-- deluge/ui/gtkui/connectionmanager.py | 20 ++++++- deluge/ui/web/common.py | 44 +++++++++----- 11 files changed, 215 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a2083bd5..df7a83232 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * Removed the AutoAdd feature on the core. It's now handled with the AutoAdd plugin, which is also shipped with Deluge, and it does a better job and now, it even supports multiple users perfectly. + * Authentication/Permission exceptions are now sent to clients and recreated + there to allow acting upon them. ==== Core ==== * Implement #1063 option to delete torrent file copy on torrent removal - patch from Ghent @@ -20,10 +22,16 @@ * File modifications on the auth file are now detected and when they happen, the file is reloaded. Upon finding an old auth file with an old format, an upgrade to the new format is made, file saved, and reloaded. + * Authentication no longer requires a username/password. If one or both of + these is missing, an authentication error will be sent to the client + which sould then ask the username/password to the user. ==== GtkUI ==== * Fix uncaught exception when closing deluge in classic mode * Allow changing ownership of torrents + * Host entries in the Connection Manager UI are now editable. They're + now also migrated from the old format were automatic localhost logins were + possible, which no longer is, this fixes #1814. ==== WebUI ==== * Migrate to ExtJS 3.1 diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 60e190593..9e8823279 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -56,7 +56,7 @@ except ImportError: import deluge.component as component import deluge.configmanager from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN -from deluge.error import DelugeError, NotAuthorizedError, AuthenticationRequired +from deluge.error import DelugeError, NotAuthorizedError, __PassthroughError RPC_RESPONSE = 1 RPC_ERROR = 2 @@ -219,6 +219,9 @@ class DelugeRPCProtocol(Protocol): log.info("Deluge client disconnected: %s", reason.value) + def valid_session(self): + return self.transport.sessionno in self.factory.authorized_sessions + def dispatch(self, request_id, method, args, kwargs): """ This method is run when a RPC Request is made. It will run the local method @@ -262,18 +265,23 @@ class DelugeRPCProtocol(Protocol): if ret: self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0]) self.factory.session_protocols[self.transport.sessionno] = self - except AuthenticationRequired, err: - self.sendData((RPC_EVENT_AUTH, request_id, err.message, args[0])) except Exception, e: - sendError() - log.exception(e) + if isinstance(e, __PassthroughError): + self.sendData( + (RPC_EVENT_AUTH, request_id, + e.__class__.__name__, + e._args, e._kwargs, args[0]) + ) + else: + sendError() + log.exception(e) else: self.sendData((RPC_RESPONSE, request_id, (ret))) if not ret: self.transport.loseConnection() finally: return - elif method == "daemon.set_event_interest" and self.transport.sessionno in self.factory.authorized_sessions: + elif method == "daemon.set_event_interest" and self.valid_session(): log.debug("RPC dispatch daemon.set_event_interest") # This special case is to allow clients to set which events they are # interested in receiving. @@ -289,22 +297,24 @@ class DelugeRPCProtocol(Protocol): finally: return - if method in self.factory.methods and self.transport.sessionno in self.factory.authorized_sessions: + if method in self.factory.methods and self.valid_session(): log.debug("RPC dispatch %s", method) try: method_auth_requirement = self.factory.methods[method]._rpcserver_auth_level auth_level = self.factory.authorized_sessions[self.transport.sessionno][0] if auth_level < method_auth_requirement: # This session is not allowed to call this method - log.debug("Session %s is trying to call a method it is not authorized to call!", self.transport.sessionno) - raise NotAuthorizedError("Auth level too low: %s < %s" % (auth_level, method_auth_requirement)) + log.debug("Session %s is trying to call a method it is not " + "authorized to call!", self.transport.sessionno) + raise NotAuthorizedError(auth_level, method_auth_requirement) # Set the session_id in the factory so that methods can know # which session is calling it. self.factory.session_id = self.transport.sessionno ret = self.factory.methods[method](*args, **kwargs) except Exception, e: sendError() - # Don't bother printing out DelugeErrors, because they are just for the client + # Don't bother printing out DelugeErrors, because they are just + # for the client if not isinstance(e, DelugeError): log.exception("Exception calling RPC request: %s", e) else: @@ -545,8 +555,12 @@ def generate_ssl_keys(): # Write out files ssl_dir = deluge.configmanager.get_config_dir("ssl") - open(os.path.join(ssl_dir, "daemon.pkey"), "w").write(crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey)) - open(os.path.join(ssl_dir, "daemon.cert"), "w").write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) + open(os.path.join(ssl_dir, "daemon.pkey"), "w").write( + crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey) + ) + open(os.path.join(ssl_dir, "daemon.cert"), "w").write( + crypto.dump_certificate(crypto.FILETYPE_PEM, cert) + ) # Make the files only readable by this user for f in ("daemon.pkey", "daemon.cert"): os.chmod(os.path.join(ssl_dir, f), stat.S_IREAD | stat.S_IWRITE) diff --git a/deluge/error.py b/deluge/error.py index cdb67091a..95d00fce8 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -50,11 +50,24 @@ class InvalidTorrentError(DelugeError): class InvalidPathError(DelugeError): pass -class NotAuthorizedError(DelugeError): - pass +class __PassthroughError(DelugeError): + def __new__(cls, *args, **kwargs): + inst = super(__PassthroughError, cls).__new__(cls, *args, **kwargs) + inst._args = args + inst._kwargs = kwargs + return inst + +class NotAuthorizedError(__PassthroughError): + def __init__(self, current_level, required_level): + self.message = _( + "Auth level too low: %(current_level)s < %(required_level)s" % + dict(current_level=current_level, required_level=required_level) + ) + self.current_level = current_level + self.required_level = required_level -class _UsernameBasedException(DelugeError): +class __UsernameBasedPasstroughError(__PassthroughError): def _get_message(self): return self._message @@ -71,16 +84,16 @@ class _UsernameBasedException(DelugeError): del _get_username, _set_username def __init__(self, message, username): - super(_UsernameBasedException, self).__init__(message) + super(__UsernameBasedPasstroughError, self).__init__(message) self.message = message self.username = username -class BadLoginError(_UsernameBasedException): +class BadLoginError(__UsernameBasedPasstroughError): pass -class AuthenticationRequired(BadLoginError): +class AuthenticationRequired(__UsernameBasedPasstroughError): pass -class AuthManagerError(_UsernameBasedException): +class AuthManagerError(__UsernameBasedPasstroughError): pass diff --git a/deluge/tests/common.py b/deluge/tests/common.py index 84722c560..78d1739b8 100644 --- a/deluge/tests/common.py +++ b/deluge/tests/common.py @@ -1,6 +1,8 @@ import os - +import sys +import time import tempfile +from subprocess import Popen, PIPE import deluge.configmanager import deluge.log @@ -31,3 +33,37 @@ try: gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) except Exception, e: print e + +def start_core(): + CWD = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) + DAEMON_SCRIPT = """ +import sys +import deluge.main + +sys.argv.extend(['-d', '-c', '%s', '-L', 'info']) + +deluge.main.start_daemon() +""" + config_directory = set_tmp_config_dir() + fp = tempfile.TemporaryFile() + fp.write(DAEMON_SCRIPT % config_directory) + fp.seek(0) + + core = Popen([sys.executable], cwd=CWD, stdin=fp, stdout=PIPE, stderr=PIPE) + while True: + line = core.stderr.readline() + if "Factory starting on 58846" in line: + time.sleep(0.3) # Slight pause just incase + break + elif 'Traceback' in line: + raise SystemExit( + "Failed to start core daemon. Do \"\"\"%s\"\"\" to see what's " + "happening" % + "python -c \"import sys; import tempfile; " + "config_directory = tempfile.mkdtemp(); " + "import deluge.main; import deluge.configmanager; " + "deluge.configmanager.set_config_dir(config_directory); " + "sys.argv.extend(['-d', '-c', config_directory, '-L', 'info']); " + "deluge.main.start_daemon()" + ) + return core diff --git a/deluge/tests/test_authmanager.py b/deluge/tests/test_authmanager.py index 617984664..08bbab662 100644 --- a/deluge/tests/test_authmanager.py +++ b/deluge/tests/test_authmanager.py @@ -2,7 +2,7 @@ from twisted.trial import unittest import common -from deluge.core.authmanager import AuthManager +from deluge.core.authmanager import AuthManager, AUTH_LEVEL_ADMIN class AuthManagerTestCase(unittest.TestCase): def setUp(self): @@ -11,4 +11,7 @@ class AuthManagerTestCase(unittest.TestCase): def test_authorize(self): from deluge.ui import common - self.assertEquals(self.auth.authorize(*common.get_localhost_auth()), 10) + self.assertEquals( + self.auth.authorize(*common.get_localhost_auth()), + AUTH_LEVEL_ADMIN + ) diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py index 8750d5c06..82171ee0c 100644 --- a/deluge/tests/test_client.py +++ b/deluge/tests/test_client.py @@ -1,53 +1,80 @@ -import os -import sys -import time -import signal -import tempfile - -from subprocess import Popen, PIPE import common from twisted.trial import unittest +from deluge import error +from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_DEFAULT from deluge.ui.client import client -CWD = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) - -DAEMON_SCRIPT = """ -import sys -import deluge.main - -sys.argv.extend(['-d', '-c', '%s', '-Linfo']) - -deluge.main.start_daemon() -""" - class ClientTestCase(unittest.TestCase): def setUp(self): - config_directory = common.set_tmp_config_dir() - - fp = tempfile.TemporaryFile() - fp.write(DAEMON_SCRIPT % config_directory) - fp.seek(0) - - self.core = Popen([sys.executable], cwd=CWD, - stdin=fp, stdout=PIPE, stderr=PIPE) - - time.sleep(2) # Slight pause just incase + self.core = common.start_core() def tearDown(self): self.core.terminate() def test_connect_no_credentials(self): - return # hack whilst core is broken + d = client.connect("localhost", 58846) - d.addCallback(self.assertEquals, 10) + + def on_failure(failure): + self.assertEqual( + failure.trap(error.AuthenticationRequired), + error.AuthenticationRequired + ) + self.addCleanup(client.disconnect) + + d.addErrback(on_failure) + return d + + def test_connect_localclient(self): + from deluge.ui import common + username, password = common.get_localhost_auth() + d = client.connect( + "localhost", 58846, username=username, password=password + ) def on_connect(result): + self.assertEqual(client.get_auth_level(), AUTH_LEVEL_ADMIN) self.addCleanup(client.disconnect) return result d.addCallback(on_connect) return d + + def test_connect_bad_password(self): + from deluge.ui import common + username, password = common.get_localhost_auth() + d = client.connect( + "localhost", 58846, username=username, password=password+'1' + ) + + def on_failure(failure): + self.assertEqual( + failure.trap(error.BadLoginError), + error.BadLoginError + ) + self.addCleanup(client.disconnect) + + d.addErrback(on_failure) + return d + + def test_connect_without_password(self): + from deluge.ui import common + username, password = common.get_localhost_auth() + d = client.connect( + "localhost", 58846, username=username + ) + + def on_failure(failure): + self.assertEqual( + failure.trap(error.AuthenticationRequired), + error.AuthenticationRequired + ) + self.assertEqual(failure.value.username, username) + self.addCleanup(client.disconnect) + + d.addErrback(on_failure) + return d diff --git a/deluge/tests/test_core.py b/deluge/tests/test_core.py index 57991681c..751851325 100644 --- a/deluge/tests/test_core.py +++ b/deluge/tests/test_core.py @@ -13,11 +13,14 @@ except ImportError: import os import common +import warnings rpath = common.rpath from deluge.core.rpcserver import RPCServer from deluge.core.core import Core +warnings.filterwarnings("ignore", category=RuntimeWarning) from deluge.ui.web.common import compress +warnings.resetwarnings() import deluge.component as component import deluge.error diff --git a/deluge/tests/test_httpdownloader.py b/deluge/tests/test_httpdownloader.py index 4dbed91e2..76d89cd6e 100644 --- a/deluge/tests/test_httpdownloader.py +++ b/deluge/tests/test_httpdownloader.py @@ -1,4 +1,5 @@ import os +import warnings from twisted.trial import unittest from twisted.internet import reactor @@ -9,7 +10,10 @@ from twisted.web.server import Site from deluge.httpdownloader import download_file from deluge.log import setupLogger + +warnings.filterwarnings("ignore", category=RuntimeWarning) from deluge.ui.web.common import compress +warnings.resetwarnings() from email.utils import formatdate diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 049595383..e59df470d 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -45,8 +45,8 @@ except ImportError: import zlib import deluge.common +from deluge import error from deluge.log import LOG as log -from deluge.error import AuthenticationRequired from deluge.event import known_events if deluge.common.windows_check(): @@ -206,7 +206,8 @@ class DelugeRPCProtocol(Protocol): # Run the callbacks registered with this Deferred object d.callback(request[2]) elif message_type == RPC_EVENT_AUTH: - d.errback(AuthenticationRequired(request[2], request[3])) + # Recreate exception and errback'it + d.errback(getattr(error, request[2])(*request[3], **request[4])) elif message_type == RPC_ERROR: # Create the DelugeRPCError to pass to the errback r = self.__rpc_requests[request_id] @@ -416,13 +417,16 @@ class DaemonSSLProxy(DaemonProxy): containing a `:class:DelugeRPCError` object. """ try: - if error_data.check(AuthenticationRequired): + if isinstance(error_data.value, error.NotAuthorizedError): + # Still log these errors + log.error(error_data.value.logable()) + return error_data + if isinstance(error_data.value, error.__PassthroughError): return error_data except: pass - if error_data.value.exception_type != 'AuthManagerError': - log.error(error_data.value.logable()) + log.error(error_data.value.logable()) return error_data def __on_connect(self, result): diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 6a1395a65..bbe7e42e8 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -43,6 +43,7 @@ from twisted.internet import reactor import deluge.component as component import common import deluge.configmanager +from deluge.ui.common import get_localhost_auth from deluge.ui.client import client import deluge.ui.client from deluge.configmanager import ConfigManager @@ -100,6 +101,7 @@ class ConnectionManager(component.Component): self.gtkui_config = ConfigManager("gtkui.conf") self.config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG) + self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2) self.running = False @@ -483,8 +485,9 @@ class ConnectionManager(component.Component): dialog.get_password()) d = dialog.run().addCallback(dialog_finished, host, port, user) return d - dialogs.ErrorDialog(_("Failed To Authenticate"), - reason.value.exception_msg).run() + dialogs.ErrorDialog( + _("Failed To Authenticate"), reason.value.message + ).run() def on_button_connect_clicked(self, widget=None): model, row = self.hostlist.get_selection().get_selected() @@ -683,3 +686,16 @@ class ConnectionManager(component.Component): def on_askpassword_dialog_entry_activate(self, entry): self.askpassword_dialog.response(gtk.RESPONSE_OK) + + def __migrate_config_1_to_2(self, config): + localclient_username, localclient_password = get_localhost_auth() + if not localclient_username: + # Nothing to do here, there's no auth file + return + for idx, (_, host, _, username, _) in enumerate(config["hosts"][:]): + if host in ("127.0.0.1", "localhost"): + if not username: + config["hosts"][idx][3] = localclient_username + config["hosts"][idx][4] = localclient_password + return config + diff --git a/deluge/ui/web/common.py b/deluge/ui/web/common.py index b21bfd8aa..e3795fa1b 100644 --- a/deluge/ui/web/common.py +++ b/deluge/ui/web/common.py @@ -35,7 +35,6 @@ import zlib import gettext -from mako.template import Template as MakoTemplate from deluge import common _ = lambda x: gettext.gettext(x).decode("utf-8") @@ -59,18 +58,31 @@ def compress(contents, request): contents += compress.flush() return contents -class Template(MakoTemplate): - """ - A template that adds some built-ins to the rendering - """ - - builtins = { - "_": _, - "escape": escape, - "version": common.get_version() - } - - def render(self, *args, **data): - data.update(self.builtins) - rendered = MakoTemplate.render_unicode(self, *args, **data) - return rendered.encode('utf-8', 'replace') +try: + # This is beeing done like this in order to allow tests to use the above + # `compress` without requiring Mako to be instaled + from mako.template import Template as MakoTemplate + class Template(MakoTemplate): + """ + A template that adds some built-ins to the rendering + """ + + builtins = { + "_": _, + "escape": escape, + "version": common.get_version() + } + + def render(self, *args, **data): + data.update(self.builtins) + rendered = MakoTemplate.render_unicode(self, *args, **data) + return rendered.encode('utf-8', 'replace') +except ImportError: + import warnings + warnings.warn("The Mako library is required to run deluge.ui.web", + RuntimeWarning) + class Template(object): + def __new__(cls, *args, **kwargs): + raise RuntimeError( + "The Mako library is required to run deluge.ui.web" + ) From 18b27d4b49546df85b39c01b171850ab7f38623b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 19:42:54 +0100 Subject: [PATCH 207/329] Remove a pref regarding auto adding in queue thinking it was from the core's previous AutoAdd. Re-Added. --- deluge/ui/gtkui/gtkui.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index e3c744d33..0a8aed334 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -135,6 +135,7 @@ DEFAULT_PREFS = { "autoconnect": False, "autoconnect_host_id": None, "autostart_localhost": False, + "autoadd_queued": False, "choose_directory_dialog_path": deluge.common.get_default_download_dir(), "show_new_releases": True, "signal_port": 40000, From 9fa8748432cfc8c58572603192696be9765855cc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 27 Apr 2011 22:06:13 +0100 Subject: [PATCH 208/329] Fix some clean config dir issues. Moved some auth stuff to `deluge.common` because they're also used on the GTK UI. Now, if a user starts deluge in classic mode and tries to change it to client/daemon mode, he see's a dialog stating that the current session will be stopped. If he answers no, nothing is done, the classic mode pref is set back as it was. If he answers yes, all components are stopped and client is disconnected. At this stage the user can open the connection manager to start the daemon and connect. If the user starts in client/daemon mode and switches to classic mode he see's a dialog stating that deluge must be restarted. The GTK UI connection manager now loads it's default config with the localclient username and password. If not present in the auth file, the auth file will be recreated. --- deluge/common.py | 40 +++++++++++++++++++++++++ deluge/core/authmanager.py | 43 +++++---------------------- deluge/core/daemon.py | 9 ++++-- deluge/ui/client.py | 1 + deluge/ui/common.py | 44 +++++++++++++++------------- deluge/ui/gtkui/connectionmanager.py | 32 +++++++++++++------- deluge/ui/gtkui/preferences.py | 34 +++++++++++++++++++-- 7 files changed, 132 insertions(+), 71 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index 7246cd3fe..ef9a5aad7 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -631,3 +631,43 @@ class VersionSplit(object): v1 = [self.version, self.suffix or 'z', self.dev] v2 = [ver.version, ver.suffix or 'z', ver.dev] return cmp(v1, v2) + + +# Common AUTH stuff +AUTH_LEVEL_NONE = 0 +AUTH_LEVEL_READONLY = 1 +AUTH_LEVEL_NORMAL = 5 +AUTH_LEVEL_ADMIN = 10 +AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL + +def create_auth_file(): + import stat, configmanager + auth_file = configmanager.get_config_dir("auth") + # Check for auth file and create if necessary + if not os.path.exists(auth_file): + fd = open(auth_file, "w") + fd.flush() + os.fsync(fd.fileno()) + fd.close() + # Change the permissions on the file so only this user can read/write it + os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE) + +def create_localclient_account(): + import configmanager, random + auth_file = configmanager.get_config_dir("auth") + if not os.path.exists(auth_file): + create_auth_file() + + try: + from hashlib import sha1 as sha_hash + except ImportError: + from sha import new as sha_hash + fd = open(auth_file, "w") + fd.write(":".join([ + "localclient", + sha_hash(str(random.random())).hexdigest(), + str(AUTH_LEVEL_ADMIN) + ]) + '\n') + fd.flush() + os.fsync(fd.fileno()) + fd.close() diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 3ec723b43..1f9528fcc 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -42,17 +42,14 @@ import logging import deluge.component as component import deluge.configmanager as configmanager +from deluge.common import (AUTH_LEVEL_ADMIN, AUTH_LEVEL_NONE, AUTH_LEVEL_NORMAL, + AUTH_LEVEL_READONLY, AUTH_LEVEL_DEFAULT, + create_auth_file, create_localclient_account) + from deluge.error import AuthManagerError, AuthenticationRequired, BadLoginError log = logging.getLogger(__name__) -AUTH_LEVEL_NONE = 0 -AUTH_LEVEL_READONLY = 1 -AUTH_LEVEL_NORMAL = 5 -AUTH_LEVEL_ADMIN = 10 - -AUTH_LEVEL_DEFAULT = AUTH_LEVEL_NORMAL - AUTH_LEVELS_MAPPING = { 'NONE': AUTH_LEVEL_NONE, 'READONLY': AUTH_LEVEL_READONLY, @@ -218,28 +215,13 @@ class AuthManager(component.Component): self.__load_auth_file() - def __create_localclient_account(self): - """ - Returns the string. - """ - # We create a 'localclient' account with a random password - try: - from hashlib import sha1 as sha_hash - except ImportError: - from sha import new as sha_hash - self.__auth["localclient"] = Account( - "localclient", - sha_hash(str(random.random())).hexdigest(), - AUTH_LEVEL_ADMIN - ) - def __load_auth_file(self): save_and_reload = False auth_file = configmanager.get_config_dir("auth") # Check for auth file and create if necessary if not os.path.exists(auth_file): - self.__create_auth_file() - self.__create_localclient_account() + create_auth_file() + create_localclient_account() self.write_auth_file() auth_file_modification_time = os.stat(auth_file).st_mtime @@ -295,7 +277,7 @@ class AuthManager(component.Component): self.__auth[username] = Account(username, password, authlevel) if "localclient" not in self.__auth: - self.__create_localclient_account() + create_localclient_account() self.write_auth_file() if save_and_reload: @@ -303,14 +285,3 @@ class AuthManager(component.Component): self.write_auth_file() self.__auth_modification_time = auth_file_modification_time - - def __create_auth_file(self): - auth_file = configmanager.get_config_dir("auth") - # Check for auth file and create if necessary - if not os.path.exists(auth_file): - fd = open(auth_file, "w") - fd.flush() - os.fsync(fd.fileno()) - fd.close() - # Change the permissions on the file so only this user can read/write it - os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE) diff --git a/deluge/core/daemon.py b/deluge/core/daemon.py index 383264dbd..0343febe5 100644 --- a/deluge/core/daemon.py +++ b/deluge/core/daemon.py @@ -54,7 +54,9 @@ class Daemon(object): if os.path.isfile(deluge.configmanager.get_config_dir("deluged.pid")): # Get the PID and the port of the supposedly running daemon try: - (pid, port) = open(deluge.configmanager.get_config_dir("deluged.pid")).read().strip().split(";") + (pid, port) = open( + deluge.configmanager.get_config_dir("deluged.pid") + ).read().strip().split(";") pid = int(pid) port = int(port) except ValueError: @@ -93,7 +95,10 @@ class Daemon(object): else: # This is a deluged! s.close() - raise deluge.error.DaemonRunningError("There is a deluge daemon running with this config directory!") + raise deluge.error.DaemonRunningError( + "There is a deluge daemon running with this config " + "directory!" + ) # Initialize gettext try: diff --git a/deluge/ui/client.py b/deluge/ui/client.py index e59df470d..a6b17b922 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -515,6 +515,7 @@ class DaemonClassicProxy(DaemonProxy): self.__daemon.core.eventmanager.register_event_handler(event, handler) def disconnect(self): + self.connected = False self.__daemon = None def call(self, method, *args, **kwargs): diff --git a/deluge/ui/common.py b/deluge/ui/common.py index fb9048d01..239bb84c9 100644 --- a/deluge/ui/common.py +++ b/deluge/ui/common.py @@ -407,26 +407,28 @@ def get_localhost_auth(): :rtype: tuple """ auth_file = deluge.configmanager.get_config_dir("auth") - if os.path.exists(auth_file): - for line in open(auth_file): - if line.startswith("#"): - # This is a comment line - continue - line = line.strip() - try: - lsplit = line.split(":") - except Exception, e: - log.error("Your auth file is malformed: %s", e) - continue + if not os.path.exists(auth_file): + from deluge.common import create_localclient_account + create_localclient_account() - if len(lsplit) == 2: - username, password = lsplit - elif len(lsplit) == 3: - username, password, level = lsplit - else: - log.error("Your auth file is malformed: Incorrect number of fields!") - continue + for line in open(auth_file): + if line.startswith("#"): + # This is a comment line + continue + line = line.strip() + try: + lsplit = line.split(":") + except Exception, e: + log.error("Your auth file is malformed: %s", e) + continue - if username == "localclient": - return (username, password) - return ("", "") + if len(lsplit) == 2: + username, password = lsplit + elif len(lsplit) == 3: + username, password, level = lsplit + else: + log.error("Your auth file is malformed: Incorrect number of fields!") + continue + + if username == "localclient": + return (username, password) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index bbe7e42e8..e28c0b751 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -33,6 +33,7 @@ # # +import os import gtk import pkg_resources import time @@ -56,11 +57,6 @@ log = logging.getLogger(__name__) DEFAULT_HOST = "127.0.0.1" DEFAULT_PORT = 58846 -DEFAULT_CONFIG = { - "hosts": [(hashlib.sha1(str(time.time())).hexdigest(), DEFAULT_HOST, - DEFAULT_PORT, "localclient", "")] -} - HOSTLIST_COL_ID = 0 HOSTLIST_COL_HOST = 1 HOSTLIST_COL_PORT = 2 @@ -99,15 +95,11 @@ class ConnectionManager(component.Component): def __init__(self): component.Component.__init__(self, "ConnectionManager") self.gtkui_config = ConfigManager("gtkui.conf") - - self.config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG) - self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2) - self.running = False # Component overrides def start(self): - pass + self.config = self.__load_config() def stop(self): # Close this dialog when we are shutting down @@ -117,6 +109,26 @@ class ConnectionManager(component.Component): def shutdown(self): pass + def __load_config(self): + auth_file = deluge.configmanager.get_config_dir("auth") + if not os.path.exists(auth_file): + from deluge.common import create_localclient_account + create_localclient_account() + + localclient_username, localclient_password = get_localhost_auth() + DEFAULT_CONFIG = { + "hosts": [( + hashlib.sha1(str(time.time())).hexdigest(), + DEFAULT_HOST, + DEFAULT_PORT, + localclient_username, + localclient_password + )] + } + config = ConfigManager("hostlist.conf.1.2", DEFAULT_CONFIG) + config.run_converter((0, 1), 2, self.__migrate_config_1_to_2) + return config + # Public methods def show(self): """ diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 83f681f76..d40e486ab 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -546,6 +546,8 @@ class Preferences(component.Component): except ImportError: from sha import new as sha_hash + classic_mode_was_set = self.gtkui_config["classic_mode"] + # Get the values from the dialog new_core_config = {} new_gtkui_config = {} @@ -666,8 +668,10 @@ class Preferences(component.Component): self.glade.get_widget("txt_tray_password").get_text()).hexdigest() if passhex != "c07eb5a8c0dc7bb81c217b67f11c3b7a5e95ffd7": new_gtkui_config["tray_password"] = passhex - new_gtkui_config["classic_mode"] = \ - self.glade.get_widget("chk_classic_mode").get_active() + + new_gtkui_in_classic_mode = self.glade.get_widget("chk_classic_mode").get_active() + new_gtkui_config["classic_mode"] = new_gtkui_in_classic_mode + new_gtkui_config["show_rate_in_title"] = \ self.glade.get_widget("chk_show_rate_in_title").get_active() @@ -763,6 +767,32 @@ class Preferences(component.Component): # Re-show the dialog to make sure everything has been updated self.show() + if classic_mode_was_set==True and new_gtkui_in_classic_mode==False: + def on_response(response): + if response == gtk.RESPONSE_NO: + # Set each changed config value in the core + self.gtkui_config["classic_mode"] = True + client.core.set_config({"classic_mode": True}) + client.force_call(True) + # Update the configuration + self.core_config.update({"classic_mode": True}) + self.glade.get_widget("chk_classic_mode").set_active(True) + else: + client.disconnect() + if client.is_classicmode(): + component.stop() + dialog = dialogs.YesNoDialog( + _("Attention"), + _("Your current session will be stopped. Continue?") + ) + dialog.run().addCallback(on_response) + elif classic_mode_was_set==False and new_gtkui_in_classic_mode==True: + dialog = dialogs.InformationDialog( + _("Attention"), + _("You must now restart the deluge UI") + ) + dialog.run() + def hide(self): self.glade.get_widget("port_img").hide() self.pref_dialog.hide() From 39978d5ade2251ec19c1ccd538c2fa705b73f76b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Apr 2011 10:37:35 +0100 Subject: [PATCH 209/329] Fix #1278 by keeping references. --- deluge/ui/gtkui/menubar.py | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index f73f9cc02..8132c2a5c 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -361,18 +361,30 @@ class MenuBar(component.Component): glade = gtk.glade.XML(pkg_resources.resource_filename( "deluge.ui.gtkui", "glade/move_storage_dialog.glade" )) - dialog = glade.get_widget("move_storage_dialog") - dialog.set_transient_for(self.window.window) - entry = glade.get_widget("entry_destination") - entry.set_text(status["save_path"]) - def _on_response_event(widget, response_id): + # Keep it referenced: + # https://bugzilla.gnome.org/show_bug.cgi?id=546802 + self.move_storage_dialog = glade.get_widget("move_storage_dialog") + self.move_storage_dialog.set_transient_for(self.window.window) + self.move_storage_dialog_entry = glade.get_widget("entry_destination") + self.move_storage_dialog_entry.set_text(status["save_path"]) + def on_dialog_response_event(widget, response_id): + + def on_core_result(result): + # Delete references + del self.move_storage_dialog + del self.move_storage_dialog_entry + if response_id == gtk.RESPONSE_OK: - log.debug("Moving torrents to %s", entry.get_text()) - path = entry.get_text() - client.core.move_storage(component.get("TorrentView").get_selected_torrents(), path) - dialog.hide() - dialog.connect("response", _on_response_event) - dialog.show() + log.debug("Moving torrents to %s", + self.move_storage_dialog.get_text()) + path = self.move_storage_dialog_entry.get_text() + client.core.move_storage( + component.get("TorrentView").get_selected_torrents(), path + ).addCallback(on_core_result) + self.move_storage_dialog.hide() + + self.move_storage_dialog.connect("response", on_dialog_response_event) + self.move_storage_dialog.show() def on_menuitem_queue_top_activate(self, value): log.debug("on_menuitem_queue_top_activate") From a063095dad70751b4310951234fde2dcf40c212f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Apr 2011 11:06:26 +0100 Subject: [PATCH 210/329] Make sure we have a config loaded in the connection manager. Fixes #1819. --- deluge/ui/gtkui/connectionmanager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index e28c0b751..1dfd3b401 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -134,6 +134,7 @@ class ConnectionManager(component.Component): """ Show the ConnectionManager dialog. """ + self.config = self.__load_config() # Get the glade file for the connection manager self.glade = gtk.glade.XML( pkg_resources.resource_filename("deluge.ui.gtkui", From e950cca05924b5f14a4c64e967fb4d4b22f78813 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 28 Apr 2011 11:50:13 +0200 Subject: [PATCH 211/329] reset selection to top on alltorrent resume in case another mode has effected torrent list --- deluge/ui/console/modes/alltorrents.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index b91b11ae2..4193abc68 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -282,6 +282,7 @@ class AllTorrents(BaseMode, component.Component): self.__help_lines = format_utils.wrap_string(HELP_STR,(self.cols/2)-2) def resume(self): + self._go_top = True component.start(["AllTorrents"]) self.refresh() From 12ea65d1885536bfac56006c2faf3b93f0698630 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 28 Apr 2011 14:20:07 +0200 Subject: [PATCH 212/329] show priorities for directories. fulfills feature request 1688 --- deluge/ui/console/modes/format_utils.py | 1 + deluge/ui/console/modes/torrentdetail.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 26c48fda5..6783acf47 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -69,6 +69,7 @@ def format_pieces(num, size): return "%d (%s)"%(num,deluge.common.fsize(size)) def format_priority(prio): + if prio == -2: return "[Mixed]" if prio < 0: return "-" pstring = deluge.common.FILE_PRIORITY[prio] if prio > 0: diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 0b585b5d4..3d6b2a3e5 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -152,6 +152,7 @@ class TorrentDetail(BaseMode, component.Component): def set_state(self, state): log.debug("got state") + need_prio_update = False if not self.file_list: # don't keep getting the files once we've got them once if state.get("files"): @@ -160,9 +161,14 @@ class TorrentDetail(BaseMode, component.Component): self._status_keys.remove("files") else: self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (File list unknown)").center(self.cols)) + need_prio_update = True self._fill_progress(self.file_list,state["file_progress"]) for i,prio in enumerate(state["file_priorities"]): - self.file_dict[i][6] = prio + if self.file_dict[i][6] != prio: + need_prio_update = True + self.file_dict[i][6] = prio + if need_prio_update: + self.__fill_prio(self.file_list) del state["file_progress"] del state["file_priorities"] self.torrent_state = state @@ -236,6 +242,16 @@ class TorrentDetail(BaseMode, component.Component): tb += bd return tb + def __fill_prio(self,fs): + for f in fs: + if f[3]: # dir, so fill in children and compute our prio + self.__fill_prio(f[3]) + s = set([e[6] for e in f[3]]) # pull out all child prios and turn into a set + if len(s) > 1: + f[6] = -2 # mixed + else: + f[6] = s.pop() + def _update_columns(self): self.column_widths = [-1,15,15,20] req = sum(filter(lambda x:x >= 0,self.column_widths)) From 751345fc28eeaeedb749892c8c745aec4f226009 Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 28 Apr 2011 14:23:38 +0200 Subject: [PATCH 213/329] minor function renaming to make things properly private --- deluge/ui/console/modes/torrentdetail.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py index 3d6b2a3e5..ae9161e1d 100644 --- a/deluge/ui/console/modes/torrentdetail.py +++ b/deluge/ui/console/modes/torrentdetail.py @@ -138,7 +138,7 @@ class TorrentDetail(BaseMode, component.Component): self.__split_help() self.column_names = ["Filename", "Size", "Progress", "Priority"] - self._update_columns() + self.__update_columns() component.start(["TorrentDetail"]) curses.curs_set(0) @@ -162,7 +162,7 @@ class TorrentDetail(BaseMode, component.Component): else: self.files_sep = "{!green,black,bold,underline!}%s"%(("Files (File list unknown)").center(self.cols)) need_prio_update = True - self._fill_progress(self.file_list,state["file_progress"]) + self.__fill_progress(self.file_list,state["file_progress"]) for i,prio in enumerate(state["file_priorities"]): if self.file_dict[i][6] != prio: need_prio_update = True @@ -211,16 +211,16 @@ class TorrentDetail(BaseMode, component.Component): cur = cl else: cur = cur[-1][3] - self._build_sizes(ret) - self._fill_progress(ret,prog) + self.__build_sizes(ret) + self.__fill_progress(ret,prog) return (ret,retdict) # fill in the sizes of the directory entries based on their children - def _build_sizes(self, fs): + def __build_sizes(self, fs): ret = 0 for f in fs: if f[2] == -1: - val = self._build_sizes(f[3]) + val = self.__build_sizes(f[3]) ret += val f[2] = val else: @@ -229,12 +229,12 @@ class TorrentDetail(BaseMode, component.Component): # fills in progress fields in all entries based on progs # returns the # of bytes complete in all the children of fs - def _fill_progress(self,fs,progs): + def __fill_progress(self,fs,progs): if not progs: return 0 tb = 0 for f in fs: if f[3]: # dir, has some children - bd = self._fill_progress(f[3],progs) + bd = self.__fill_progress(f[3],progs) f[5] = format_utils.format_progress((bd/f[2])*100) else: # file, update own prog and add to total bd = f[2]*progs[f[1]] @@ -252,7 +252,7 @@ class TorrentDetail(BaseMode, component.Component): else: f[6] = s.pop() - def _update_columns(self): + def __update_columns(self): self.column_widths = [-1,15,15,20] req = sum(filter(lambda x:x >= 0,self.column_widths)) if (req > self.cols): # can't satisfy requests, just spread out evenly @@ -337,7 +337,7 @@ class TorrentDetail(BaseMode, component.Component): def on_resize(self, *args): BaseMode.on_resize_norefresh(self, *args) - self._update_columns() + self.__update_columns() self.__split_help() if self.popup: self.popup.handle_resize() @@ -465,7 +465,7 @@ class TorrentDetail(BaseMode, component.Component): self.popup.add_line("_High Priority",data=deluge.common.FILE_PRIORITY["High Priority"]) self.popup.add_line("H_ighest Priority",data=deluge.common.FILE_PRIORITY["Highest Priority"]) - def _mark_unmark(self,idx): + def __mark_unmark(self,idx): if idx in self.marked: del self.marked[idx] else: @@ -524,7 +524,7 @@ class TorrentDetail(BaseMode, component.Component): if c > 31 and c < 256: if chr(c) == 'm': if self.current_file: - self._mark_unmark(self.current_file[1]) + self.__mark_unmark(self.current_file[1]) elif chr(c) == 'c': self.marked = {} elif chr(c) == 'a': From 1be59bb1160ff90866e41f21eea3e4af409ee91d Mon Sep 17 00:00:00 2001 From: Nick Lanham Date: Thu, 28 Apr 2011 14:26:01 +0200 Subject: [PATCH 214/329] don't show decimals for 100% progress (100% instead of 100.00%) --- deluge/ui/console/modes/format_utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deluge/ui/console/modes/format_utils.py b/deluge/ui/console/modes/format_utils.py index 6783acf47..fa064f812 100644 --- a/deluge/ui/console/modes/format_utils.py +++ b/deluge/ui/console/modes/format_utils.py @@ -63,7 +63,10 @@ def format_seeds_peers(num, total): return "%d (%d)"%(num,total) def format_progress(perc): - return "%.2f%%"%perc + if perc < 100: + return "%.2f%%"%perc + else: + return "100%" def format_pieces(num, size): return "%d (%s)"%(num,deluge.common.fsize(size)) From 63d0d0c69bbc77f151c2bf38b806895b603e039f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 28 Apr 2011 16:53:20 +0100 Subject: [PATCH 215/329] GTK UI connection manager fixes. Auto-connecting to daemon now works. Fixes #1815. Auto-starting a `localhost` daemon now also works, the reconnecting attempts were not being "triggered". When not connected to a daemon, "Quit & Shutdown Daemon" is not present. So #1818 is also fixed. Some more work regarding #1819 was done. Client now disconnects before shutting down the GTK UI. --- deluge/ui/client.py | 4 +- deluge/ui/gtkui/connectionmanager.py | 80 +++++++++++++++---- .../ui/gtkui/glade/connection_manager.glade | 29 ++++--- deluge/ui/gtkui/gtkui.py | 46 ++++++++++- deluge/ui/gtkui/mainwindow.py | 16 +++- 5 files changed, 141 insertions(+), 34 deletions(-) diff --git a/deluge/ui/client.py b/deluge/ui/client.py index a6b17b922..dc39fb192 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -607,13 +607,15 @@ class Client(object): self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) d = self._daemon_proxy.connect(host, port) + auth_deferred = defer.Deferred() + def on_connect_fail(reason): self.disconnect() + auth_deferred.errback(reason) return reason d.addErrback(on_connect_fail) if not skip_authentication: - auth_deferred = defer.Deferred() def on_authenticate(result, daemon_info): log.debug("Authentication sucessfull: %s", result) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 1dfd3b401..09341c8b6 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -95,11 +95,12 @@ class ConnectionManager(component.Component): def __init__(self): component.Component.__init__(self, "ConnectionManager") self.gtkui_config = ConfigManager("gtkui.conf") + self.config = self.__load_config() self.running = False # Component overrides def start(self): - self.config = self.__load_config() + pass def stop(self): # Close this dialog when we are shutting down @@ -184,23 +185,22 @@ class ConnectionManager(component.Component): column = gtk.TreeViewColumn(_("Version"), render, text=HOSTLIST_COL_VERSION) self.hostlist.append_column(column) + # Connect the signals to the handlers + self.glade.signal_autoconnect(self) + # Load any saved host entries self.__load_hostlist() self.__load_options() - - # Select the first host if possible - if len(self.liststore) > 0: - self.hostlist.get_selection().select_path("0") - - # Connect the signals to the handlers - self.glade.signal_autoconnect(self) - self.hostlist.get_selection().connect( - "changed", self.on_hostlist_selection_changed - ) - self.__update_list() self.running = True + # Trigger the on_selection_changed code and select the first host + # if possible + self.hostlist.get_selection().unselect_all() + if len(self.liststore) > 0: + self.hostlist.get_selection().select_path("0") + + # Run the dialog response = self.connection_manager.run() self.running = False @@ -361,9 +361,13 @@ class ConnectionManager(component.Component): """ Set the widgets to show the correct options from the config. """ - self.glade.get_widget("chk_autoconnect").set_active(self.gtkui_config["autoconnect"]) - self.glade.get_widget("chk_autostart").set_active(self.gtkui_config["autostart_localhost"]) - self.glade.get_widget("chk_donotshow").set_active(not self.gtkui_config["show_connection_manager_on_start"]) + self.autoconnect_host_id = self.gtkui_config['autoconnect_host_id'] + self.glade.get_widget("chk_autostart").set_active( + self.gtkui_config["autostart_localhost"] + ) + self.glade.get_widget("chk_donotshow").set_active( + not self.gtkui_config["show_connection_manager_on_start"] + ) def __save_options(self): """ @@ -385,18 +389,26 @@ class ConnectionManager(component.Component): self.glade.get_widget("image_startdaemon").set_from_stock( gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) self.glade.get_widget("label_startdaemon").set_text("_Start Daemon") + self.glade.get_widget("chk_autoconnect").set_sensitive(False) model, row = self.hostlist.get_selection().get_selected() if not row: self.glade.get_widget("button_edithost").set_sensitive(False) + self.glade.get_widget("chk_autoconnect").set_sensitive(False) return self.glade.get_widget("button_edithost").set_sensitive(True) + self.glade.get_widget("chk_autoconnect").set_sensitive(True) # Get some values about the selected host status = model[row][HOSTLIST_COL_STATUS] + hostid = model[row][HOSTLIST_COL_ID] host = model[row][HOSTLIST_COL_HOST] + self.glade.get_widget("chk_autoconnect").set_active( + hostid == self.gtkui_config["autoconnect_host_id"] + ) + log.debug("Status: %s", status) # Check to see if we have a localhost entry selected localhost = False @@ -700,6 +712,44 @@ class ConnectionManager(component.Component): def on_askpassword_dialog_entry_activate(self, entry): self.askpassword_dialog.response(gtk.RESPONSE_OK) + def on_hostlist_cursor_changed(self, widget): + paths = self.hostlist.get_selection().get_selected_rows()[1] + if len(paths) < 1: + self.glade.get_widget("chk_autoconnect").set_sensitive(False) + return + else: + self.glade.get_widget("chk_autoconnect").set_sensitive(True) + + hostid = self.liststore[paths[0]][HOSTLIST_COL_ID] + self.glade.get_widget("chk_autoconnect").set_active( + hostid == self.gtkui_config["autoconnect_host_id"] + ) + + def on_chk_autoconnect_toggled(self, widget): + paths = self.hostlist.get_selection().get_selected_rows()[1] + if len(paths) < 1: + self.glade.get_widget("chk_autoconnect").set_sensitive(False) + self.glade.get_widget("chk_autostart").set_sensitive(False) + return + else: + self.glade.get_widget("chk_autoconnect").set_sensitive(True) + + self.glade.get_widget("chk_autostart").set_sensitive(widget.get_active()) + + hostid = self.liststore[paths[0]][HOSTLIST_COL_ID] + + if widget.get_active(): + if self.autoconnect_host_id != hostid: + self.gtkui_config["autoconnect_host_id"] = hostid + self.autoconnect_host_id = hostid + self.gtkui_config.save() + return + + if self.autoconnect_host_id == hostid: + self.gtkui_config["autoconnect_host_id"] = None + self.autoconnect_host_id = None + self.gtkui_config.save() + def __migrate_config_1_to_2(self, config): localclient_username, localclient_password = get_localhost_auth() if not localclient_username: diff --git a/deluge/ui/gtkui/glade/connection_manager.glade b/deluge/ui/gtkui/glade/connection_manager.glade index fa93556dc..35cea0e4c 100644 --- a/deluge/ui/gtkui/glade/connection_manager.glade +++ b/deluge/ui/gtkui/glade/connection_manager.glade @@ -1,4 +1,4 @@ - + @@ -10,7 +10,6 @@ center True dialog - False True @@ -230,7 +229,6 @@ 300 True dialog - False True @@ -294,6 +292,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + @@ -471,14 +470,21 @@ - - Automatically start localhost if needed + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - + 15 + + + Automatically start localhost if needed + True + False + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 1 @@ -585,7 +591,6 @@ True dialog True - False True @@ -608,7 +613,7 @@ True True False - ● + ● diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 0a8aed334..849660542 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -333,28 +333,66 @@ Please see the details below for more information."), details=traceback.format_e # Check to see if we need to start the localhost daemon if self.config["autostart_localhost"] and host[1] in ("localhost", "127.0.0.1"): log.debug("Autostarting localhost:%s", host[2]) - try_connect = client.start_daemon(host[2], deluge.configmanager.get_config_dir()) + try_connect = client.start_daemon( + host[2], deluge.configmanager.get_config_dir() + ) log.debug("Localhost started: %s", try_connect) if not try_connect: dialogs.ErrorDialog( _("Error Starting Daemon"), - _("There was an error starting the daemon process. Try running it from a console to see if there is an error.")).run() + _("There was an error starting the daemon " + "process. Try running it from a console " + "to see if there is an error.") + ).run() + +# def refresh_connection_manager_list(): +# try: +# self.connectionmanager.glade.get_widget( +# "button_refresh" +# ).emit("clicked") +# except: +# pass +# +# reactor.callLatter(1, refresh_connection_manager_list) + + def update_connection_manager(): + if not self.connectionmanager.running: + return + self.connectionmanager.glade.get_widget( + "button_refresh" + ).emit("clicked") + + def close_connection_manager(): + if not self.connectionmanager.running: + return + self.connectionmanager.glade.get_widget( + "button_close" + ).emit("clicked") + def on_connect(connector): + print 'ON GTK UI CONNECT!!!!\n\n' component.start() + reactor.callLater(0.5, update_connection_manager) + reactor.callLater(1, close_connection_manager) + def on_connect_fail(result, try_counter): log.error("Connection to host failed..") # We failed connecting to the daemon, but lets try again if try_counter: - log.info("Retrying connection.. Retries left: %s", try_counter) + log.info("Retrying connection.. Retries left: " + "%s", try_counter) try_counter -= 1 import time time.sleep(0.5) do_connect(try_counter) + reactor.callLater(0.5, update_connection_manager) return result def do_connect(try_counter): - client.connect(*host[1:]).addCallback(on_connect).addErrback(on_connect_fail, try_counter) + d = client.connect(*host[1:]) + d.addCallback(on_connect) + d.addErrback(on_connect_fail, try_counter) if try_connect: do_connect(6) diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index a3265d813..572284e25 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -161,8 +161,20 @@ class MainWindow(component.Component): :type shutdown: boolean """ if shutdown: - client.daemon.shutdown() - reactor.stop() + def on_daemon_shutdown(result): + reactor.stop() + client.daemon.shutdown().addCallback(on_daemon_shutdown) + return + if client.is_classicmode(): + reactor.stop() + return + if not client.connected(): + reactor.stop() + return + def on_client_disconnected(result): + reactor.stop() + client.disconnect().addCallback(on_client_disconnected) + def load_window_state(self): x = self.config["window_x_pos"] From dd3f78bd368b8821590c73dd36796b4e3508a50b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 30 Apr 2011 07:42:06 +0100 Subject: [PATCH 216/329] More changes related to automatic connections. Auto-connecting on start of the gtk ui is now fully working. Auto-staring localhost if needed is now also working. Authentication failures now get passed correctly to the client implementation which will allow the user to enter username and/or password to complete authentication. It's now possible to shutdown the daemon from the connection manager even if not on localhost, it just needs all required information to be present on the liststore. --- deluge/core/rpcserver.py | 4 +- deluge/core/torrentmanager.py | 4 +- deluge/error.py | 32 +- deluge/ui/client.py | 58 +-- deluge/ui/gtkui/connectionmanager.py | 87 ++-- .../ui/gtkui/glade/connection_manager.glade | 379 +++++++++++------- deluge/ui/gtkui/gtkui.py | 107 ++--- 7 files changed, 375 insertions(+), 296 deletions(-) diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py index 9e8823279..274aeae48 100644 --- a/deluge/core/rpcserver.py +++ b/deluge/core/rpcserver.py @@ -56,7 +56,7 @@ except ImportError: import deluge.component as component import deluge.configmanager from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN -from deluge.error import DelugeError, NotAuthorizedError, __PassthroughError +from deluge.error import DelugeError, NotAuthorizedError, _PassthroughError RPC_RESPONSE = 1 RPC_ERROR = 2 @@ -266,7 +266,7 @@ class DelugeRPCProtocol(Protocol): self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0]) self.factory.session_protocols[self.transport.sessionno] = self except Exception, e: - if isinstance(e, __PassthroughError): + if isinstance(e, _PassthroughError): self.sendData( (RPC_EVENT_AUTH, request_id, e.__class__.__name__, diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index ad2033588..a59a742b4 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -448,7 +448,9 @@ class TorrentManager(component.Component): # Set auto_managed to False because the torrent is paused handle.auto_managed(False) # Create a Torrent object - owner = state.owner if state else (owner if owner else component.get("RPCServer").get_session_user()) + owner = state.owner if state else ( + owner if owner else component.get("RPCServer").get_session_user() + ) account_exists = component.get("AuthManager").has_account(owner) if not account_exists: owner = 'localclient' diff --git a/deluge/error.py b/deluge/error.py index 95d00fce8..c75091639 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -50,14 +50,23 @@ class InvalidTorrentError(DelugeError): class InvalidPathError(DelugeError): pass -class __PassthroughError(DelugeError): +class _PassthroughError(DelugeError): + + def _get_message(self): + return self._message + def _set_message(self, message): + self._message = message + message = property(_get_message, _set_message) + del _get_message, _set_message + def __new__(cls, *args, **kwargs): - inst = super(__PassthroughError, cls).__new__(cls, *args, **kwargs) + inst = super(_PassthroughError, cls).__new__(cls, *args, **kwargs) inst._args = args inst._kwargs = kwargs return inst -class NotAuthorizedError(__PassthroughError): +class NotAuthorizedError(_PassthroughError): + def __init__(self, current_level, required_level): self.message = _( "Auth level too low: %(current_level)s < %(required_level)s" % @@ -67,14 +76,7 @@ class NotAuthorizedError(__PassthroughError): self.required_level = required_level -class __UsernameBasedPasstroughError(__PassthroughError): - - def _get_message(self): - return self._message - def _set_message(self, message): - self._message = message - message = property(_get_message, _set_message) - del _get_message, _set_message +class _UsernameBasedPasstroughError(_PassthroughError): def _get_username(self): return self._username @@ -84,16 +86,16 @@ class __UsernameBasedPasstroughError(__PassthroughError): del _get_username, _set_username def __init__(self, message, username): - super(__UsernameBasedPasstroughError, self).__init__(message) + super(_UsernameBasedPasstroughError, self).__init__(message) self.message = message self.username = username -class BadLoginError(__UsernameBasedPasstroughError): +class BadLoginError(_UsernameBasedPasstroughError): pass -class AuthenticationRequired(__UsernameBasedPasstroughError): +class AuthenticationRequired(_UsernameBasedPasstroughError): pass -class AuthManagerError(__UsernameBasedPasstroughError): +class AuthManagerError(_UsernameBasedPasstroughError): pass diff --git a/deluge/ui/client.py b/deluge/ui/client.py index dc39fb192..58928024b 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -421,7 +421,7 @@ class DaemonSSLProxy(DaemonProxy): # Still log these errors log.error(error_data.value.logable()) return error_data - if isinstance(error_data.value, error.__PassthroughError): + if isinstance(error_data.value, error._PassthroughError): return error_data except: pass @@ -472,7 +472,7 @@ class DaemonSSLProxy(DaemonProxy): self.login_deferred.callback(result) def __on_login_fail(self, result): - log.debug("_on_login_fail(): %s", result) + log.debug("_on_login_fail(): %s", result.value) self.login_deferred.errback(result) def __on_auth_levels_mappings(self, result): @@ -529,12 +529,14 @@ class DaemonClassicProxy(DaemonProxy): log.exception(e) return defer.fail(e) else: - return defer.maybeDeferred(m, *copy.deepcopy(args), **copy.deepcopy(kwargs)) + return defer.maybeDeferred( + m, *copy.deepcopy(args), **copy.deepcopy(kwargs) + ) def register_event_handler(self, event, handler): """ - Registers a handler function to be called when `:param:event` is received - from the daemon. + Registers a handler function to be called when `:param:event` is + received from the daemon. :param event: the name of the event to handle :type event: str @@ -604,37 +606,39 @@ class Client(object): :returns: a Deferred object that will be called once the connection has been established or fails """ + self._daemon_proxy = DaemonSSLProxy(dict(self.__event_handlers)) self._daemon_proxy.set_disconnect_callback(self.__on_disconnect) + d = self._daemon_proxy.connect(host, port) - auth_deferred = defer.Deferred() def on_connect_fail(reason): self.disconnect() - auth_deferred.errback(reason) return reason + + def on_authenticate(result, daemon_info): + log.debug("Authentication sucessfull: %s", result) + return result + + def on_authenticate_fail(reason): + log.debug("Failed to authenticate: %s", reason.value) + return reason + + def on_connected(daemon_version): + log.debug("Client.connect.on_connected. Daemon version: %s", + daemon_version) + return daemon_version + + def authenticate(daemon_version, username, password): + d = self._daemon_proxy.authenticate(username, password) + d.addCallback(on_authenticate, daemon_version) + d.addErrback(on_authenticate_fail) + return d + + d.addCallback(on_connected) d.addErrback(on_connect_fail) - if not skip_authentication: - - def on_authenticate(result, daemon_info): - log.debug("Authentication sucessfull: %s", result) - auth_deferred.callback(daemon_info) - - def on_authenticate_fail(reason): - log.debug("Failed to authenticate") - log.exception(reason) - auth_deferred.errback(reason) - - def on_connected(daemon_version): - log.debug("Client.connect.on_connected. Daemon version: %s", - daemon_version) - d = self._daemon_proxy.authenticate(username, password) - d.addCallback(on_authenticate, daemon_version) - d.addErrback(on_authenticate_fail) - - d.addCallback(on_connected) - return auth_deferred + d.addCallback(authenticate, username, password) return d def disconnect(self): diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 09341c8b6..c61fe4a6c 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -48,8 +48,7 @@ from deluge.ui.common import get_localhost_auth from deluge.ui.client import client import deluge.ui.client from deluge.configmanager import ConfigManager -from deluge.error import AuthenticationRequired -from deluge.log import LOG as log +from deluge.error import AuthenticationRequired, BadLoginError import dialogs log = logging.getLogger(__name__) @@ -187,6 +186,9 @@ class ConnectionManager(component.Component): # Connect the signals to the handlers self.glade.signal_autoconnect(self) + self.hostlist.get_selection().connect( + "changed", self.on_hostlist_selection_changed + ) # Load any saved host entries self.__load_hostlist() @@ -361,7 +363,9 @@ class ConnectionManager(component.Component): """ Set the widgets to show the correct options from the config. """ - self.autoconnect_host_id = self.gtkui_config['autoconnect_host_id'] + self.glade.get_widget("chk_autoconnect").set_active( + self.gtkui_config["autoconnect"] + ) self.glade.get_widget("chk_autostart").set_active( self.gtkui_config["autostart_localhost"] ) @@ -389,25 +393,20 @@ class ConnectionManager(component.Component): self.glade.get_widget("image_startdaemon").set_from_stock( gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) self.glade.get_widget("label_startdaemon").set_text("_Start Daemon") - self.glade.get_widget("chk_autoconnect").set_sensitive(False) model, row = self.hostlist.get_selection().get_selected() if not row: self.glade.get_widget("button_edithost").set_sensitive(False) - self.glade.get_widget("chk_autoconnect").set_sensitive(False) return self.glade.get_widget("button_edithost").set_sensitive(True) - self.glade.get_widget("chk_autoconnect").set_sensitive(True) # Get some values about the selected host status = model[row][HOSTLIST_COL_STATUS] - hostid = model[row][HOSTLIST_COL_ID] host = model[row][HOSTLIST_COL_HOST] - - self.glade.get_widget("chk_autoconnect").set_active( - hostid == self.gtkui_config["autoconnect_host_id"] - ) + port = model[row][HOSTLIST_COL_PORT] + user = model[row][HOSTLIST_COL_USER] + passwd = model[row][HOSTLIST_COL_PASS] log.debug("Status: %s", status) # Check to see if we have a localhost entry selected @@ -445,8 +444,14 @@ class ConnectionManager(component.Component): self.glade.get_widget("label_startdaemon").set_text( _("_Start Daemon")) - if not localhost: - # An offline host + if client.connected() and (host, port, user) == client.connection_info(): + # If we're connected, we can stop the dameon + self.glade.get_widget("button_startdaemon").set_sensitive(True) + elif user and passwd: + # In this case we also have all the info to shutdown the dameon + self.glade.get_widget("button_startdaemon").set_sensitive(True) + else: + # Can't stop non localhost daemons, specially without the necessary info self.glade.get_widget("button_startdaemon").set_sensitive(False) # Make sure label is displayed correctly using mnemonics @@ -493,16 +498,16 @@ class ConnectionManager(component.Component): def __on_connected(self, daemon_info, host_id): if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id - self.connection_manager.response(gtk.RESPONSE_OK) component.start() def __on_connected_failed(self, reason, host_id, host, port, user): log.debug("Failed to connect: %s", reason) - if reason.check(AuthenticationRequired): + if reason.check(AuthenticationRequired, BadLoginError): log.debug("PasswordRequired exception") - dialog = dialogs.AuthenticationDialog(reason.value.message, - reason.value.username) + dialog = dialogs.AuthenticationDialog( + reason.value.message, reason.value.username + ) def dialog_finished(response_id, host, port, user): if response_id == gtk.RESPONSE_OK: self.__connect(host_id, host, port, @@ -547,6 +552,7 @@ class ConnectionManager(component.Component): time.sleep(0.5) do_retry_connect(try_counter) return result + def do_retry_connect(try_counter): d = client.connect(host, port, user, password) d.addCallback(self.__on_connected, host_id) @@ -657,9 +663,11 @@ class ConnectionManager(component.Component): log.debug("on_button_startdaemon_clicked") if self.liststore.iter_n_children(None) < 1: # There is nothing in the list, so lets create a localhost entry - self.add_host(DEFAULT_HOST, DEFAULT_PORT) + self.add_host(DEFAULT_HOST, DEFAULT_PORT, *get_localhost_auth()) # ..and start the daemon. - self.start_daemon(DEFAULT_PORT, deluge.configmanager.get_config_dir()) + self.start_daemon( + DEFAULT_PORT, deluge.configmanager.get_config_dir() + ) return paths = self.hostlist.get_selection().get_selected_rows()[1] @@ -681,9 +689,10 @@ class ConnectionManager(component.Component): def on_daemon_shutdown(d): # Update display to show change self.__update_list() + if client.connected() and client.connection_info() == (host, port, user): client.daemon.shutdown().addCallback(on_daemon_shutdown) - else: + elif user and password: # Create a new client instance c = deluge.ui.client.Client() def on_connect(d, c): @@ -712,44 +721,6 @@ class ConnectionManager(component.Component): def on_askpassword_dialog_entry_activate(self, entry): self.askpassword_dialog.response(gtk.RESPONSE_OK) - def on_hostlist_cursor_changed(self, widget): - paths = self.hostlist.get_selection().get_selected_rows()[1] - if len(paths) < 1: - self.glade.get_widget("chk_autoconnect").set_sensitive(False) - return - else: - self.glade.get_widget("chk_autoconnect").set_sensitive(True) - - hostid = self.liststore[paths[0]][HOSTLIST_COL_ID] - self.glade.get_widget("chk_autoconnect").set_active( - hostid == self.gtkui_config["autoconnect_host_id"] - ) - - def on_chk_autoconnect_toggled(self, widget): - paths = self.hostlist.get_selection().get_selected_rows()[1] - if len(paths) < 1: - self.glade.get_widget("chk_autoconnect").set_sensitive(False) - self.glade.get_widget("chk_autostart").set_sensitive(False) - return - else: - self.glade.get_widget("chk_autoconnect").set_sensitive(True) - - self.glade.get_widget("chk_autostart").set_sensitive(widget.get_active()) - - hostid = self.liststore[paths[0]][HOSTLIST_COL_ID] - - if widget.get_active(): - if self.autoconnect_host_id != hostid: - self.gtkui_config["autoconnect_host_id"] = hostid - self.autoconnect_host_id = hostid - self.gtkui_config.save() - return - - if self.autoconnect_host_id == hostid: - self.gtkui_config["autoconnect_host_id"] = None - self.autoconnect_host_id = None - self.gtkui_config.save() - def __migrate_config_1_to_2(self, config): localclient_username, localclient_password = get_localhost_auth() if not localclient_username: diff --git a/deluge/ui/gtkui/glade/connection_manager.glade b/deluge/ui/gtkui/glade/connection_manager.glade index 35cea0e4c..cd343c81e 100644 --- a/deluge/ui/gtkui/glade/connection_manager.glade +++ b/deluge/ui/gtkui/glade/connection_manager.glade @@ -1,8 +1,9 @@ - + + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Add Host @@ -13,16 +14,83 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + False + False + 0 + + + + + gtk-add + 1 + True + True + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + + False + False + 1 + + + + + gtk-save + 2 + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Hostname: @@ -35,6 +103,7 @@ True + False 1 @@ -42,16 +111,23 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False + False + True + True + True + True 1 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Port: @@ -69,6 +145,10 @@ 5 5 1 + False + False + True + True 58846 0 65535 1 10 0 1 True @@ -89,17 +169,23 @@ True + False 2 2 True + False 5 True True False + False + False + True + True @@ -113,11 +199,16 @@ True + False 5 True True + False + False + True + True @@ -129,6 +220,7 @@ True + False Password: @@ -140,6 +232,7 @@ True + False Username: @@ -149,25 +242,46 @@ False + True 2 + + + + + False + 5 + Password Required + True + center-on-parent + 320 + True + dialog + True + + + True + False + 2 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False end - - gtk-cancel + + gtk-connect + 1 True True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True + False @@ -175,49 +289,61 @@ 0 + + + False + True + end + 0 + + + + + True + False - - gtk-add - 1 + True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + False + gtk-dialog-authentication + 6 - False - False - 1 + True + True + 0 - - gtk-save - 2 + + True True - True - True + False + ● + False + False + True + True + - False - False - 2 + True + True + 1 - False - end - 0 + True + True + 1 + False True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -232,16 +358,33 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 + + + False + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + False + False + end + 0 + + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-missing-image @@ -254,18 +397,21 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <big><b>Connection Manager</b></big> True False + True 1 False + True 5 1 @@ -273,11 +419,13 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue @@ -292,7 +440,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - @@ -300,16 +447,20 @@ + True + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK start @@ -319,6 +470,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -332,9 +484,9 @@ gtk-edit True - False True True + False True @@ -351,6 +503,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -367,51 +520,44 @@ 0 - - - gtk-refresh - True - True - True - True - - - - False - False - 2 - - True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-execute + True + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Start local daemon True + True + True 1 @@ -425,6 +571,22 @@ 1 + + + gtk-refresh + True + True + True + False + True + + + + False + False + 2 + + False @@ -434,6 +596,8 @@ + True + True 10 2 @@ -446,6 +610,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 5 @@ -454,6 +619,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -462,31 +628,30 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True + True + True 0 - + + Automatically start localhost if needed True - 15 - - - Automatically start localhost if needed - True - False - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + True + + True + True 1 @@ -497,10 +662,13 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True + True + True 2 @@ -511,6 +679,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Options @@ -521,12 +690,14 @@ False + True 3 True + False end @@ -535,6 +706,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -550,6 +722,7 @@ True True True + False True @@ -566,92 +739,6 @@ 4 - - - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - False - False - end - 0 - - - - - - - 5 - Password Required - True - center-on-parent - 320 - True - dialog - True - - - True - 2 - - - True - - - True - gtk-dialog-authentication - 6 - - - 0 - - - - - True - True - False - ● - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-connect - 1 - True - True - True - True - - - - False - False - 0 - - - - - False - end - 0 - - diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 849660542..b87c56a2f 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -327,14 +327,30 @@ Please see the details below for more information."), details=traceback.format_e def __start_non_classic(self): # Autoconnect to a host if self.config["autoconnect"]: - for host in self.connectionmanager.config["hosts"]: - if host[0] == self.config["autoconnect_host_id"]: + + def update_connection_manager(): + if not self.connectionmanager.running: + return + self.connectionmanager.glade.get_widget( + "button_refresh" + ).emit("clicked") + + def close_connection_manager(): + if not self.connectionmanager.running: + return + self.connectionmanager.glade.get_widget( + "button_close" + ).emit("clicked") + + for host_config in self.connectionmanager.config["hosts"]: + hostid, host, port, user, passwd = host_config + if hostid == self.config["autoconnect_host_id"]: try_connect = True # Check to see if we need to start the localhost daemon - if self.config["autostart_localhost"] and host[1] in ("localhost", "127.0.0.1"): - log.debug("Autostarting localhost:%s", host[2]) + if self.config["autostart_localhost"] and host in ("localhost", "127.0.0.1"): + log.debug("Autostarting localhost:%s", host) try_connect = client.start_daemon( - host[2], deluge.configmanager.get_config_dir() + port, deluge.configmanager.get_config_dir() ) log.debug("Localhost started: %s", try_connect) if not try_connect: @@ -345,57 +361,54 @@ Please see the details below for more information."), details=traceback.format_e "to see if there is an error.") ).run() -# def refresh_connection_manager_list(): -# try: -# self.connectionmanager.glade.get_widget( -# "button_refresh" -# ).emit("clicked") -# except: -# pass -# -# reactor.callLatter(1, refresh_connection_manager_list) - - def update_connection_manager(): - if not self.connectionmanager.running: - return - self.connectionmanager.glade.get_widget( - "button_refresh" - ).emit("clicked") - - def close_connection_manager(): - if not self.connectionmanager.running: - return - self.connectionmanager.glade.get_widget( - "button_close" - ).emit("clicked") - + # Daemon Started, let's update it's info + reactor.callLater(0.5, update_connection_manager) def on_connect(connector): - print 'ON GTK UI CONNECT!!!!\n\n' component.start() - reactor.callLater(0.5, update_connection_manager) - reactor.callLater(1, close_connection_manager) + reactor.callLater(0.2, update_connection_manager) + reactor.callLater(0.5, close_connection_manager) + + def on_connect_fail(reason, try_counter, + host, port, user, passwd): + if not try_counter: + return + + if reason.check(deluge.error.AuthenticationRequired, + deluge.error.BadLoginError): + log.debug("PasswordRequired exception") + dialog = dialogs.AuthenticationDialog( + reason.value.message, reason.value.username + ) + def dialog_finished(response_id, host, port): + if response_id == gtk.RESPONSE_OK: + reactor.callLater( + 0.5, do_connect, try_counter-1, + host, port, dialog.get_username(), + dialog.get_password()) + dialog.run().addCallback(dialog_finished, + host, port) + return - def on_connect_fail(result, try_counter): log.error("Connection to host failed..") - # We failed connecting to the daemon, but lets try again - if try_counter: - log.info("Retrying connection.. Retries left: " - "%s", try_counter) - try_counter -= 1 - import time - time.sleep(0.5) - do_connect(try_counter) - reactor.callLater(0.5, update_connection_manager) - return result + log.info("Retrying connection.. Retries left: " + "%s", try_counter) + reactor.callLater(0.5, update_connection_manager) + reactor.callLater(0.5, do_connect, try_counter-1, + host, port, user, passwd) - def do_connect(try_counter): - d = client.connect(*host[1:]) + def do_connect(try_counter, host, port, user, passwd): + log.debug("Trying to connect to %s@%s:%s", + user, host, port) + d = client.connect(host, port, user, passwd) d.addCallback(on_connect) - d.addErrback(on_connect_fail, try_counter) + d.addErrback(on_connect_fail, try_counter, + host, port, user, passwd) if try_connect: - do_connect(6) + reactor.callLater( + 0.5, do_connect, 6, host, port, user, passwd + ) break if self.config["show_connection_manager_on_start"]: From f6826a4f482ab2251ceea4b7c1e08fe76e0ca58b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 30 Apr 2011 20:45:15 +0100 Subject: [PATCH 217/329] Fix #1822 Only query the core for the known accounts if connected to it. --- deluge/ui/gtkui/preferences.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index d40e486ab..74c00c80e 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -882,7 +882,8 @@ class Preferences(component.Component): try: if model.get_value(row, 1) == _("Daemon"): # Let's see update the accounts related stuff - self._get_accounts_tab_data() + if client.connected(): + self._get_accounts_tab_data() self.notebook.set_current_page(model.get_value(row, 0)) except TypeError: pass From f26de83509aa6e798b84aa847b7692d50184e708 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 1 May 2011 04:44:42 +0100 Subject: [PATCH 218/329] Don't run into loops when the auth file does not exist and we're trying to create it. --- deluge/common.py | 4 ++-- deluge/core/authmanager.py | 14 ++++++++------ deluge/tests/common.py | 11 ++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index ef9a5aad7..533094f96 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -652,7 +652,7 @@ def create_auth_file(): # Change the permissions on the file so only this user can read/write it os.chmod(auth_file, stat.S_IREAD | stat.S_IWRITE) -def create_localclient_account(): +def create_localclient_account(append=False): import configmanager, random auth_file = configmanager.get_config_dir("auth") if not os.path.exists(auth_file): @@ -662,7 +662,7 @@ def create_localclient_account(): from hashlib import sha1 as sha_hash except ImportError: from sha import new as sha_hash - fd = open(auth_file, "w") + fd = open(auth_file, "a" if append else "w") fd.write(":".join([ "localclient", sha_hash(str(random.random())).hexdigest(), diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index 1f9528fcc..cd278016a 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -196,7 +196,8 @@ class AuthManager(component.Component): new_auth_file = old_auth_file + '.new' bak_auth_file = old_auth_file + '.bak' # Let's first create a backup - shutil.copy2(old_auth_file, bak_auth_file) + if os.path.exists(old_auth_file): + shutil.copy2(old_auth_file, bak_auth_file) try: fd = open(new_auth_file, "w") @@ -211,7 +212,8 @@ class AuthManager(component.Component): os.rename(new_auth_file, old_auth_file) except: # Something failed, let's restore the previous file - os.rename(bak_auth_file, old_auth_file) + if os.path.exists(bak_auth_file): + os.rename(bak_auth_file, old_auth_file) self.__load_auth_file() @@ -220,9 +222,8 @@ class AuthManager(component.Component): auth_file = configmanager.get_config_dir("auth") # Check for auth file and create if necessary if not os.path.exists(auth_file): - create_auth_file() create_localclient_account() - self.write_auth_file() + return self.__load_auth_file() auth_file_modification_time = os.stat(auth_file).st_mtime if self.__auth_modification_time is None: @@ -277,8 +278,9 @@ class AuthManager(component.Component): self.__auth[username] = Account(username, password, authlevel) if "localclient" not in self.__auth: - create_localclient_account() - self.write_auth_file() + create_localclient_account(True) + return self.__load_auth_file() + if save_and_reload: log.info("Re-writing auth file (upgrade)") diff --git a/deluge/tests/common.py b/deluge/tests/common.py index 78d1739b8..c24cd4c60 100644 --- a/deluge/tests/common.py +++ b/deluge/tests/common.py @@ -55,15 +55,16 @@ deluge.main.start_daemon() if "Factory starting on 58846" in line: time.sleep(0.3) # Slight pause just incase break + elif "Couldn't listen on localhost:58846" in line: + raise SystemExit("Could not start deluge test client. %s" % line) elif 'Traceback' in line: raise SystemExit( - "Failed to start core daemon. Do \"\"\"%s\"\"\" to see what's " + "Failed to start core daemon. Do \"\"\" %s \"\"\" to see what's " "happening" % - "python -c \"import sys; import tempfile; " - "config_directory = tempfile.mkdtemp(); " - "import deluge.main; import deluge.configmanager; " + "python -c \"import sys; import tempfile; import deluge.main; " + "import deluge.configmanager; config_directory = tempfile.mkdtemp(); " "deluge.configmanager.set_config_dir(config_directory); " "sys.argv.extend(['-d', '-c', config_directory, '-L', 'info']); " - "deluge.main.start_daemon()" + "deluge.main.start_daemon()\"" ) return core From f2249d580370724dd69780cc777afbd480c16e7b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 1 May 2011 04:46:54 +0100 Subject: [PATCH 219/329] Remove un-used import. --- deluge/core/authmanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index cd278016a..ed74b9ef3 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -44,7 +44,7 @@ import deluge.component as component import deluge.configmanager as configmanager from deluge.common import (AUTH_LEVEL_ADMIN, AUTH_LEVEL_NONE, AUTH_LEVEL_NORMAL, AUTH_LEVEL_READONLY, AUTH_LEVEL_DEFAULT, - create_auth_file, create_localclient_account) + create_localclient_account) from deluge.error import AuthManagerError, AuthenticationRequired, BadLoginError From 6f3bc5620f6624eff5717539207c14c124a9fc2d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 1 May 2011 07:41:44 +0100 Subject: [PATCH 220/329] Fix #1824. When connected to a client, and then trying to connect to another, the connection manager component will be stopped(while the connect deferred is still running), so, the ConnectionManager.connection_manager reference will be deleted. If that's not the case, close the dialog. --- deluge/ui/gtkui/connectionmanager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index c61fe4a6c..55da39b16 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -498,7 +498,12 @@ class ConnectionManager(component.Component): def __on_connected(self, daemon_info, host_id): if self.gtkui_config["autoconnect"]: self.gtkui_config["autoconnect_host_id"] = host_id - self.connection_manager.response(gtk.RESPONSE_OK) + if self.running: + # When connected to a client, and then trying to connect to another, + # this component will be stopped(while the connect deferred is + # runing), so, self.connection_manager will be deleted. + # If that's not the case, close the dialog. + self.connection_manager.response(gtk.RESPONSE_OK) component.start() def __on_connected_failed(self, reason, host_id, host, port, user): From 138b8ae3146e030c97b42e451b2ec200fa39053d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 2 May 2011 05:00:20 +0100 Subject: [PATCH 221/329] Sorry for the noise. Email change. --- deluge/core/authmanager.py | 2 +- deluge/core/core.py | 2 +- deluge/error.py | 2 +- deluge/plugins/autoadd/autoadd/core.py | 2 +- deluge/plugins/autoadd/setup.py | 4 ++-- deluge/ui/client.py | 2 +- deluge/ui/gtkui/menubar.py | 2 +- deluge/ui/gtkui/preferences.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deluge/core/authmanager.py b/deluge/core/authmanager.py index ed74b9ef3..771043e8b 100644 --- a/deluge/core/authmanager.py +++ b/deluge/core/authmanager.py @@ -2,7 +2,7 @@ # authmanager.py # # Copyright (C) 2009 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # diff --git a/deluge/core/core.py b/deluge/core/core.py index 7b44191c4..0df829b80 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -2,7 +2,7 @@ # core.py # # Copyright (C) 2007-2009 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # diff --git a/deluge/error.py b/deluge/error.py index c75091639..d9669ec20 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -2,7 +2,7 @@ # error.py # # Copyright (C) 2008 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py index 17dc2816f..259ca9042 100644 --- a/deluge/plugins/autoadd/autoadd/core.py +++ b/deluge/plugins/autoadd/autoadd/core.py @@ -2,7 +2,7 @@ # core.py # # Copyright (C) 2009 GazpachoKing -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken diff --git a/deluge/plugins/autoadd/setup.py b/deluge/plugins/autoadd/setup.py index 6a509e3ca..5ce62fe1e 100644 --- a/deluge/plugins/autoadd/setup.py +++ b/deluge/plugins/autoadd/setup.py @@ -2,7 +2,7 @@ # setup.py # # Copyright (C) 2009 GazpachoKing -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Basic plugin template created by: # Copyright (C) 2008 Martijn Voncken @@ -42,7 +42,7 @@ from setuptools import setup __plugin_name__ = "AutoAdd" __author__ = "Chase Sterling, Pedro Algarvio" -__author_email__ = "chase.sterling@gmail.com, ufs@ufsoft.org" +__author_email__ = "chase.sterling@gmail.com, pedro@algarvio.me" __version__ = "1.02" __url__ = "http://forum.deluge-torrent.org/viewtopic.php?f=9&t=26775" __license__ = "GPLv3" diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 58928024b..e281a30ca 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -2,7 +2,7 @@ # client.py # # Copyright (C) 2009 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py index 8132c2a5c..dfdd7a0ba 100644 --- a/deluge/ui/gtkui/menubar.py +++ b/deluge/ui/gtkui/menubar.py @@ -2,7 +2,7 @@ # menubar.py # # Copyright (C) 2007, 2008 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 74c00c80e..18e3bd653 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -2,7 +2,7 @@ # preferences.py # # Copyright (C) 2007, 2008 Andrew Resch -# Copyright (C) 2011 Pedro Algarvio +# Copyright (C) 2011 Pedro Algarvio # # Deluge is free software. # From d362a6ceba9c96c91ee7a25bccd1eab36e0fd5c1 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Tue, 3 May 2011 19:05:04 +0100 Subject: [PATCH 222/329] fix the path given by the set-cookie header --- deluge/ui/web/auth.py | 82 ++++++++++++++++++++--------------------- deluge/ui/web/server.py | 37 +++++++++++-------- 2 files changed, 61 insertions(+), 58 deletions(-) diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py index 699133cb0..5cd345e2c 100644 --- a/deluge/ui/web/auth.py +++ b/deluge/ui/web/auth.py @@ -71,11 +71,11 @@ def get_session_id(session_id): """ if not session_id: return None - + try: checksum = int(session_id[-4:]) session_id = session_id[:-4] - + if checksum == make_checksum(session_id): return session_id return None @@ -93,32 +93,32 @@ class Auth(JSONComponent): """ The component that implements authentification into the JSON interface. """ - + def __init__(self): super(Auth, self).__init__("Auth") self.worker = LoopingCall(self._clean_sessions) self.worker.start(5) - + def _clean_sessions(self): config = component.get("DelugeWeb").config session_ids = config["sessions"].keys() - + now = time.gmtime() for session_id in session_ids: session = config["sessions"][session_id] - + if "expires" not in session: del config["sessions"][session_id] continue - + if time.gmtime(session["expires"]) < now: del config["sessions"][session_id] continue - + def _create_session(self, request, login='admin'): """ Creates a new session. - + :keyword login: the username of the user logging in, currently \ only for future use currently. :type login: string @@ -131,14 +131,13 @@ class Auth(JSONComponent): session_id = m.hexdigest() config = component.get("DelugeWeb").config - + expires, expires_str = make_expires(config["session_timeout"]) checksum = str(make_checksum(session_id)) - - base = str(component.get("Web").get_config()["base"]) + request.addCookie('_session_id', session_id + checksum, - path=base+"json", expires=expires_str) - + path=request.base+"json", expires=expires_str) + log.debug("Creating session for %s", login) config = component.get("DelugeWeb").config @@ -151,7 +150,7 @@ class Auth(JSONComponent): "expires": expires } return True - + def check_password(self, password): config = component.get("DelugeWeb").config if "pwd_md5" in config.config: @@ -165,14 +164,14 @@ class Auth(JSONComponent): # the old passwords from the config file. self._change_password(password) del config.config["pwd_md5"] - + # Remove the older password if there is now. if "old_pwd_md5" in config.config: del config.config["old_pwd_salt"] del config.config["old_pwd_md5"] - + return True - + elif "old_pwd_md5" in config.config: # We are using the 1.1 webui auth method log.debug("Received a password via the 1.1 auth method") @@ -181,13 +180,13 @@ class Auth(JSONComponent): m.update(decodestring(config["old_pwd_salt"])) m.update(password) if m.digest() == decodestring(config["old_pwd_md5"]): - + # We want to move the password over to sha1 and remove # the old passwords from the config file. self._change_password(password) del config.config["old_pwd_salt"] del config.config["old_pwd_md5"] - + return True elif "pwd_sha1" in config.config: @@ -204,25 +203,25 @@ class Auth(JSONComponent): # access. log.debug("Failed to detect the login method") return False - + def check_request(self, request, method=None, level=None): """ Check to ensure that a request is authorised to call the specified method of authentication level. - + :param request: The HTTP request in question :type request: twisted.web.http.Request :keyword method: Check the specified method :type method: function :keyword level: Check the specified auth level :type level: integer - + :raises: Exception """ config = component.get("DelugeWeb").config session_id = get_session_id(request.getCookie("_session_id")) - + if session_id not in config["sessions"]: auth_level = AUTH_LEVEL_NONE session_id = None @@ -233,34 +232,33 @@ class Auth(JSONComponent): session["expires"] = expires _session_id = request.getCookie("_session_id") - base = str(component.get("Web").get_config()["base"]) request.addCookie('_session_id', _session_id, - path=base+"json", expires=expires_str) - + path=request.base+"json", expires=expires_str) + if method: if not hasattr(method, "_json_export"): raise Exception("Not an exported method") - + method_level = getattr(method, "_json_auth_level") if method_level is None: raise Exception("Method has no auth level") level = method_level - + if level is None: raise Exception("No level specified to check against") - + request.auth_level = auth_level request.session_id = session_id - + if auth_level < level: raise AuthError("Not authenticated") - + def _change_password(self, new_password): """ Change the password. This is to allow the UI to change/reset a password. - + :param new_password: the password to change to :type new_password: string """ @@ -272,12 +270,12 @@ class Auth(JSONComponent): config["pwd_salt"] = salt config["pwd_sha1"] = s.hexdigest() return True - + @export def change_password(self, old_password, new_password): """ Change the password. - + :param old_password: the current password :type old_password: string :param new_password: the password to change to @@ -286,22 +284,22 @@ class Auth(JSONComponent): if not self.check_password(old_password): return False return self._change_password(new_password) - + @export(AUTH_LEVEL_NONE) def check_session(self, session_id=None): """ Check a session to see if it's still valid. - + :returns: True if the session is valid, False if not. :rtype: booleon """ return __request__.session_id is not None - + @export def delete_session(self): """ Removes a session. - + :param session_id: the id for the session to remove :type session_id: string """ @@ -309,18 +307,18 @@ class Auth(JSONComponent): config = component.get("DelugeWeb").config del config["sessions"][__request__.session_id] return True - + @export(AUTH_LEVEL_NONE) def login(self, password): """ Test a password to see if it's valid. - + :param password: the password to test :type password: string :returns: a session id or False :rtype: string or False """ - + if self.check_password(password): return self._create_session(__request__) else: diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index bb7b12da8..ee03e85e0 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -518,13 +518,31 @@ class TopLevel(resource.Resource): self.__scripts.remove(script) self.__debug_scripts.remove(script) - def getChild(self, path, request): if path == "": return self else: return resource.Resource.getChild(self, path, request) + def getChildWithDefault(self, path, request): + # Calculate the request base + header = request.getHeader('x-deluge-base') + base = header if header else component.get("DelugeWeb").base + + # validate the base parameter + if not base: + base = '/' + + if base[0] != '/': + base = '/' + base + + if base[-1] != '/': + base += '/' + + request.base = base.encode('idna') + + return resource.Resource.getChildWithDefault(self, path, request) + def render(self, request): debug = False if 'debug' in request.args: @@ -555,25 +573,12 @@ class TopLevel(resource.Resource): template = Template(filename=rpath("index.html")) request.setHeader("content-type", "text/html; charset=utf-8") - header = request.getHeader('x-deluge-base') - base = header if header else component.get("DelugeWeb").base - - # validate the base parameter - if not base: - base = '/' - - if base[0] != '/': - base = '/' + base - - if base[-1] != '/': - base += '/' - web_config = component.get("Web").get_config() - web_config["base"] = base + web_config["base"] = request.base config = dict([(key, web_config[key]) for key in UI_CONFIG_KEYS]) js_config = common.json.dumps(config) return template.render(scripts=scripts, stylesheets=self.stylesheets, - debug=debug, base=base, js_config=js_config) + debug=debug, base=request.base, js_config=js_config) class ServerContextFactory: From 06f025f4bdece32c7e21cc07b4dd7d788f974d4e Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Fri, 6 May 2011 19:02:54 +0100 Subject: [PATCH 223/329] fix the widths on the input boxes, whitespace changes too --- deluge/ui/web/js/deluge-all/add/UrlWindow.js | 140 +++++++++---------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/deluge/ui/web/js/deluge-all/add/UrlWindow.js b/deluge/ui/web/js/deluge-all/add/UrlWindow.js index 963be0264..2fa8199d6 100644 --- a/deluge/ui/web/js/deluge-all/add/UrlWindow.js +++ b/deluge/ui/web/js/deluge-all/add/UrlWindow.js @@ -1,6 +1,6 @@ /*! * Deluge.add.UrlWindow.js - * + * * Copyright (c) Damien Churchill 2009-2010 * * This program is free software; you can redistribute it and/or modify @@ -33,75 +33,75 @@ Ext.namespace('Deluge.add'); Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, { - title: _('Add from Url'), - modal: true, - plain: true, - layout: 'fit', - width: 350, - height: 155, + title: _('Add from Url'), + modal: true, + plain: true, + layout: 'fit', + width: 350, + height: 155, - buttonAlign: 'center', - closeAction: 'hide', - bodyStyle: 'padding: 10px 5px;', - iconCls: 'x-deluge-add-url-window-icon', - - initComponent: function() { - Deluge.add.UrlWindow.superclass.initComponent.call(this); - this.addButton(_('Add'), this.onAddClick, this); - - var form = this.add({ - xtype: 'form', - defaultType: 'textfield', - baseCls: 'x-plain', - labelWidth: 55 - }); - - this.urlField = form.add({ - fieldLabel: _('Url'), - id: 'url', - name: 'url', - anchor: '100%' - }); - this.urlField.on('specialkey', this.onAdd, this); - - this.cookieField = form.add({ - fieldLabel: _('Cookies'), - id: 'cookies', - name: 'cookies', - anchor: '100%' - }); - this.cookieField.on('specialkey', this.onAdd, this); - }, - - onAddClick: function(field, e) { - if ((field.id == 'url' || field.id == 'cookies') && e.getKey() != e.ENTER) return; + buttonAlign: 'center', + closeAction: 'hide', + bodyStyle: 'padding: 10px 5px;', + iconCls: 'x-deluge-add-url-window-icon', - var field = this.urlField; - var url = field.getValue(); - var cookies = this.cookieField.getValue(); - var torrentId = this.createTorrentId(); - - deluge.client.web.download_torrent_from_url(url, cookies, { - success: this.onDownload, - scope: this, - torrentId: torrentId - }); - this.hide(); - this.fireEvent('beforeadd', torrentId, url); - }, - - onDownload: function(filename, obj, resp, req) { - this.urlField.setValue(''); - deluge.client.web.get_torrent_info(filename, { - success: this.onGotInfo, - scope: this, - filename: filename, - torrentId: req.options.torrentId - }); - }, - - onGotInfo: function(info, obj, response, request) { - info['filename'] = request.options.filename; - this.fireEvent('add', request.options.torrentId, info); - } + initComponent: function() { + Deluge.add.UrlWindow.superclass.initComponent.call(this); + this.addButton(_('Add'), this.onAddClick, this); + + var form = this.add({ + xtype: 'form', + defaultType: 'textfield', + baseCls: 'x-plain', + labelWidth: 55 + }); + + this.urlField = form.add({ + fieldLabel: _('Url'), + id: 'url', + name: 'url', + width: '97%' + }); + this.urlField.on('specialkey', this.onAdd, this); + + this.cookieField = form.add({ + fieldLabel: _('Cookies'), + id: 'cookies', + name: 'cookies', + width: '97%' + }); + this.cookieField.on('specialkey', this.onAdd, this); + }, + + onAddClick: function(field, e) { + if ((field.id == 'url' || field.id == 'cookies') && e.getKey() != e.ENTER) return; + + var field = this.urlField; + var url = field.getValue(); + var cookies = this.cookieField.getValue(); + var torrentId = this.createTorrentId(); + + deluge.client.web.download_torrent_from_url(url, cookies, { + success: this.onDownload, + scope: this, + torrentId: torrentId + }); + this.hide(); + this.fireEvent('beforeadd', torrentId, url); + }, + + onDownload: function(filename, obj, resp, req) { + this.urlField.setValue(''); + deluge.client.web.get_torrent_info(filename, { + success: this.onGotInfo, + scope: this, + filename: filename, + torrentId: req.options.torrentId + }); + }, + + onGotInfo: function(info, obj, response, request) { + info['filename'] = request.options.filename; + this.fireEvent('add', request.options.torrentId, info); + } }); From a06b3508588d7dc9ed88c9c263ff138349ff6383 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 6 May 2011 19:08:23 +0100 Subject: [PATCH 224/329] Correct log message. --- deluge/core/torrentmanager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index a59a742b4..9e1fec2f8 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -500,10 +500,10 @@ class TorrentManager(component.Component): component.get("EventManager").emit( TorrentAddedEvent(torrent.torrent_id, from_state) ) - log.info("Torrent %s %s by user: %s", + log.info("Torrent %s from user \"%s\" %s", torrent.get_status(["name"])["name"], - (from_state and "added" or "loaded"), - component.get("RPCServer").get_session_user()) + torrent.get_status(["owner"])["owner"], + (from_state and "added" or "loaded")) return torrent.torrent_id def load_torrent(self, torrent_id): From 30d70d2b9b62d4071286f8e053c7269e1dbc08af Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Fri, 6 May 2011 19:14:26 +0100 Subject: [PATCH 225/329] apply patch from #1562 --- .../ui/web/js/deluge-all/preferences/PluginsPage.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js b/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js index d963d1fde..49ab9db6a 100644 --- a/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js +++ b/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js @@ -1,6 +1,6 @@ /*! * Deluge.preferences.PluginsPage.js - * + * * Copyright (c) Damien Churchill 2009-2010 * * This program is free software; you can redistribute it and/or modify @@ -64,7 +64,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { this.pluginTemplate.compile(); var checkboxRenderer = function(v, p, record){ - p.css += ' x-grid3-check-col-td'; + p.css += ' x-grid3-check-col-td'; return '
'; } @@ -122,7 +122,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { }] }) }); - + var pp = this.pluginInfo = this.add({ xtype: 'panel', border: true, @@ -145,7 +145,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { style: 'margin-left: 10px' } }); - + this.pluginInfo.on('render', this.onPluginInfoRender, this); this.list.on('click', this.onNodeClick, this); deluge.preferences.on('show', this.onPreferencesShow, this); @@ -166,7 +166,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { var values = plugin || this.defaultValues; this.pluginInfo.body.dom.innerHTML = this.pluginTemplate.apply(values); }, - + updatePlugins: function() { deluge.client.web.get_plugins({ success: this.onGotPlugins, @@ -238,7 +238,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { plugin.set('enabled', true); plugin.commit(); }, - + onPluginDisabled: function(pluginName) { var index = this.list.getStore().find('plugin', pluginName); if (index == -1) return; @@ -252,6 +252,7 @@ Deluge.preferences.Plugins = Ext.extend(Ext.Panel, { }, onPluginSelect: function(dv, selections) { + if (selections.length == 0) return; var r = dv.getRecords(selections)[0]; deluge.client.web.get_plugin_info(r.get('plugin'), { success: this.onGotPluginInfo, From 922e64a07ec11f77153d0027e773755f3eca8667 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Fri, 6 May 2011 22:00:47 +0100 Subject: [PATCH 226/329] fix issue #1799 --- deluge/core/torrent.py | 2 + deluge/ui/web/js/deluge-all/Keys.js | 15 +-- .../web/js/deluge-all/details/OptionsTab.js | 97 +++++++++++-------- 3 files changed, 69 insertions(+), 45 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 0ca8df1be..9f8efefa3 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -603,6 +603,8 @@ class Torrent(object): "message": self.statusmsg, "move_on_completed_path": self.options["move_completed_path"], "move_on_completed": self.options["move_completed"], + "move_completed_path": self.options["move_completed_path"], + "move_completed": self.options["move_completed"], "next_announce": self.status.next_announce.seconds, "num_peers": self.status.num_peers - self.status.num_seeds, "num_seeds": self.status.num_seeds, diff --git a/deluge/ui/web/js/deluge-all/Keys.js b/deluge/ui/web/js/deluge-all/Keys.js index fe1c0b4b1..2600e704f 100644 --- a/deluge/ui/web/js/deluge-all/Keys.js +++ b/deluge/ui/web/js/deluge-all/Keys.js @@ -1,6 +1,6 @@ /*! * Deluge.Keys.js - * + * * Copyright (c) Damien Churchill 2009-2010 * * This program is free software; you can redistribute it and/or modify @@ -50,7 +50,7 @@ Deluge.Keys = { 'upload_payload_rate', 'eta', 'ratio', 'distributed_copies', 'is_auto_managed', 'time_added', 'tracker_host', 'save_path' ], - + /** * Keys used in the status tab of the statistics panel. * These get updated to include the keys in {@link #Grid}. @@ -65,7 +65,7 @@ Deluge.Keys = { 'piece_length', 'is_auto_managed', 'active_time', 'seeding_time', 'seed_rank' ], - + /** * Keys used in the files tab of the statistics panel. * 
['files', 'file_progress', 'file_priorities']
@@ -73,7 +73,7 @@ Deluge.Keys = { Files: [ 'files', 'file_progress', 'file_priorities' ], - + /** * Keys used in the peers tab of the statistics panel. * 
['peers']
@@ -81,7 +81,7 @@ Deluge.Keys = { Peers: [ 'peers' ], - + /** * Keys used in the details tab of the statistics panel. */ @@ -89,7 +89,7 @@ Deluge.Keys = { 'name', 'save_path', 'total_size', 'num_files', 'tracker_status', 'tracker', 'comment' ], - + /** * Keys used in the options tab of the statistics panel. * 
['max_download_speed', 'max_upload_speed', 'max_connections', 'max_upload_slots',
@@ -99,7 +99,8 @@ Deluge.Keys = {
     Options: [
         'max_download_speed', 'max_upload_speed', 'max_connections',
         'max_upload_slots','is_auto_managed', 'stop_at_ratio', 'stop_ratio',
-        'remove_at_ratio', 'private', 'prioritize_first_last'
+        'remove_at_ratio', 'private', 'prioritize_first_last',
+        'move_completed', 'move_completed_path'
     ]
 };
 
diff --git a/deluge/ui/web/js/deluge-all/details/OptionsTab.js b/deluge/ui/web/js/deluge-all/details/OptionsTab.js
index 97b410553..34256988c 100644
--- a/deluge/ui/web/js/deluge-all/details/OptionsTab.js
+++ b/deluge/ui/web/js/deluge-all/details/OptionsTab.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.details.OptionsTab.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 
 	initComponent: function() {
 		Deluge.details.OptionsTab.superclass.initComponent.call(this);
-		
+
 		this.fieldsets = {}, this.fields = {};
 		this.optionsManager = new Deluge.MultiOptionsManager({
 			options: {
@@ -65,12 +65,13 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 				'stop_at_ratio': false,
 				'stop_ratio': 2.0,
 				'remove_at_ratio': false,
-				'move_completed': null,
+				'move_completed': false,
+                'move_completed_path': '',
 				'private': false,
 				'prioritize_first_last': false
 			}
 		});
-		
+
 		/*
 		 * Bandwidth Options
 		 */
@@ -78,16 +79,16 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			xtype: 'fieldset',
 			defaultType: 'spinnerfield',
 			bodyStyle: 'padding: 5px',
-			
+
 			layout: 'table',
 			layoutConfig: {columns: 3},
 			labelWidth: 150,
-			
+
 			style: 'margin-left: 10px; margin-right: 5px; padding: 5px',
 			title: _('Bandwidth'),
 			width: 250
 		});
-		
+
 		/*
 		 * Max Download Speed
 		 */
@@ -113,7 +114,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			text: _('KiB/s'),
 			style: 'margin-left: 10px'
 		});
-		
+
 		/*
 		 * Max Upload Speed
 		 */
@@ -140,7 +141,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			text: _('KiB/s'),
 			style: 'margin-left: 10px'
 		});
-		
+
 		/*
 		 * Max Connections
 		 */
@@ -163,7 +164,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			},
 			colspan: 2
 		});
-		
+
 		/*
 		 * Max Upload Slots
 		 */
@@ -195,17 +196,17 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			title: _('Queue'),
 			style: 'margin-left: 5px; margin-right: 5px; padding: 5px',
 			width: 210,
-			
+
 			layout: 'table',
 			layoutConfig: {columns: 2},
 			labelWidth: 0,
-			
+
 			defaults: {
 				fieldLabel: '',
 				labelSeparator: ''
 			}
 		});
-		
+
 		this.fields.auto_managed = this.fieldsets.queue.add({
 			xtype: 'checkbox',
 			fieldLabel: '',
@@ -215,7 +216,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			width: 200,
 			colspan: 2
 		});
-		
+
 		this.fields.stop_at_ratio = this.fieldsets.queue.add({
 			fieldLabel: '',
 			labelSeparator: '',
@@ -225,7 +226,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			handler: this.onStopRatioChecked,
 			scope: this
 		});
-		
+
 		this.fields.stop_ratio = this.fieldsets.queue.add({
 			xtype: 'spinnerfield',
 			id: 'stop_ratio',
@@ -242,7 +243,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 				decimalPrecision: 1
 			}
 		});
-		
+
 		this.fields.remove_at_ratio = this.fieldsets.queue.add({
 			fieldLabel: '',
 			labelSeparator: '',
@@ -253,16 +254,28 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			disabled: true,
 			colspan: 2
 		});
-		
+
 		this.fields.move_completed = this.fieldsets.queue.add({
 			fieldLabel: '',
 			labelSeparator: '',
 			id: 'move_completed',
 			boxLabel: _('Move Completed'),
-			colspan: 2
+			colspan: 2,
+            handler: this.onMoveCompletedChecked,
+            scope: this
 		});
-		
-		
+
+        this.fields.move_completed_path = this.fieldsets.queue.add({
+            xtype: 'textfield',
+            fieldLabel: '',
+            id: 'move_completed_path',
+            colspan: 3,
+			bodyStyle: 'margin-left: 20px',
+            width: 180,
+            disabled: true
+        });
+
+
 		/*
 		 * General Options
 		 */
@@ -272,7 +285,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			style: 'margin-left: 5px',
 			width: 210
 		});
-		
+
 		this.fieldsets.general = this.rightColumn.add({
 			xtype: 'fieldset',
 			autoHeight: true,
@@ -280,7 +293,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			title: _('General'),
 			layout: 'form'
 		});
-		
+
 		this.fields['private'] = this.fieldsets.general.add({
 			fieldLabel: '',
 			labelSeparator: '',
@@ -288,19 +301,19 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			id: 'private',
 			disabled: true
 		});
-		
+
 		this.fields.prioritize_first_last = this.fieldsets.general.add({
 			fieldLabel: '',
 			labelSeparator: '',
 			boxLabel: _('Prioritize First/Last'),
 			id: 'prioritize_first_last'
 		});
-		
+
 		// Bind the fields so the options manager can manage them.
 		for (var id in this.fields) {
 			this.optionsManager.bind(id, this.fields[id]);
 		}
-		
+
 		/*
 		 * Buttons
 		 */
@@ -309,7 +322,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			xtype: 'panel',
 			border: false
 		});
-		
+
 		/*
 		 * Edit Trackers button
 		 */
@@ -324,7 +337,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			handler: this.onEditTrackers,
 			scope: this
 		});
-		
+
 		/*
 		 * Apply button
 		 */
@@ -339,31 +352,31 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			scope: this
 		});
 	},
-	
+
 	onRender: function(ct, position) {
 		Deluge.details.OptionsTab.superclass.onRender.call(this, ct, position);
-		
+
 		// This is another hack I think, so keep an eye out here when upgrading.
 		this.layout = new Ext.layout.ColumnLayout();
 		this.layout.setContainer(this);
 		this.doLayout();
 	},
-	
+
 	clear: function() {
 		if (this.torrentId == null) return;
 		this.torrentId = null;
 		this.optionsManager.changeId(null);
 	},
-	
+
 	reset: function() {
 		if (this.torrentId) this.optionsManager.reset();
 	},
-	
+
 	update: function(torrentId) {
 		if (this.torrentId && !torrentId) this.clear(); // we want to clear the pane if we get a null torrent torrentIds
-		
+
 		if (!torrentId) return; // we don't care about null torrentIds
-		
+
 		if (this.torrentId != torrentId) {
 			this.torrentId = torrentId;
 			this.optionsManager.changeId(torrentId);
@@ -373,7 +386,7 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			scope: this
 		});
 	},
-	
+
 	onApply: function() {
 		var changed = this.optionsManager.getDirty();
 		if (!Ext.isEmpty(changed['prioritize_first_last'])) {
@@ -392,16 +405,23 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			scope: this
 		});
 	},
-	
+
 	onEditTrackers: function() {
 		deluge.editTrackers.show();
 	},
-	
+
+    onMoveCompletedChecked: function(checkbox, checked) {
+        this.fields.move_completed_path.setDisabled(!checked);
+
+        if (!checked) return;
+        this.fields.move_completed_path.focus();
+    },
+
 	onStopRatioChecked: function(checkbox, checked) {
 		this.fields.remove_at_ratio.setDisabled(!checked);
 		this.fields.stop_ratio.setDisabled(!checked);
 	},
-	
+
 	onRequestComplete: function(torrent, options) {
 		this.fields['private'].setValue(torrent['private']);
 		this.fields['private'].setDisabled(true);
@@ -411,5 +431,6 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 		var stop_at_ratio = this.optionsManager.get('stop_at_ratio');
 		this.fields.remove_at_ratio.setDisabled(!stop_at_ratio);
 		this.fields.stop_ratio.setDisabled(!stop_at_ratio);
+        this.fields.move_completed_path.setDisabled(!this.optionsManager.get('move_completed'));
 	}
 });

From 5ad21303c683d68e24c8c431074cf09f45aec5c9 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Fri, 6 May 2011 22:08:59 +0100
Subject: [PATCH 227/329] fix issue #1567, js from plugins not working with
 different base setting

---
 deluge/ui/web/js/deluge-all/UI.js | 18 ++++++++---------
 deluge/ui/web/pluginmanager.py    | 32 +++++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/UI.js b/deluge/ui/web/js/deluge-all/UI.js
index 4a1b96278..2492caf9e 100644
--- a/deluge/ui/web/js/deluge-all/UI.js
+++ b/deluge/ui/web/js/deluge-all/UI.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.UI.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -75,7 +75,7 @@ deluge.ui = {
 			layout: 'fit',
 			items: [this.MainPanel]
 		});
-	
+
 		deluge.events.on("connect", this.onConnect, this);
 		deluge.events.on("disconnect", this.onDisconnect, this);
 		deluge.events.on('PluginDisabledEvent', this.onPluginDisabled, this);
@@ -83,7 +83,7 @@ deluge.ui = {
 		deluge.client = new Ext.ux.util.RpcClient({
 			url: deluge.config.base + 'json'
 		});
-	
+
 		// enable all the already active plugins
 		for (var plugin in Deluge.pluginStore) {
 			plugin = Deluge.createPlugin(plugin);
@@ -93,11 +93,11 @@ deluge.ui = {
 
 		// Initialize quicktips so all the tooltip configs start working.
 		Ext.QuickTips.init();
-	
+
 		deluge.client.on('connected', function(e) {
 			deluge.login.show();
 		}, this, {single: true});
-	
+
 		this.update = this.update.createDelegate(this);
 		this.checkConnection = this.checkConnection.createDelegate(this);
 
@@ -126,7 +126,7 @@ deluge.ui = {
 	},
 
 	onConnectionError: function(error) {
-		
+
 	},
 
 	onConnectionSuccess: function(result) {
@@ -169,8 +169,8 @@ deluge.ui = {
 		}
 
 		if (deluge.config.show_session_speed) {
-			document.title = this.originalTitle + 
-				' (Down: ' + fspeed(data['stats'].download_rate, true) + 
+			document.title = this.originalTitle +
+				' (Down: ' + fspeed(data['stats'].download_rate, true) +
 				' Up: ' + fspeed(data['stats'].upload_rate, true) + ')';
 		}
 		if (Ext.areObjectsEqual(this.filters, this.oldFilters)) {
@@ -232,7 +232,7 @@ deluge.ui = {
 		var scripts = (Deluge.debug) ? resources.debug_scripts : resources.scripts;
 		Ext.each(scripts, function(script) {
 			Ext.ux.JSLoader({
-				url: script,
+				url: deluge.config.base + script,
 				onLoad: this.onPluginLoaded,
 				pluginName: resources.name
 			});
diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py
index bbf56ef6f..c2ed75efd 100644
--- a/deluge/ui/web/pluginmanager.py
+++ b/deluge/ui/web/pluginmanager.py
@@ -58,20 +58,20 @@ def gather_info(plugin):
         "debug_scripts": debug_scripts,
         "script_directories": directories
     }
-    
+
 class PluginManager(PluginManagerBase, component.Component):
     def __init__(self):
         component.Component.__init__(self, "Web.PluginManager")
         self.config = ConfigManager("web.conf")
         PluginManagerBase.__init__(self, "web.conf", "deluge.plugin.web")
-        
+
         client.register_event_handler("PluginEnabledEvent", self._on_plugin_enabled_event)
         client.register_event_handler("PluginDisabledEvent", self._on_plugin_disabled_event)
-    
+
     def _on_get_enabled_plugins(self, plugins):
         for plugin in plugins:
             self.enable_plugin(plugin)
-    
+
     def _on_plugin_enabled_event(self, name):
         self.enable_plugin(name)
 
@@ -85,31 +85,31 @@ class PluginManager(PluginManagerBase, component.Component):
         except KeyError:
             log.info("Plugin has no web ui")
             return
-        
+
         info = gather_info(plugin)
 
         scripts = component.get("Scripts")
         for script in info["scripts"]:
             scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower()))
-        
+
         for script in info["debug_scripts"]:
             scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower()), "debug")
             scripts.remove_script("%s/%s" % (name.lower(), os.path.basename(script).lower()), "dev")
-        
+
         super(PluginManager, self).disable_plugin(name)
-    
+
     def enable_plugin(self, name):
         super(PluginManager, self).enable_plugin(name)
-        
+
         # Get the plugin instance
         try:
             plugin = component.get("WebPlugin." + name)
         except KeyError:
             log.info("Plugin has no web ui")
             return
-        
+
         info = gather_info(plugin)
-        
+
         scripts = component.get("Scripts")
         for script in info["scripts"]:
             log.debug("adding script %s for %s", name, os.path.basename(script))
@@ -127,16 +127,16 @@ class PluginManager(PluginManagerBase, component.Component):
         # Update the enabled plugins from the core
         d = client.core.get_enabled_plugins()
         d.addCallback(self._on_get_enabled_plugins)
-    
+
     def stop(self):
         """
         Stop the plugin manager
         """
         self.disable_plugins()
-    
+
     def update(self):
         pass
-    
+
     def get_plugin_resources(self, name):
         # Get the plugin instance
         try:
@@ -146,7 +146,7 @@ class PluginManager(PluginManagerBase, component.Component):
             return
         info = gather_info(plugin)
         info["name"] = name
-        info["scripts"] = ["/js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["scripts"]]
-        info["debug_scripts"] = ["/js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["debug_scripts"]]
+        info["scripts"] = ["js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["scripts"]]
+        info["debug_scripts"] = ["js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["debug_scripts"]]
         del info["script_directories"]
         return info

From 95819c79e5ba2afd9dc93cbaef4821edfd0120d3 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Fri, 6 May 2011 22:22:29 +0100
Subject: [PATCH 228/329] Fix #1268, Torrent errors not displayed in webui

---
 deluge/ui/web/js/deluge-all/Keys.js               |  2 +-
 deluge/ui/web/js/deluge-all/details/DetailsTab.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/Keys.js b/deluge/ui/web/js/deluge-all/Keys.js
index 2600e704f..cb74db3dd 100644
--- a/deluge/ui/web/js/deluge-all/Keys.js
+++ b/deluge/ui/web/js/deluge-all/Keys.js
@@ -86,7 +86,7 @@ Deluge.Keys = {
      * Keys used in the details tab of the statistics panel.
 	 */
     Details: [
-        'name', 'save_path', 'total_size', 'num_files', 'tracker_status',
+        'name', 'save_path', 'total_size', 'num_files', 'message',
         'tracker', 'comment'
     ],
 
diff --git a/deluge/ui/web/js/deluge-all/details/DetailsTab.js b/deluge/ui/web/js/deluge-all/details/DetailsTab.js
index 9a3fce56f..0c04421e2 100644
--- a/deluge/ui/web/js/deluge-all/details/DetailsTab.js
+++ b/deluge/ui/web/js/deluge-all/details/DetailsTab.js
@@ -52,7 +52,7 @@ Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
 		this.addItem('status', _('Status'));
 		this.addItem('tracker', _('Tracker'));
 	},
-	
+
 	onRender: function(ct, position) {
 		Deluge.details.DetailsTab.superclass.onRender.call(this, ct, position);
 		this.body.setStyle('padding', '10px');
@@ -76,7 +76,7 @@ Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
 		Ext.DomHelper.append(this.dl, {tag: 'dt', cls: id, html: label + ':'});
 		this.fields[id] = Ext.DomHelper.append(this.dl, {tag: 'dd', cls: id, html: ''}, true);
 	},
-	
+
 	clear: function() {
 		if (!this.fields) return;
 		for (var k in this.fields) {
@@ -84,7 +84,7 @@ Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
 		}
 		this.oldData = {}
 	},
-	
+
 	update: function(torrentId) {
 		deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Details, {
 			success: this.onRequestComplete,
@@ -92,7 +92,7 @@ Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
 			torrentId: torrentId
 		});
 	},
-	
+
 	onRequestComplete: function(torrent, request, response, options) {
 		var data = {
 			torrent_name: torrent.name,
@@ -100,11 +100,11 @@ Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
 			path: torrent.save_path,
 			size: fsize(torrent.total_size),
 			files: torrent.num_files,
-			status: torrent.tracker_status,
+			status: torrent.message,
 			tracker: torrent.tracker,
 			comment: torrent.comment
 		};
-		
+
 		for (var field in this.fields) {
 			if (!Ext.isDefined(data[field])) continue; // this is a field we aren't responsible for.
 			if (data[field] == this.oldData[field]) continue;

From 2e62ced8118fa6b06f4da3272bb7cfe8e4f433f7 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Fri, 6 May 2011 22:32:46 +0100
Subject: [PATCH 229/329] fix #1323 filter panels not scrollable

---
 deluge/ui/web/js/deluge-all/FilterPanel.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/FilterPanel.js b/deluge/ui/web/js/deluge-all/FilterPanel.js
index d40f5e8a0..5e68daf36 100644
--- a/deluge/ui/web/js/deluge-all/FilterPanel.js
+++ b/deluge/ui/web/js/deluge-all/FilterPanel.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.FilterPanel.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,9 @@ Ext.ns('Deluge');
  * @extends Ext.list.ListView
  */
 Deluge.FilterPanel = Ext.extend(Ext.Panel, {
-	
+
+    autoScroll: true,
+
 	border: false,
 
 	show_zero: null,

From 1f3a7bf44c9fe3d34410cad444ce9b4ad6182e94 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Fri, 6 May 2011 23:24:00 +0100
Subject: [PATCH 230/329] Fix #1333 Peer list doesn't update automatically

---
 .../ui/web/js/deluge-all/details/PeersTab.js  | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/details/PeersTab.js b/deluge/ui/web/js/deluge-all/details/PeersTab.js
index 6ddc8d057..f9728936b 100644
--- a/deluge/ui/web/js/deluge-all/details/PeersTab.js
+++ b/deluge/ui/web/js/deluge-all/details/PeersTab.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.details.PeersTab.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,9 @@
 
 (function() {
 	function flagRenderer(value) {
-		if (!value) return '';
+		if (!value.replace(' ', '').replace(' ', '')){
+            return '';
+        }
 		return String.format('', value);
 	}
 	function peerAddressRenderer(value, p, record) {
@@ -45,10 +47,10 @@
 	}
 
 	Deluge.details.PeersTab = Ext.extend(Ext.grid.GridPanel, {
-		
+
 		// fast way to figure out if we have a peer already.
 		peers: {},
-		
+
 		constructor: function(config) {
 			config = Ext.apply({
 				title: _('Peers'),
@@ -95,26 +97,26 @@
 					sortable: true,
 					renderer: fspeed,
 					dataIndex: 'up_speed'
-				}],	
+				}],
 				stripeRows: true,
 				deferredRender:false,
 				autoScroll:true
 			}, config);
 			Deluge.details.PeersTab.superclass.constructor.call(this, config);
 		},
-		
+
 		clear: function() {
 			this.getStore().removeAll();
 			this.peers = {};
 		},
-		
+
 		update: function(torrentId) {
 			deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Peers, {
 				success: this.onRequestComplete,
 				scope: this
 			});
 		},
-		
+
 		onRequestComplete: function(torrent, options) {
 			if (!torrent) return;
 
@@ -125,6 +127,14 @@
 			// Go through the peers updating and creating peer records
 			Ext.each(torrent.peers, function(peer) {
 				if (this.peers[peer.ip]) {
+                    var record = store.getById(peer.ip);
+                    record.beginEdit();
+                    for (var k in peer) {
+                        if (record.get(k) != peer[k]) {
+                            record.set(k, peer[k]);
+                        }
+                    }
+                    record.endEdit();
 				} else {
 					this.peers[peer.ip] = 1;
 					newPeers.push(new Deluge.data.Peer(peer, peer.ip));

From d6f5e5b4ec4d5e1fa131d20d8cb56aa0409bc8a6 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Fri, 6 May 2011 23:43:40 +0100
Subject: [PATCH 231/329] fix #1537 editing trackers list, trackers have to be
 reselected

---
 .../web/js/deluge-all/EditTrackersWindow.js   | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
index 4beae3f6c..e67f85944 100644
--- a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
+++ b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.EditTrackers.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,17 +49,17 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 	buttonAlign: 'right',
 	closeAction: 'hide',
 	iconCls: 'x-deluge-edit-trackers',
-	
+
 	initComponent: function() {
 		Deluge.EditTrackersWindow.superclass.initComponent.call(this);
-		
+
 		this.addButton(_('Cancel'), this.onCancelClick, this);
 		this.addButton(_('Ok'), this.onOkClick, this);
 		this.addEvents('save');
-		
+
 		this.on('show', this.onShow, this);
 		this.on('save', this.onSave, this);
-		
+
 		this.addWindow = new Deluge.AddTrackerWindow();
 		this.addWindow.on('add', this.onAddTrackers, this);
 		this.editWindow = new Deluge.EditTrackerWindow();
@@ -91,7 +91,7 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 				'selectionchange': {fn: this.onSelect, scope: this}
 			}
 		});
-		
+
 		this.panel = this.add({
 			margins: '0 0 0 0',
 			items: [this.list],
@@ -128,11 +128,11 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 			})
 		});
 	},
-	
+
 	onAddClick: function() {
 		this.addWindow.show();
 	},
-	
+
 	onAddTrackers: function(trackers) {
 		var store = this.list.getStore();
 		Ext.each(trackers, function(tracker) {
@@ -150,15 +150,15 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 			store.add(new store.recordType({'tier': heightestTier + 1, 'url': tracker}));
 		}, this);
 	},
-	
+
 	onCancelClick: function() {
 		this.hide();
 	},
-	
+
 	onEditClick: function() {
 		this.editWindow.show(this.list.getSelectedRecords()[0]);
 	},
-	
+
 	onHide: function() {
 		this.list.getStore().removeAll();
 	},
@@ -166,7 +166,7 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 	onListNodeDblClicked: function(list, index, node, e) {
 		this.editWindow.show(this.list.getRecord(node));
 	},
-	
+
 	onOkClick: function() {
 		var trackers = [];
 		this.list.getStore().each(function(record) {
@@ -175,7 +175,7 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 				'url': record.get('url')
 			})
 		}, this);
-		
+
 		deluge.client.core.set_torrent_trackers(this.torrentId, trackers, {
 			failure: this.onSaveFail,
 			scope: this
@@ -183,27 +183,27 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 
 		this.hide();
 	},
-	
+
 	onRemoveClick: function() {
 		// Remove from the grid
 		this.list.getStore().remove(this.list.getSelectedRecords()[0]);
 	},
-	
+
 	onRequestComplete: function(status) {
 		this.list.getStore().loadData(status);
 		this.list.getStore().sort('tier', 'ASC');
 	},
-	
+
 	onSaveFail: function() {
-		
+
 	},
-	
+
 	onSelect: function(list) {
 		if (list.getSelectionCount()) {
 			this.panel.getBottomToolbar().items.get(4).enable();
 		}
 	},
-	
+
 	onShow: function() {
 		this.panel.getBottomToolbar().items.get(4).disable();
 		var r = deluge.torrents.getSelected();
@@ -216,16 +216,24 @@ Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 
 	onDownClick: function() {
 		var r = this.list.getSelectedRecords()[0];
+        if (!r) return;
+
 		r.set('tier', r.get('tier') + 1);
-		r.commit();
 		r.store.sort('tier', 'ASC');
+        r.store.commitChanges();
+
+        this.list.select(r.store.indexOf(r));
 	},
 
 	onUpClick: function() {
 		var r = this.list.getSelectedRecords()[0];
+        if (!r) return;
+
 		if (r.get('tier') == 0) return;
 		r.set('tier', r.get('tier') - 1);
-		r.commit();
 		r.store.sort('tier', 'ASC');
+        r.store.commitChanges();
+
+        this.list.select(r.store.indexOf(r));
 	}
 });

From 04af8965bcc3687846887f8e6dbd71ecd0b499f5 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Sat, 7 May 2011 00:02:20 +0100
Subject: [PATCH 232/329] apply patch from #1742

---
 deluge/core/eventmanager.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deluge/core/eventmanager.py b/deluge/core/eventmanager.py
index 198507007..16cfa42ee 100644
--- a/deluge/core/eventmanager.py
+++ b/deluge/core/eventmanager.py
@@ -55,7 +55,10 @@ class EventManager(component.Component):
         if event.name in self.handlers:
             for handler in self.handlers[event.name]:
                 #log.debug("Running handler %s for event %s with args: %s", event.name, handler, event.args)
-                handler(*event.args)
+                try:
+                    handler(*event.args)
+                except:
+                    log.error("Event handler %s failed in %s", event.name, handler)
 
     def register_event_handler(self, event, handler):
         """

From 117d50b72820807f53914d4db1071244492d5485 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Sat, 7 May 2011 11:51:47 +0100
Subject: [PATCH 233/329] fix a bug when the host_id doesn't exist

---
 deluge/ui/web/json_api.py | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index 836578498..2cf90b70d 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -740,46 +740,46 @@ class WebApi(JSONComponent):
         :param host_id: the hash id of the host
         :type host_id: string
     	"""
-        main_deferred = Deferred()
 
-        (host_id, host, port, user, password) = self.get_host(host_id)
+        def response(status, info=None):
+            return host_id, host, port, status, info
 
-        def callback(status, info=None):
-            main_deferred.callback((host_id, host, port, status, info))
+        try:
+            host_id, host, port, user, password = self.get_host(host_id)
+        except TypeError, e:
+            return response(_("Offline"))
 
         def on_connect(connected, c, host_id):
             def on_info(info, c):
                 c.disconnect()
-                callback(_("Online"), info)
+                return response(_("Online"), info)
 
             def on_info_fail(reason, c):
                 c.disconnect()
-                callback(_("Offline"))
+                return response(_("Offline"))
 
             if not connected:
-                callback(_("Offline"))
-                return
+                return response(_("Offline"))
 
-            d = c.daemon.info()
-            d.addCallback(on_info, c)
-            d.addErrback(on_info_fail, c)
+            return c.daemon.info(
+                ).addCallback(on_info, c
+                ).addErrback(on_info_fail, c)
 
         def on_connect_failed(reason, host_id):
-            callback(_("Offline"))
+            return response(_("Offline"))
 
-        if client.connected() and (host, port, "localclient" if not \
-                                   user and host in ("127.0.0.1", "localhost") else \
+        if client.connected() and (host, port, "localclient" if not
+                                   user and host in ("127.0.0.1", "localhost") else
                                    user)  == client.connection_info():
             def on_info(info):
-                callback(_("Connected"), info)
+                return response(_("Connected"), info)
 
-            client.daemon.info().addCallback(on_info)
+            return client.daemon.info().addCallback(on_info)
         else:
             c = Client()
-            d = c.connect(host, port, user, password)
-            d.addCallback(on_connect, c, host_id)
-            d.addErrback(on_connect_failed, host_id)
-        return main_deferred
+            return c.connect(host, port, user, password
+                ).addCallback(on_connect, c, host_id
+                ).addErrback(on_connect_failed, host_id)
 
     @export
     def start_daemon(self, port):

From 8922717ff2bd8d91231994677df9d9f16bd00bc7 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Sat, 7 May 2011 13:19:41 +0100
Subject: [PATCH 234/329] fix unrequired requests

---
 deluge/ui/web/js/deluge-all/ConnectionManager.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/ConnectionManager.js b/deluge/ui/web/js/deluge-all/ConnectionManager.js
index 54b3b25ed..c7f8121b9 100644
--- a/deluge/ui/web/js/deluge-all/ConnectionManager.js
+++ b/deluge/ui/web/js/deluge-all/ConnectionManager.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.ConnectionManager.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,7 +88,7 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 				'selectionchange': {fn: this.onSelectionChanged, scope: this}
 			}
 		});
-		
+
 		this.panel = this.add({
 			autoScroll: true,
 			items: [this.list],
@@ -172,7 +172,7 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 	 */
 	updateButtons: function(record) {
 		var button = this.buttons[1], status = record.get('status');
-	
+
 		// Update the Connect/Disconnect button
 		if (status == _('Connected')) {
 			button.enable();
@@ -183,7 +183,7 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 			button.enable();
 			button.setText(_('Connect'));
 		}
-		
+
 		// Update the Stop/Start Daemon button
 		if (status == _('Offline')) {
 			if (record.get('host') == '127.0.0.1' || record.get('host') == 'localhost') {
@@ -333,6 +333,7 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 		}
 	},
 
+    // FIXME: Find out why this is being fired twice
 	// private
 	onShow: function() {
 		if (!this.addHostButton) {
@@ -342,9 +343,10 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 			this.stopHostButton = bbar.items.get('cm-stop');
 		}
 		this.loadHosts();
+        if (this.running) return;
 		this.running = window.setInterval(this.update, 2000, this);
 	},
-	
+
 	// private
 	onStopClick: function(button, e) {
 		var connection = this.list.getSelectedRecords()[0];

From a7bd9531698ae47b48acbcefb60c26f85e397dc6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 7 May 2011 15:14:32 +0100
Subject: [PATCH 235/329] GTK UI Connection Manager (#1824)

Warn the user if he's trying to connect to a local daemon that's not running and "start local daemon if necessary" is not enabled.
Extend and reuse the connection callbacks on the connection manager to re-use code.
---
 deluge/ui/gtkui/connectionmanager.py | 59 ++++++++++++++--------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 55da39b16..fdddacd1e 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -471,6 +471,7 @@ class ConnectionManager(component.Component):
                     _("Deluge cannot find the 'deluged' executable, it is "
                       "likely that you forgot to install the deluged package "
                       "or it's not in your PATH.")).run()
+                return False
             else:
                 raise e
         except Exception, e:
@@ -483,11 +484,13 @@ class ConnectionManager(component.Component):
                 details=traceback.format_exc(tb[2])).run()
 
     # Signal handlers
-    def __connect(self, host_id, host, port, username, password, skip_authentication=False):
+    def __connect(self, host_id, host, port, username, password,
+                  skip_authentication=False, try_counter=0):
         def do_connect(*args):
             d = client.connect(host, port, username, password, skip_authentication)
             d.addCallback(self.__on_connected, host_id)
-            d.addErrback(self.__on_connected_failed, host_id, host, port, username)
+            d.addErrback(self.__on_connected_failed, host_id, host, port,
+                         username, password, try_counter)
             return d
 
         if client.connected():
@@ -506,8 +509,11 @@ class ConnectionManager(component.Component):
             self.connection_manager.response(gtk.RESPONSE_OK)
         component.start()
 
-    def __on_connected_failed(self, reason, host_id, host, port, user):
-        log.debug("Failed to connect: %s", reason)
+    def __on_connected_failed(self, reason, host_id, host, port, user, passwd,
+                              try_counter):
+        log.debug("Failed to connect: %s", reason.value)
+        print reason, host_id, host, port, user, passwd, try_counter
+
         if reason.check(AuthenticationRequired, BadLoginError):
             log.debug("PasswordRequired exception")
             dialog = dialogs.AuthenticationDialog(
@@ -520,9 +526,19 @@ class ConnectionManager(component.Component):
                                    dialog.get_password())
             d = dialog.run().addCallback(dialog_finished, host, port, user)
             return d
-        dialogs.ErrorDialog(
-            _("Failed To Authenticate"), reason.value.message
-        ).run()
+
+        if try_counter:
+            log.info("Retrying connection.. Retries left: %s", try_counter)
+            return reactor.callLater(
+                0.5, self.__connect, host_id, host, port, user, passwd,
+                try_counter=try_counter-1
+            )
+
+        msg = str(reason.value)
+        if not self.glade.get_widget("chk_autostart").get_active():
+            msg += '\n' + _("Auto-starting the daemon localy is not enabled. "
+                            "See \"Options\" on the \"Connection Manager\".")
+        dialogs.ErrorDialog(_("Failed To Connect"), msg).run()
 
     def on_button_connect_clicked(self, widget=None):
         model, row = self.hostlist.get_selection().get_selected()
@@ -544,28 +560,13 @@ class ConnectionManager(component.Component):
         if status == _("Offline") and \
                     self.glade.get_widget("chk_autostart").get_active() and \
                     host in ("127.0.0.1", "localhost"):
-            # We need to start this localhost
-            self.start_daemon(port, deluge.configmanager.get_config_dir())
-
-            def on_connect_fail(result, try_counter):
-                log.error("Connection to host failed..")
-                # We failed connecting to the daemon, but lets try again
-                if try_counter:
-                    log.info("Retrying connection.. Retries left: %s", try_counter)
-                    try_counter -= 1
-                    import time
-                    time.sleep(0.5)
-                    do_retry_connect(try_counter)
-                return result
-
-            def do_retry_connect(try_counter):
-                d = client.connect(host, port, user, password)
-                d.addCallback(self.__on_connected, host_id)
-                d.addErrback(on_connect_fail, try_counter)
-
-            do_retry_connect(6)
-
-        return self.__connect(host_id, host, port, user, password, skip_authentication=False)
+            if not self.start_daemon(port, deluge.configmanager.get_config_dir()):
+                log.debug("Failed to auto-start daemon")
+                return
+            return self.__connect(
+                host_id, host, port, user, password, try_counter=6
+            )
+        return self.__connect(host_id, host, port, user, password)
 
     def on_button_close_clicked(self, widget):
         self.connection_manager.response(gtk.RESPONSE_CLOSE)

From 4044f52f77df395240e04ec0591f373fc199e73b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 7 May 2011 15:54:10 +0100
Subject: [PATCH 236/329] GTK UI Torrent's options tab.

Set the apply button to sensitive if the value of a spin button changed. This was missing.
---
 deluge/ui/gtkui/glade/main_window.glade | 1181 +++++++++++++++--------
 deluge/ui/gtkui/options_tab.py          |    7 +-
 2 files changed, 771 insertions(+), 417 deletions(-)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index a426b9620..df8646974 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -1,8 +1,9 @@
-
+
 
-  
+  
   
   
+    False
     Deluge
     
     
@@ -10,28 +11,36 @@
     
       
         True
+        False
         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
         
           
             True
+            False
             
               
                 True
+                False
+                False
                 _File
                 True
                 
                   
+                    False
                     
                       
                         _Add Torrent
                         True
                         False
+                        False
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-add
                             1
                           
@@ -42,12 +51,15 @@
                       
                         _Create Torrent
                         True
+                        False
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-new
                             1
                           
@@ -55,18 +67,23 @@
                       
                     
                     
-                      
+                      
+                        False
+                      
                     
                     
                       
                         Quit & _Shutdown Daemon
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-quit
                             1
                           
@@ -76,12 +93,15 @@
                     
                       
                         True
+                        False
                       
                     
                     
                       
-                        gtk-quit
+                        gtk-quit
                         True
+                        False
+                        False
                         True
                         True
                         
@@ -94,15 +114,20 @@
             
               
                 True
+                False
+                False
                 _Edit
                 True
                 
                   
                     True
+                    False
                     
                       
-                        gtk-preferences
+                        gtk-preferences
                         True
+                        False
+                        False
                         True
                         True
                         
@@ -112,13 +137,16 @@
                       
                         _Connection Manager
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-network
                             1
                           
@@ -131,6 +159,8 @@
             
             
               
+                False
+                False
                 _Torrent
                 True
               
@@ -138,14 +168,19 @@
             
               
                 True
+                False
+                False
                 _View
                 True
                 
                   
                     True
+                    False
                     
                       
                         True
+                        False
+                        False
                         _Toolbar
                         True
                         True
@@ -155,7 +190,9 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        False
                         _Sidebar
                         True
                         True
@@ -165,6 +202,8 @@
                     
                       
                         True
+                        False
+                        False
                         Status_bar
                         True
                         True
@@ -174,11 +213,14 @@
                     
                       
                         True
+                        False
                       
                     
                     
                       
                         True
+                        False
+                        False
                         T_abs
                         True
                       
@@ -186,6 +228,8 @@
                     
                       
                         True
+                        False
+                        False
                         _Columns
                         True
                       
@@ -193,16 +237,21 @@
                     
                       
                         True
+                        False
                         True
+                        False
                         S_idebar
                         True
                         
                           
                             True
+                            False
                             True
                             
                               
                                 True
+                                False
+                                False
                                 Show _Zero Hits
                                 True
                                 True
@@ -212,6 +261,8 @@
                             
                               
                                 True
+                                False
+                                False
                                 Show _Trackers
                                 True
                                 True
@@ -229,21 +280,27 @@
             
               
                 True
+                False
+                False
                 _Help
                 True
                 
                   
+                    False
                     
                       
                         _Homepage
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-home
                             1
                           
@@ -254,14 +311,17 @@
                       
                         _FAQ
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         Frequently Asked Questions
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             gtk-dialog-question
                             1
                           
@@ -272,13 +332,16 @@
                       
                         _Community
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        False
                         True
                         False
                         
                         
                           
                             True
+                            False
                             0.4699999988079071
                             gtk-info
                             1
@@ -289,12 +352,15 @@
                     
                       
                         True
+                        False
                       
                     
                     
                       
                         gtk-about
                         True
+                        False
+                        False
                         True
                         True
                         
@@ -307,17 +373,21 @@
           
           
             False
+            True
             0
           
         
         
           
             True
+            False
             
               
                 True
                 False
+                False
                 Add torrent
+                False
                 Add Torrent
                 True
                 gtk-add
@@ -332,7 +402,9 @@
               
                 True
                 False
+                False
                 Remove torrent
+                False
                 Remove Torrent
                 gtk-remove
                 
@@ -345,6 +417,7 @@
             
               
                 True
+                False
               
               
                 False
@@ -354,7 +427,9 @@
               
                 True
                 False
+                False
                 Pause the selected torrents
+                False
                 Pause
                 True
                 gtk-media-pause
@@ -369,8 +444,10 @@
               
                 True
                 False
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 Resume the selected torrents
+                False
                 Resume
                 gtk-media-play
                 
@@ -383,6 +460,7 @@
             
               
                 True
+                False
               
               
                 False
@@ -392,8 +470,10 @@
               
                 True
                 False
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 Queue Torrent Up
+                False
                 Queue Up
                 gtk-go-up
                 
@@ -407,8 +487,10 @@
               
                 True
                 False
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 Queue Torrent Down
+                False
                 Queue Down
                 gtk-go-down
                 
@@ -421,6 +503,7 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
               
               
@@ -430,7 +513,9 @@
             
               
                 True
+                False
                 Preferences
+                False
                 Preferences
                 True
                 gtk-preferences
@@ -444,8 +529,10 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 Connection Manager
+                False
                 Connection Manager
                 gtk-network
                 
@@ -458,17 +545,20 @@
           
           
             False
+            True
             1
           
         
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             2
             
               
                 True
+                False
                 
                   
                     True
@@ -514,6 +604,7 @@
                 
                   
                     True
+                    False
                     False
                   
                   
@@ -525,12 +616,15 @@
             
           
           
+            True
+            True
             2
           
         
         
           
             True
+            False
           
           
             False
@@ -543,10 +637,13 @@
   
   
     True
+    False
     
       
         gtk-open
         True
+        False
+        False
         True
         True
         
@@ -555,18 +652,22 @@
     
       
         True
+        False
       
     
     
       
         _Expand All
         True
+        False
+        False
         True
         False
         
         
           
             True
+            False
             gtk-zoom-fit
             1
           
@@ -576,18 +677,22 @@
     
       
         True
+        False
       
     
     
       
         _Do Not Download
         True
+        False
+        False
         True
         False
         
         
           
             True
+            False
             gtk-no
             1
           
@@ -598,12 +703,15 @@
       
         _Normal Priority
         True
+        False
+        False
         True
         False
         
         
           
             True
+            False
             gtk-yes
             1
           
@@ -614,12 +722,15 @@
       
         _High Priority
         True
+        False
+        False
         True
         False
         
         
           
             True
+            False
             gtk-go-up
             1
           
@@ -630,12 +741,15 @@
       
         Hi_ghest Priority
         True
+        False
+        False
         True
         False
         
         
           
             True
+            False
             gtk-goto-top
             1
           
@@ -643,7 +757,471 @@
       
     
   
+  
+    True
+    False
+    
+      
+        _Add Peer
+        True
+        False
+        Add a peer by its IP
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-add
+            1
+          
+        
+      
+    
+  
+  
+    False
+    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+    5
+    Remove Torrent?
+    False
+    center-on-parent
+    dialog
+    
+      
+        True
+        False
+        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+        2
+        
+          
+            True
+            False
+            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+            center
+            
+              
+                gtk-cancel
+                True
+                True
+                True
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
+                True
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                Remove Selected Torrent
+                True
+                True
+                True
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
+              
+              
+                False
+                False
+                1
+              
+            
+          
+          
+            False
+            True
+            end
+            0
+          
+        
+        
+          
+            True
+            False
+            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+            5
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                10
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    gtk-dialog-warning
+                    6
+                  
+                  
+                    False
+                    False
+                    0
+                  
+                
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    <big><b>Are you sure you want to remove the selected torrent?</b></big>
+                    True
+                    True
+                  
+                  
+                    False
+                    False
+                    1
+                  
+                
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+              
+              
+                False
+                True
+                1
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                15
+                
+                  
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    5
+                    
+                      
+                        True
+                        False
+                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        gtk-dialog-warning
+                      
+                      
+                        False
+                        False
+                        1
+                      
+                    
+                    
+                      
+                        True
+                        False
+                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        0
+                        <i>The associated .torrent will be deleted!</i>
+                        True
+                      
+                      
+                        True
+                        True
+                        1
+                      
+                    
+                  
+                
+              
+              
+                True
+                True
+                2
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                15
+                
+                  
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    5
+                    
+                      
+                        True
+                        False
+                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        gtk-dialog-warning
+                      
+                      
+                        False
+                        False
+                        0
+                      
+                    
+                    
+                      
+                        True
+                        False
+                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                        0
+                        <i>The downloaded data will be deleted!</i>
+                        True
+                      
+                      
+                        True
+                        True
+                        1
+                      
+                    
+                  
+                
+              
+              
+                True
+                True
+                3
+              
+            
+          
+          
+            False
+            False
+            5
+            1
+          
+        
+      
+    
+  
+  
+    False
+    5
+    New Release
+    center-on-parent
+    deluge
+    dialog
+    
+      
+        True
+        False
+        2
+        
+          
+            True
+            False
+            end
+            
+              
+                gtk-close
+                True
+                True
+                True
+                False
+                True
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                _Goto Website
+                True
+                True
+                True
+                False
+                True
+                
+              
+              
+                False
+                False
+                1
+              
+            
+          
+          
+            False
+            False
+            end
+            0
+          
+        
+        
+          
+            True
+            False
+            10
+            5
+            
+              
+                True
+                False
+                5
+                
+                  
+                    True
+                    False
+                    gtk-missing-image
+                  
+                  
+                    False
+                    False
+                    0
+                  
+                
+                
+                  
+                    True
+                    False
+                    <b><big>New Release Available!</big></b>
+                    True
+                  
+                  
+                    False
+                    False
+                    1
+                  
+                
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                True
+                False
+              
+              
+                False
+                True
+                1
+              
+            
+            
+              
+                True
+                False
+                5
+                
+                  
+                    True
+                    False
+                    2
+                    2
+                    10
+                    2
+                    
+                      
+                        True
+                        False
+                      
+                      
+                        1
+                        2
+                        1
+                        2
+                        
+                      
+                    
+                    
+                      
+                        True
+                        False
+                        0
+                        <i>Available Version:</i>
+                        True
+                      
+                      
+                        1
+                        2
+                        GTK_FILL
+                      
+                    
+                    
+                      
+                        True
+                        False
+                      
+                      
+                        1
+                        2
+                        
+                      
+                    
+                    
+                      
+                        True
+                        False
+                        0
+                        <i>Current Version:</i>
+                        True
+                      
+                      
+                        GTK_FILL
+                      
+                    
+                  
+                
+              
+              
+                True
+                True
+                2
+              
+            
+            
+              
+                True
+                False
+                5
+                
+                  
+                    Do not show this dialog in the future
+                    True
+                    True
+                    False
+                    False
+                    True
+                  
+                
+              
+              
+                True
+                True
+                3
+              
+            
+          
+          
+            False
+            False
+            1
+          
+        
+      
+    
+  
   
+    False
     
       
         True
@@ -658,12 +1236,14 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 queue
                 none
                 
                   
                     True
+                    False
                     10
                     10
                     15
@@ -671,11 +1251,13 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         5
                         
                           
                             True
+                            False
                             True
                             0.10000000149
                           
@@ -688,6 +1270,7 @@
                         
                           
                             True
+                            False
                             5
                             8
                             10
@@ -695,6 +1278,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -708,6 +1292,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Auto Managed:</b>
                                 True
@@ -723,6 +1308,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -736,6 +1322,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -749,6 +1336,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Seed Rank:</b>
                                 True
@@ -764,6 +1352,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Seeding Time:</b>
                                 True
@@ -779,6 +1368,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -790,6 +1380,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Active Time:</b>
                                 True
@@ -803,6 +1394,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 True
                               
@@ -817,6 +1409,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -830,6 +1423,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 True
                                 char
@@ -846,6 +1440,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 0
                                 <b>Tracker Status:</b>
@@ -861,6 +1456,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 True
                                 word-char
@@ -876,6 +1472,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 1
                                 <b>Availability:</b>
@@ -892,6 +1489,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -905,6 +1503,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -918,6 +1517,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -931,6 +1531,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Peers:</b>
                                 True
@@ -946,6 +1547,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -957,6 +1559,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Seeders:</b>
                                 True
@@ -970,11 +1573,13 @@
                             
                               
                                 True
+                                False
                                 15
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Pieces:</b>
                                     True
@@ -992,11 +1597,13 @@
                             
                               
                                 True
+                                False
                                 15
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>ETA:</b>
                                     True
@@ -1014,11 +1621,13 @@
                             
                               
                                 True
+                                False
                                 15
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Speed:</b>
                                     True
@@ -1036,11 +1645,13 @@
                             
                               
                                 True
+                                False
                                 15
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Speed:</b>
                                     True
@@ -1056,10 +1667,12 @@
                             
                               
                                 True
+                                False
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Next Announce:</b>
                                     True
@@ -1075,10 +1688,12 @@
                             
                               
                                 True
+                                False
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Share Ratio:</b>
                                     True
@@ -1094,10 +1709,12 @@
                             
                               
                                 True
+                                False
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Uploaded:</b>
                                     True
@@ -1113,10 +1730,12 @@
                             
                               
                                 True
+                                False
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     <b>Downloaded:</b>
                                     True
@@ -1130,6 +1749,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -1143,6 +1763,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -1156,6 +1777,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -1167,6 +1789,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -1178,6 +1801,7 @@
                             
                               
                                 True
+                                False
                                 0
                                 <b>Date Added:</b>
                                 True
@@ -1193,6 +1817,7 @@
                             
                               
                                 True
+                                False
                                 0
                               
                               
@@ -1221,26 +1846,33 @@
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             2
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 gtk-dialog-info
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 _Status
                 True
               
               
+                True
+                True
                 1
               
             
@@ -1260,12 +1892,14 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 queue
                 none
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     10
                     10
@@ -1274,6 +1908,7 @@
                     
                       
                         True
+                        False
                         10
                         4
                         5
@@ -1281,6 +1916,7 @@
                         
                           
                             True
+                            False
                             0
                             char
                             True
@@ -1296,6 +1932,7 @@
                         
                           
                             True
+                            False
                             0
                             1
                             <b>Comments:</b>
@@ -1311,6 +1948,7 @@
                         
                           
                             True
+                            False
                             0
                             True
                           
@@ -1325,6 +1963,7 @@
                         
                           
                             True
+                            False
                             0
                             1
                             <b># of files:</b>
@@ -1340,6 +1979,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             True
@@ -1357,6 +1997,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             <b>Hash:</b>
@@ -1372,6 +2013,7 @@
                         
                           
                             True
+                            False
                             0
                             char
                             True
@@ -1387,6 +2029,7 @@
                         
                           
                             True
+                            False
                             0
                             1
                             <b>Tracker:</b>
@@ -1402,11 +2045,13 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             5
                             
                               
                                 True
+                                False
                                 0
                                 1
                                 <b>Total Size:</b>
@@ -1424,6 +2069,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK
                             0
                             True
@@ -1439,11 +2085,13 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             5
                             
                               
                                 True
+                                False
                                 0
                                 0
                                 1
@@ -1460,11 +2108,13 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             5
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 <b>Path:</b>
@@ -1482,6 +2132,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             True
@@ -1499,6 +2150,7 @@
                         
                           
                             True
+                            False
                             0
                             1
                             <b>Status:</b>
@@ -1514,6 +2166,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             True
@@ -1529,6 +2182,7 @@
                         
                           
                             True
+                            False
                             0
                             True
                           
@@ -1543,6 +2197,7 @@
                         
                           
                             True
+                            False
                             0
                             1
                             <b>Owner:</b>
@@ -1558,6 +2213,7 @@
                         
                           
                             True
+                            False
                             Torrent is shared between other Deluge users or not.
                             0
                             1
@@ -1574,6 +2230,7 @@
                         
                           
                             True
+                            False
                             0
                             char
                             True
@@ -1589,6 +2246,7 @@
                         
                           
                             True
+                            False
                             Torrent is shared between other Deluge users or not.
                             0
                             char
@@ -1640,26 +2298,33 @@
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             2
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 gtk-properties
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 _Details
                 True
               
               
+                True
+                True
                 1
               
             
@@ -1692,26 +2357,33 @@
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             2
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 gtk-copy
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 _Files
                 True
               
               
+                True
+                True
                 1
               
             
@@ -1744,26 +2416,33 @@
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             2
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 gtk-network
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 _Peers
                 True
               
               
+                True
+                True
                 1
               
             
@@ -1783,24 +2462,29 @@
             
               
                 True
+                False
                 5
                 queue
                 none
                 
                   
                     True
+                    False
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 5
                                 4
                                 3
@@ -1811,7 +2495,12 @@
                                     True
                                     6
                                     1
+                                    False
+                                    False
+                                    True
+                                    True
                                     -1 -1 999999 1 10 0
+                                    
                                   
                                   
                                     1
@@ -1828,8 +2517,13 @@
                                     True
                                     6
                                     1
+                                    False
+                                    False
+                                    True
+                                    True
                                     -1 -1 99999 1 10 0
                                     1
+                                    
                                   
                                   
                                     1
@@ -1846,8 +2540,13 @@
                                     True
                                     6
                                     1
+                                    False
+                                    False
+                                    True
+                                    True
                                     -1 -1 999999 1 10 0
                                     1
+                                    
                                   
                                   
                                     1
@@ -1859,6 +2558,7 @@
                                 
                                   
                                     True
+                                    False
                                     0
                                     Max Connections:
                                   
@@ -1872,6 +2572,7 @@
                                 
                                   
                                     True
+                                    False
                                     0
                                     Max Upload Speed:
                                   
@@ -1885,6 +2586,7 @@
                                 
                                   
                                     True
+                                    False
                                     0
                                     Max Download Speed:
                                   
@@ -1896,6 +2598,7 @@
                                 
                                   
                                     True
+                                    False
                                     KiB/s
                                   
                                   
@@ -1908,6 +2611,7 @@
                                 
                                   
                                     True
+                                    False
                                     KiB/s
                                   
                                   
@@ -1922,6 +2626,7 @@
                                 
                                   
                                     True
+                                    False
                                     0
                                     Max Upload Slots:
                                   
@@ -1938,7 +2643,12 @@
                                     True
                                     6
                                     1
+                                    False
+                                    False
+                                    True
+                                    True
                                     -1 -1 999999 1 10 0
+                                    
                                   
                                   
                                     1
@@ -1962,6 +2672,7 @@
                         
                           
                             True
+                            False
                             <b>Bandwidth</b>
                             True
                           
@@ -1979,22 +2690,26 @@
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             5
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     Auto Managed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                   
                                   
@@ -2006,9 +2721,11 @@
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
@@ -2016,6 +2733,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             
                                           
@@ -2030,9 +2748,14 @@
                                             True
                                             True
                                             1
+                                            False
+                                            False
+                                            True
+                                            True
                                             2 0 99999 0.10000000000000001 10 0
                                             1
                                             True
+                                            
                                           
                                           
                                             False
@@ -2050,6 +2773,7 @@
                                     
                                       
                                         True
+                                        False
                                         10
                                         
                                           
@@ -2057,6 +2781,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                           
                                         
@@ -2073,6 +2798,7 @@
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         
                                       
@@ -2085,12 +2811,14 @@
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             True
                                             False
-                                            False
+                                            False
                                             select-folder
+                                            False
                                             Select A Folder
                                           
                                           
@@ -2103,6 +2831,10 @@
                                           
                                             False
                                             True
+                                            False
+                                            False
+                                            True
+                                            True
                                           
                                           
                                             False
@@ -2119,6 +2851,8 @@
                                     
                                   
                                   
+                                    True
+                                    True
                                     1
                                   
                                 
@@ -2129,6 +2863,7 @@
                         
                           
                             True
+                            False
                             <b>Queue</b>
                             True
                           
@@ -2146,14 +2881,17 @@
                     
                       
                         True
+                        False
                         
                           
                             True
+                            False
                             0
                             none
                             
                               
                                 True
+                                False
                                 0
                                 0
                                 5
@@ -2161,6 +2899,7 @@
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         Private
@@ -2169,6 +2908,7 @@
                                         True
                                         False
                                         If checked this torrent won't be shared among trackers, DHT nodes, etc...
+                                        False
                                         True
                                       
                                       
@@ -2183,6 +2923,7 @@
                                         True
                                         True
                                         False
+                                        False
                                         True
                                       
                                       
@@ -2198,10 +2939,13 @@
                                         True
                                         False
                                         Torrent is shared between other Deluge users or not.
+                                        False
                                         True
                                         
                                       
                                       
+                                        True
+                                        True
                                         2
                                       
                                     
@@ -2210,16 +2954,19 @@
                                         True
                                         True
                                         True
+                                        False
                                         0
                                         0
                                         
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
                                                 True
+                                                False
                                                 gtk-edit
                                               
                                               
@@ -2231,6 +2978,7 @@
                                             
                                               
                                                 True
+                                                False
                                                 _Edit Trackers
                                                 True
                                               
@@ -2256,6 +3004,7 @@
                             
                               
                                 True
+                                False
                                 <b>General</b>
                                 True
                               
@@ -2273,11 +3022,13 @@
                         
                           
                             True
+                            False
                             0
                             none
                             
                               
                                 True
+                                False
                                 0
                                 0
                                 12
@@ -2288,6 +3039,7 @@
                                     False
                                     True
                                     True
+                                    False
                                     True
                                     
                                   
@@ -2326,23 +3078,30 @@
         
           
             True
+            False
             2
             
               
                 True
+                False
                 gtk-preferences
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
                 _Options
                 True
               
               
+                True
+                True
                 1
               
             
@@ -2356,414 +3115,4 @@
       
     
   
-  
-    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-    5
-    Remove Torrent?
-    False
-    center-on-parent
-    dialog
-    False
-    
-      
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        2
-        
-          
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            5
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                10
-                
-                  
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    gtk-dialog-warning
-                    6
-                  
-                  
-                    False
-                    False
-                    0
-                  
-                
-                
-                  
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    <big><b>Are you sure you want to remove the selected torrent?</b></big>
-                    True
-                    True
-                  
-                  
-                    False
-                    False
-                    1
-                  
-                
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-              
-              
-                False
-                1
-              
-            
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                15
-                
-                  
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    5
-                    
-                      
-                        True
-                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        gtk-dialog-warning
-                      
-                      
-                        False
-                        False
-                        1
-                      
-                    
-                    
-                      
-                        True
-                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        0
-                        <i>The associated .torrent will be deleted!</i>
-                        True
-                      
-                      
-                        1
-                      
-                    
-                  
-                
-              
-              
-                2
-              
-            
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                15
-                
-                  
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    5
-                    
-                      
-                        True
-                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        gtk-dialog-warning
-                      
-                      
-                        False
-                        False
-                        0
-                      
-                    
-                    
-                      
-                        True
-                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        0
-                        <i>The downloaded data will be deleted!</i>
-                        True
-                      
-                      
-                        1
-                      
-                    
-                  
-                
-              
-              
-                3
-              
-            
-          
-          
-            False
-            False
-            5
-            1
-          
-        
-        
-          
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            center
-            
-              
-                gtk-cancel
-                True
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                True
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                Remove Selected Torrent
-                True
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-              
-              
-                False
-                False
-                1
-              
-            
-          
-          
-            False
-            end
-            0
-          
-        
-      
-    
-  
-  
-    5
-    New Release
-    center-on-parent
-    deluge
-    dialog
-    False
-    
-      
-        True
-        2
-        
-          
-            True
-            10
-            5
-            
-              
-                True
-                5
-                
-                  
-                    True
-                    gtk-missing-image
-                  
-                  
-                    False
-                    False
-                    0
-                  
-                
-                
-                  
-                    True
-                    <b><big>New Release Available!</big></b>
-                    True
-                  
-                  
-                    False
-                    False
-                    1
-                  
-                
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                True
-              
-              
-                False
-                1
-              
-            
-            
-              
-                True
-                5
-                
-                  
-                    True
-                    2
-                    2
-                    10
-                    2
-                    
-                      
-                        True
-                      
-                      
-                        1
-                        2
-                        1
-                        2
-                        
-                      
-                    
-                    
-                      
-                        True
-                        0
-                        <i>Available Version:</i>
-                        True
-                      
-                      
-                        1
-                        2
-                        GTK_FILL
-                      
-                    
-                    
-                      
-                        True
-                      
-                      
-                        1
-                        2
-                        
-                      
-                    
-                    
-                      
-                        True
-                        0
-                        <i>Current Version:</i>
-                        True
-                      
-                      
-                        GTK_FILL
-                      
-                    
-                  
-                
-              
-              
-                2
-              
-            
-            
-              
-                True
-                5
-                
-                  
-                    Do not show this dialog in the future
-                    True
-                    True
-                    False
-                    True
-                  
-                
-              
-              
-                3
-              
-            
-          
-          
-            False
-            False
-            1
-          
-        
-        
-          
-            True
-            end
-            
-              
-                gtk-close
-                True
-                True
-                True
-                True
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                _Goto Website
-                True
-                True
-                True
-                True
-                
-              
-              
-                False
-                False
-                1
-              
-            
-          
-          
-            False
-            False
-            end
-            0
-          
-        
-      
-    
-  
-  
-    True
-    
-      
-        _Add Peer
-        True
-        Add a peer by its IP
-        True
-        False
-        
-        
-          
-            True
-            gtk-add
-            1
-          
-        
-      
-    
-  
 
diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py
index 8f4d5bffa..39330765d 100644
--- a/deluge/ui/gtkui/options_tab.py
+++ b/deluge/ui/gtkui/options_tab.py
@@ -71,7 +71,8 @@ class OptionsTab(Tab):
             "on_button_edit_trackers_clicked": self._on_button_edit_trackers_clicked,
             "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled,
             "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled,
-            "on_chk_shared_toggled": self._on_chk_shared_toggled
+            "on_chk_shared_toggled": self._on_chk_shared_toggled,
+            "on_spin_value_changed": self._on_spin_value_changed
         })
 
     def start(self):
@@ -233,3 +234,7 @@ class OptionsTab(Tab):
     def _on_chk_shared_toggled(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
+
+    def _on_spin_value_changed(self, widget):
+        if not self.button_apply.is_sensitive():
+            self.button_apply.set_sensitive(True)

From 95d7caf3ac4df009462d553bec2581a3625edb4e Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 7 May 2011 20:06:37 +0100
Subject: [PATCH 237/329] Implement Last Seen Complete, on core and on GTK UI.

---
 deluge/core/torrent.py         | 22 +++++++++++++++++++++-
 deluge/core/torrentmanager.py  | 19 ++++++++++++++++++-
 deluge/ui/gtkui/listview.py    |  8 ++++++++
 deluge/ui/gtkui/torrentview.py |  8 +++++++-
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 9f8efefa3..c21bf2566 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -188,6 +188,13 @@ class Torrent(object):
         else:
             self.owner = owner
 
+        # XXX: Remove when libtorrent 0.16 get's released???
+        if lt.version_minor < 16:
+            if state:
+                self._last_seen_complete = state.last_seen_complete or 0.0
+            else:
+                self._last_seen_complete = 0.0
+
         # Keep track if we're forcing a recheck of the torrent so that we can
         # repause it after its done if necessary
         self.forcing_recheck = False
@@ -585,7 +592,6 @@ class Torrent(object):
         if distributed_copies < 0:
             distributed_copies = 0.0
 
-        #if you add a key here->add it to core.py STATUS_KEYS too.
         full_status = {
             "active_time": self.status.active_time,
             "all_time_download": self.status.all_time_download,
@@ -633,6 +639,10 @@ class Torrent(object):
             "tracker_status": self.tracker_status,
             "upload_payload_rate": self.status.upload_payload_rate
         }
+        if lt.version_minor > 16:
+            full_status["last_seen_complete"] = self.status.last_seen_complete
+        else:
+            full_status["last_seen_complete"] = self._last_seen_complete
 
         def ti_comment():
             if self.handle.has_metadata():
@@ -935,3 +945,13 @@ class Torrent(object):
         for key in self.prev_status.keys():
             if not self.rpcserver.is_session_valid(key):
                 del self.prev_status[key]
+
+    # XXX: Remove when libtorrent 0.16 get's released???
+    def calculate_last_seen_complete(self):
+        availability = self.handle.piece_availability()
+        if filter(lambda x: x<1, availability):
+            # Torrent does not have all the pieces
+            return
+        log.trace("Torrent %s has all the pieces. Setting last seen complete.",
+                  self.torrent_id)
+        self._last_seen_complete = time.time()
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 9e1fec2f8..433f83fa7 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -85,7 +85,8 @@ class TorrentState:
             move_completed_path=None,
             magnet=None,
             time_added=-1,
-            owner="",
+            last_seen_complete=0.0,   # 0 is the default returned when the info
+            owner="",                 # does not exist on lt >= .16
             shared=False
         ):
         self.torrent_id = torrent_id
@@ -96,6 +97,7 @@ class TorrentState:
         self.is_finished = is_finished
         self.magnet = magnet
         self.time_added = time_added
+        self.last_seen_complete = last_seen_complete
         self.owner = owner
 
         # Options
@@ -632,6 +634,17 @@ class TorrentManager(component.Component):
                 log.error("Torrent state file is either corrupt or incompatible! %s", e)
                 break
 
+
+        # XXX: Remove when libtorrent 0.16 get's released???
+        if lt.version_minor < 16:
+            log.debug("libtorrent version is lower than 0.16. Start looping "
+                      "callback to calculate last_seen_complete info.")
+            def calculate_last_seen_complete():
+                for torrent in self.torrents.values():
+                    torrent.calculate_last_seen_complete()
+            task = LoopingCall(calculate_last_seen_complete)
+            task.start(60)
+
         component.get("EventManager").emit(SessionStartedEvent())
 
     def save_state(self):
@@ -670,6 +683,10 @@ class TorrentManager(component.Component):
                 torrent.owner,
                 torrent.options["shared"]
             )
+            # XXX: Remove when libtorrent 0.16 get's released???
+            if lt.version_minor < 16:
+                torrent_state.last_seen_complete = torrent._last_seen_complete
+
             state.torrents.append(torrent_state)
 
         # Pickle the TorrentManagerState object
diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py
index f7b002c88..7b43fb7cc 100644
--- a/deluge/ui/gtkui/listview.py
+++ b/deluge/ui/gtkui/listview.py
@@ -103,6 +103,14 @@ def cell_data_date(column, cell, model, row, data):
     """Display value as date, eg 05/05/08"""
     cell.set_property('text', deluge.common.fdate(model.get_value(row, data)))
 
+def cell_data_date_or_never(column, cell, model, row, data):
+    """Display value as date, eg 05/05/08 or Never"""
+    value = model.get_value(row, data)
+    if value > 0.0:
+        cell.set_property('text', deluge.common.fdate(value))
+    else:
+        cell.set_property('text', _("Never"))
+
 class ListViewColumnState:
     """Used for saving/loading column state"""
     def __init__(self, name, position, width, visible, sort, sort_order):
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 2e3a02838..8b2b96a29 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -240,6 +240,9 @@ class TorrentView(listview.ListView, component.Component):
                              status_field=["distributed_copies"])
         self.add_func_column(_("Added"), listview.cell_data_date, [float],
                              status_field=["time_added"])
+        self.add_func_column(_("Last Seen Complete"),
+                             listview.cell_data_date_or_never, [float],
+                             status_field=["last_seen_complete"])
         self.add_texticon_column(_("Tracker"),
                                  status_field=["tracker_host", "tracker_host"],
                                  function=cell_data_trackericon)
@@ -395,7 +398,10 @@ class TorrentView(listview.ListView, component.Component):
                                 if row[column_index[i]] != row_value:
                                     row[column_index[i]] = row_value
                             except Exception, e:
-                                log.debug("%s", e)
+                                log.debug("Error while updating row for column "
+                                          "index %d, status field %r, value %r:"
+                                          " %s", column_index[0], status_field,
+                                          row_value, e)
 
         component.get("MenuBar").update_menu()
 

From 38906468c19d70fe022e7c4f560d693d53c0af47 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 01:36:40 +0100
Subject: [PATCH 238/329] Last seen complete

Update last_seen_complete when a status is queried for and that key is on the keys to get or it's a full status query. Either way, only "calculate" last seen at a minimum of one time per 60 seconds(simple caching).
---
 deluge/core/torrent.py        | 20 +++++++++++++++-----
 deluge/core/torrentmanager.py |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index c21bf2566..c94c833cb 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -564,6 +564,16 @@ class Torrent(object):
                 return host
         return ""
 
+    def get_last_seen_complete(self):
+        """
+        Returns the time a torrent was last seen complete, ie, with all pieces
+        available.
+        """
+        if lt.version_minor > 16:
+            return self.status.last_seen_complete
+        self.calculate_last_seen_complete()
+        return self._last_seen_complete
+
     def get_status(self, keys, diff=False):
         """
         Returns the status of the torrent based on the keys provided
@@ -639,10 +649,6 @@ class Torrent(object):
             "tracker_status": self.tracker_status,
             "upload_payload_rate": self.status.upload_payload_rate
         }
-        if lt.version_minor > 16:
-            full_status["last_seen_complete"] = self.status.last_seen_complete
-        else:
-            full_status["last_seen_complete"] = self._last_seen_complete
 
         def ti_comment():
             if self.handle.has_metadata():
@@ -715,6 +721,7 @@ class Torrent(object):
             "ratio": self.get_ratio,
             "total_size": ti_total_size,
             "tracker_host": self.get_tracker_host,
+            "last_seen_complete": self.get_last_seen_complete
         }
 
         # Create the desired status dictionary and return it
@@ -946,8 +953,11 @@ class Torrent(object):
             if not self.rpcserver.is_session_valid(key):
                 del self.prev_status[key]
 
-    # XXX: Remove when libtorrent 0.16 get's released???
     def calculate_last_seen_complete(self):
+        if self._last_seen_complete+60 > time.time():
+            # Simple caching. Only calculate every 1 min at minimum
+            return self._last_seen_complete
+
         availability = self.handle.piece_availability()
         if filter(lambda x: x<1, availability):
             # Torrent does not have all the pieces
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 433f83fa7..1f49eb320 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -130,7 +130,8 @@ class TorrentManager(component.Component):
     """
 
     def __init__(self):
-        component.Component.__init__(self, "TorrentManager", interval=5, depend=["CorePluginManager"])
+        component.Component.__init__(self, "TorrentManager", interval=5,
+                                     depend=["CorePluginManager"])
         log.debug("TorrentManager init..")
         # Set the libtorrent session
         self.session = component.get("Core").session

From 9d29ca7b2971c220e90c5821ca74904dcb75575a Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 02:39:35 +0100
Subject: [PATCH 239/329] Check against libtorrent >15 not >16.

---
 deluge/core/torrent.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index c94c833cb..d114bf379 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -569,7 +569,7 @@ class Torrent(object):
         Returns the time a torrent was last seen complete, ie, with all pieces
         available.
         """
-        if lt.version_minor > 16:
+        if lt.version_minor > 15:
             return self.status.last_seen_complete
         self.calculate_last_seen_complete()
         return self._last_seen_complete

From ffd344d0b5ac883a38eb2968c53f6d05ba814e5c Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 21:35:06 +0100
Subject: [PATCH 240/329] On some "race" conditions, the torrent is removed
 before it's status could be retrieved. Return an empty status.

---
 deluge/core/core.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 0df829b80..716fdbcc3 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -412,7 +412,11 @@ class Core(component.Component):
     @export
     def get_torrent_status(self, torrent_id, keys, diff=False):
         # Build the status dictionary
-        status = self.torrentmanager[torrent_id].get_status(keys, diff)
+        try:
+            status = self.torrentmanager[torrent_id].get_status(keys, diff)
+        except KeyError:
+            # Torrent was probaly removed meanwhile
+            return {}
 
         # Get the leftover fields and ask the plugin manager to fill them
         leftover_fields = list(set(keys) - set(status.keys()))

From 3b8ebf68a6b02dd72f4c60c533ab65e5151f37cb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 21:36:10 +0100
Subject: [PATCH 241/329] GTK UI menubar accounts retrieval.

Only ask for known accounts if we have the required level for it.
---
 deluge/ui/gtkui/menubar.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index dfdd7a0ba..32234bb28 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -213,10 +213,11 @@ class MenuBar(component.Component):
         # demon.
         self.menuitem_change_owner.set_visible(False)
 
-        # Get Known accounts to allow chaning ownership
-        client.core.get_known_accounts().addCallback(
-            self._on_known_accounts).addErrback(self._on_known_accounts_fail
-        )
+        if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
+            # Get Known accounts to allow chaning ownership
+            client.core.get_known_accounts().addCallback(
+                self._on_known_accounts).addErrback(self._on_known_accounts_fail
+            )
 
     def stop(self):
         log.debug("MenuBar stopping")

From 110026edbee08759e2cc8798b30ae4545d434363 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 21:38:53 +0100
Subject: [PATCH 242/329] AutoAdd plugin #1842

Fix bug #1842 and also implement "delete torrent file on torrent removal from session".
---
 deluge/plugins/autoadd/autoadd/core.py        |  93 +++-
 .../autoadd/data/autoadd_options.glade        | 398 ++++++++++++++----
 deluge/plugins/autoadd/autoadd/gtkui.py       |  83 ++--
 3 files changed, 443 insertions(+), 131 deletions(-)

diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py
index 259ca9042..af5bc279c 100644
--- a/deluge/plugins/autoadd/autoadd/core.py
+++ b/deluge/plugins/autoadd/autoadd/core.py
@@ -44,6 +44,7 @@ from deluge.log import getPluginLogger
 from deluge.plugins.pluginbase import CorePluginBase
 import deluge.component as component
 import deluge.configmanager
+from deluge.common import AUTH_LEVEL_ADMIN
 from deluge.core.rpcserver import export
 from twisted.internet.task import LoopingCall, deferLater
 from twisted.internet import reactor
@@ -61,6 +62,7 @@ OPTIONS_AVAILABLE = { #option: builtin
     "path":False,
     "append_extension":False,
     "copy_torrent": False,
+    "delete_copy_torrent_toggle": False,
     "abspath":False,
     "download_location":True,
     "max_download_speed":True,
@@ -100,6 +102,10 @@ class Core(CorePluginBase):
         self.config.save()
         self.watchdirs = self.config["watchdirs"]
 
+        component.get("EventManager").register_event_handler(
+            "PreTorrentRemovedEvent", self.__on_pre_torrent_removed
+        )
+
         # Dict of Filename:Attempts
         self.invalid_torrents = {}
         # Loopingcall timers for each enabled watchdir
@@ -107,13 +113,16 @@ class Core(CorePluginBase):
         deferLater(reactor, 5, self.enable_looping)
 
     def enable_looping(self):
-        #Enable all looping calls for enabled watchdirs here
+        # Enable all looping calls for enabled watchdirs here
         for watchdir_id, watchdir in self.watchdirs.iteritems():
             if watchdir['enabled']:
                 self.enable_watchdir(watchdir_id)
 
     def disable(self):
         #disable all running looping calls
+        component.get("EventManager").deregister_event_handler(
+            "PreTorrentRemovedEvent", self.__on_pre_torrent_removed
+        )
         for loopingcall in self.update_timers.itervalues():
             loopingcall.stop()
         self.config.save()
@@ -165,16 +174,19 @@ class Core(CorePluginBase):
             raise e
 
         # Get the info to see if any exceptions are raised
-        info = lt.torrent_info(lt.bdecode(filedump))
+        lt.torrent_info(lt.bdecode(filedump))
 
         return filedump
 
     def update_watchdir(self, watchdir_id):
         """Check the watch folder for new torrents to add."""
+        log.trace("Updating watchdir id: %s", watchdir_id)
         watchdir_id = str(watchdir_id)
         watchdir = self.watchdirs[watchdir_id]
         if not watchdir['enabled']:
             # We shouldn't be updating because this watchdir is not enabled
+            log.debug("Watchdir id %s is not enabled. Disabling it.",
+                      watchdir_id)
             self.disable_watchdir(watchdir_id)
             return
 
@@ -193,15 +205,17 @@ class Core(CorePluginBase):
             if OPTIONS_AVAILABLE.get(option):
                 if watchdir.get(option+'_toggle', True):
                     opts[option] = value
-
         for filename in os.listdir(watchdir["abspath"]):
-            if filename.split(".")[-1] == "torrent":
-                try:
-                    filepath = os.path.join(watchdir["abspath"], filename)
-                except UnicodeDecodeError, e:
-                    log.error("Unable to auto add torrent due to improper "
-                              "filename encoding: %s", e)
-                    continue
+            try:
+                filepath = os.path.join(watchdir["abspath"], filename)
+            except UnicodeDecodeError, e:
+                log.error("Unable to auto add torrent due to improper "
+                          "filename encoding: %s", e)
+                continue
+            if os.path.isdir(filepath):
+                # Skip directories
+                continue
+            elif os.path.splitext(filename)[1] == ".torrent":
                 try:
                     filedump = self.load_torrent(filepath)
                 except (RuntimeError, Exception), e:
@@ -212,6 +226,9 @@ class Core(CorePluginBase):
                     if filename in self.invalid_torrents:
                         self.invalid_torrents[filename] += 1
                         if self.invalid_torrents[filename] >= MAX_NUM_ATTEMPTS:
+                            log.warning("Maximum attepts reached while trying "
+                                        "to add the torrent file with the path"
+                                        " %s", filepath)
                             os.rename(filepath, filepath + ".invalid")
                             del self.invalid_torrents[filename]
                     else:
@@ -236,14 +253,19 @@ class Core(CorePluginBase):
                             component.get("TorrentManager").queue_top(torrent_id)
                         else:
                             component.get("TorrentManager").queue_bottom(torrent_id)
-                # Rename or delete the torrent once added to deluge.
+
+                # Rename, copy or delete the torrent once added to deluge.
                 if watchdir.get('append_extension_toggle'):
                     if not watchdir.get('append_extension'):
                         watchdir['append_extension'] = ".added"
                     os.rename(filepath, filepath + watchdir['append_extension'])
                 elif watchdir.get('copy_torrent_toggle'):
                     copy_torrent_path = watchdir['copy_torrent']
-                    os.rename(filepath, copy_torrent_path)
+                    log.debug("Moving added torrent file \"%s\" to \"%s\"",
+                              os.path.basename(filepath), copy_torrent_path)
+                    os.rename(
+                        filepath, os.path.join(copy_torrent_path, filename)
+                    )
                 else:
                     os.remove(filepath)
 
@@ -298,7 +320,22 @@ class Core(CorePluginBase):
 
     @export
     def get_watchdirs(self):
-        return self.watchdirs.keys()
+        rpcserver = component.get("RPCServer")
+        session_user = rpcserver.get_session_user()
+        session_auth_level = rpcserver.get_session_auth_level()
+        if session_auth_level == AUTH_LEVEL_ADMIN:
+            log.debug("\n\nCurrent logged in user %s is an ADMIN, send all "
+                      "watchdirs", session_user)
+            return self.watchdirs
+
+        watchdirs = {}
+        for watchdir_id, watchdir in self.watchdirs.iteritems():
+            if watchdir.get("owner", "localclient") == session_user:
+                watchdirs[watchdir_id] = watchdir
+
+        log.debug("\n\nCurrent logged in user %s is not an ADMIN, send only "
+                  "his watchdirs: %s", session_user, watchdirs.keys())
+        return watchdirs
 
     def _make_unicode(self, options):
         opts = {}
@@ -348,6 +385,30 @@ class Core(CorePluginBase):
             config['watchdirs'][watchdir_id]['owner'] = 'localclient'
         return config
 
-    ### XXX: Handle torrent finished / remove torrent file per whatchdir
-    ### deluge/core/torrentmanager.py:
-    ###     filename = self.torrents[torrent_id].filename
+    def __on_pre_torrent_removed(self, torrent_id):
+        try:
+            torrent = component.get("TorrentManager")[torrent_id]
+        except KeyError:
+            log.warning("Unable to remove torrent file for torrent id %s. It"
+                        "was already deleted from the TorrentManager",
+                        torrent_id)
+            return
+        torrent_fname = torrent.filename
+        for watchdir in self.watchdirs.itervalues():
+            if not watchdir.get('copy_torrent_toggle', False):
+                # This watchlist does copy torrents
+                continue
+            elif not watchdir.get('delete_copy_torrent_toggle', False):
+                # This watchlist is not set to delete finished torrents
+                continue
+            copy_torrent_path = watchdir['copy_torrent']
+            torrent_fname_path = os.path.join(copy_torrent_path, torrent_fname)
+            if os.path.isfile(torrent_fname_path):
+                try:
+                    os.remove(torrent_fname_path)
+                    log.info("Removed torrent file \"%s\" from \"%s\"",
+                             torrent_fname, copy_torrent_path)
+                    break
+                except OSError, e:
+                    log.info("Failed to removed torrent file \"%s\" from "
+                             "\"%s\": %s", torrent_fname, copy_torrent_path, e)
diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
index 58545ebe8..8e69ba9a6 100644
--- a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
+++ b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
@@ -3,6 +3,7 @@
   
   
   
+    False
     6
     AutoAdd Error
     False
@@ -12,40 +13,11 @@
     
       
         True
-        
-          
-            True
-            
-              
-                True
-                gtk-dialog-error
-              
-              
-                False
-                0
-              
-            
-            
-              
-                True
-                0.46000000834465027
-                Error
-                True
-              
-              
-                False
-                False
-                1
-              
-            
-          
-          
-            2
-          
-        
+        False
         
           
             True
+            False
             end
             
               
@@ -55,6 +27,7 @@
                 True
                 True
                 False
+                False
                 True
                 
               
@@ -67,14 +40,53 @@
           
           
             False
+            True
             end
             0
           
         
+        
+          
+            True
+            False
+            
+              
+                True
+                False
+                gtk-dialog-error
+              
+              
+                False
+                True
+                0
+              
+            
+            
+              
+                True
+                False
+                0.46000000834465027
+                Error
+                True
+              
+              
+                False
+                False
+                1
+              
+            
+          
+          
+            True
+            True
+            2
+          
+        
       
     
   
   
+    False
     Watch Folder Properties
     False
     True
@@ -83,9 +95,75 @@
     
       
         True
+        False
+        
+          
+            True
+            False
+            end
+            
+              
+                gtk-cancel
+                True
+                True
+                True
+                False
+                False
+                True
+                
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                gtk-add
+                True
+                True
+                True
+                False
+                False
+                True
+                
+              
+              
+                False
+                False
+                1
+              
+            
+            
+              
+                gtk-apply
+                True
+                True
+                True
+                False
+                False
+                True
+                
+              
+              
+                False
+                False
+                2
+              
+            
+          
+          
+            False
+            True
+            end
+            0
+          
+        
         
           
             True
+            False
             
               
                 True
@@ -93,44 +171,60 @@
                 
                   
                     True
+                    False
                     6
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         True
                                         True
                                         ●
+                                        False
+                                        False
+                                        True
+                                        True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
                                     
                                       
                                         True
+                                        False
                                         select-folder
                                         Select A Folder
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
                                   
                                   
+                                    True
+                                    True
                                     0
                                   
                                 
@@ -140,6 +234,7 @@
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -157,6 +252,7 @@
                         
                           
                             True
+                            False
                             <b>Watch Folder</b>
                             True
                           
@@ -166,6 +262,7 @@
                         
                       
                       
+                        True
                         False
                         0
                       
@@ -173,15 +270,18 @@
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                               
                             
                           
@@ -189,6 +289,7 @@
                         
                           
                             True
+                            False
                             <b>Owner</b>
                             True
                           
@@ -198,51 +299,64 @@
                         
                       
                       
+                        True
+                        True
                         1
                       
                     
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         Delete .torrent after adding
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             Append extension after adding:
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             isnt_append_extension
                                             
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
@@ -252,19 +366,28 @@
                                             True
                                             •
                                             .added
+                                            False
+                                            False
+                                            True
+                                            True
                                           
                                           
+                                            True
+                                            True
                                             1
                                           
                                         
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
                                     
                                       
                                         True
+                                        False
                                         2
                                         2
                                         
@@ -273,6 +396,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             isnt_append_extension
                                             
@@ -281,23 +405,33 @@
                                         
                                           
                                             True
+                                            False
                                             
                                               
                                                 True
                                                 True
                                                 •
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
                                             
                                               
                                                 True
+                                                False
                                                 select-folder
                                                 Select A Folder
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -316,6 +450,7 @@
                                             True
                                             Delete the copy of the torrent file
 created when the torrent is removed
+                                            False
                                             True
                                           
                                           
@@ -327,6 +462,8 @@ created when the torrent is removed
                                         
                                       
                                       
+                                        True
+                                        True
                                         2
                                       
                                     
@@ -339,6 +476,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Torrent File Action</b>
                             True
                           
@@ -348,27 +486,33 @@ created when the torrent is removed
                         
                       
                       
+                        True
+                        True
                         2
                       
                     
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     Set download location
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -382,28 +526,39 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         True
                                         True
                                         ●
+                                        False
+                                        False
+                                        True
+                                        True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
                                     
                                       
                                         True
+                                        False
                                         select-folder
                                         Select A Folder
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
                                   
                                   
+                                    True
                                     False
                                     1
                                   
@@ -415,6 +570,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Download Location</b>
                             True
                           
@@ -424,6 +580,7 @@ created when the torrent is removed
                         
                       
                       
+                        True
                         False
                         3
                       
@@ -431,21 +588,25 @@ created when the torrent is removed
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     Set move completed location
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -459,23 +620,33 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         True
                                         True
                                         ●
+                                        False
+                                        False
+                                        True
+                                        True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
                                     
                                       
                                         True
+                                        False
                                         select-folder
                                         Select A Folder
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
@@ -484,6 +655,7 @@ created when the torrent is removed
                                         False
                                         False
                                         False
+                                        False
                                         True
                                         True
                                         True
@@ -496,6 +668,7 @@ created when the torrent is removed
                                     
                                   
                                   
+                                    True
                                     False
                                     1
                                   
@@ -507,6 +680,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Move Completed</b>
                             True
                           
@@ -516,27 +690,32 @@ created when the torrent is removed
                         
                       
                       
+                        True
                         False
                         4
                       
                     
                     
                       
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 
                                   
                                     Label: 
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -550,8 +729,20 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
+                                    
+                                      
+                                        False
+                                        False
+                                        False
+                                        True
+                                        True
+                                      
+                                    
                                   
                                   
+                                    True
+                                    True
                                     1
                                   
                                 
@@ -562,6 +753,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Label</b>
                             True
                           
@@ -571,6 +763,8 @@ created when the torrent is removed
                         
                       
                       
+                        True
+                        True
                         5
                       
                     
@@ -579,6 +773,7 @@ created when the torrent is removed
                 
                   
                     True
+                    False
                     Main
                   
                   
@@ -589,6 +784,7 @@ created when the torrent is removed
                 
                   
                     True
+                    False
                     6
                     
                       
@@ -596,24 +792,30 @@ created when the torrent is removed
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 3
                                 4
                                 3
+                                2
+                                4
                                 
                                   
                                     Max Upload Speed:
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -631,6 +833,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -648,6 +851,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -663,6 +867,10 @@ created when the torrent is removed
                                   
                                     True
                                     True
+                                    False
+                                    False
+                                    True
+                                    True
                                     0 -1 10000 1 10 0
                                     1
                                     1
@@ -677,6 +885,10 @@ created when the torrent is removed
                                   
                                     True
                                     True
+                                    False
+                                    False
+                                    True
+                                    True
                                     0 -1 10000 1 10 0
                                     1
                                     1
@@ -693,6 +905,10 @@ created when the torrent is removed
                                   
                                     True
                                     True
+                                    False
+                                    False
+                                    True
+                                    True
                                     0 -1 10000 1 10 0
                                     1
                                   
@@ -708,6 +924,10 @@ created when the torrent is removed
                                   
                                     True
                                     True
+                                    False
+                                    False
+                                    True
+                                    True
                                     0 -1 10000 1 10 0
                                     1
                                   
@@ -722,6 +942,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     0
                                     5
                                     KiB/s
@@ -736,6 +957,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     0
                                     5
                                     KiB/s
@@ -755,6 +977,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -777,6 +1000,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Bandwidth</b>
                             True
                           
@@ -786,32 +1010,41 @@ created when the torrent is removed
                         
                       
                       
+                        True
+                        True
                         1
                       
                     
                     
                       
                         True
+                        False
                         0
                         none
                         
                           
                             True
+                            False
                             12
                             
                               
                                 True
+                                False
                                 5
                                 4
+                                2
+                                4
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         Stop seed at ratio:
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         True
                                         
@@ -827,6 +1060,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     0
                                     0
                                     12
@@ -836,6 +1070,7 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         True
                                       
@@ -852,6 +1087,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     
@@ -868,6 +1104,7 @@ created when the torrent is removed
                                     False
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     True
@@ -886,6 +1123,7 @@ created when the torrent is removed
                                     False
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     True
@@ -904,6 +1142,10 @@ created when the torrent is removed
                                     True
                                     True
                                     ●
+                                    False
+                                    False
+                                    True
+                                    True
                                     2 0 100 0.10000000149 10 0
                                     1
                                     1
@@ -919,6 +1161,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     True
                                     
                                       
@@ -926,10 +1169,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
@@ -939,10 +1185,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         auto_managed
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
@@ -961,6 +1210,7 @@ created when the torrent is removed
                                     False
                                     True
                                     False
+                                    False
                                     True
                                     True
                                     True
@@ -980,6 +1230,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     
                                   
@@ -987,6 +1238,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     True
                                     
                                       
@@ -994,10 +1246,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
@@ -1007,10 +1262,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         add_paused
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
@@ -1026,6 +1284,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    False
                                     True
                                     
                                   
@@ -1037,6 +1296,7 @@ created when the torrent is removed
                                 
                                   
                                     True
+                                    False
                                     True
                                     
                                       
@@ -1044,10 +1304,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         True
                                       
                                       
+                                        True
+                                        True
                                         0
                                       
                                     
@@ -1057,10 +1320,13 @@ created when the torrent is removed
                                         True
                                         True
                                         False
+                                        False
                                         True
                                         queue_to_top
                                       
                                       
+                                        True
+                                        True
                                         1
                                       
                                     
@@ -1103,6 +1369,7 @@ created when the torrent is removed
                         
                           
                             True
+                            False
                             <b>Queue</b>
                             True
                           
@@ -1112,6 +1379,8 @@ created when the torrent is removed
                         
                       
                       
+                        True
+                        True
                         2
                       
                     
@@ -1123,6 +1392,7 @@ created when the torrent is removed
                 
                   
                     True
+                    False
                     Options
                   
                   
@@ -1133,81 +1403,29 @@ created when the torrent is removed
                 
               
               
+                True
+                True
                 0
               
             
             
               
                 True
+                False
               
               
+                True
+                True
                 1
               
             
           
           
+            True
+            True
             2
           
         
-        
-          
-            True
-            end
-            
-              
-                gtk-cancel
-                True
-                True
-                True
-                False
-                True
-                
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                gtk-add
-                True
-                True
-                True
-                False
-                True
-                
-              
-              
-                False
-                False
-                1
-              
-            
-            
-              
-                gtk-apply
-                True
-                True
-                True
-                False
-                True
-                
-              
-              
-                False
-                False
-                2
-              
-            
-          
-          
-            False
-            end
-            0
-          
-        
       
     
   
diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py
index 8ee1aff98..18ce63f7b 100644
--- a/deluge/plugins/autoadd/autoadd/gtkui.py
+++ b/deluge/plugins/autoadd/autoadd/gtkui.py
@@ -88,10 +88,6 @@ class OptionsDialog():
             self.watchdir_id = None
 
         self.load_options(options)
-
-        # Not implemented feateures present in UI
-        self.glade.get_widget("delete_copy_torrent_toggle").hide()
-
         self.dialog.run()
 
     def load_options(self, options):
@@ -108,6 +104,9 @@ class OptionsDialog():
         self.glade.get_widget('copy_torrent_toggle').set_active(
             options.get('copy_torrent_toggle', False)
         )
+        self.glade.get_widget('delete_copy_torrent_toggle').set_active(
+            options.get('delete_copy_torrent_toggle', False)
+        )
         self.accounts.clear()
         self.labels.clear()
         combobox = self.glade.get_widget('OwnerCombobox')
@@ -162,6 +161,13 @@ class OptionsDialog():
                     selected_idx = idx
             self.glade.get_widget('OwnerCombobox').set_active(selected_idx)
 
+        def on_accounts_failure(failure):
+            log.debug("Failed to get accounts!!! %s", failure)
+            iter = self.accounts.append()
+            self.accounts.set_value(iter, 0, client.get_auth_user())
+            self.glade.get_widget('OwnerCombobox').set_active(0)
+            self.glade.get_widget('OwnerCombobox').set_sensitive(False)
+
         def on_labels(labels):
             log.debug("Got Labels: %s", labels)
             for label in labels:
@@ -182,9 +188,15 @@ class OptionsDialog():
                 self.glade.get_widget('label_toggle').set_active(False)
 
         client.core.get_enabled_plugins().addCallback(on_get_enabled_plugins)
-        client.core.get_known_accounts().addCallback(
-            on_accounts, options.get('owner', 'localclient')
-        ).addErrback(on_failure)
+        if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
+            client.core.get_known_accounts().addCallback(
+                on_accounts, options.get('owner', 'localclient')
+            ).addErrback(on_accounts_failure)
+        else:
+            iter = self.accounts.append()
+            self.accounts.set_value(iter, 0, client.get_auth_user())
+            self.glade.get_widget('OwnerCombobox').set_active(0)
+            self.glade.get_widget('OwnerCombobox').set_sensitive(False)
 
     def set_sensitive(self):
         maintoggles = ['download_location', 'append_extension',
@@ -255,7 +267,9 @@ class OptionsDialog():
         self.err_dialog.hide()
 
     def on_add(self, Event=None):
-        client.autoadd.add(self.generate_opts()).addCallbacks(self.on_added, self.on_error_show)
+        client.autoadd.add(
+            self.generate_opts()
+        ).addCallbacks(self.on_added, self.on_error_show)
 
     def on_cancel(self, Event=None):
         self.dialog.destroy()
@@ -266,14 +280,20 @@ class OptionsDialog():
         options['enabled'] = self.glade.get_widget('enabled').get_active()
         if client.is_localhost():
             options['path'] = self.glade.get_widget('path_chooser').get_filename()
-            options['download_location'] = self.glade.get_widget('download_location_chooser').get_filename()
-            options['move_completed_path'] = self.glade.get_widget('move_completed_path_chooser').get_filename()
-            options['copy_torrent'] = self.glade.get_widget('copy_torrent_chooser').get_filename()
+            options['download_location'] = self.glade.get_widget(
+                'download_location_chooser').get_filename()
+            options['move_completed_path'] = self.glade.get_widget(
+                'move_completed_path_chooser').get_filename()
+            options['copy_torrent'] = self.glade.get_widget(
+                'copy_torrent_chooser').get_filename()
         else:
             options['path'] = self.glade.get_widget('path_entry').get_text()
-            options['download_location'] = self.glade.get_widget('download_location_entry').get_text()
-            options['move_completed_path'] = self.glade.get_widget('move_completed_path_entry').get_text()
-            options['copy_torrent'] = self.glade.get_widget('copy_torrent_entry').get_text()
+            options['download_location'] = self.glade.get_widget(
+                'download_location_entry').get_text()
+            options['move_completed_path'] = self.glade.get_widget(
+                'move_completed_path_entry').get_text()
+            options['copy_torrent'] = self.glade.get_widget(
+                'copy_torrent_entry').get_text()
 
         options['label'] = self.glade.get_widget('label').child.get_text().lower()
         options['append_extension'] = self.glade.get_widget('append_extension').get_text()
@@ -281,7 +301,8 @@ class OptionsDialog():
             self.glade.get_widget('OwnerCombobox').get_active()][0]
 
         for key in ['append_extension_toggle', 'download_location_toggle',
-                    'label_toggle', 'copy_torrent_toggle']:
+                    'label_toggle', 'copy_torrent_toggle',
+                    'delete_copy_torrent_toggle']:
             options[key] = self.glade.get_widget(key).get_active()
 
         for id in self.spin_ids:
@@ -307,9 +328,15 @@ class GtkUI(GtkPluginBase):
         })
         self.opts_dialog = OptionsDialog()
 
-        component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs)
-        component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs)
-        client.register_event_handler("AutoaddOptionsChangedEvent", self.on_options_changed_event)
+        component.get("PluginManager").register_hook(
+            "on_apply_prefs", self.on_apply_prefs
+        )
+        component.get("PluginManager").register_hook(
+            "on_show_prefs", self.on_show_prefs
+        )
+        client.register_event_handler(
+            "AutoaddOptionsChangedEvent", self.on_options_changed_event
+        )
 
         self.watchdirs = {}
 
@@ -330,14 +357,20 @@ class GtkUI(GtkPluginBase):
         self.create_columns(self.treeView)
         sw.add(self.treeView)
         sw.show_all()
-        component.get("Preferences").add_page("AutoAdd", self.glade.get_widget("prefs_box"))
+        component.get("Preferences").add_page(
+            "AutoAdd", self.glade.get_widget("prefs_box")
+        )
         self.on_show_prefs()
 
 
     def disable(self):
         component.get("Preferences").remove_page("AutoAdd")
-        component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs)
-        component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs)
+        component.get("PluginManager").deregister_hook(
+            "on_apply_prefs", self.on_apply_prefs
+        )
+        component.get("PluginManager").deregister_hook(
+            "on_show_prefs", self.on_show_prefs
+        )
 
     def create_model(self):
         store = gtk.ListStore(str, bool, str, str)
@@ -418,14 +451,14 @@ class GtkUI(GtkPluginBase):
             client.autoadd.set_options(watchdir_id, watchdir)
 
     def on_show_prefs(self):
-        client.autoadd.get_config().addCallback(self.cb_get_config)
+        client.autoadd.get_watchdirs().addCallback(self.cb_get_config)
 
     def on_options_changed_event(self):
-        client.autoadd.get_config().addCallback(self.cb_get_config)
+        client.autoadd.get_watchdirs().addCallback(self.cb_get_config)
 
-    def cb_get_config(self, config):
+    def cb_get_config(self, watchdirs):
         """callback for on show_prefs"""
-        self.watchdirs = config.get('watchdirs', {})
+        self.watchdirs = watchdirs
         self.store.clear()
         for watchdir_id, watchdir in self.watchdirs.iteritems():
             self.store.append([

From 837c39fddade76eee67d38f73fc4f30fb5ba31ff Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 21:58:26 +0100
Subject: [PATCH 243/329] Last seen complete checks.

Remove some un-necessary `lt.version_minor` checks since these checks will remain for a while, at least until deluge depends on libtorrent >= 0.16 which should preferrably not happen.
---
 deluge/core/torrent.py        | 11 +++++------
 deluge/core/torrentmanager.py |  6 +-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index d114bf379..26f3344d2 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -188,12 +188,11 @@ class Torrent(object):
         else:
             self.owner = owner
 
-        # XXX: Remove when libtorrent 0.16 get's released???
-        if lt.version_minor < 16:
-            if state:
-                self._last_seen_complete = state.last_seen_complete or 0.0
-            else:
-                self._last_seen_complete = 0.0
+        # Keep trac of last seen complete
+        if state:
+            self._last_seen_complete = state.last_seen_complete or 0.0
+        else:
+            self._last_seen_complete = 0.0
 
         # Keep track if we're forcing a recheck of the torrent so that we can
         # repause it after its done if necessary
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 1f49eb320..0a597b5c1 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -636,7 +636,6 @@ class TorrentManager(component.Component):
                 break
 
 
-        # XXX: Remove when libtorrent 0.16 get's released???
         if lt.version_minor < 16:
             log.debug("libtorrent version is lower than 0.16. Start looping "
                       "callback to calculate last_seen_complete info.")
@@ -681,13 +680,10 @@ class TorrentManager(component.Component):
                 torrent.options["move_completed_path"],
                 torrent.magnet,
                 torrent.time_added,
+                torrent.get_last_seen_complete(),
                 torrent.owner,
                 torrent.options["shared"]
             )
-            # XXX: Remove when libtorrent 0.16 get's released???
-            if lt.version_minor < 16:
-                torrent_state.last_seen_complete = torrent._last_seen_complete
-
             state.torrents.append(torrent_state)
 
         # Pickle the TorrentManagerState object

From 89b79c76a32bea0def888c21211c2e8cdf412ce0 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 22:08:39 +0100
Subject: [PATCH 244/329] Multiple files prioritize first last.

Now `set_prioritize_first_last()` sets the first 2% and the last 2% of the pieces of each file on a torrent at a high priority, ie, it no longer works on just single file torrents.
---
 deluge/core/torrent.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 26f3344d2..d9e9b7bc5 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -252,14 +252,26 @@ class Torrent(object):
 
     def set_prioritize_first_last(self, prioritize):
         self.options["prioritize_first_last_pieces"] = prioritize
-        if prioritize:
-            if self.handle.has_metadata():
-                if self.handle.get_torrent_info().num_files() == 1:
-                    # We only do this if one file is in the torrent
-                    priorities = [1] * self.handle.get_torrent_info().num_pieces()
-                    priorities[0] = 7
-                    priorities[-1] = 7
-                    self.handle.prioritize_pieces(priorities)
+        if self.handle.has_metadata():
+            if self.options["compact_allocation"]:
+                log.debug("Setting first/last priority with compact "
+                          "allocation does not work!")
+                return
+
+            paths = {}
+            ti = self.handle.get_torrent_info()
+            for n in range(ti.num_pieces()):
+                slices = ti.map_block(n, 0, ti.piece_size(n))
+                for slice in slices:
+                    fe = ti.file_at(slice.file_index)
+                    paths.setdefault(fe.path, []).append(n)
+
+            priorities = self.handle.piece_priorities()
+            for pieces in paths.itervalues():
+                two_percent = 2*100/len(pieces)
+                for piece in pieces[:two_percent]+pieces[-two_percent:]:
+                    priorities[piece] = prioritize and 7 or 1
+            self.handle.prioritize_pieces(priorities)
 
     def set_auto_managed(self, auto_managed):
         self.options["auto_managed"] = auto_managed

From cc5f2ffe1874e74937f66736d23ef83051ed38ad Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 22:39:11 +0100
Subject: [PATCH 245/329] Implemented sequential downloads on core.

---
 ChangeLog                         |  1 +
 deluge/core/core.py               |  5 +++
 deluge/core/preferencesmanager.py |  1 +
 deluge/core/torrent.py            | 53 +++++++++++++++++++------------
 deluge/core/torrentmanager.py     |  4 +++
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index df7a83232..46956e581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
 	* Authentication no longer requires a username/password. If one or both of
 	these is missing, an authentication error will be sent to the client
 	which sould then ask the username/password to the user.
+	* Implemented sequential downloads.
 
 ==== GtkUI ====
 	* Fix uncaught exception when closing deluge in classic mode
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 716fdbcc3..d70160759 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -564,6 +564,11 @@ class Core(component.Component):
         """Sets a higher priority to the first and last pieces"""
         return self.torrentmanager[torrent_id].set_prioritize_first_last(value)
 
+    @export
+    def set_torrent_sequential_download(self, torrent_id, value):
+        """Toggle sequencial pieces download"""
+        return self.torrentmanager[torrent_id].set_sequential_download(value)
+
     @export
     def set_torrent_auto_managed(self, torrent_id, value):
         """Sets the auto managed flag for queueing purposes"""
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index ba1d2294b..743d3ea6a 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -63,6 +63,7 @@ DEFAULT_PREFS = {
     "torrentfiles_location": deluge.common.get_default_download_dir(),
     "plugins_location": os.path.join(deluge.configmanager.get_config_dir(), "plugins"),
     "prioritize_first_last_pieces": False,
+    "sequential_download": False,
     "random_port": True,
     "dht": True,
     "upnp": True,
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index d9e9b7bc5..5db3a4c67 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -55,22 +55,23 @@ class TorrentOptions(dict):
     def __init__(self):
         config = ConfigManager("core.conf").config
         options_conf_map = {
-                            "max_connections": "max_connections_per_torrent",
-                            "max_upload_slots": "max_upload_slots_per_torrent",
-                            "max_upload_speed": "max_upload_speed_per_torrent",
-                            "max_download_speed": "max_download_speed_per_torrent",
-                            "prioritize_first_last_pieces": "prioritize_first_last_pieces",
-                            "compact_allocation": "compact_allocation",
-                            "download_location": "download_location",
-                            "auto_managed": "auto_managed",
-                            "stop_at_ratio": "stop_seed_at_ratio",
-                            "stop_ratio": "stop_seed_ratio",
-                            "remove_at_ratio": "remove_seed_at_ratio",
-                            "move_completed": "move_completed",
-                            "move_completed_path": "move_completed_path",
-                            "add_paused": "add_paused",
-                            "shared": "shared"
-                           }
+            "max_connections": "max_connections_per_torrent",
+            "max_upload_slots": "max_upload_slots_per_torrent",
+            "max_upload_speed": "max_upload_speed_per_torrent",
+            "max_download_speed": "max_download_speed_per_torrent",
+            "prioritize_first_last_pieces": "prioritize_first_last_pieces",
+            "sequential_download": "sequential_download",
+            "compact_allocation": "compact_allocation",
+            "download_location": "download_location",
+            "auto_managed": "auto_managed",
+            "stop_at_ratio": "stop_seed_at_ratio",
+            "stop_ratio": "stop_seed_ratio",
+            "remove_at_ratio": "remove_seed_at_ratio",
+            "move_completed": "move_completed",
+            "move_completed_path": "move_completed_path",
+            "add_paused": "add_paused",
+            "shared": "shared"
+        }
         for opt_k, conf_k in options_conf_map.iteritems():
             self[opt_k] = config[conf_k]
         self["file_priorities"] = []
@@ -212,7 +213,9 @@ class Torrent(object):
             "max_download_speed": self.set_max_download_speed,
             "max_upload_slots": self.handle.set_max_uploads,
             "max_upload_speed": self.set_max_upload_speed,
-            "prioritize_first_last_pieces": self.set_prioritize_first_last
+            "prioritize_first_last_pieces": self.set_prioritize_first_last,
+            "sequential_download": self.set_sequential_download
+
         }
         for (key, value) in options.items():
             if OPTIONS_FUNCS.has_key(key):
@@ -273,6 +276,10 @@ class Torrent(object):
                     priorities[piece] = prioritize and 7 or 1
             self.handle.prioritize_pieces(priorities)
 
+    def set_sequential_download(self, set_sequencial):
+        self.options["sequential_download"] = set_sequencial
+        self.handle.set_sequential_download(set_sequencial)
+
     def set_auto_managed(self, auto_managed):
         self.options["auto_managed"] = auto_managed
         if not (self.handle.is_paused() and not self.handle.is_auto_managed()):
@@ -638,6 +645,7 @@ class Torrent(object):
             "owner": self.owner,
             "paused": self.status.paused,
             "prioritize_first_last": self.options["prioritize_first_last_pieces"],
+            "sequential_download": self.options["sequential_download"],
             "progress": progress,
             "shared": self.options["shared"],
             "remove_at_ratio": self.options["remove_at_ratio"],
@@ -776,6 +784,7 @@ class Torrent(object):
         self.handle.set_upload_limit(int(self.max_upload_speed * 1024))
         self.handle.set_download_limit(int(self.max_download_speed * 1024))
         self.handle.prioritize_files(self.file_priorities)
+        self.handle.set_sequential_download(self.options["sequential_download"])
         self.handle.resolve_countries(True)
 
     def pause(self):
@@ -842,10 +851,10 @@ class Torrent(object):
         # Attempt to convert utf8 path to unicode
         # Note: Inconsistent encoding for 'dest', needs future investigation
         try:
-           dest_u = unicode(dest, "utf-8")
+            dest_u = unicode(dest, "utf-8")
         except TypeError:
-           # String is already unicode
-           dest_u = dest
+            # String is already unicode
+            dest_u = dest
 
         if not os.path.exists(dest_u):
             try:
@@ -853,7 +862,9 @@ class Torrent(object):
                 os.makedirs(dest_u)
             except IOError, e:
                 log.exception(e)
-                log.error("Could not move storage for torrent %s since %s does not exist and could not create the directory.", self.torrent_id, dest_u)
+                log.error("Could not move storage for torrent %s since %s does "
+                          "not exist and could not create the directory.",
+                          self.torrent_id, dest_u)
                 return False
         try:
             self.handle.move_storage(dest_u)
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 0a597b5c1..8c9ac415d 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -74,6 +74,7 @@ class TorrentState:
             max_upload_speed=-1.0,
             max_download_speed=-1.0,
             prioritize_first_last=False,
+            sequential_download=False,
             file_priorities=None,
             queue=None,
             auto_managed=True,
@@ -109,6 +110,7 @@ class TorrentState:
         self.max_upload_speed = max_upload_speed
         self.max_download_speed = max_download_speed
         self.prioritize_first_last = prioritize_first_last
+        self.sequential_download = sequential_download
         self.file_priorities = file_priorities
         self.auto_managed = auto_managed
         self.stop_ratio = stop_ratio
@@ -362,6 +364,7 @@ class TorrentManager(component.Component):
             options["max_upload_speed"] = state.max_upload_speed
             options["max_download_speed"] = state.max_download_speed
             options["prioritize_first_last_pieces"] = state.prioritize_first_last
+            options["sequential_download"] = state.sequential_download
             options["file_priorities"] = state.file_priorities
             options["compact_allocation"] = state.compact
             options["download_location"] = state.save_path
@@ -669,6 +672,7 @@ class TorrentManager(component.Component):
                 torrent.options["max_upload_speed"],
                 torrent.options["max_download_speed"],
                 torrent.options["prioritize_first_last_pieces"],
+                torrent.options["sequential_download"],
                 torrent.options["file_priorities"],
                 torrent.get_queue_position(),
                 torrent.options["auto_managed"],

From c8735b5cab854f2db5528ae0cc27bd1202be7aec Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 22:55:55 +0100
Subject: [PATCH 246/329] Sequential downloads: Implemented in add torrent GTK
 UI dialog.

---
 deluge/ui/gtkui/addtorrentdialog.py           |  79 ++-
 .../ui/gtkui/glade/add_torrent_dialog.glade   | 562 ++++++++++++------
 2 files changed, 425 insertions(+), 216 deletions(-)

diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py
index 2f9ceb1a1..e062b47ba 100644
--- a/deluge/ui/gtkui/addtorrentdialog.py
+++ b/deluge/ui/gtkui/addtorrentdialog.py
@@ -81,7 +81,8 @@ class AddTorrentDialog(component.Component):
             "on_button_cancel_clicked": self._on_button_cancel_clicked,
             "on_button_add_clicked": self._on_button_add_clicked,
             "on_button_apply_clicked": self._on_button_apply_clicked,
-            "on_button_revert_clicked": self._on_button_revert_clicked
+            "on_button_revert_clicked": self._on_button_revert_clicked,
+            "on_alocation_toggled": self._on_alocation_toggled
         })
 
         self.torrent_liststore = gtk.ListStore(str, str, str)
@@ -144,6 +145,7 @@ class AddTorrentDialog(component.Component):
             "max_upload_speed_per_torrent",
             "max_download_speed_per_torrent",
             "prioritize_first_last_pieces",
+            "sequential_download",
             "download_location",
             "add_paused"
         ]
@@ -211,7 +213,11 @@ class AddTorrentDialog(component.Component):
 
             if info.info_hash in self.files:
                 log.debug("Trying to add a duplicate torrent!")
-                dialogs.ErrorDialog(_("Duplicate Torrent"), _("You cannot add the same torrent twice."), self.dialog).run()
+                dialogs.ErrorDialog(
+                    _("Duplicate Torrent"),
+                    _("You cannot add the same torrent twice."),
+                    self.dialog
+                ).run()
                 continue
 
             name = "%s (%s)" % (info.name, os.path.split(filename)[-1])
@@ -296,7 +302,9 @@ class AddTorrentDialog(component.Component):
         split_files = { }
         i = 0
         for file in files:
-            self.prepare_file(file, file["path"], i, file["download"], split_files)
+            self.prepare_file(
+                file, file["path"], i, file["download"], split_files
+            )
             i += 1
         self.add_files(None, split_files)
         self.listview_files.set_model(self.files_treestore)
@@ -323,8 +331,10 @@ class AddTorrentDialog(component.Component):
                 self.files_treestore.set(chunk_iter, 2, chunk_size)
                 ret += chunk_size
             else:
-                self.files_treestore.append(parent_iter, [value[2], key,
-                                        value[1]["size"], value[0], False, gtk.STOCK_FILE])
+                self.files_treestore.append(parent_iter, [
+                    value[2], key, value[1]["size"],
+                    value[0], False, gtk.STOCK_FILE
+                ])
 
                 if parent_iter and self.files_treestore.iter_has_child(parent_iter):
                     # Iterate through the children and see what we should label the
@@ -380,12 +390,15 @@ class AddTorrentDialog(component.Component):
             options["add_paused"])
         self.glade.get_widget("chk_prioritize").set_active(
             options["prioritize_first_last_pieces"])
+        self.glade.get_widget("chk_sequential_download").set_active(
+            options["sequential_download"])
 
     def save_torrent_options(self, row=None):
         # Keeps the torrent options dictionary up-to-date with what the user has
         # selected.
         if row is None:
-            if self.previous_selected_torrent and self.torrent_liststore.iter_is_valid(self.previous_selected_torrent):
+            if self.previous_selected_torrent and \
+                self.torrent_liststore.iter_is_valid(self.previous_selected_torrent):
                 row = self.previous_selected_torrent
             else:
                 return
@@ -425,12 +438,16 @@ class AddTorrentDialog(component.Component):
             self.glade.get_widget("chk_paused").get_active()
         options["prioritize_first_last_pieces"] = \
             self.glade.get_widget("chk_prioritize").get_active()
+        options["sequential_download"] = \
+            self.glade.get_widget("radio_full").get_active() and \
+            self.glade.get_widget("chk_sequential_download").get_active() or False
 
         self.options[torrent_id] = options
 
         # Save the file priorities
         files_priorities = self.build_priorities(
-                                self.files_treestore.get_iter_first(), {})
+            self.files_treestore.get_iter_first(), {}
+        )
 
         if len(files_priorities) > 0:
             for i, file_dict in enumerate(self.files[torrent_id]):
@@ -442,7 +459,8 @@ class AddTorrentDialog(component.Component):
                 self.build_priorities(self.files_treestore.iter_children(iter),
                                           priorities)
             elif not self.files_treestore.get_value(iter, 1).endswith(os.path.sep):
-                priorities[self.files_treestore.get_value(iter, 3)] = self.files_treestore.get_value(iter, 0)
+                priorities[self.files_treestore.get_value(iter, 3)] = \
+                                        self.files_treestore.get_value(iter, 0)
             iter = self.files_treestore.iter_next(iter)
         return priorities
 
@@ -470,6 +488,8 @@ class AddTorrentDialog(component.Component):
             self.core_config["add_paused"])
         self.glade.get_widget("chk_prioritize").set_active(
             self.core_config["prioritize_first_last_pieces"])
+        self.glade.get_widget("chk_sequential_download").set_active(
+            self.core_config["sequential_download"])
 
     def get_file_priorities(self, torrent_id):
         # A list of priorities
@@ -492,7 +512,12 @@ class AddTorrentDialog(component.Component):
                     self.options[model[row][0]]["compact_allocation"] = False
                     self.update_torrent_options(model[row][0])
 
-            d = dialogs.YesNoDialog(_("Unable to set file priority!"), _("File prioritization is unavailable when using Compact allocation.  Would you like to switch to Full allocation?"), self.dialog).run()
+            d = dialogs.YesNoDialog(
+                _("Unable to set file priority!"),
+                _("File prioritization is unavailable when using Compact "
+                  "allocation.  Would you like to switch to Full allocation?"),
+                self.dialog
+            ).run()
             d.addCallback(on_answer)
 
             return
@@ -541,11 +566,13 @@ class AddTorrentDialog(component.Component):
     def _on_button_file_clicked(self, widget):
         log.debug("_on_button_file_clicked")
         # Setup the filechooserdialog
-        chooser = gtk.FileChooserDialog(_("Choose a .torrent file"),
+        chooser = gtk.FileChooserDialog(
+            _("Choose a .torrent file"),
             None,
             gtk.FILE_CHOOSER_ACTION_OPEN,
             buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
-                        gtk.RESPONSE_OK))
+                     gtk.RESPONSE_OK)
+        )
 
         chooser.set_transient_for(self.dialog)
         chooser.set_select_multiple(True)
@@ -606,7 +633,7 @@ class AddTorrentDialog(component.Component):
         response = dialog.run()
 
         if response == gtk.RESPONSE_OK:
-            url = entry.get_text().decode("utf_8")
+            url = entry.get_text().decode("utf-8")
         else:
             url = None
 
@@ -622,7 +649,11 @@ class AddTorrentDialog(component.Component):
             elif deluge.common.is_magnet(url):
                 self.add_from_magnets([url])
             else:
-                dialogs.ErrorDialog(_("Invalid URL"), _("%s is not a valid URL." % url), self.dialog).run()
+                dialogs.ErrorDialog(
+                    _("Invalid URL"),
+                    _("%s is not a valid URL." % url),
+                    self.dialog
+                ).run()
 
     def add_from_url(self, url):
         dialog = gtk.Dialog(
@@ -668,8 +699,10 @@ class AddTorrentDialog(component.Component):
             else:
                 log.debug("Download failed: %s", result)
                 dialog.destroy()
-                dialogs.ErrorDialog(_("Download Failed"), _("Failed to download : %s" % url),
-                                    details=result.getErrorMessage(), parent=self.dialog).run()
+                dialogs.ErrorDialog(
+                    _("Download Failed"), _("Failed to download : %s" % url),
+                    details=result.getErrorMessage(), parent=self.dialog
+                ).run()
             return result
 
         d = download_file(url, tmp_file, on_part)
@@ -698,7 +731,7 @@ class AddTorrentDialog(component.Component):
             # handle this way.
             log.debug("trackers: %s", trackers)
             magnet = deluge.common.create_magnet_uri(
-                infohash=entry.get_text().decode("utf_8"),
+                infohash=entry.get_text().decode("utf-8"),
                 trackers=trackers)
             log.debug("magnet uri: %s", magnet)
             self.add_from_magnets([magnet])
@@ -848,7 +881,9 @@ class AddTorrentDialog(component.Component):
 
                 # Get the file path base once, since it will be the same for
                 # all siblings
-                file_path_base = self.get_file_path(self.files_treestore.iter_parent(row))
+                file_path_base = self.get_file_path(
+                    self.files_treestore.iter_parent(row)
+                )
 
                 # Iterate through all the siblings at this level
                 while row:
@@ -880,8 +915,9 @@ class AddTorrentDialog(component.Component):
                 for s in split_text[:-1]:
                     # We don't iterate over the last item because we'll just use
                     # the existing itr and change the text
-                    parent = self.files_treestore.append(parent,
-                                [True, s + os.path.sep, 0, -1, False, gtk.STOCK_DIRECTORY])
+                    parent = self.files_treestore.append(parent, [
+                        True, s + os.path.sep, 0, -1, False, gtk.STOCK_DIRECTORY
+                    ])
 
                 self.files_treestore[itr][1] = split_text[-1] + os.path.sep
 
@@ -900,3 +936,8 @@ class AddTorrentDialog(component.Component):
             # Walk through the tree from 'itr' and add all the new file paths
             # to the 'mapped_files' option
             walk_tree(itr)
+
+    def _on_alocation_toggled(self, widget):
+        full_allocation_active = self.glade.get_widget("radio_full").get_active()
+        self.glade.get_widget("chk_prioritize").set_sensitive(full_allocation_active)
+        self.glade.get_widget("chk_sequential_download").set_sensitive(full_allocation_active)
diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.glade b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
index d59c24d20..98d7aafc6 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.glade
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
@@ -1,8 +1,9 @@
-
+
 
-  
+  
   
   
+    False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
     5
     Add Torrents
@@ -12,24 +13,25 @@
     
       
         True
+        False
         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        vertical
         2
         
           
             True
             True
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            vertical
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 0
                 none
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     5
                     12
@@ -37,8 +39,8 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        vertical
                         
                           
                             True
@@ -58,12 +60,15 @@
                             
                           
                           
+                            True
+                            True
                             0
                           
                         
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             center
                             
@@ -72,16 +77,19 @@
                                 True
                                 True
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
                                 
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     4
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         gtk-open
                                         1
@@ -95,6 +103,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         _File
                                         True
@@ -120,16 +129,19 @@
                                 True
                                 True
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
                                 
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     4
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         gtk-network
                                         1
@@ -143,6 +155,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         _URL
                                         True
@@ -168,16 +181,19 @@
                                 True
                                 True
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
                                 
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     4
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         gtk-revert-to-saved
                                         1
@@ -191,6 +207,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         Info_hash
                                         True
@@ -216,15 +233,18 @@
                                 True
                                 True
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
                                 
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     4
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         gtk-remove
                                       
@@ -237,6 +257,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         _Remove
                                         True
@@ -270,6 +291,7 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     <b>Torrents</b>
                     True
@@ -313,25 +335,32 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         gtk-open
                       
                       
+                        True
+                        True
                         0
                       
                     
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         Fi_les
                         True
                       
                       
+                        True
+                        True
                         5
                         1
                       
@@ -345,19 +374,21 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     5
-                    vertical
                     5
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         0
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             5
                             5
@@ -365,14 +396,18 @@
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 
                                   
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     select-folder
                                     Select A Folder
                                   
                                   
+                                    True
+                                    True
                                     0
                                   
                                 
@@ -380,8 +415,14 @@
                                   
                                     True
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                    False
+                                    False
+                                    True
+                                    True
                                   
                                   
+                                    True
+                                    True
                                     1
                                   
                                 
@@ -392,6 +433,7 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             <b>Download Location</b>
                             True
@@ -410,25 +452,28 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         10
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             none
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 5
                                 12
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                    vertical
                                     
                                       
                                         Full
@@ -436,8 +481,10 @@
                                         True
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        False
                                         True
                                         True
+                                        
                                       
                                       
                                         False
@@ -452,8 +499,10 @@
                                         True
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        False
                                         True
                                         radio_full
+                                        
                                       
                                       
                                         False
@@ -468,6 +517,7 @@
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 <b>Allocation</b>
                                 True
@@ -486,18 +536,21 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             none
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 5
                                 12
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     4
                                     2
@@ -508,7 +561,11 @@
                                         True
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         1
-                                        -1 -1 9999 1 10 0
+                                        False
+                                        False
+                                        True
+                                        True
+                                        0 -1 9999 1 10 0
                                       
                                       
                                         1
@@ -520,6 +577,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         0
                                         Max Down Speed:
@@ -532,6 +590,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         0
                                         Max Up Speed:
@@ -546,6 +605,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         0
                                         Max Connections:
@@ -560,6 +620,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         0
                                         Max Upload Slots:
@@ -577,7 +638,11 @@
                                         True
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         1
-                                        -1 -1 9999 1 10 0
+                                        False
+                                        False
+                                        True
+                                        True
+                                        0 -1 9999 1 10 0
                                         if-valid
                                       
                                       
@@ -595,7 +660,11 @@
                                         True
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         1
-                                        -1 -1 9999 1 10 0
+                                        False
+                                        False
+                                        True
+                                        True
+                                        0 -1 9999 1 10 0
                                       
                                       
                                         1
@@ -612,7 +681,11 @@
                                         True
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         1
-                                        -1 -1 9999 1 10 0
+                                        False
+                                        False
+                                        True
+                                        True
+                                        0 -1 9999 1 10 0
                                       
                                       
                                         1
@@ -630,6 +703,7 @@
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 <b>Bandwidth</b>
                                 True
@@ -648,29 +722,30 @@
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             0
                             none
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 5
                                 12
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                    vertical
-                                    5
                                     
-                                      
-                                        Add In _Paused State
+                                      
+                                        Prioritize First/Last Pieces
                                         True
                                         True
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                        True
+                                        False
                                         True
                                       
                                       
@@ -680,12 +755,19 @@
                                       
                                     
                                     
-                                      
-                                        Prioritize First/Last Pieces
+                                      
+                                        Sequential Download
                                         True
                                         True
                                         False
-                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        True
+                                        When enabled, the piece picker will pick pieces in
+sequence instead of rarest first.
+
+Enabling sequential download will affect the piece
+distribution negatively in the swarm. It should be
+used sparingly.
+                                        False
                                         True
                                       
                                       
@@ -694,6 +776,23 @@
                                         1
                                       
                                     
+                                    
+                                      
+                                        Add In _Paused State
+                                        True
+                                        True
+                                        False
+                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        False
+                                        True
+                                        True
+                                      
+                                      
+                                        False
+                                        False
+                                        2
+                                      
+                                    
                                   
                                 
                               
@@ -701,6 +800,7 @@
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 <b>General</b>
                                 True
@@ -726,63 +826,13 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         5
-                        
-                          
-                            True
-                            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                            
-                              
-                                True
-                                True
-                                True
-                                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                
-                                
-                                  
-                                    True
-                                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                    
-                                      
-                                        True
-                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                        gtk-revert-to-saved
-                                      
-                                      
-                                        False
-                                        False
-                                        0
-                                      
-                                    
-                                    
-                                      
-                                        True
-                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                                        Revert To Defaults
-                                      
-                                      
-                                        False
-                                        False
-                                        5
-                                        1
-                                      
-                                    
-                                  
-                                
-                              
-                            
-                          
-                          
-                            False
-                            False
-                            end
-                            1
-                          
-                        
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
@@ -790,14 +840,17 @@
                                 True
                                 True
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
                                 
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         1
                                         gtk-apply
@@ -811,6 +864,7 @@
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         0
                                         Apply To All
@@ -834,6 +888,63 @@
                             0
                           
                         
+                        
+                          
+                            True
+                            False
+                            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                            
+                              
+                                True
+                                True
+                                True
+                                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                False
+                                
+                                
+                                  
+                                    True
+                                    False
+                                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                    
+                                      
+                                        True
+                                        False
+                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        gtk-revert-to-saved
+                                      
+                                      
+                                        False
+                                        False
+                                        0
+                                      
+                                    
+                                    
+                                      
+                                        True
+                                        False
+                                        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        Revert To Defaults
+                                      
+                                      
+                                        False
+                                        False
+                                        5
+                                        1
+                                      
+                                    
+                                  
+                                
+                              
+                            
+                          
+                          
+                            False
+                            False
+                            end
+                            1
+                          
+                        
                       
                       
                         False
@@ -849,25 +960,32 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         gtk-properties
                       
                       
+                        True
+                        True
                         0
                       
                     
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         _Options
                         True
                       
                       
+                        True
+                        True
                         5
                         1
                       
@@ -887,12 +1005,15 @@
             
           
           
+            True
+            True
             0
           
         
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             end
             
@@ -902,6 +1023,7 @@
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
                 
               
@@ -918,6 +1040,7 @@
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
                 
               
@@ -930,6 +1053,7 @@
           
           
             False
+            True
             end
             1
           
@@ -937,130 +1061,37 @@
       
     
   
-  
+  
     462
+    False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
     5
-    Add URL
+    Add Infohash
     center-on-parent
     True
     dialog
     False
-    False
     
-      
+      
         True
+        False
         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        vertical
         2
-        
-          
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            vertical
-            5
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                5
-                
-                  
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    gtk-add
-                  
-                  
-                    False
-                    False
-                    0
-                  
-                
-                
-                  
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    <b>From URL</b>
-                    True
-                  
-                  
-                    False
-                    False
-                    1
-                  
-                
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-              
-              
-                False
-                1
-              
-            
-            
-              
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                5
-                
-                  
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    URL:
-                  
-                  
-                    False
-                    False
-                    0
-                  
-                
-                
-                  
-                    True
-                    True
-                    True
-                    True
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    True
-                  
-                  
-                    1
-                  
-                
-              
-              
-                False
-                False
-                2
-              
-            
-          
-          
-            1
-          
-        
         
-          
+          
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             end
             
-              
+              
                 gtk-cancel
                 -6
                 True
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
               
               
@@ -1070,7 +1101,7 @@
               
             
             
-              
+              
                 gtk-ok
                 -5
                 True
@@ -1079,6 +1110,7 @@
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
               
               
@@ -1090,43 +1122,27 @@
           
           
             False
+            True
             end
             0
           
         
-      
-    
-  
-  
-    462
-    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-    5
-    Add Infohash
-    center-on-parent
-    True
-    dialog
-    False
-    False
-    
-      
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        vertical
-        2
         
           
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            vertical
             5
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 5
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     gtk-revert-to-saved
                   
@@ -1139,6 +1155,7 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     <b>From Infohash</b>
                     True
@@ -1159,21 +1176,25 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
               
               
                 False
+                True
                 1
               
             
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 5
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     Infohash:
                   
@@ -1191,8 +1212,14 @@
                     True
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     True
+                    False
+                    False
+                    True
+                    True
                   
                   
+                    True
+                    True
                     1
                   
                 
@@ -1206,10 +1233,12 @@
             
               
                 True
+                False
                 5
                 
                   
                     True
+                    False
                     0
                     Trackers:
                   
@@ -1234,32 +1263,59 @@
                     
                   
                   
+                    True
+                    True
                     1
                   
                 
               
               
+                True
+                True
                 3
               
             
           
           
+            True
+            True
             1
           
         
+      
+    
+  
+  
+    462
+    False
+    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+    5
+    Add URL
+    center-on-parent
+    True
+    dialog
+    False
+    
+      
+        True
+        False
+        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+        2
         
-          
+          
             True
+            False
             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
             end
             
-              
+              
                 gtk-cancel
                 -6
                 True
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
               
               
@@ -1269,7 +1325,7 @@
               
             
             
-              
+              
                 gtk-ok
                 -5
                 True
@@ -1278,6 +1334,7 @@
                 True
                 True
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
                 True
               
               
@@ -1289,10 +1346,121 @@
           
           
             False
+            True
             end
             0
           
         
+        
+          
+            True
+            False
+            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+            5
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                5
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    gtk-add
+                  
+                  
+                    False
+                    False
+                    0
+                  
+                
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    <b>From URL</b>
+                    True
+                  
+                  
+                    False
+                    False
+                    1
+                  
+                
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+              
+              
+                False
+                True
+                1
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                5
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    URL:
+                  
+                  
+                    False
+                    False
+                    0
+                  
+                
+                
+                  
+                    True
+                    True
+                    True
+                    True
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    True
+                    False
+                    False
+                    True
+                    True
+                  
+                  
+                    True
+                    True
+                    1
+                  
+                
+              
+              
+                False
+                False
+                2
+              
+            
+          
+          
+            True
+            True
+            1
+          
+        
       
     
   

From ce3ce2c035e086e5999e1dd2938e4238b2801f68 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 23:11:51 +0100
Subject: [PATCH 247/329] Sequential downloads: Implemented in GTK UI
 preferences dialog.

---
 deluge/ui/gtkui/glade/main_window.glade | 181 ++++--------------------
 deluge/ui/gtkui/preferences.py          |  53 +++++--
 2 files changed, 71 insertions(+), 163 deletions(-)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index df8646974..40665cab8 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -635,152 +635,6 @@
       
     
   
-  
-    True
-    False
-    
-      
-        gtk-open
-        True
-        False
-        False
-        True
-        True
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Expand All
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-zoom-fit
-            1
-          
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Do Not Download
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-no
-            1
-          
-        
-      
-    
-    
-      
-        _Normal Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-yes
-            1
-          
-        
-      
-    
-    
-      
-        _High Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-go-up
-            1
-          
-        
-      
-    
-    
-      
-        Hi_ghest Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-goto-top
-            1
-          
-        
-      
-    
-  
-  
-    True
-    False
-    
-      
-        _Add Peer
-        True
-        False
-        Add a peer by its IP
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-add
-            1
-          
-        
-      
-    
-  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -2499,7 +2353,7 @@
                                     False
                                     True
                                     True
-                                    -1 -1 999999 1 10 0
+                                    0 -1 999999 1 10 0
                                     
                                   
                                   
@@ -2521,7 +2375,7 @@
                                     False
                                     True
                                     True
-                                    -1 -1 99999 1 10 0
+                                    0 -1 99999 1 10 0
                                     1
                                     
                                   
@@ -2544,7 +2398,7 @@
                                     False
                                     True
                                     True
-                                    -1 -1 999999 1 10 0
+                                    0 -1 999999 1 10 0
                                     1
                                     
                                   
@@ -2647,7 +2501,7 @@
                                     False
                                     True
                                     True
-                                    -1 -1 999999 1 10 0
+                                    0 -1 999999 1 10 0
                                     
                                   
                                   
@@ -2932,6 +2786,29 @@
                                         1
                                       
                                     
+                                    
+                                      
+                                        Sequential Download
+                                        True
+                                        True
+                                        False
+                                        True
+                                        When enabled, the piece picker will pick pieces in
+sequence instead of rarest first.
+
+Enabling sequential download will affect the piece
+distribution negatively in the swarm. It should be
+used sparingly.
+                                        False
+                                        True
+                                        
+                                      
+                                      
+                                        True
+                                        True
+                                        2
+                                      
+                                    
                                     
                                       
                                         Shared
@@ -2946,7 +2823,7 @@
                                       
                                         True
                                         True
-                                        2
+                                        3
                                       
                                     
                                     
@@ -2994,7 +2871,7 @@
                                       
                                         False
                                         False
-                                        3
+                                        4
                                       
                                     
                                   
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index 18e3bd653..96950e0da 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -45,7 +45,6 @@ import pkg_resources
 import deluge.component as component
 from deluge.ui.client import client
 import deluge.common
-import deluge.error
 import common
 import dialogs
 from deluge.configmanager import ConfigManager
@@ -152,7 +151,8 @@ class Preferences(component.Component):
             "on_button_associate_magnet_clicked": self._on_button_associate_magnet_clicked,
             "on_accounts_add_clicked": self._on_accounts_add_clicked,
             "on_accounts_delete_clicked": self._on_accounts_delete_clicked,
-            "on_accounts_edit_clicked": self._on_accounts_edit_clicked
+            "on_accounts_edit_clicked": self._on_accounts_edit_clicked,
+            "on_alocation_toggled": self._on_alocation_toggled
         })
 
         # These get updated by requests done to the core
@@ -282,6 +282,9 @@ class Preferences(component.Component):
                 "chk_prioritize_first_last_pieces": \
                     ("active",
                         self.core_config["prioritize_first_last_pieces"]),
+                "chk_sequential_download": \
+                    ("active",
+                        self.core_config["sequential_download"]),
                 "chk_add_paused": ("active", self.core_config["add_paused"]),
                 "spin_port_min": ("value", self.core_config["listen_ports"][0]),
                 "spin_port_max": ("value", self.core_config["listen_ports"][1]),
@@ -349,28 +352,44 @@ class Preferences(component.Component):
             }
             # Add proxy stuff
             for t in ("peer", "web_seed", "tracker", "dht"):
-                core_widgets["spin_proxy_port_%s" % t] = ("value", self.core_config["proxies"][t]["port"])
-                core_widgets["combo_proxy_type_%s" % t] = ("active", self.core_config["proxies"][t]["type"])
-                core_widgets["txt_proxy_server_%s" % t] = ("text", self.core_config["proxies"][t]["hostname"])
-                core_widgets["txt_proxy_username_%s" % t] = ("text", self.core_config["proxies"][t]["username"])
-                core_widgets["txt_proxy_password_%s" % t] = ("text", self.core_config["proxies"][t]["password"])
+                core_widgets["spin_proxy_port_%s" % t] = (
+                    "value", self.core_config["proxies"][t]["port"]
+                )
+                core_widgets["combo_proxy_type_%s" % t] = (
+                    "active", self.core_config["proxies"][t]["type"]
+                )
+                core_widgets["txt_proxy_server_%s" % t] = (
+                    "text", self.core_config["proxies"][t]["hostname"]
+                )
+                core_widgets["txt_proxy_username_%s" % t] = (
+                    "text", self.core_config["proxies"][t]["username"]
+                )
+                core_widgets["txt_proxy_password_%s" % t] = (
+                    "text", self.core_config["proxies"][t]["password"]
+                )
 
             # Change a few widgets if we're connected to a remote host
             if not client.is_localhost():
                 self.glade.get_widget("entry_download_path").show()
                 self.glade.get_widget("download_path_button").hide()
                 core_widgets.pop("download_path_button")
-                core_widgets["entry_download_path"] = ("text", self.core_config["download_location"])
+                core_widgets["entry_download_path"] = (
+                    "text", self.core_config["download_location"]
+                )
 
                 self.glade.get_widget("entry_move_completed_path").show()
                 self.glade.get_widget("move_completed_path_button").hide()
                 core_widgets.pop("move_completed_path_button")
-                core_widgets["entry_move_completed_path"] = ("text", self.core_config["move_completed_path"])
+                core_widgets["entry_move_completed_path"] = (
+                    "text", self.core_config["move_completed_path"]
+                )
 
                 self.glade.get_widget("entry_torrents_path").show()
                 self.glade.get_widget("torrent_files_button").hide()
                 core_widgets.pop("torrent_files_button")
-                core_widgets["entry_torrents_path"] = ("text", self.core_config["torrentfiles_location"])
+                core_widgets["entry_torrents_path"] = (
+                    "text", self.core_config["torrentfiles_location"]
+                )
             else:
                 self.glade.get_widget("entry_download_path").hide()
                 self.glade.get_widget("download_path_button").show()
@@ -419,6 +438,7 @@ class Preferences(component.Component):
                 "radio_compact_allocation",
                 "radio_full_allocation",
                 "chk_prioritize_first_last_pieces",
+                "chk_sequential_download",
                 "chk_add_paused",
                 "spin_port_min",
                 "spin_port_max",
@@ -539,7 +559,8 @@ class Preferences(component.Component):
         """
         Sets all altered config values in the core.
 
-        :param hide: bool, if True, will not re-show the dialog and will hide it instead
+        :param hide: bool, if True, will not re-show the dialog and will hide
+        it instead
         """
         try:
             from hashlib import sha1 as sha_hash
@@ -583,6 +604,11 @@ class Preferences(component.Component):
         new_core_config["prioritize_first_last_pieces"] = \
             self.glade.get_widget(
                 "chk_prioritize_first_last_pieces").get_active()
+        new_core_config["sequential_download"] = \
+            self.glade.get_widget("chk_sequential_download").get_active()
+        new_core_config["sequential_download"] = \
+            self.glade.get_widget("radio_compact_allocation").get_active() and \
+            False or self.glade.get_widget("chk_sequential_download").get_active()
         new_core_config["add_paused"] = \
             self.glade.get_widget("chk_add_paused").get_active()
 
@@ -1179,3 +1205,8 @@ class Preferences(component.Component):
                     username
                 ).addCallback(remove_ok).addErrback(remove_fail)
         dialog.run().addCallback(dialog_finished)
+
+    def _on_alocation_toggled(self, widget):
+        full_allocation_active = self.glade.get_widget("radio_full_allocation").get_active()
+        self.glade.get_widget("chk_prioritize_first_last_pieces").set_sensitive(full_allocation_active)
+        self.glade.get_widget("chk_sequential_download").set_sensitive(full_allocation_active)

From 3b676eca403dffd185ea63b991a0760725fd8817 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 23:33:21 +0100
Subject: [PATCH 248/329] Sequential downloads: Implemented in GTK UI torrent
 options tab.

---
 .../ui/gtkui/glade/preferences_dialog.glade   | 862 ++++++++++++++++--
 deluge/ui/gtkui/options_tab.py                |  77 +-
 2 files changed, 864 insertions(+), 75 deletions(-)

diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 05ea703ff..9dfb2c5f4 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -1,8 +1,9 @@
 
 
-  
+  
   
   
+    False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
     5
     Preferences
@@ -15,8 +16,74 @@
     
       
         True
+        False
         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
         2
+        
+          
+            True
+            False
+            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+            end
+            
+              
+                gtk-cancel
+                True
+                True
+                True
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
+                True
+                
+              
+              
+                False
+                False
+                0
+              
+            
+            
+              
+                gtk-apply
+                True
+                True
+                True
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
+                True
+                
+              
+              
+                False
+                False
+                1
+              
+            
+            
+              
+                gtk-ok
+                True
+                True
+                True
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                False
+                True
+                
+              
+              
+                False
+                False
+                2
+              
+            
+          
+          
+            False
+            True
+            end
+            0
+          
+        
         
           
             True
@@ -25,6 +92,7 @@
             
               
                 True
+                False
                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                 queue
                 
@@ -57,16 +125,19 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -76,42 +147,50 @@
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         5
                                         2
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 5
                                                 
@@ -133,26 +212,37 @@
                                         
                                           
                                             True
+                                            False
                                             
                                               
                                                 True
+                                                False
                                                 5
                                                 
                                                   
                                                     True
+                                                    False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     select-folder
                                                     Select A Folder
                                                   
                                                   
+                                                    True
+                                                    True
                                                     0
                                                   
                                                 
                                                 
                                                   
                                                     True
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                   
                                                   
+                                                    True
+                                                    True
                                                     1
                                                   
                                                 
@@ -172,6 +262,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             
                                           
@@ -184,17 +275,21 @@
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             
                                               
                                                 True
                                                 False
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 select-folder
                                                 Select A Folder
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
@@ -202,8 +297,14 @@
                                               
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -216,6 +317,7 @@
                                         
                                           
                                             True
+                                            False
                                             0
                                             Download to:
                                           
@@ -229,6 +331,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             
                                           
@@ -241,20 +344,25 @@
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 5
                                                 
                                                   
                                                     True
+                                                    False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     select-folder
                                                     Select A Folder
                                                   
                                                   
+                                                    True
+                                                    True
                                                     0
                                                   
                                                 
@@ -263,8 +371,14 @@
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     ●
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                   
                                                   
+                                                    True
+                                                    True
                                                     1
                                                   
                                                 
@@ -285,6 +399,7 @@
                                             True
                                             False
                                             Delete the copy of the torrent file created when the torrent is removed
+                                            False
                                             True
                                           
                                           
@@ -304,6 +419,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Folders</b>
                                     True
                                   
@@ -322,17 +438,20 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         10
                                         
@@ -343,8 +462,10 @@
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             Full allocation preallocates all of the space that is needed for the torrent and prevents disk fragmentation
+                                            False
                                             True
                                             True
+                                            
                                           
                                           
                                             False
@@ -360,8 +481,10 @@
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             Compact allocation only allocates space as needed
+                                            False
                                             True
                                             radio_full_allocation
+                                            
                                           
                                           
                                             False
@@ -376,6 +499,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Allocation</b>
                                     True
                                   
@@ -394,17 +518,20 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             Prioritize first and last pieces of torrent
@@ -413,23 +540,49 @@
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             Prioritize first and last pieces of files in torrent
+                                            False
                                             True
                                           
                                           
                                             False
+                                            True
                                             0
                                           
                                         
+                                        
+                                          
+                                            Sequential download
+                                            True
+                                            True
+                                            False
+                                            When enabled, the piece picker will pick pieces in
+sequence instead of rarest first.
+
+Enabling sequential download will affect the piece
+distribution negatively in the swarm. It should be
+used sparingly.
+                                            False
+                                            True
+                                          
+                                          
+                                            True
+                                            True
+                                            1
+                                          
+                                        
                                         
                                           
                                             Add torrents in Paused state
                                             True
                                             True
                                             False
+                                            False
                                             True
                                           
                                           
-                                            1
+                                            True
+                                            True
+                                            2
                                           
                                         
                                       
@@ -439,6 +592,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Options</b>
                                     True
                                   
@@ -463,6 +617,7 @@
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     page 6
                   
@@ -481,16 +636,19 @@
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -500,36 +658,43 @@
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             20
                                             
@@ -540,11 +705,13 @@
                                                 False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 Deluge will automatically choose a different port to use every time.
+                                                False
                                                 True
                                                 
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 0
                                               
@@ -552,16 +719,19 @@
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 
                                                   
                                                     True
+                                                    False
                                                     1
                                                     Active Port:
                                                     right
                                                   
                                                   
                                                     False
+                                                    True
                                                     5
                                                     0
                                                   
@@ -569,12 +739,14 @@
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     0000
                                                     5
                                                   
                                                   
                                                     False
+                                                    True
                                                     5
                                                     1
                                                   
@@ -582,12 +754,15 @@
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 1
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             5
                                             0
                                           
@@ -595,13 +770,16 @@
                                         
                                           
                                             True
+                                            False
                                             
                                               
                                                 True
+                                                False
                                                 From:
                                               
                                               
                                                 False
+                                                True
                                                 0
                                               
                                             
@@ -612,6 +790,10 @@
                                                 True
                                                 5
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 0 65535 1 10 0
                                                 1
                                                 True
@@ -619,6 +801,7 @@
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 1
                                               
@@ -626,6 +809,7 @@
                                             
                                               
                                                 True
+                                                False
                                                 5
                                                 To:
                                               
@@ -642,6 +826,10 @@
                                                 True
                                                 5
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 0 65535 1 10 0
                                                 1
                                                 True
@@ -649,6 +837,7 @@
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 3
                                               
@@ -660,6 +849,7 @@
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
                                                 
                                               
                                               
@@ -671,20 +861,25 @@
                                             
                                               
                                                 True
+                                                False
                                                 5
                                                 
                                                   
+                                                    False
                                                     gtk-missing-image
                                                   
                                                 
                                               
                                               
                                                 False
+                                                True
                                                 5
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             5
                                             1
                                           
@@ -696,6 +891,7 @@
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Incoming Ports</b>
                                     True
@@ -707,6 +903,7 @@
                               
                               
                                 False
+                                True
                                 5
                                 2
                               
@@ -714,16 +911,19 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     5
                                     12
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
@@ -731,6 +931,7 @@
                                             True
                                             True
                                             False
+                                            False
                                             True
                                             
                                           
@@ -743,10 +944,12 @@
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
                                                 True
+                                                False
                                                 From:
                                               
                                               
@@ -762,6 +965,10 @@
                                                 True
                                                 5
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 0 65535 1 10 0
                                                 1
                                                 True
@@ -769,6 +976,7 @@
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 1
                                               
@@ -776,6 +984,7 @@
                                             
                                               
                                                 True
+                                                False
                                                 To:
                                               
                                               
@@ -791,6 +1000,10 @@
                                                 True
                                                 5
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 0 65535 1 10 0
                                                 1
                                                 True
@@ -798,12 +1011,15 @@
                                               
                                               
                                                 False
+                                                True
                                                 5
                                                 3
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             1
                                           
                                         
@@ -814,6 +1030,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Outgoing Ports</b>
                                     True
                                   
@@ -831,17 +1048,20 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             True
@@ -850,6 +1070,10 @@
                                             60
                                             ●
                                             30
+                                            False
+                                            False
+                                            True
+                                            True
                                           
                                           
                                             False
@@ -867,6 +1091,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Interface</b>
                                     True
                                   
@@ -884,24 +1109,29 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
                                                 True
+                                                False
                                                 The TOS byte set in the IP header of every packet sent to peers (including web seeds).  Expects a Hex value.
                                                 Peer TOS Byte:
                                               
@@ -917,6 +1147,10 @@
                                                 True
                                                 4
                                                 0x00
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 False
@@ -926,6 +1160,8 @@
                                             
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
@@ -936,6 +1172,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>TOS</b>
                                     True
                                   
@@ -946,6 +1183,7 @@
                               
                               
                                 False
+                                True
                                 5
                                 5
                               
@@ -953,17 +1191,20 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         2
                                         3
                                         5
@@ -974,6 +1215,7 @@
                                             True
                                             False
                                             Universal Plug and Play
+                                            False
                                             True
                                             True
                                             True
@@ -989,6 +1231,7 @@
                                             True
                                             False
                                             NAT Port Mapping Protocol
+                                            False
                                             True
                                             True
                                             True
@@ -1006,6 +1249,7 @@
                                             True
                                             False
                                             Peer Exchange
+                                            False
                                             True
                                             True
                                             True
@@ -1024,6 +1268,7 @@
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             Local Service Discovery finds local peers on your network.
+                                            False
                                             True
                                           
                                           
@@ -1039,6 +1284,7 @@
                                             True
                                             False
                                             Distributed hash table may improve the amount of active connections.
+                                            False
                                             True
                                             True
                                           
@@ -1060,6 +1306,7 @@
                                 
                                   
                                     True
+                                    False
                                     <b>Network Extras</b>
                                     True
                                   
@@ -1070,6 +1317,7 @@
                               
                               
                                 False
+                                True
                                 5
                                 6
                               
@@ -1077,40 +1325,50 @@
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         5
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 1
                                                 Inbound:
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Level:
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -1124,26 +1382,33 @@
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 Forced
 Enabled
 Disabled
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
                                             
                                               
                                                 True
+                                                False
                                                 Handshake
 Full Stream
 Either
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -1157,14 +1422,17 @@ Either
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 
                                                   
                                                     True
+                                                    False
                                                     1
                                                     Outbound:
                                                   
@@ -1177,17 +1445,21 @@ Either
                                                 
                                                   
                                                     True
+                                                    False
                                                     Forced
 Enabled
 Disabled
                                                   
                                                   
                                                     False
+                                                    True
                                                     1
                                                   
                                                 
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
@@ -1197,17 +1469,21 @@ Disabled
                                                 True
                                                 True
                                                 False
+                                                False
                                                 True
                                                 True
                                               
                                               
                                                 False
+                                                True
                                                 3
                                                 1
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             2
                                           
                                         
@@ -1218,6 +1494,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     <b>Encryption</b>
                                     True
                                   
@@ -1245,6 +1522,7 @@ Disabled
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     page 7
                   
@@ -1264,16 +1542,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -1283,37 +1564,44 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             6
                                             2
@@ -1323,6 +1611,10 @@ Disabled
                                                 True
                                                 True
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 9999 1 10 0
                                                 True
                                               
@@ -1339,6 +1631,10 @@ Disabled
                                                 True
                                                 True
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 9999 1 10 0
                                                 True
                                               
@@ -1353,6 +1649,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Maximum Connection Attempts per Second:
                                               
@@ -1365,6 +1662,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Maximum Half-Open Connections:
                                               
@@ -1377,6 +1675,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 The maximum upload speed for all torrents.  Set -1 for unlimited.
                                                 0
                                                 Maximum Upload Speed (KiB/s):
@@ -1390,6 +1689,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 The maximum number of connections allowed.  Set -1 for unlimited.
                                                 0
                                                 Maximum Connections:
@@ -1401,6 +1701,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 The maximum upload slots for all torrents.  Set -1 for unlimited.
                                                 0
                                                 Maximum Upload Slots:
@@ -1418,6 +1719,10 @@ Disabled
                                                 The maximum number of connections allowed.  Set -1 for unlimited.
                                                 4
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 9000 1 10 0
                                                 1
                                                 True
@@ -1433,6 +1738,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 The maximum download speed for all torrents.  Set -1 for unlimited.
                                                 0
                                                 Maximum Download Speed (KiB/s):
@@ -1450,6 +1756,10 @@ Disabled
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 The maximum download speed for all torrents.  Set -1 for unlimited.
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 60000 1 10 0
                                                 1
                                                 1
@@ -1469,6 +1779,10 @@ Disabled
                                                 True
                                                 The maximum upload speed for all torrents.  Set -1 for unlimited.
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 60000 1 10 0
                                                 1
                                                 1
@@ -1488,6 +1802,10 @@ Disabled
                                                 True
                                                 The maximum upload slots for all torrents.  Set -1 for unlimited.
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 -1 9000 1 10 0
                                                 1
                                                 True
@@ -1503,12 +1821,15 @@ Disabled
                                             
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
@@ -1516,18 +1837,22 @@ Disabled
                                                 True
                                                 True
                                                 False
+                                                False
                                                 True
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             1
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
@@ -1536,12 +1861,15 @@ Disabled
                                                 True
                                                 False
                                                 If checked, the estimated TCP/IP overhead is drained from the rate limiters, to avoid exceeding the limits with the total traffic
+                                                False
                                                 True
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             2
                                           
                                         
@@ -1552,6 +1880,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     <b>Global Bandwidth Usage</b>
                                     True
                                   
@@ -1570,12 +1899,14 @@ Disabled
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     2
@@ -1583,6 +1914,7 @@ Disabled
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         4
                                         2
@@ -1593,6 +1925,10 @@ Disabled
                                             True
                                             The maximum upload slots per torrent.  Set -1 for unlimited.
                                             1
+                                            False
+                                            False
+                                            True
+                                            True
                                             0 -1 9000 1 10 0
                                             1
                                             True
@@ -1612,6 +1948,10 @@ Disabled
                                             True
                                             The maximum number of connections per torrent.  Set -1 for unlimited.
                                             1
+                                            False
+                                            False
+                                            True
+                                            True
                                             0 -1 9000 1 10 0
                                             True
                                             True
@@ -1625,6 +1965,7 @@ Disabled
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             0
                                             Maximum Connections:
@@ -1636,6 +1977,7 @@ Disabled
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             0
                                             Maximum Upload Slots:
@@ -1649,6 +1991,7 @@ Disabled
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             0
                                             Maximum Download Speed (KiB/s):
@@ -1662,6 +2005,7 @@ Disabled
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             0
                                             Maximum Upload Speed (KiB/s):
@@ -1678,6 +2022,10 @@ Disabled
                                             True
                                             The maximum number of connections per torrent.  Set -1 for unlimited.
                                             1
+                                            False
+                                            False
+                                            True
+                                            True
                                             0 -1 9000 1 10 0
                                             1
                                             True
@@ -1696,6 +2044,10 @@ Disabled
                                             True
                                             The maximum number of connections per torrent.  Set -1 for unlimited.
                                             1
+                                            False
+                                            False
+                                            True
+                                            True
                                             0 -1 9000 1 10 0
                                             1
                                             True
@@ -1715,6 +2067,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Per Torrent Bandwidth Usage</b>
                                     True
@@ -1726,6 +2079,7 @@ Disabled
                               
                               
                                 False
+                                True
                                 5
                                 3
                               
@@ -1742,6 +2096,7 @@ Disabled
                 
                   
                     True
+                    False
                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                     page 8
                   
@@ -1761,16 +2116,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -1780,28 +2138,33 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     2
@@ -1814,6 +2177,7 @@ Disabled
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         Classic Mode will hide most of the daemon functionality and will make Deluge appear to be a single application.  Use this if you do not want to take advantage of running Deluge as a daemon. You need to restart Deluge for this setting to take effect.
+                                        False
                                         True
                                       
                                     
@@ -1822,6 +2186,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Classic Mode</b>
                                     True
@@ -1841,17 +2206,20 @@ Disabled
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
@@ -1860,9 +2228,12 @@ Disabled
                                             True
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                            False
                                             True
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
@@ -1873,6 +2244,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     <b>Main Window</b>
                                     True
                                   
@@ -1891,17 +2263,20 @@ Disabled
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
@@ -1910,16 +2285,20 @@ Disabled
                                             True
                                             False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                            False
                                             True
                                             
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
@@ -1928,11 +2307,14 @@ Disabled
                                                 True
                                                 False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             1
                                           
                                         
@@ -1943,6 +2325,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     <b>Add Torrents Dialog</b>
                                     True
                                   
@@ -1961,34 +2344,41 @@ Disabled
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     2
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             Enable system tray icon
                                             True
                                             False
                                             False
+                                            False
                                             True
                                             True
                                             
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             10
                                             
                                               
@@ -1997,18 +2387,22 @@ Disabled
                                                 False
                                                 False
                                                 False
+                                                False
                                                 True
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             1
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             10
                                             
                                               
@@ -2017,18 +2411,22 @@ Disabled
                                                 False
                                                 False
                                                 False
+                                                False
                                                 True
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             2
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             10
                                             
                                               
@@ -2037,18 +2435,22 @@ Disabled
                                                 False
                                                 False
                                                 False
+                                                False
                                                 True
                                                 True
                                               
                                             
                                           
                                           
+                                            True
+                                            True
                                             3
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             3
                                             10
                                             
@@ -2058,6 +2460,7 @@ Disabled
                                                 False
                                                 True
                                                 False
+                                                False
                                                 True
                                                 True
                                                 
@@ -2066,27 +2469,32 @@ Disabled
                                           
                                           
                                             False
+                                            True
                                             4
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             20
                                             
                                               
                                                 True
+                                                False
                                                 5
                                                 
                                                   
                                                     True
                                                     False
+                                                    False
                                                     0
                                                     Password:
                                                   
                                                   
                                                     False
+                                                    True
                                                     0
                                                   
                                                 
@@ -2099,9 +2507,14 @@ Disabled
                                                     False
                                                     16
                                                     ********
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                   
                                                   
                                                     False
+                                                    True
                                                     1
                                                   
                                                 
@@ -2109,6 +2522,8 @@ Disabled
                                             
                                           
                                           
+                                            True
+                                            True
                                             5
                                           
                                         
@@ -2119,6 +2534,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     <b>System Tray</b>
                                     True
                                   
@@ -2129,6 +2545,7 @@ Disabled
                               
                               
                                 False
+                                True
                                 5
                                 5
                               
@@ -2145,6 +2562,7 @@ Disabled
                 
                   
                     True
+                    False
                     page 10
                   
                   
@@ -2163,16 +2581,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -2182,38 +2603,45 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
@@ -2223,6 +2651,7 @@ Disabled
                                                 False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 Deluge will check our servers and will tell you if a newer version has been released
+                                                False
                                                 True
                                               
                                             
@@ -2240,6 +2669,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Updates</b>
                                     True
@@ -2259,22 +2689,26 @@ Disabled
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             0
                                             Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types.  Absolutely no other information is sent.
@@ -2290,6 +2724,7 @@ Disabled
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             10
                                             
@@ -2299,12 +2734,14 @@ Disabled
                                                 True
                                                 False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
                                                 True
                                               
                                             
                                           
                                           
                                             False
+                                            True
                                             1
                                           
                                         
@@ -2315,6 +2752,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>System Information</b>
                                     True
@@ -2334,30 +2772,36 @@ Disabled
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
                                                 True
+                                                False
                                                 5
                                                 
                                                   
                                                     True
+                                                    False
                                                     Location:
                                                   
                                                   
@@ -2372,8 +2816,14 @@ Disabled
                                                     True
                                                     If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country.
                                                     ●
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                   
                                                   
+                                                    True
+                                                    True
                                                     1
                                                   
                                                 
@@ -2393,6 +2843,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>GeoIP Database</b>
                                     True
@@ -2412,36 +2863,46 @@ Disabled
                             
                               
                                 True
+                                False
                                 12
                                 
                                   
                                     True
+                                    False
                                     start
                                     
                                       
                                         True
                                         True
                                         True
+                                        False
                                         
                                         
                                           
                                             True
+                                            False
                                             2
                                             
                                               
                                                 True
+                                                False
                                                 gtk-missing-image
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
                                             
                                               
                                                 True
+                                                False
                                                 Associate Magnet links with Deluge
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -2475,6 +2936,7 @@ Disabled
                 
                   
                     True
+                    False
                     page 11
                   
                   
@@ -2493,16 +2955,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -2512,43 +2977,51 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     2
                                     12
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 Daemon port:
                                               
@@ -2564,6 +3037,10 @@ Disabled
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 1
+                                                False
+                                                False
+                                                True
+                                                True
                                                 0 0 65535 1 10 0
                                               
                                               
@@ -2586,6 +3063,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Port</b>
                                     True
@@ -2605,12 +3083,14 @@ Disabled
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     5
                                     10
@@ -2621,6 +3101,7 @@ Disabled
                                         True
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        False
                                         True
                                       
                                     
@@ -2629,6 +3110,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Connections</b>
                                     True
@@ -2648,12 +3130,14 @@ Disabled
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     5
                                     10
@@ -2664,6 +3148,7 @@ Disabled
                                         True
                                         False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                        False
                                         True
                                       
                                     
@@ -2672,6 +3157,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     <b>Other</b>
                                     True
@@ -2691,15 +3177,18 @@ Disabled
                             
                               
                                 True
+                                False
                                 0
                                 none
                                 
                                   
                                     True
+                                    False
                                     12
                                     
                                       
                                         True
+                                        False
                                         
                                           
                                             True
@@ -2707,12 +3196,15 @@ Disabled
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                           
                                           
+                                            True
+                                            True
                                             0
                                           
                                         
                                         
                                           
                                             True
+                                            False
                                             5
                                             True
                                             start
@@ -2722,6 +3214,7 @@ Disabled
                                                 True
                                                 True
                                                 True
+                                                False
                                                 True
                                                 
                                               
@@ -2738,6 +3231,7 @@ Disabled
                                                 False
                                                 True
                                                 True
+                                                False
                                                 True
                                                 
                                               
@@ -2754,6 +3248,7 @@ Disabled
                                                 False
                                                 True
                                                 True
+                                                False
                                                 True
                                                 
                                               
@@ -2766,6 +3261,7 @@ Disabled
                                           
                                           
                                             False
+                                            True
                                             4
                                             1
                                           
@@ -2777,6 +3273,7 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     0
                                     10
@@ -2790,6 +3287,8 @@ Disabled
                                 
                               
                               
+                                True
+                                True
                                 5
                               
                             
@@ -2805,6 +3304,7 @@ Disabled
                 
                   
                     True
+                    False
                     page 11
                   
                   
@@ -2823,16 +3323,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -2842,39 +3345,46 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 5
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         5
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             
                                               
@@ -2883,9 +3393,12 @@ Disabled
                                                 True
                                                 False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
                                                 True
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
@@ -2896,6 +3409,7 @@ Disabled
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         <b>General</b>
                                         True
@@ -2914,22 +3428,26 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         5
                                         12
                                         
                                           
                                             True
+                                            False
                                             5
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 3
                                                 2
@@ -2940,6 +3458,10 @@ Disabled
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     0 -1 9999 1 10 0
                                                     True
                                                     True
@@ -2956,6 +3478,10 @@ Disabled
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     0 -1 9999 1 10 0
                                                     True
                                                     True
@@ -2971,6 +3497,7 @@ Disabled
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     Total active seeding:
                                                   
@@ -2983,6 +3510,7 @@ Disabled
                                                 
                                                   
                                                     True
+                                                    False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     0
                                                     Total active:
@@ -2997,6 +3525,10 @@ Disabled
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     0 -1 9999 1 10 0
                                                     True
                                                     True
@@ -3012,6 +3544,7 @@ Disabled
                                                 
                                                   
                                                     True
+                                                    False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     0
                                                     Total active downloading:
@@ -3024,6 +3557,8 @@ Disabled
                                                 
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
@@ -3033,9 +3568,12 @@ Disabled
                                                 True
                                                 True
                                                 False
+                                                False
                                                 True
                                               
                                               
+                                                True
+                                                True
                                                 1
                                               
                                             
@@ -3046,6 +3584,7 @@ Disabled
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         <b>Active Torrents</b>
                                         True
@@ -3064,29 +3603,34 @@ Disabled
                                 
                                   
                                     True
+                                    False
                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         5
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             2
                                             
                                               
                                                 True
+                                                False
                                                 3
                                                 2
                                                 10
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     Share Ratio Limit:
                                                   
@@ -3097,6 +3641,7 @@ Disabled
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     Seed Time Ratio:
                                                   
@@ -3109,6 +3654,7 @@ Disabled
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     Seed Time (m):
                                                   
@@ -3124,6 +3670,10 @@ Disabled
                                                     True
                                                     6
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     1.5 -1 100 0.10000000000000001 10 0
                                                     2
                                                   
@@ -3139,6 +3689,10 @@ Disabled
                                                     True
                                                     6
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     6 -1 100 0.10000000000000001 10 0
                                                     2
                                                   
@@ -3156,6 +3710,10 @@ Disabled
                                                     True
                                                     6
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     6 -1 10000 1 10 0
                                                   
                                                   
@@ -3168,12 +3726,15 @@ Disabled
                                                 
                                               
                                               
+                                                True
+                                                True
                                                 0
                                               
                                             
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 5
                                                 
@@ -3183,6 +3744,7 @@ Disabled
                                                     True
                                                     False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
                                                     True
                                                     
                                                   
@@ -3199,6 +3761,10 @@ Disabled
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     2 0.5 100 0.10000000000000001 1 0
                                                     2
                                                     True
@@ -3219,6 +3785,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 10
                                                 
@@ -3229,11 +3796,14 @@ Disabled
                                                     True
                                                     False
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
                                                     True
                                                   
                                                 
                                               
                                               
+                                                True
+                                                True
                                                 2
                                               
                                             
@@ -3244,6 +3814,7 @@ Disabled
                                     
                                       
                                         True
+                                        False
                                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                         <b>Seeding</b>
                                         True
@@ -3261,6 +3832,8 @@ Disabled
                                 
                               
                               
+                                True
+                                True
                                 5
                                 2
                               
@@ -3277,6 +3850,7 @@ Disabled
                 
                   
                     True
+                    False
                     page 12
                   
                   
@@ -3295,16 +3869,19 @@ Disabled
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -3314,35 +3891,42 @@ Disabled
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 5
                                 
                                   
                                     True
+                                    False
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         12
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             2
@@ -3350,6 +3934,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Password:
@@ -3366,6 +3951,10 @@ Disabled
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 False
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3378,6 +3967,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Host:
                                               
@@ -3392,6 +3982,10 @@ Disabled
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3403,6 +3997,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Port:
                                               
@@ -3415,6 +4010,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 0
                                                 
@@ -3422,6 +4018,10 @@ Disabled
                                                     True
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     100 0 65535 1 10 0
                                                     True
                                                   
@@ -3440,6 +4040,10 @@ Disabled
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3452,6 +4056,7 @@ Disabled
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 None
 Socksv4
@@ -3471,6 +4076,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Type:
@@ -3483,6 +4089,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Username:
@@ -3500,6 +4107,7 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         <b>Peer</b>
                                         True
                                       
@@ -3517,16 +4125,19 @@ HTTP W/ Auth
                                 
                                   
                                     True
+                                    False
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         12
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             2
@@ -3534,6 +4145,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Password:
@@ -3550,6 +4162,10 @@ HTTP W/ Auth
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 False
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3562,6 +4178,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Host:
                                               
@@ -3576,6 +4193,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3587,6 +4208,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Port:
                                               
@@ -3599,6 +4221,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 0
                                                 
@@ -3606,6 +4229,10 @@ HTTP W/ Auth
                                                     True
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     100 0 65535 1 10 0
                                                     True
                                                   
@@ -3624,6 +4251,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3636,6 +4267,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 None
 Socksv4
@@ -3655,6 +4287,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Type:
@@ -3667,6 +4300,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Username:
@@ -3684,6 +4318,7 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         <b>Web Seed</b>
                                         True
                                       
@@ -3701,16 +4336,19 @@ HTTP W/ Auth
                                 
                                   
                                     True
+                                    False
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         12
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             2
@@ -3718,6 +4356,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Password:
@@ -3734,6 +4373,10 @@ HTTP W/ Auth
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 False
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3746,6 +4389,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Host:
                                               
@@ -3760,6 +4404,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3771,6 +4419,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Port:
                                               
@@ -3783,6 +4432,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 0
                                                 
@@ -3790,6 +4440,10 @@ HTTP W/ Auth
                                                     True
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     100 0 65535 1 10 0
                                                     True
                                                   
@@ -3808,6 +4462,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3820,6 +4478,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 None
 Socksv4
@@ -3839,6 +4498,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Type:
@@ -3851,6 +4511,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Username:
@@ -3868,6 +4529,7 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         <b>Tracker</b>
                                         True
                                       
@@ -3885,16 +4547,19 @@ HTTP W/ Auth
                                 
                                   
                                     True
+                                    False
                                     0
                                     none
                                     
                                       
                                         True
+                                        False
                                         12
                                         12
                                         
                                           
                                             True
+                                            False
                                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                             5
                                             2
@@ -3902,6 +4567,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Password:
@@ -3919,6 +4585,10 @@ HTTP W/ Auth
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 False
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3931,6 +4601,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Host:
                                               
@@ -3946,6 +4617,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -3957,6 +4632,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 Port:
                                               
@@ -3970,6 +4646,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 0
                                                 0
                                                 
@@ -3977,6 +4654,10 @@ HTTP W/ Auth
                                                     True
                                                     True
                                                     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     100 0 65535 1 10 0
                                                     True
                                                   
@@ -3995,6 +4676,10 @@ HTTP W/ Auth
                                                 True
                                                 True
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                                                False
+                                                False
+                                                True
+                                                True
                                               
                                               
                                                 1
@@ -4007,6 +4692,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 None
 Socksv4
@@ -4026,6 +4712,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Type:
@@ -4038,6 +4725,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                                 0
                                                 Username:
@@ -4056,6 +4744,7 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         <b>DHT</b>
                                         True
                                       
@@ -4072,6 +4761,8 @@ HTTP W/ Auth
                                 
                               
                               
+                                True
+                                True
                                 5
                                 2
                               
@@ -4100,14 +4791,17 @@ HTTP W/ Auth
                     
                       
                         True
+                        False
                         queue
                         none
                         
                           
                             True
+                            False
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -4117,44 +4811,53 @@ HTTP W/ Auth
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                               
                               
                                 False
+                                True
                                 1
                               
                             
                             
                               
                                 True
+                                False
                                 12
                                 
                                   
                                     True
+                                    False
                                     
                                       
                                         True
+                                        False
                                         0
                                         none
                                         
                                           
                                             True
+                                            False
                                             5
                                             12
                                             
                                               
                                                 True
+                                                False
                                                 2
                                                 2
                                                 5
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     Cache Size (16 KiB blocks):
                                                   
@@ -4165,6 +4868,7 @@ HTTP W/ Auth
                                                 
                                                   
                                                     True
+                                                    False
                                                     True
                                                     The number of seconds from the last cached write to a piece in the write cache, to when it's forcefully flushed to disk. Default is 60 seconds.
                                                     0
@@ -4182,6 +4886,10 @@ HTTP W/ Auth
                                                     True
                                                     ●
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     100 0 99999 1 10 0
                                                     True
                                                     if-valid
@@ -4200,6 +4908,10 @@ HTTP W/ Auth
                                                     ●
                                                     5
                                                     1
+                                                    False
+                                                    False
+                                                    True
+                                                    True
                                                     60 1 32000 1 10 0
                                                   
                                                   
@@ -4217,6 +4929,7 @@ HTTP W/ Auth
                                         
                                           
                                             True
+                                            False
                                             <b>Settings</b>
                                             True
                                           
@@ -4235,34 +4948,41 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         0
                                         none
                                         
                                           
                                             True
+                                            False
                                             5
                                             12
                                             
                                               
                                                 True
+                                                False
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     none
                                                     
                                                       
                                                         True
+                                                        False
                                                         12
                                                         
                                                           
                                                             True
+                                                            False
                                                             3
                                                             2
                                                             5
                                                             
                                                             
                                                             True
+                                                            False
                                                             The total number of 16 KiB blocks written to disk since this session was started.
                                                             0
                                                             Blocks Written:
@@ -4274,6 +4994,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             The total number of write operations performed since this session was started.
                                                             0
                                                             Writes:
@@ -4287,6 +5008,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             The ratio (blocks_written - writes) / blocks_written represents the number of saved write operations per total write operations, i.e. a kind of cache hit ratio for the write cache.
                                                             0
                                                             Write Cache Hit Ratio:
@@ -4300,6 +5022,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4311,6 +5034,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4324,6 +5048,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4341,6 +5066,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         <b>Write</b>
                                                         True
                                                       
@@ -4350,27 +5076,33 @@ HTTP W/ Auth
                                                     
                                                   
                                                   
+                                                    True
+                                                    True
                                                     0
                                                   
                                                 
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     none
                                                     
                                                       
                                                         True
+                                                        False
                                                         12
                                                         
                                                           
                                                             True
+                                                            False
                                                             4
                                                             2
                                                             5
                                                             
                                                             
                                                             True
+                                                            False
                                                             The number of blocks that were requested from the bittorrent engine (from peers), that were served from disk or cache.
                                                             0
                                                             Blocks Read:
@@ -4382,6 +5114,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             The number of blocks that were served from cache.
                                                             0
                                                             Blocks Read Hit:
@@ -4395,6 +5128,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             The cache hit ratio for the read cache.
                                                             0
                                                             Read Cache Hit Ratio:
@@ -4408,6 +5142,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4419,6 +5154,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4432,6 +5168,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4445,6 +5182,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             True
                                                             The total number of read operations performed since this session was started.
                                                             0
@@ -4459,6 +5197,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             
                                                             
                                                             1
@@ -4475,6 +5214,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         <b>Read</b>
                                                         True
                                                       
@@ -4484,27 +5224,33 @@ HTTP W/ Auth
                                                     
                                                   
                                                   
+                                                    True
+                                                    True
                                                     1
                                                   
                                                 
                                                 
                                                   
                                                     True
+                                                    False
                                                     0
                                                     none
                                                     
                                                       
                                                         True
+                                                        False
                                                         12
                                                         
                                                           
                                                             True
+                                                            False
                                                             2
                                                             2
                                                             5
                                                             
                                                             
                                                             True
+                                                            False
                                                             The number of 16 KiB blocks currently in the disk cache. This includes both read and write cache.
                                                             0
                                                             Cache Size:
@@ -4516,6 +5262,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             0
                                                             Read Cache Size:
                                                             
@@ -4528,6 +5275,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4539,6 +5287,7 @@ HTTP W/ Auth
                                                             
                                                             
                                                             True
+                                                            False
                                                             1
                                                             
                                                             
@@ -4556,6 +5305,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         <b>Size</b>
                                                         True
                                                       
@@ -4565,12 +5315,15 @@ HTTP W/ Auth
                                                     
                                                   
                                                   
+                                                    True
+                                                    True
                                                     2
                                                   
                                                 
                                                 
                                                   
                                                     True
+                                                    False
                                                     start
                                                     
                                                       
@@ -4578,6 +5331,7 @@ HTTP W/ Auth
                                                         True
                                                         True
                                                         True
+                                                        False
                                                         True
                                                         
                                                       
@@ -4589,6 +5343,8 @@ HTTP W/ Auth
                                                     
                                                   
                                                   
+                                                    True
+                                                    True
                                                     3
                                                   
                                                 
@@ -4599,6 +5355,7 @@ HTTP W/ Auth
                                         
                                           
                                             True
+                                            False
                                             <b>Status</b>
                                             True
                                           
@@ -4618,6 +5375,8 @@ HTTP W/ Auth
                                 
                               
                               
+                                True
+                                True
                                 2
                               
                             
@@ -4646,16 +5405,19 @@ HTTP W/ Auth
                     
                       
                         True
+                        False
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         queue
                         none
                         
                           
                             True
+                            False
                             GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                                 0
                                 10
@@ -4665,16 +5427,19 @@ HTTP W/ Auth
                               
                               
                                 False
+                                True
                                 0
                               
                             
                             
                               
                                 True
+                                False
                                 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                               
                               
                                 False
+                                True
                                 1
                               
                             
@@ -4712,26 +5477,31 @@ HTTP W/ Auth
                                     
                                       
                                         True
+                                        False
                                         queue
                                         none
                                         
                                           
                                             True
+                                            False
                                             0
                                             none
                                             
                                               
                                                 True
+                                                False
                                                 12
                                                 
                                                   
                                                     True
+                                                    False
                                                     5
                                                     2
                                                     5
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                       
                                                       
@@ -4745,6 +5515,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                       
                                                       
@@ -4758,6 +5529,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                       
                                                       
@@ -4769,6 +5541,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                         0
                                                         Details:
@@ -4783,6 +5556,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                         Version:
                                                       
@@ -4796,6 +5570,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                         Author:
                                                       
@@ -4807,6 +5582,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                         Homepage:
                                                       
@@ -4820,6 +5596,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                         Author Email:
                                                       
@@ -4833,6 +5610,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                       
                                                       
@@ -4846,6 +5624,7 @@ HTTP W/ Auth
                                                     
                                                       
                                                         True
+                                                        False
                                                         0
                                                       
                                                       
@@ -4863,6 +5642,7 @@ HTTP W/ Auth
                                             
                                               
                                                 True
+                                                False
                                                 <b>Info</b>
                                                 True
                                               
@@ -4882,26 +5662,32 @@ HTTP W/ Auth
                                 
                               
                               
+                                True
+                                True
                                 2
                               
                             
                             
                               
                                 True
+                                False
                                 center
                                 
                                   
                                     True
                                     True
                                     True
+                                    False
                                     
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
                                             True
+                                            False
                                             gtk-add
                                           
                                           
@@ -4913,6 +5699,7 @@ HTTP W/ Auth
                                         
                                           
                                             True
+                                            False
                                             _Install Plugin
                                             True
                                             True
@@ -4937,14 +5724,17 @@ HTTP W/ Auth
                                     True
                                     True
                                     True
+                                    False
                                     
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
                                             True
+                                            False
                                             gtk-refresh
                                           
                                           
@@ -4956,6 +5746,7 @@ HTTP W/ Auth
                                         
                                           
                                             True
+                                            False
                                             _Rescan Plugins
                                             True
                                             True
@@ -4985,19 +5776,23 @@ HTTP W/ Auth
                             
                               
                                 True
+                                False
                                 
                                   
                                     True
                                     True
                                     True
+                                    False
                                     
                                     
                                       
                                         True
+                                        False
                                         5
                                         
                                           
                                             True
+                                            False
                                             gtk-find
                                           
                                           
@@ -5009,6 +5804,7 @@ HTTP W/ Auth
                                         
                                           
                                             True
+                                            False
                                             _Find More Plugins
                                             True
                                             True
@@ -5067,69 +5863,11 @@ HTTP W/ Auth
             
           
           
+            True
+            True
             1
           
         
-        
-          
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            end
-            
-              
-                gtk-cancel
-                True
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                True
-                
-              
-              
-                False
-                False
-                0
-              
-            
-            
-              
-                gtk-apply
-                True
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                True
-                
-              
-              
-                False
-                False
-                1
-              
-            
-            
-              
-                gtk-ok
-                True
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                True
-                
-              
-              
-                False
-                False
-                2
-              
-            
-          
-          
-            False
-            end
-            0
-          
-        
       
     
   
diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py
index 39330765d..c5fc4c7d5 100644
--- a/deluge/ui/gtkui/options_tab.py
+++ b/deluge/ui/gtkui/options_tab.py
@@ -53,6 +53,7 @@ class OptionsTab(Tab):
         self.spin_max_upload_slots = glade.get_widget("spin_max_upload_slots")
         self.chk_private = glade.get_widget("chk_private")
         self.chk_prioritize_first_last = glade.get_widget("chk_prioritize_first_last")
+        self.chk_sequential_download = glade.get_widget("chk_sequential_download")
         self.chk_auto_managed = glade.get_widget("chk_auto_managed")
         self.chk_stop_at_ratio = glade.get_widget("chk_stop_at_ratio")
         self.chk_remove_at_ratio = glade.get_widget("chk_remove_at_ratio")
@@ -72,7 +73,9 @@ class OptionsTab(Tab):
             "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled,
             "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled,
             "on_chk_shared_toggled": self._on_chk_shared_toggled,
-            "on_spin_value_changed": self._on_spin_value_changed
+            "on_spin_value_changed": self._on_spin_value_changed,
+            "on_chk_sequential_download_toggled": \
+                                        self._on_chk_sequential_download_toggled
         })
 
     def start(self):
@@ -113,6 +116,8 @@ class OptionsTab(Tab):
             "stop_at_ratio",
             "stop_ratio",
             "remove_at_ratio",
+            "compact_allocation",
+            "sequential_download",
             "move_on_completed",
             "move_on_completed_path",
             "shared"
@@ -162,6 +167,18 @@ class OptionsTab(Tab):
             if status["shared"] != self.prev_status["shared"]:
                 self.chk_shared.set_active(status["shared"])
 
+            if status["compact_allocation"]:
+                self.chk_prioritize_first_last.set_sensitive(False)
+                self.chk_prioritize_first_last.hide()
+                self.chk_sequential_download.set_sensitive(False)
+                self.chk_sequential_download.hide()
+            else:
+                if status["prioritize_first_last"] != self.prev_status["prioritize_first_last"]:
+                    self.chk_prioritize_first_last.set_active(status["prioritize_first_last"])
+                if status["sequential_download"] != self.prev_status["sequential_download"]:
+                    self.chk_sequential_download.set_active(status["sequential_download"])
+
+
             if self.button_apply.is_sensitive():
                 self.button_apply.set_sensitive(False)
 
@@ -169,25 +186,53 @@ class OptionsTab(Tab):
 
     def _on_button_apply_clicked(self, button):
         if self.spin_max_download.get_value() != self.prev_status["max_download_speed"]:
-            client.core.set_torrent_max_download_speed(self.prev_torrent_id, self.spin_max_download.get_value())
+            client.core.set_torrent_max_download_speed(
+                self.prev_torrent_id, self.spin_max_download.get_value()
+            )
         if self.spin_max_upload.get_value() != self.prev_status["max_upload_speed"]:
-            client.core.set_torrent_max_upload_speed(self.prev_torrent_id, self.spin_max_upload.get_value())
+            client.core.set_torrent_max_upload_speed(
+                self.prev_torrent_id, self.spin_max_upload.get_value()
+            )
         if self.spin_max_connections.get_value_as_int() != self.prev_status["max_connections"]:
-            client.core.set_torrent_max_connections(self.prev_torrent_id, self.spin_max_connections.get_value_as_int())
+            client.core.set_torrent_max_connections(
+                self.prev_torrent_id, self.spin_max_connections.get_value_as_int()
+            )
         if self.spin_max_upload_slots.get_value_as_int() != self.prev_status["max_upload_slots"]:
-            client.core.set_torrent_max_upload_slots(self.prev_torrent_id, self.spin_max_upload_slots.get_value_as_int())
-        if self.chk_prioritize_first_last.get_active() != self.prev_status["prioritize_first_last"]:
-            client.core.set_torrent_prioritize_first_last(self.prev_torrent_id, self.chk_prioritize_first_last.get_active())
+            client.core.set_torrent_max_upload_slots(
+                self.prev_torrent_id, self.spin_max_upload_slots.get_value_as_int()
+            )
+        if self.chk_prioritize_first_last.get_active() != \
+                        self.prev_status["prioritize_first_last"] and \
+                                    not self.prev_status["compact_allocation"]:
+            client.core.set_torrent_prioritize_first_last(
+                self.prev_torrent_id, self.chk_prioritize_first_last.get_active()
+            )
+        if self.chk_sequential_download.get_active() != \
+                        self.prev_status["sequential_download"] and \
+                                    not self.prev_status["compact_allocation"]:
+            client.core.set_torrent_sequential_download(
+                self.prev_torrent_id, self.chk_prioritize_first_last.get_active()
+            )
         if self.chk_auto_managed.get_active() != self.prev_status["is_auto_managed"]:
-            client.core.set_torrent_auto_managed(self.prev_torrent_id, self.chk_auto_managed.get_active())
+            client.core.set_torrent_auto_managed(
+                self.prev_torrent_id, self.chk_auto_managed.get_active()
+            )
         if self.chk_stop_at_ratio.get_active() != self.prev_status["stop_at_ratio"]:
-            client.core.set_torrent_stop_at_ratio(self.prev_torrent_id, self.chk_stop_at_ratio.get_active())
+            client.core.set_torrent_stop_at_ratio(
+                self.prev_torrent_id, self.chk_stop_at_ratio.get_active()
+            )
         if self.spin_stop_ratio.get_value() != self.prev_status["stop_ratio"]:
-            client.core.set_torrent_stop_ratio(self.prev_torrent_id, self.spin_stop_ratio.get_value())
+            client.core.set_torrent_stop_ratio(
+                self.prev_torrent_id, self.spin_stop_ratio.get_value()
+            )
         if self.chk_remove_at_ratio.get_active() != self.prev_status["remove_at_ratio"]:
-            client.core.set_torrent_remove_at_ratio(self.prev_torrent_id, self.chk_remove_at_ratio.get_active())
+            client.core.set_torrent_remove_at_ratio(
+                self.prev_torrent_id, self.chk_remove_at_ratio.get_active()
+            )
         if self.chk_move_completed.get_active() != self.prev_status["move_on_completed"]:
-            client.core.set_torrent_move_completed(self.prev_torrent_id, self.chk_move_completed.get_active())
+            client.core.set_torrent_move_completed(
+                self.prev_torrent_id, self.chk_move_completed.get_active()
+            )
         if self.chk_move_completed.get_active():
             if client.is_localhost():
                 path = self.filechooser_move_completed.get_current_folder()
@@ -195,7 +240,9 @@ class OptionsTab(Tab):
                 path = self.entry_move_completed.get_text()
             client.core.set_torrent_move_completed_path(self.prev_torrent_id, path)
         if self.chk_shared.get_active() != self.prev_status["shared"]:
-            client.core.set_torrents_shared(self.prev_torrent_id, self.chk_shared.get_active())
+            client.core.set_torrents_shared(
+                self.prev_torrent_id, self.chk_shared.get_active()
+            )
         self.button_apply.set_sensitive(False)
 
     def _on_button_edit_trackers_clicked(self, button):
@@ -238,3 +285,7 @@ class OptionsTab(Tab):
     def _on_spin_value_changed(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
+
+    def _on_chk_sequential_download_toggled(self, widget):
+        if not self.button_apply.is_sensitive():
+            self.button_apply.set_sensitive(True)

From 77fc53afc0933a31ff2eff564c8767497c7f8946 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 23:46:55 +0100
Subject: [PATCH 249/329] Sequential downloads. Was querying for the wrong key
 on the torrent status. Fixed.

---
 ChangeLog                      | 1 +
 deluge/ui/gtkui/options_tab.py | 8 ++++----
 deluge/ui/sessionproxy.py      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46956e581..8a5f3f9b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@
 	* Host entries in the Connection Manager UI are now editable. They're
 	now also migrated from the old format were automatic localhost logins were
 	possible, which no longer is, this fixes #1814.
+	* Implemented sequential downloads UI handling.
 
 ==== WebUI ====
 	* Migrate to ExtJS 3.1
diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py
index c5fc4c7d5..7d61870cf 100644
--- a/deluge/ui/gtkui/options_tab.py
+++ b/deluge/ui/gtkui/options_tab.py
@@ -116,7 +116,7 @@ class OptionsTab(Tab):
             "stop_at_ratio",
             "stop_ratio",
             "remove_at_ratio",
-            "compact_allocation",
+            "compact",
             "sequential_download",
             "move_on_completed",
             "move_on_completed_path",
@@ -167,7 +167,7 @@ class OptionsTab(Tab):
             if status["shared"] != self.prev_status["shared"]:
                 self.chk_shared.set_active(status["shared"])
 
-            if status["compact_allocation"]:
+            if status["compact"]:
                 self.chk_prioritize_first_last.set_sensitive(False)
                 self.chk_prioritize_first_last.hide()
                 self.chk_sequential_download.set_sensitive(False)
@@ -203,13 +203,13 @@ class OptionsTab(Tab):
             )
         if self.chk_prioritize_first_last.get_active() != \
                         self.prev_status["prioritize_first_last"] and \
-                                    not self.prev_status["compact_allocation"]:
+                                                not self.prev_status["compact"]:
             client.core.set_torrent_prioritize_first_last(
                 self.prev_torrent_id, self.chk_prioritize_first_last.get_active()
             )
         if self.chk_sequential_download.get_active() != \
                         self.prev_status["sequential_download"] and \
-                                    not self.prev_status["compact_allocation"]:
+                                                not self.prev_status["compact"]:
             client.core.set_torrent_sequential_download(
                 self.prev_torrent_id, self.chk_prioritize_first_last.get_active()
             )
diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py
index f14a05a7c..5e33a629f 100644
--- a/deluge/ui/sessionproxy.py
+++ b/deluge/ui/sessionproxy.py
@@ -135,7 +135,7 @@ class SessionProxy(component.Component):
                     keys_to_get.append(key)
 
             if not keys_to_get:
-                 return succeed(self.create_status_dict([torrent_id], keys)[torrent_id])
+                return succeed(self.create_status_dict([torrent_id], keys)[torrent_id])
             else:
                 d = client.core.get_torrent_status(torrent_id, keys_to_get, True)
                 def on_status(result, torrent_id):

From d4692bef4264c2def0f8bcd0499fa29dfda938b2 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 8 May 2011 23:48:42 +0100
Subject: [PATCH 250/329] AutoAdd Plugin. Remove line feeds from log messages.

---
 deluge/plugins/autoadd/autoadd/core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py
index af5bc279c..bfea91e17 100644
--- a/deluge/plugins/autoadd/autoadd/core.py
+++ b/deluge/plugins/autoadd/autoadd/core.py
@@ -324,7 +324,7 @@ class Core(CorePluginBase):
         session_user = rpcserver.get_session_user()
         session_auth_level = rpcserver.get_session_auth_level()
         if session_auth_level == AUTH_LEVEL_ADMIN:
-            log.debug("\n\nCurrent logged in user %s is an ADMIN, send all "
+            log.debug("Current logged in user %s is an ADMIN, send all "
                       "watchdirs", session_user)
             return self.watchdirs
 
@@ -333,7 +333,7 @@ class Core(CorePluginBase):
             if watchdir.get("owner", "localclient") == session_user:
                 watchdirs[watchdir_id] = watchdir
 
-        log.debug("\n\nCurrent logged in user %s is not an ADMIN, send only "
+        log.debug("Current logged in user %s is not an ADMIN, send only "
                   "his watchdirs: %s", session_user, watchdirs.keys())
         return watchdirs
 

From 1ac997e7d735908ba9fde28dcfec06d514a499ac Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Mon, 9 May 2011 15:47:10 +0100
Subject: [PATCH 251/329] Upgrade core config and handle empty AutoAdd
 watchdirs.

We now upgrade the core's config to include 'sequential_download'.
On the auto add plugin, if there are no watchdir, provide a default that will allow the GTK UI not to thrown an exception.
---
 deluge/core/preferencesmanager.py       | 23 +++++++++++++++++++----
 deluge/plugins/autoadd/autoadd/gtkui.py |  3 ++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 743d3ea6a..76b1d41c2 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -154,6 +154,7 @@ class PreferencesManager(component.Component):
                       "attribute to shared.")
             self.config["shared"] = self.config["public"]
             del self.config["public"]
+        self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2)
 
     def start(self):
         self.core = component.get("Core")
@@ -196,7 +197,9 @@ class PreferencesManager(component.Component):
         # Only set the listen ports if random_port is not true
         if self.config["random_port"] is not True:
             log.debug("listen port range set to %s-%s", value[0], value[1])
-            self.session.listen_on(value[0], value[1], str(self.config["listen_interface"]))
+            self.session.listen_on(
+                value[0], value[1], str(self.config["listen_interface"])
+            )
 
     def _on_set_listen_interface(self, key, value):
         # Call the random_port callback since it'll do what we need
@@ -218,7 +221,10 @@ class PreferencesManager(component.Component):
         # Set the listen ports
         log.debug("listen port range set to %s-%s", listen_ports[0],
             listen_ports[1])
-        self.session.listen_on(listen_ports[0], listen_ports[1], str(self.config["listen_interface"]))
+        self.session.listen_on(
+            listen_ports[0], listen_ports[1],
+            str(self.config["listen_interface"])
+        )
 
     def _on_set_outgoing_ports(self, key, value):
         if not self.config["random_outgoing_ports"]:
@@ -445,8 +451,12 @@ class PreferencesManager(component.Component):
         geoip_db = ""
         if os.path.exists(value):
             geoip_db = value
-        elif os.path.exists(pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))):
-            geoip_db = pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))
+        elif os.path.exists(
+            pkg_resources.resource_filename("deluge",
+                                            os.path.join("data", "GeoIP.dat"))):
+            geoip_db = pkg_resources.resource_filename(
+                "deluge", os.path.join("data", "GeoIP.dat")
+            )
         else:
             log.warning("Unable to find GeoIP database file!")
 
@@ -464,3 +474,8 @@ class PreferencesManager(component.Component):
     def _on_set_cache_expiry(self, key, value):
         log.debug("%s: %s", key, value)
         self.session_set_setting("cache_expiry", value)
+
+    def __migrate_config_1_to_2(self, config):
+        if 'sequential_download' not in config:
+            config['sequential_download'] = DEFAULT_PREFS['sequential_download']
+        return config
diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py
index 18ce63f7b..d06daaec1 100644
--- a/deluge/plugins/autoadd/autoadd/gtkui.py
+++ b/deluge/plugins/autoadd/autoadd/gtkui.py
@@ -458,7 +458,8 @@ class GtkUI(GtkPluginBase):
 
     def cb_get_config(self, watchdirs):
         """callback for on show_prefs"""
-        self.watchdirs = watchdirs
+        log.debug("Got whatchdirs from core: %s", watchdirs)
+        self.watchdirs = watchdirs or {}
         self.store.clear()
         for watchdir_id, watchdir in self.watchdirs.iteritems():
             self.store.append([

From 0c110c240879acdb343b79f1027848732ee9fefb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 10 May 2011 11:21:24 +0100
Subject: [PATCH 252/329] Fix broken tests. Twisted deferred loops, must be
 stopped!

---
 deluge/core/torrentmanager.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 8c9ac415d..54f183005 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -148,6 +148,7 @@ class TorrentManager(component.Component):
 
         # Create the torrents dict { torrent_id: Torrent }
         self.torrents = {}
+        self.last_seen_complete_loop = None
 
         # This is a list of torrent_id when we shutdown the torrentmanager.
         # We use this list to determine if all active torrents have been paused
@@ -220,6 +221,9 @@ class TorrentManager(component.Component):
         self.save_resume_data_timer = LoopingCall(self.save_resume_data)
         self.save_resume_data_timer.start(190)
 
+        if self.last_seen_complete_loop:
+            self.last_seen_complete_loop.start(60)
+
     def stop(self):
         # Stop timers
         if self.save_state_timer.running:
@@ -228,6 +232,9 @@ class TorrentManager(component.Component):
         if self.save_resume_data_timer.running:
             self.save_resume_data_timer.stop()
 
+        if self.last_seen_complete_loop:
+            self.last_seen_complete_loop.stop()
+
         # Save state on shutdown
         self.save_state()
 
@@ -267,9 +274,12 @@ class TorrentManager(component.Component):
 
     def update(self):
         for torrent_id, torrent in self.torrents.items():
-            if torrent.options["stop_at_ratio"] and torrent.state not in ("Checking", "Allocating", "Paused", "Queued"):
-                # If the global setting is set, but the per-torrent isn't.. Just skip to the next torrent
-                # This is so that a user can turn-off the stop at ratio option on a per-torrent basis
+            if torrent.options["stop_at_ratio"] and torrent.state not in (
+                                "Checking", "Allocating", "Paused", "Queued"):
+                # If the global setting is set, but the per-torrent isn't..
+                # Just skip to the next torrent.
+                # This is so that a user can turn-off the stop at ratio option
+                # on a per-torrent basis
                 if not torrent.options["stop_at_ratio"]:
                     continue
                 if torrent.get_ratio() >= torrent.options["stop_ratio"] and torrent.is_finished:
@@ -598,7 +608,8 @@ class TorrentManager(component.Component):
 
         # Emit the signal to the clients
         component.get("EventManager").emit(TorrentRemovedEvent(torrent_id))
-        log.info("Torrent %s removed by user: %s", torrent_name, component.get("RPCServer").get_session_user())
+        log.info("Torrent %s removed by user: %s", torrent_name,
+                 component.get("RPCServer").get_session_user())
         return True
 
     def load_state(self):
@@ -645,8 +656,9 @@ class TorrentManager(component.Component):
             def calculate_last_seen_complete():
                 for torrent in self.torrents.values():
                     torrent.calculate_last_seen_complete()
-            task = LoopingCall(calculate_last_seen_complete)
-            task.start(60)
+            self.last_seen_complete_loop = LoopingCall(
+                calculate_last_seen_complete
+            )
 
         component.get("EventManager").emit(SessionStartedEvent())
 

From 74618d5a658591cebd29edd4e8e237c4e1dce7d9 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 10 May 2011 20:13:26 +0100
Subject: [PATCH 253/329] GTK UI move storage fixed. Was still not allowing
 moves.

---
 deluge/ui/gtkui/menubar.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index 32234bb28..b4b775c52 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -221,7 +221,9 @@ class MenuBar(component.Component):
 
     def stop(self):
         log.debug("MenuBar stopping")
-        self.menuitem_change_owner.remove_submenu()
+        if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
+            # If not an admin, no submenu was added
+            self.menuitem_change_owner.remove_submenu()
 
         for widget in self.change_sensitivity:
             self.window.main_glade.get_widget(widget).set_sensitive(False)
@@ -332,17 +334,21 @@ class MenuBar(component.Component):
         def _on_torrent_status(status):
             deluge.common.open_file(status["save_path"])
         for torrent_id in component.get("TorrentView").get_selected_torrents():
-            component.get("SessionProxy").get_torrent_status(torrent_id, ["save_path"]).addCallback(_on_torrent_status)
+            component.get("SessionProxy").get_torrent_status(
+                torrent_id, ["save_path"]).addCallback(_on_torrent_status)
 
     def on_menuitem_move_activate(self, data=None):
         log.debug("on_menuitem_move_activate")
         if client.is_localhost():
             from deluge.configmanager import ConfigManager
             config = ConfigManager("gtkui.conf")
-            chooser = gtk.FileChooserDialog(_("Choose a directory to move files to"\
-                ) , component.get("MainWindow").window, \
-                gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, buttons=(gtk.STOCK_CANCEL, \
-                gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK))
+            chooser = gtk.FileChooserDialog(
+                _("Choose a directory to move files to"),
+                component.get("MainWindow").window,
+                gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
+                buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                         gtk.STOCK_OK, gtk.RESPONSE_OK)
+            )
             chooser.set_local_only(True)
             if not deluge.common.windows_check():
                 chooser.set_icon(common.get_deluge_icon())
@@ -355,7 +361,9 @@ class MenuBar(component.Component):
                     component.get("TorrentView").get_selected_torrents(), result)
             chooser.destroy()
         else:
-            component.get("SessionProxy").get_torrent_status(component.get("TorrentView").get_selected_torrent(), ["save_path"]).addCallback(self.show_move_storage_dialog)
+            component.get("SessionProxy").get_torrent_status(
+                component.get("TorrentView").get_selected_torrent(),
+                ["save_path"]).addCallback(self.show_move_storage_dialog)
 
     def show_move_storage_dialog(self, status):
         log.debug("show_move_storage_dialog")
@@ -377,7 +385,7 @@ class MenuBar(component.Component):
 
             if response_id == gtk.RESPONSE_OK:
                 log.debug("Moving torrents to %s",
-                          self.move_storage_dialog.get_text())
+                          self.move_storage_dialog_entry.get_text())
                 path = self.move_storage_dialog_entry.get_text()
                 client.core.move_storage(
                     component.get("TorrentView").get_selected_torrents(), path

From 81ca9952e9dee9130264a175891320b8d8d6b60b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 10 May 2011 20:15:33 +0100
Subject: [PATCH 254/329] Moved core.conf config upgrade to core instead of
 pref's manager.

---
 deluge/core/core.py               | 8 ++++++++
 deluge/core/preferencesmanager.py | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index d70160759..6537ce379 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -113,6 +113,8 @@ class Core(component.Component):
 
         # Get the core config
         self.config = deluge.configmanager.ConfigManager("core.conf")
+        self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2)
+        self.config.save()
 
         # If there was an interface value from the command line, use it, but
         # store the one in the config so we can restore it on shutdown
@@ -159,6 +161,12 @@ class Core(component.Component):
         except Exception, e:
             log.warning("Failed to load lt state: %s", e)
 
+
+    def __migrate_config_1_to_2(self, config):
+        if 'sequential_download' not in config:
+            config['sequential_download'] = False
+        return config
+
     def save_dht_state(self):
         """Saves the dht state to a file"""
         try:
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 76b1d41c2..d42be335c 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -154,7 +154,6 @@ class PreferencesManager(component.Component):
                       "attribute to shared.")
             self.config["shared"] = self.config["public"]
             del self.config["public"]
-        self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2)
 
     def start(self):
         self.core = component.get("Core")
@@ -474,8 +473,3 @@ class PreferencesManager(component.Component):
     def _on_set_cache_expiry(self, key, value):
         log.debug("%s: %s", key, value)
         self.session_set_setting("cache_expiry", value)
-
-    def __migrate_config_1_to_2(self, config):
-        if 'sequential_download' not in config:
-            config['sequential_download'] = DEFAULT_PREFS['sequential_download']
-        return config

From 6a8e3f1c49856b27a444f3810ed96cebac551712 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Wed, 11 May 2011 09:06:21 +0100
Subject: [PATCH 255/329] Minor code cleanup.

---
 deluge/ui/sessionproxy.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py
index 5e33a629f..af485a458 100644
--- a/deluge/ui/sessionproxy.py
+++ b/deluge/ui/sessionproxy.py
@@ -75,11 +75,11 @@ class SessionProxy(component.Component):
         def on_torrent_status(status):
             # Save the time we got the torrent status
             t = time.time()
-            for key, value in status.items():
+            for key, value in status.iteritems():
                 self.torrents[key] = [t, value]
                 self.cache_times[key] = {}
-                for k, v in value.items():
-                    self.cache_times[key][k] = t
+                for ikey in value.iterkeys():
+                    self.cache_times[key][ikey] = t
 
         return client.core.get_torrents_status({}, [], True).addCallback(on_torrent_status)
 
@@ -105,7 +105,10 @@ class SessionProxy(component.Component):
         sd = {}
         for torrent_id in torrent_ids:
             if keys:
-                sd[torrent_id] = dict([(x, y) for x, y in self.torrents[torrent_id][1].iteritems() if x in keys])
+                sd[torrent_id] = dict([
+                    (x, y) for x, y in self.torrents[torrent_id][1].iteritems()
+                    if x in keys
+                ])
             else:
                 sd[torrent_id] = dict(self.torrents[torrent_id][1])
 
@@ -135,7 +138,9 @@ class SessionProxy(component.Component):
                     keys_to_get.append(key)
 
             if not keys_to_get:
-                return succeed(self.create_status_dict([torrent_id], keys)[torrent_id])
+                return succeed(
+                    self.create_status_dict([torrent_id], keys)[torrent_id]
+                )
             else:
                 d = client.core.get_torrent_status(torrent_id, keys_to_get, True)
                 def on_status(result, torrent_id):

From bc5b4d902f32379f95289b4b317c0f4e3133184f Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Thu, 12 May 2011 18:14:10 +0100
Subject: [PATCH 256/329] Fix LP Bug #779074 - TypeError in
 on_key_press_event(): cannot concatenate 'str' and 'NoneType'

---
 deluge/ui/gtkui/torrentview.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 8b2b96a29..4fc5ce331 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -567,9 +567,10 @@ class TorrentView(listview.ListView, component.Component):
     # Handle keyboard shortcuts
     def on_key_press_event(self, widget, event):
         keyname = gtk.gdk.keyval_name(event.keyval)
-        func = getattr(self, 'keypress_' + keyname, None)
-        if func:
-            return func(event)
+        if keyname is not None:
+            func = getattr(self, 'keypress_' + keyname, None)
+            if func:
+                return func(event)
 
     def keypress_Delete(self, event):
         log.debug("keypress_Delete")

From 552c898998f5ed9f8169eae6f3640106903f5429 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 15 May 2011 11:19:27 +0100
Subject: [PATCH 257/329] Fix #1844.

The submenu got lost on one of the glade files merges. Re-added.
---
 deluge/ui/gtkui/glade/main_window.glade | 146 ++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 40665cab8..43a10c8f0 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -635,6 +635,152 @@
       
     
   
+  
+    True
+    False
+    
+      
+        gtk-open
+        True
+        False
+        False
+        True
+        True
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Expand All
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-zoom-fit
+            1
+          
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Do Not Download
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-no
+            1
+          
+        
+      
+    
+    
+      
+        _Normal Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-yes
+            1
+          
+        
+      
+    
+    
+      
+        _High Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-go-up
+            1
+          
+        
+      
+    
+    
+      
+        Hi_ghest Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-goto-top
+            1
+          
+        
+      
+    
+  
+  
+    True
+    False
+    
+      
+        _Add Peer
+        True
+        False
+        Add a peer by its IP
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-add
+            1
+          
+        
+      
+    
+  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK

From 0ba0e013b54c033227fbc2329e0b01acf7846218 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 15 May 2011 22:18:38 +0100
Subject: [PATCH 258/329] Force backwards incompatibility.

Force clients prior to 1.4 to fail authentication, this was we might reduce tickets like #1852.
---
 deluge/core/rpcserver.py    | 10 ++++-
 deluge/error.py             |  3 ++
 deluge/tests/test_client.py | 76 ++++++++++++++++++++++++++++++++++++-
 deluge/ui/client.py         |  6 +--
 4 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index 274aeae48..5536d2892 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -56,7 +56,8 @@ except ImportError:
 import deluge.component as component
 import deluge.configmanager
 from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN
-from deluge.error import DelugeError, NotAuthorizedError, _PassthroughError
+from deluge.error import (DelugeError, NotAuthorizedError, _PassthroughError,
+                          IncompatibleClient)
 
 RPC_RESPONSE = 1
 RPC_ERROR = 2
@@ -261,6 +262,13 @@ class DelugeRPCProtocol(Protocol):
             # We need to authenticate the user here
             log.debug("RPC dispatch daemon.login")
             try:
+                client_version = kwargs.pop('client_version', None)
+                if client_version is None:
+                    raise IncompatibleClient(
+                        "Your deluge client is not compatible with the daemon. "
+                        "Please upgrade your client to %s" %
+                        deluge.common.get_version()
+                    )
                 ret = component.get("AuthManager").authorize(*args, **kwargs)
                 if ret:
                     self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0])
diff --git a/deluge/error.py b/deluge/error.py
index d9669ec20..2e3c78305 100644
--- a/deluge/error.py
+++ b/deluge/error.py
@@ -65,6 +65,9 @@ class _PassthroughError(DelugeError):
         inst._kwargs = kwargs
         return inst
 
+class IncompatibleClient(_PassthroughError):
+    pass
+
 class NotAuthorizedError(_PassthroughError):
 
     def __init__(self, current_level, required_level):
diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py
index 82171ee0c..0e9bf5c1b 100644
--- a/deluge/tests/test_client.py
+++ b/deluge/tests/test_client.py
@@ -1,11 +1,65 @@
 
 import common
 
+from twisted.internet import defer
 from twisted.trial import unittest
 
 from deluge import error
-from deluge.core.authmanager import AUTH_LEVEL_ADMIN, AUTH_LEVEL_DEFAULT
-from deluge.ui.client import client
+from deluge.core.authmanager import AUTH_LEVEL_ADMIN
+from deluge.ui.client import client, Client, DaemonSSLProxy
+
+
+class NoVersionSendingDaemonSSLProxy(DaemonSSLProxy):
+    def authenticate(self, username, password):
+        self.login_deferred = defer.Deferred()
+        d = self.call("daemon.login", username, password)
+        d.addCallback(self.__on_login, username)
+        d.addErrback(self.__on_login_fail)
+        return self.login_deferred
+
+    def __on_login(self, result, username):
+        self.login_deferred.callback(result)
+
+    def __on_login_fail(self, result):
+        self.login_deferred.errback(result)
+
+class NoVersionSendingClient(Client):
+
+    def connect(self, host="127.0.0.1", port=58846, username="", password="",
+                skip_authentication=False):
+        self._daemon_proxy = NoVersionSendingDaemonSSLProxy()
+        self._daemon_proxy.set_disconnect_callback(self.__on_disconnect)
+
+        d = self._daemon_proxy.connect(host, port)
+
+        def on_connect_fail(reason):
+            self.disconnect()
+            return reason
+
+        def on_authenticate(result, daemon_info):
+            return result
+
+        def on_authenticate_fail(reason):
+            return reason
+
+        def on_connected(daemon_version):
+            return daemon_version
+
+        def authenticate(daemon_version, username, password):
+            d = self._daemon_proxy.authenticate(username, password)
+            d.addCallback(on_authenticate, daemon_version)
+            d.addErrback(on_authenticate_fail)
+            return d
+
+        d.addCallback(on_connected)
+        d.addErrback(on_connect_fail)
+        if not skip_authentication:
+            d.addCallback(authenticate, username, password)
+        return d
+
+    def __on_disconnect(self):
+        if self.disconnect_callback:
+            self.disconnect_callback()
 
 class ClientTestCase(unittest.TestCase):
 
@@ -78,3 +132,21 @@ class ClientTestCase(unittest.TestCase):
 
         d.addErrback(on_failure)
         return d
+
+    def test_connect_without_sending_client_version_fails(self):
+        from deluge.ui import common
+        username, password = common.get_localhost_auth()
+        no_version_sending_client = NoVersionSendingClient()
+        d = no_version_sending_client.connect(
+            "localhost", 58846, username=username, password=password
+        )
+
+        def on_failure(failure):
+            self.assertEqual(
+                failure.trap(error.IncompatibleClient),
+                error.IncompatibleClient
+            )
+            self.addCleanup(no_version_sending_client.disconnect)
+
+        d.addErrback(on_failure)
+        return d
diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index e281a30ca..e2105f2df 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -46,7 +46,6 @@ import zlib
 
 import deluge.common
 from deluge import error
-from deluge.log import LOG as log
 from deluge.event import known_events
 
 if deluge.common.windows_check():
@@ -299,8 +298,6 @@ class DaemonSSLProxy(DaemonProxy):
 
         :param host: str, the host to connect to
         :param port: int, the listening port on the daemon
-        :param username: str, the username to login as
-        :param password: str, the password to login with
 
         :returns: twisted.Deferred
 
@@ -451,7 +448,8 @@ class DaemonSSLProxy(DaemonProxy):
     def authenticate(self, username, password):
         log.debug("%s.authenticate: %s", self.__class__.__name__, username)
         self.login_deferred = defer.Deferred()
-        d = self.call("daemon.login", username, password)
+        d = self.call("daemon.login", username, password,
+                      client_version=deluge.common.get_version())
         d.addCallback(self.__on_login, username)
         d.addErrback(self.__on_login_fail)
         return self.login_deferred

From 6391970fad4cd57aa60c25ec5b480674d08f4c72 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Mon, 16 May 2011 19:15:57 +0100
Subject: [PATCH 259/329] Updates to desktop file

Add magnet mimetype and tryexec key
Fix exec key to handle files and urls to conform with new desktop-entry spec
Update name, comment and category keys
---
 deluge/data/share/applications/deluge.desktop | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/deluge/data/share/applications/deluge.desktop b/deluge/data/share/applications/deluge.desktop
index 2f3b16fdb..b482a311f 100644
--- a/deluge/data/share/applications/deluge.desktop
+++ b/deluge/data/share/applications/deluge.desktop
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Version=1.0
-Name=Deluge BitTorrent Client
-GenericName=Bittorrent Client
-Comment=Transfer files using the Bittorrent protocol
-Exec=deluge-gtk
+Name=Deluge
+GenericName=BitTorrent Client
+X-GNOME-FullName=Deluge BitTorrent Client
+Comment=Download and share files over BitTorrent
+TryExec=deluge-gtk
+Exec=deluge-gtk %U
 Icon=deluge
 Terminal=false
 Type=Application
-Categories=Network;
+Categories=Network;FileTransfer;P2P;GTK
 StartupNotify=true
-MimeType=application/x-bittorrent;
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;

From 9a3bf35cdf2a46e231be2240cc3b9643565603df Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 17 May 2011 02:45:53 +0100
Subject: [PATCH 260/329] Include our custom lower log levels into python's
 logging.

---
 deluge/log.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deluge/log.py b/deluge/log.py
index 390010c0e..179e03dfd 100644
--- a/deluge/log.py
+++ b/deluge/log.py
@@ -141,6 +141,8 @@ def setupLogger(level="error", filename=None, filemode="w"):
 
     if logging.getLoggerClass() is not Logging:
         logging.setLoggerClass(Logging)
+        logging.addLevelName(5, 'TRACE')
+        logging.addLevelName(1, 'GARBAGE')
 
     level = levels.get(level, logging.ERROR)
 

From 6151050ad44ad6364cfb50088039a5a48d0a8b1e Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 17 May 2011 22:16:12 +0100
Subject: [PATCH 261/329] PEP-8

---
 deluge/ui/gtkui/aboutdialog.py | 233 ++++++++++++++++++++++++++++++---
 1 file changed, 212 insertions(+), 21 deletions(-)

diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py
index 7c549ae7b..5dd9d32dd 100644
--- a/deluge/ui/gtkui/aboutdialog.py
+++ b/deluge/ui/gtkui/aboutdialog.py
@@ -57,35 +57,226 @@ class AboutDialog:
         version = deluge.common.get_version()
 
         self.about.set_copyright(u'Copyright \u00A9 2007-2009 Deluge Team')
-        self.about.set_comments("A peer-to-peer file sharing program\nutilizing the Bittorrent protocol.\n\nCore Version: %coreversion%\nlibtorrent version: %ltversion%")
+        self.about.set_comments(
+            "A peer-to-peer file sharing program\nutilizing the Bittorrent "
+            "protocol.\n\nCore Version: %coreversion%\nlibtorrent version: "
+            "%ltversion%")
         self.about.set_version(version)
-        self.about.set_authors(["Current Developers:", "Andrew Resch", "Damien Churchill", "John Garland", "",
-            "libtorrent (www.libtorrent.org):", "Arvid Norberg", "", "Past Developers or Contributors:", "Zach Tibbitts", "Alon Zakai", "Marcos Pinto", "Alex Dedul", "Sadrul Habib Chowdhury", "Ido Abramovich", "Martijn Voncken"])
+        self.about.set_authors([
+            "Current Developers:", "Andrew Resch", "Damien Churchill",
+            "John Garland", "", "libtorrent (www.libtorrent.org):",
+            "Arvid Norberg", "", "Past Developers or Contributors:",
+            "Zach Tibbitts", "Alon Zakai", "Marcos Pinto", "Alex Dedul",
+            "Sadrul Habib Chowdhury", "Ido Abramovich", "Martijn Voncken"
+        ])
         self.about.set_artists(["Andrew Wedderburn", "Andrew Resch"])
-        self.about.set_translator_credits("Aaron Wang Shi \nabbigss \nABCdatos \nAbcx \nActam \nAdam \nadaminikisi \nadi_oporanu \nAdrian Goll \nafby \nAhmades \nAhmad Farghal \nAhmad Gharbeia أحمد غربية \nakira \nAki Sivula \nAlan Pepelko \nAlberto \nAlberto Ferrer \nalcatr4z \nAlckO \nAleksej Korgenkov \nAlessio Treglia \nAlexander Ilyashov \nAlexander Matveev \nAlexander Saltykov \nAlexander Taubenkorb \nAlexander Telenga \nAlexander Yurtsev \nAlexandre Martani \nAlexandre Rosenfeld \nAlexandre Sapata Carbonell \nAlexey Osipov \nAlin Claudiu Radut \nallah \nAlSim \nAlvaro Carrillanca P. \nA.Matveev \nAndras Hipsag \nAndrás Kárász \nAndrea Ratto \nAndreas Johansson \nAndreas Str \nAndré F. Oliveira \nAndreiF \nandrewh \nAngel Guzman Maeso \nAníbal Deboni Neto \nanimarval \nAntonio Cono \nantoniojreyes \nAnton Shestakov \nAnton Yakutovich \nantou \nArkadiusz Kalinowski \nArtin \nartir \nAstur \nAthanasios Lefteris \nAthmane MOKRAOUI (ButterflyOfFire) \nAugusta Carla Klug \nAvoledo Marco \naxaard \nAxelRafn \nAxezium \nAyont \nb3rx \nBae Taegil \nBajusz Tamás \nBalaam's Miracle \nBallestein \nBent Ole Fosse \nberto89 \nbigx \nBjorn Inge Berg \nblackbird \nBlackeyed \nblackmx \nBlueSky \nBlutheo \nbmhm \nbob00work \nboenki \nBogdan Bădic-Spătariu \nbonpu \nBoone \nboss01 \nBranislav Jovanović \nbronze \nbrownie \nBrus46 \nbumper \nbutely \nBXCracer \nc0nfidencal \nCan Kaya \nCarlos Alexandro Becker \ncassianoleal \nCédric.h \nCésar Rubén \nchaoswizard \nChen Tao \nchicha \nChien Cheng Wei \nChristian Kopac \nChristian Widell \nChristoffer Brodd-Reijer \nchristooss \nCityAceE \nClopy \nClusty \ncnu \nCommandant \nConstantinos Koniaris \nCoolmax \ncosmix \nCostin Chirvasuta \nCoVaLiDiTy \ncow_2001 \nCrispin Kirchner \ncrom \nCruster \nCybolic \nDan Bishop \nDanek \nDani \nDaniel Demarco \nDaniel Ferreira \nDaniel Frank \nDaniel Holm \nDaniel Høyer Iversen \nDaniel Marynicz \nDaniel Nylander \nDaniel Patriche \nDaniel Schildt \nDaniil Sorokin \nDante Díaz \nDaria Michalska \nDarkenCZ \nDarren \nDaspah \nDavid Eurenius \ndavidhjelm \nDavid Machakhelidze \nDawid Dziurdzia \nDaya Adianto \ndcruz \nDeady \nDereck Wonnacott \nDevgru \nDevid Antonio Filoni \nDevilDogTG \ndi0rz` \nDialecti Valsamou \nDiego Medeiros \nDkzoffy \nDmitrij D. Czarkoff \nDmitriy Geels \nDmitry Olyenyov \nDominik Kozaczko \nDominik Lübben \ndoomster \nDorota Król \nDoyen Philippe \nDread Knight \nDreamSonic \nduan \nDuong Thanh An \nDvoglavaZver \ndwori \ndylansmrjones \nEbuntor \nEdgar Alejandro Jarquin Flores \nEetu \nekerazha \nElias Julkunen \nelparia \nEmberke \nEmiliano Goday Caneda \nEndelWar \neng.essam \nenubuntu \nercangun \nErdal Ronahi \nergin üresin \nEric \nÉric Lassauge \nErlend Finvåg \nErrdil \nethan shalev \nEvgeni Spasov \nezekielnin \nFabian Ordelmans \nFabio Mazanatti \nFábio Nogueira \nFaCuZ \nFelipe Lerena \nFernando Pereira \nfjetland \nFlorian Schäfer \nFoBoS \nFolke \nForce \nfosk \nfragarray \nfreddeg \nFrédéric Perrin \nFredrik Kilegran \nFreeAtMind \nFulvio Ciucci \nGabor Kelemen \nGalatsanos Panagiotis \nGaussian \ngdevitis \nGeorg Brzyk \nGeorge Dumitrescu \nGeorgi Arabadjiev \nGeorg Sieber \nGerd Radecke \nGermán Heusdens \nGianni Vialetto \nGigih Aji Ibrahim \nGiorgio Wicklein \nGiovanni Rapagnani \nGiuseppe \ngl \nglen \ngranjerox \nGreen Fish \ngreentea \nGreyhound \nG. U. \nGuillaume BENOIT \nGuillaume Pelletier \nGustavo Henrique Klug \ngutocarvalho \nGuybrush88 \nHans Rødtang \nHardDisk \nHargas Gábor \nHeitor Thury Barreiros Barbosa \nhelios91940 \nhelix84 \nHelton Rodrigues \nHendrik Luup \nHenrique Ferreiro \nHenry Goury-Laffont \nHezy Amiel \nhidro \nhoball \nhokten \nHolmsss \nhristo.num \nHubert Życiński \nHyo \nIarwain \nibe \nibear \nId2ndR \nIgor Zubarev \nIKON (Ion) \nimen \nIonuț Jula \nIsabelle STEVANT \nIstván Nyitrai \nIvan Petrovic \nIvan Prignano \nIvaSerge \njackmc \nJacks0nxD \nJack Shen \nJacky Yeung \nJacques Stadler \nJanek Thomaschewski \nJan Kaláb \nJan Niklas Hasse \nJasper Groenewegen \nJavi Rodríguez \nJayasimha (ಜಯಸಿಂಹ) \njeannich \nJeff Bailes \nJesse Zilstorff \nJoan Duran \nJoão Santos \nJoar Bagge \nJoe Anderson \nJoel Calado \nJohan Linde \nJohn Garland \nJojan \njollyr0ger \nJonas Bo Grimsgaard \nJonas Granqvist \nJonas Slivka \nJonathan Zeppettini \nJørgen \nJørgen Tellnes \njosé \nJosé Geraldo Gouvêa \nJosé Iván León Islas \nJosé Lou C. \nJose Sun \nJr. \nJukka Kauppinen \nJulián Alarcón \njulietgolf \nJusic \nJustzupi \nKaarel \nKai Thomsen \nKalman Tarnay \nKamil Páral \nKane_F \nkaotiks@gmail.com \nKateikyoushii \nkaxhinaz \nKazuhiro NISHIYAMA \nKerberos \nKeresztes Ákos \nkevintyk \nkiersie \nKimbo^ \nKim Lübbe \nkitzOgen \nKjetil Rydland \nkluon \nkmikz \nKnedlyk \nkoleoptero \nKőrösi Krisztián \nKouta \nKrakatos \nKrešo Kunjas \nkripken \nKristaps \nKristian Øllegaard \nKristoffer Egil Bonarjee \nKrzysztof Janowski \nKrzysztof Zawada \nLarry Wei Liu \nlaughterwym \nLaur Mõtus \nlazka \nleandrud \nlê bình \nLe Coz Florent \nLeo \nliorda \nLKRaider \nLoLo_SaG \nLong Tran \nLorenz \nLow Kian Seong \nLuca Andrea Rossi \nLuca Ferretti \nLucky LIX \nLuis Gomes \nLuis Reis \nŁukasz Wyszyński \nluojie-dune \nmaaark \nMaciej Chojnacki \nMaciej Meller \nMads Peter Rommedahl \nMajor Kong \nMalaki \nmalde \nMalte Lenz \nMantas Kriaučiūnas \nMara Sorella \nMarcin \nMarcin Falkiewicz \nmarcobra \nMarco da Silva \nMarco de Moulin \nMarco Rodrigues \nMarcos \nMarcos Escalier \nMarcos Pinto \nMarcus Ekstrom \nMarek Dębowski \nMário Buči \nMario Munda \nMarius Andersen \nMarius Hudea \nMarius Mihai \nMariusz Cielecki \nMark Krapivner \nmarko-markovic \nMarkus Brummer \nMarkus Sutter \nMartin \nMartin Dybdal \nMartin Iglesias \nMartin Lettner \nMartin Pihl \nMasoud Kalali \nmat02 \nMatej Urbančič \nMathias-K \nMathieu Arès \nMathieu D. (MatToufoutu) \nMathijs \nMatrik \nMatteo Renzulli \nMatteo Settenvini \nMatthew Gadd \nMatthias Benkard \nMatthias Mailänder \nMattias Ohlsson \nMauro de Carvalho \nMax Molchanov \nMe \nMercuryCC \nMert Bozkurt \nMert Dirik \nMFX \nmhietar \nmibtha \nMichael Budde \nMichael Kaliszka \nMichalis Makaronides \nMichał Tokarczyk \nMiguel Pires da Rosa \nMihai Capotă \nMiika Metsälä \nMikael Fernblad \nMike Sierra \nmikhalek \nMilan Prvulović \nMilo Casagrande \nMindaugas \nMiroslav Matejaš \nmisel \nmithras \nMitja Pagon \nM.Kitchen \nMohamed Magdy \nmoonkey \nMrBlonde \nmuczy \nMünir Ekinci \nMustafa Temizel \nmvoncken \nMytonn \nNagyMarton \nneaion \nNeil Lin \nNemo \nNerijus Arlauskas \nNicklas Larsson \nNicolaj Wyke \nNicola Piovesan \nNicolas Sabatier \nNicolas Velin \nNightfall \nNiKoB \nNikolai M. Riabov \nNiko_Thien \nniska \nNithir \nnoisemonkey \nnomemohes \nnosense \nnull \nNuno Estêvão \nNuno Santos \nnxxs \nnyo \nobo \nOjan \nOlav Andreas Lindekleiv \noldbeggar \nOlivier FAURAX \norphe \nosantana \nOsman Tosun \nOssiR \notypoks \nounn \nOz123 \nÖzgür BASKIN \nPablo Carmona A. \nPablo Ledesma \nPablo Navarro Castillo \nPaco Molinero \nPål-Eivind Johnsen \npano \nPaolo Naldini \nParacelsus \nPatryk13_03 \nPatryk Skorupa \nPattogoTehen \nPaul Lange \nPavcio \nPaweł Wysocki \nPedro Brites Moita \nPedro Clemente Pereira Neto \nPekka \"PEXI\" Niemistö \nPenegal \nPenzo \nperdido \nPeter Kotrcka \nPeter Skov \nPeter Van den Bosch \nPetter Eklund \nPetter Viklund \nphatsphere \nPhenomen \nPhilipi \nPhilippides Homer \nphoenix \npidi \nPierre Quillery \nPierre Rudloff \nPierre Slamich \nPietrao \nPiotr Strębski \nPiotr Wicijowski \nPittmann Tamás \nPlaymolas \nPrescott \nPrescott_SK \npronull \nPrzemysław Kulczycki \nPumy \npushpika \nPY \nqubicllj \nr21vo \nRafał Barański \nrainofchaos \nRajbir \nras0ir \nRat \nrd1381 \nRenato \nRene Hennig \nRene Pärts \nRicardo Duarte \nRichard \nRobert Hrovat \nRoberth Sjonøy \nRobert Lundmark \nRobin Jakobsson \nRobin Kåveland \nRodrigo Donado \nRoel Groeneveld \nrohmaru \nRolf Christensen \nRolf Leggewie \nRoni Kantis \nRonmi \nRostislav Raykov \nroyto \nRuiAmaro \nRui Araújo \nRui Moura \nRune Svendsen \nRusna \nRytis \nSabirov Mikhail \nsalseeg \nSami Koskinen \nSamir van de Sand \nSamuel Arroyo Acuña \nSamuel R. C. Vale \nSanel \nSanti \nSanti Martínez Cantelli \nSardan \nSargate Kanogan \nSarmad Jari \nSaša Bodiroža \nsat0shi \nSaulius Pranckevičius \nSavvas Radevic \nSebastian Krauß \nSebastián Porta \nSedir \nSefa Denizoğlu \nsekolands \nSelim Suerkan \nsemsomi \nSergii Golovatiuk \nsetarcos \nSheki \nShironeko \nShlomil \nsilfiriel \nSimone Tolotti \nSimone Vendemia \nsirkubador \nSławomir Więch \nslip \nslyon \nsmoke \nSonja \nspectral \nspin_555 \nspitf1r3 \nSpiziuz \nSpyros Theodoritsis \nSqUe \nSquigly \nsrtck \nStefan Horning \nStefano Maggiolo \nStefano Roberto Soleti \nsteinberger \nStéphane Travostino \nStephan Klein \nSteven De Winter \nStevie \nStian24 \nstylius \nSukarn Maini \nSunjae Park \nSusana Pereira \nszymon siglowy \ntakercena \nTAS \nTaygeto \ntemy4 \ntexxxxxx \nthamood \nThanos Chatziathanassiou \nTharawut Paripaiboon \nTheodoor \nThéophane Anestis \nThor Marius K. Høgås \nTiago Silva \nTiago Sousa \nTikkel \ntim__b \nTim Bordemann \nTim Fuchs \nTim Kornhammar \nTimo \nTimo Jyrinki \nTimothy Babych \nTitkosRejtozo \nTom \nTomas Gustavsson \nTomas Valentukevičius \nTomasz Dominikowski \nTomislav Plavčić \nTom Mannerhagen \nTommy Mikkelsen \nTom Verdaat \nTony Manco \nTor Erling H. Opsahl \nToudi \ntqm_z \nTrapanator \nTribaal \nTriton \nTuniX12 \nTuomo Sipola \nturbojugend_gr \nTurtle.net \ntwilight \ntymmej \nUlrik \nUmarzuki Mochlis \nunikob \nVadim Gusev \nVagi \nValentin Bora \nValmantas Palikša \nVASKITTU \nVassilis Skoullis \nvetal17 \nvicedo \nviki \nvillads hamann \nVincent Garibal \nVincent Ortalda \nvinchi007 \nVinícius de Figueiredo Silva \nVinzenz Vietzke \nvirtoo \nvirtual_spirit \nVitor Caike \nVitor Lamas Gatti \nVladimir Lazic \nVladimir Sharshov \nWanderlust \nWander Nauta \nWard De Ridder \nWebCrusader \nwebdr \nWentao Tang \nwilana \nWilfredo Ernesto Guerrero Campos \nWim Champagne \nWorld Sucks \nXabi Ezpeleta \nXavi de Moner \nXavierToo \nXChesser \nXiaodong Xu \nxyb \nYaron \nYasen Pramatarov \nYesPoX \nYuren Ju \nYves MATHIEU \nzekopeko \nzhuqin \nZissan \nΓιάννης Κατσαμπίρης \nАртём Попов \nМиша \nШаймарданов Максим \n蔡查理")
+        self.about.set_translator_credits("\n".join([
+            "Aaron Wang Shi", "abbigss", "ABCdatos", "Abcx", "Actam", "Adam",
+            "adaminikisi", "adi_oporanu", "Adrian Goll", "afby", "Ahmades",
+            "Ahmad Farghal", "Ahmad Gharbeia أحمد غربية", "akira", "Aki Sivula",
+            "Alan Pepelko", "Alberto", "Alberto Ferrer", "alcatr4z", "AlckO",
+            "Aleksej Korgenkov", "Alessio Treglia", "Alexander Ilyashov",
+            "Alexander Matveev", "Alexander Saltykov", "Alexander Taubenkorb",
+            "Alexander Telenga", "Alexander Yurtsev", "Alexandre Martani",
+            "Alexandre Rosenfeld", "Alexandre Sapata Carbonell",
+            "Alexey Osipov", "Alin Claudiu Radut", "allah", "AlSim",
+            "Alvaro Carrillanca P.", "A.Matveev", "Andras Hipsag",
+            "András Kárász", "Andrea Ratto", "Andreas Johansson", "Andreas Str",
+            "André F. Oliveira", "AndreiF", "andrewh", "Angel Guzman Maeso",
+            "Aníbal Deboni Neto", "animarval", "Antonio Cono", "antoniojreyes",
+            "Anton Shestakov", "Anton Yakutovich", "antou",
+            "Arkadiusz Kalinowski", "Artin", "artir", "Astur",
+            "Athanasios Lefteris", "Athmane MOKRAOUI (ButterflyOfFire)",
+            "Augusta Carla Klug", "Avoledo Marco", "axaard", "AxelRafn",
+            "Axezium", "Ayont", "b3rx", "Bae Taegil", "Bajusz Tamás",
+            "Balaam's Miracle", "Ballestein", "Bent Ole Fosse", "berto89",
+            "bigx", "Bjorn Inge Berg", "blackbird", "Blackeyed", "blackmx",
+            "BlueSky", "Blutheo", "bmhm", "bob00work", "boenki",
+            "Bogdan Bădic-Spătariu", "bonpu", "Boone", "boss01",
+            "Branislav Jovanović", "bronze", "brownie", "Brus46", "bumper",
+            "butely", "BXCracer", "c0nfidencal", "Can Kaya",
+            "Carlos Alexandro Becker", "cassianoleal", "Cédric.h",
+            "César Rubén", "chaoswizard", "Chen Tao", "chicha",
+            "Chien Cheng Wei", "Christian Kopac", "Christian Widell",
+            "Christoffer Brodd-Reijer", "christooss", "CityAceE", "Clopy",
+            "Clusty", "cnu", "Commandant", "Constantinos Koniaris", "Coolmax",
+            "cosmix", "Costin Chirvasuta", "CoVaLiDiTy", "cow_2001",
+            "Crispin Kirchner", "crom", "Cruster", "Cybolic", "Dan Bishop",
+            "Danek", "Dani", "Daniel Demarco", "Daniel Ferreira",
+            "Daniel Frank", "Daniel Holm", "Daniel Høyer Iversen",
+            "Daniel Marynicz", "Daniel Nylander", "Daniel Patriche",
+            "Daniel Schildt", "Daniil Sorokin", "Dante Díaz", "Daria Michalska",
+            "DarkenCZ", "Darren", "Daspah", "David Eurenius", "davidhjelm",
+            "David Machakhelidze", "Dawid Dziurdzia", "Daya Adianto ", "dcruz",
+            "Deady", "Dereck Wonnacott", "Devgru", "Devid Antonio Filoni"
+            "DevilDogTG", "di0rz`", "Dialecti Valsamou", "Diego Medeiros",
+            "Dkzoffy", "Dmitrij D. Czarkoff", "Dmitriy Geels",
+            "Dmitry Olyenyov", "Dominik Kozaczko", "Dominik Lübben", "doomster",
+            "Dorota Król", "Doyen Philippe", "Dread Knight", "DreamSonic",
+            "duan", "Duong Thanh An", "DvoglavaZver", "dwori", "dylansmrjones",
+            "Ebuntor", "Edgar Alejandro Jarquin Flores", "Eetu", "ekerazha",
+            "Elias Julkunen", "elparia", "Emberke", "Emiliano Goday Caneda",
+            "EndelWar", "eng.essam", "enubuntu", "ercangun", "Erdal Ronahi",
+            "ergin üresin", "Eric", "Éric Lassauge", "Erlend Finvåg", "Errdil",
+            "ethan shalev", "Evgeni Spasov", "ezekielnin", "Fabian Ordelmans",
+            "Fabio Mazanatti", "Fábio Nogueira", "FaCuZ", "Felipe Lerena",
+            "Fernando Pereira", "fjetland", "Florian Schäfer", "FoBoS", "Folke",
+            "Force", "fosk", "fragarray", "freddeg", "Frédéric Perrin",
+            "Fredrik Kilegran", "FreeAtMind", "Fulvio Ciucci", "Gabor Kelemen",
+            "Galatsanos Panagiotis", "Gaussian", "gdevitis", "Georg Brzyk",
+            "George Dumitrescu", "Georgi Arabadjiev", "Georg Sieber",
+            "Gerd Radecke", "Germán Heusdens", "Gianni Vialetto",
+            "Gigih Aji Ibrahim", "Giorgio Wicklein", "Giovanni Rapagnani",
+            "Giuseppe", "gl", "glen", "granjerox", "Green Fish", "greentea",
+            "Greyhound", "G. U.", "Guillaume BENOIT", "Guillaume Pelletier",
+            "Gustavo Henrique Klug", "gutocarvalho", "Guybrush88",
+            "Hans Rødtang", "HardDisk", "Hargas Gábor",
+            "Heitor Thury Barreiros Barbosa", "helios91940", "helix84",
+            "Helton Rodrigues", "Hendrik Luup", "Henrique Ferreiro",
+            "Henry Goury-Laffont", "Hezy Amiel", "hidro", "hoball", "hokten",
+            "Holmsss", "hristo.num", "Hubert Życiński", "Hyo", "Iarwain", "ibe",
+            "ibear", "Id2ndR", "Igor Zubarev", "IKON (Ion)", "imen",
+            "Ionuț Jula", "Isabelle STEVANT", "István Nyitrai", "Ivan Petrovic",
+            "Ivan Prignano", "IvaSerge", "jackmc", "Jacks0nxD", "Jack Shen",
+            "Jacky Yeung","Jacques Stadler", "Janek Thomaschewski", "Jan Kaláb",
+            "Jan Niklas Hasse", "Jasper Groenewegen", "Javi Rodríguez",
+            "Jayasimha (ಜಯಸಿಂಹ)", "jeannich", "Jeff Bailes", "Jesse Zilstorff",
+            "Joan Duran", "João Santos", "Joar Bagge", "Joe Anderson",
+            "Joel Calado", "Johan Linde", "John Garland", "Jojan", "jollyr0ger",
+            "Jonas Bo Grimsgaard", "Jonas Granqvist", "Jonas Slivka",
+            "Jonathan Zeppettini", "Jørgen", "Jørgen Tellnes", "josé",
+            "José Geraldo Gouvêa", "José Iván León Islas", "José Lou C.",
+            "Jose Sun", "Jr.", "Jukka Kauppinen", "Julián Alarcón",
+            "julietgolf", "Jusic", "Justzupi", "Kaarel", "Kai Thomsen",
+            "Kalman Tarnay", "Kamil Páral", "Kane_F", "kaotiks@gmail.com",
+            "Kateikyoushii", "kaxhinaz", "Kazuhiro NISHIYAMA", "Kerberos",
+            "Keresztes Ákos", "kevintyk", "kiersie", "Kimbo^", "Kim Lübbe",
+            "kitzOgen", "Kjetil Rydland", "kluon", "kmikz", "Knedlyk",
+            "koleoptero", "Kőrösi Krisztián", "Kouta", "Krakatos",
+            "Krešo Kunjas", "kripken", "Kristaps", "Kristian Øllegaard",
+            "Kristoffer Egil Bonarjee", "Krzysztof Janowski",
+            "Krzysztof Zawada", "Larry Wei Liu", "laughterwym", "Laur Mõtus",
+            "lazka", "leandrud", "lê bình", "Le Coz Florent", "Leo", "liorda",
+            "LKRaider", "LoLo_SaG", "Long Tran", "Lorenz", "Low Kian Seong",
+            "Luca Andrea Rossi", "Luca Ferretti", "Lucky LIX", "Luis Gomes",
+            "Luis Reis", "Łukasz Wyszyński", "luojie-dune", "maaark",
+            "Maciej Chojnacki", "Maciej Meller", "Mads Peter Rommedahl",
+            "Major Kong", "Malaki", "malde", "Malte Lenz", "Mantas Kriaučiūnas",
+            "Mara Sorella", "Marcin", "Marcin Falkiewicz", "marcobra",
+            "Marco da Silva", "Marco de Moulin", "Marco Rodrigues", "Marcos",
+            "Marcos Escalier", "Marcos Pinto", "Marcus Ekstrom",
+            "Marek Dębowski", "Mário Buči", "Mario Munda", "Marius Andersen",
+            "Marius Hudea", "Marius Mihai", "Mariusz Cielecki",
+            "Mark Krapivner", "marko-markovic", "Markus Brummer",
+            "Markus Sutter", "Martin", "Martin Dybdal", "Martin Iglesias",
+            "Martin Lettner", "Martin Pihl", "Masoud Kalali", "mat02",
+            "Matej Urbančič", "Mathias-K", "Mathieu Arès",
+            "Mathieu D. (MatToufoutu)", "Mathijs", "Matrik", "Matteo Renzulli",
+            "Matteo Settenvini", "Matthew Gadd", "Matthias Benkard",
+            "Matthias Mailänder", "Mattias Ohlsson", "Mauro de Carvalho",
+            "Max Molchanov", "Me", "MercuryCC", "Mert Bozkurt", "Mert Dirik",
+            "MFX", "mhietar", "mibtha", "Michael Budde", "Michael Kaliszka",
+            "Michalis Makaronides", "Michał Tokarczyk", "Miguel Pires da Rosa",
+            "Mihai Capotă", "Miika Metsälä", "Mikael Fernblad", "Mike Sierra",
+            "mikhalek", "Milan Prvulović", "Milo Casagrande", "Mindaugas",
+            "Miroslav Matejaš", "misel", "mithras", "Mitja Pagon", "M.Kitchen",
+            "Mohamed Magdy", "moonkey", "MrBlonde", "muczy", "Münir Ekinci",
+            "Mustafa Temizel", "mvoncken", "Mytonn", "NagyMarton", "neaion",
+            "Neil Lin", "Nemo", "Nerijus Arlauskas", "Nicklas Larsson",
+            "Nicolaj Wyke", "Nicola Piovesan", "Nicolas Sabatier",
+            "Nicolas Velin", "Nightfall", "NiKoB", "Nikolai M. Riabov",
+            "Niko_Thien", "niska", "Nithir", "noisemonkey", "nomemohes",
+            "nosense", "null", "Nuno Estêvão", "Nuno Santos", "nxxs", "nyo",
+            "obo", "Ojan", "Olav Andreas Lindekleiv", "oldbeggar",
+            "Olivier FAURAX", "orphe", "osantana", "Osman Tosun", "OssiR",
+            "otypoks", "ounn", "Oz123", "Özgür BASKIN", "Pablo Carmona A.",
+            "Pablo Ledesma", "Pablo Navarro Castillo", "Paco Molinero",
+            "Pål-Eivind Johnsen", "pano", "Paolo Naldini", "Paracelsus",
+            "Patryk13_03", "Patryk Skorupa", "PattogoTehen", "Paul Lange",
+            "Pavcio", "Paweł Wysocki", "Pedro Brites Moita",
+            "Pedro Clemente Pereira Neto", "Pekka \"PEXI\" Niemistö", "Penegal",
+            "Penzo", "perdido", "Peter Kotrcka", "Peter Skov",
+            "Peter Van den Bosch", "Petter Eklund", "Petter Viklund",
+            "phatsphere", "Phenomen", "Philipi", "Philippides Homer", "phoenix",
+            "pidi", "Pierre Quillery", "Pierre Rudloff", "Pierre Slamich",
+            "Pietrao", "Piotr Strębski", "Piotr Wicijowski", "Pittmann Tamás",
+            "Playmolas", "Prescott", "Prescott_SK", "pronull",
+            "Przemysław Kulczycki", "Pumy", "pushpika", "PY", "qubicllj",
+            "r21vo", "Rafał Barański", "rainofchaos", "Rajbir", "ras0ir", "Rat",
+            "rd1381", "Renato", "Rene Hennig", "Rene Pärts", "Ricardo Duarte",
+            "Richard", "Robert Hrovat", "Roberth Sjonøy", "Robert Lundmark",
+            "Robin Jakobsson", "Robin Kåveland", "Rodrigo Donado",
+            "Roel Groeneveld", "rohmaru", "Rolf Christensen", "Rolf Leggewie",
+            "Roni Kantis", "Ronmi", "Rostislav Raykov", "royto", "RuiAmaro",
+            "Rui Araújo", "Rui Moura", "Rune Svendsen", "Rusna", "Rytis",
+            "Sabirov Mikhail", "salseeg", "Sami Koskinen", "Samir van de Sand",
+            "Samuel Arroyo Acuña", "Samuel R. C. Vale", "Sanel", "Santi",
+            "Santi Martínez Cantelli", "Sardan", "Sargate Kanogan",
+            "Sarmad Jari", "Saša Bodiroža", "sat0shi", "Saulius Pranckevičius",
+            "Savvas Radevic", "Sebastian Krauß", "Sebastián Porta", "Sedir",
+            "Sefa Denizoğlu", "sekolands", "Selim Suerkan", "semsomi",
+            "Sergii Golovatiuk", "setarcos", "Sheki", "Shironeko", "Shlomil",
+            "silfiriel", "Simone Tolotti", "Simone Vendemia", "sirkubador",
+            "Sławomir Więch", "slip", "slyon", "smoke", "Sonja", "spectral",
+            "spin_555", "spitf1r3", "Spiziuz", "Spyros Theodoritsis", "SqUe",
+            "Squigly", "srtck", "Stefan Horning", "Stefano Maggiolo",
+            "Stefano Roberto Soleti", "steinberger", "Stéphane Travostino",
+            "Stephan Klein", "Steven De Winter", "Stevie", "Stian24", "stylius",
+            "Sukarn Maini", "Sunjae Park", "Susana Pereira", "szymon siglowy",
+            "takercena", "TAS", "Taygeto", "temy4", "texxxxxx", "thamood",
+            "Thanos Chatziathanassiou", "Tharawut Paripaiboon", "Theodoor",
+            "Théophane Anestis", "Thor Marius K. Høgås", "Tiago Silva",
+            "Tiago Sousa", "Tikkel", "tim__b", "Tim Bordemann", "Tim Fuchs",
+            "Tim Kornhammar", "Timo", "Timo Jyrinki", "Timothy Babych",
+            "TitkosRejtozo", "Tom", "Tomas Gustavsson", "Tomas Valentukevičius",
+            "Tomasz Dominikowski", "Tomislav Plavčić", "Tom Mannerhagen",
+            "Tommy Mikkelsen", "Tom Verdaat", "Tony Manco",
+            "Tor Erling H. Opsahl", "Toudi", "tqm_z", "Trapanator", "Tribaal",
+            "Triton", "TuniX12", "Tuomo Sipola", "turbojugend_gr", "Turtle.net",
+            "twilight", "tymmej", "Ulrik", "Umarzuki Mochlis", "unikob",
+            "Vadim Gusev", "Vagi", "Valentin Bora", "Valmantas Palikša",
+            "VASKITTU", "Vassilis Skoullis", "vetal17", "vicedo", "viki",
+            "villads hamann", "Vincent Garibal", "Vincent Ortalda", "vinchi007",
+            "Vinícius de Figueiredo Silva", "Vinzenz Vietzke", "virtoo",
+            "virtual_spirit", "Vitor Caike", "Vitor Lamas Gatti",
+            "Vladimir Lazic", "Vladimir Sharshov", "Wanderlust", "Wander Nauta",
+            "Ward De Ridder", "WebCrusader", "webdr", "Wentao Tang", "wilana",
+            "Wilfredo Ernesto Guerrero Campos", "Wim Champagne", "World Sucks",
+            "Xabi Ezpeleta", "Xavi de Moner", "XavierToo", "XChesser",
+            "Xiaodong Xu", "xyb", "Yaron", "Yasen Pramatarov", "YesPoX",
+            "Yuren Ju", "Yves MATHIEU", "zekopeko", "zhuqin", "Zissan",
+            "Γιάννης Κατσαμπίρης", "Артём Попов", "Миша", "Шаймарданов Максим",
+            "蔡查理"
+        ]))
         self.about.set_wrap_license(True)
-        self.about.set_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 . \
-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 \
-statement from all source files in the program, then also delete it here."))
+        self.about.set_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 . 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 statement from all "
+            "source files in the program, then also delete it here."
+        ))
         self.about.set_website("http://deluge-torrent.org")
         self.about.set_website_label("http://deluge-torrent.org")
 
         self.about.set_icon(common.get_deluge_icon())
         self.about.set_logo(gtk.gdk.pixbuf_new_from_file(
-                                deluge.common.get_pixmap("deluge-about.png")))
+            deluge.common.get_pixmap("deluge-about.png")
+        ))
 
         if client.connected():
             def on_lt_version(result):

From e3831877965570dd0e808ac6bd462dcaa4171643 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 17 May 2011 22:50:05 +0100
Subject: [PATCH 262/329] Fix #1281. Show a nice dialog stating that the client
 is incompatible on the GTK UI.

---
 deluge/core/rpcserver.py             | 19 +++++++++----------
 deluge/error.py                      |  7 ++++++-
 deluge/ui/client.py                  |  4 ++--
 deluge/ui/gtkui/connectionmanager.py | 10 ++++++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index 5536d2892..7069ec6e9 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -55,14 +55,15 @@ except ImportError:
 
 import deluge.component as component
 import deluge.configmanager
-from deluge.core.authmanager import AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT, AUTH_LEVEL_ADMIN
+from deluge.core.authmanager import (AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT,
+                                     AUTH_LEVEL_ADMIN)
 from deluge.error import (DelugeError, NotAuthorizedError, _PassthroughError,
                           IncompatibleClient)
 
 RPC_RESPONSE = 1
 RPC_ERROR = 2
 RPC_EVENT = 3
-RPC_EVENT_AUTH = 4
+RPC_EVENT_EXCEPTION = 4
 
 log = logging.getLogger(__name__)
 
@@ -177,7 +178,8 @@ class DelugeRPCProtocol(Protocol):
 
             for call in request:
                 if len(call) != 4:
-                    log.debug("Received invalid rpc request: number of items in request is %s", len(call))
+                    log.debug("Received invalid rpc request: number of items "
+                              "in request is %s", len(call))
                     continue
                 #log.debug("RPCRequest: %s", format_request(call))
                 reactor.callLater(0, self.dispatch, *call)
@@ -198,7 +200,8 @@ class DelugeRPCProtocol(Protocol):
         This method is called when a new client connects.
         """
         peer = self.transport.getPeer()
-        log.info("Deluge Client connection made from: %s:%s", peer.host, peer.port)
+        log.info("Deluge Client connection made from: %s:%s",
+                 peer.host, peer.port)
         # Set the initial auth level of this session to AUTH_LEVEL_NONE
         self.factory.authorized_sessions[self.transport.sessionno] = AUTH_LEVEL_NONE
 
@@ -264,11 +267,7 @@ class DelugeRPCProtocol(Protocol):
             try:
                 client_version = kwargs.pop('client_version', None)
                 if client_version is None:
-                    raise IncompatibleClient(
-                        "Your deluge client is not compatible with the daemon. "
-                        "Please upgrade your client to %s" %
-                        deluge.common.get_version()
-                    )
+                    raise IncompatibleClient(deluge.common.get_version())
                 ret = component.get("AuthManager").authorize(*args, **kwargs)
                 if ret:
                     self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0])
@@ -276,7 +275,7 @@ class DelugeRPCProtocol(Protocol):
             except Exception, e:
                 if isinstance(e, _PassthroughError):
                     self.sendData(
-                        (RPC_EVENT_AUTH, request_id,
+                        (RPC_EVENT_EXCEPTION, request_id,
                          e.__class__.__name__,
                          e._args, e._kwargs, args[0])
                     )
diff --git a/deluge/error.py b/deluge/error.py
index 2e3c78305..14579d88a 100644
--- a/deluge/error.py
+++ b/deluge/error.py
@@ -66,7 +66,12 @@ class _PassthroughError(DelugeError):
         return inst
 
 class IncompatibleClient(_PassthroughError):
-    pass
+    def __init__(self, daemon_version):
+        self.daemon_version = daemon_version
+        self.message = _(
+            "Your deluge client is not compatible with the daemon. "
+            "Please upgrade your client to %(daemon_version)s"
+        ) % {'daemon_version': self.daemon_version}
 
 class NotAuthorizedError(_PassthroughError):
 
diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index e2105f2df..794f3ed21 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -56,7 +56,7 @@ else:
 RPC_RESPONSE = 1
 RPC_ERROR = 2
 RPC_EVENT = 3
-RPC_EVENT_AUTH = 4
+RPC_EVENT_EXCEPTION = 4
 
 log = logging.getLogger(__name__)
 
@@ -204,7 +204,7 @@ class DelugeRPCProtocol(Protocol):
             if message_type == RPC_RESPONSE:
                 # Run the callbacks registered with this Deferred object
                 d.callback(request[2])
-            elif message_type == RPC_EVENT_AUTH:
+            elif message_type == RPC_EVENT_EXCEPTION:
                 # Recreate exception and errback'it
                 d.errback(getattr(error, request[2])(*request[3], **request[4]))
             elif message_type == RPC_ERROR:
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index fdddacd1e..c76c80c8e 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -48,7 +48,7 @@ from deluge.ui.common import get_localhost_auth
 from deluge.ui.client import client
 import deluge.ui.client
 from deluge.configmanager import ConfigManager
-from deluge.error import AuthenticationRequired, BadLoginError
+from deluge.error import AuthenticationRequired, BadLoginError, IncompatibleClient
 import dialogs
 
 log = logging.getLogger(__name__)
@@ -512,7 +512,6 @@ class ConnectionManager(component.Component):
     def __on_connected_failed(self, reason, host_id, host, port, user, passwd,
                               try_counter):
         log.debug("Failed to connect: %s", reason.value)
-        print reason, host_id, host, port, user, passwd, try_counter
 
         if reason.check(AuthenticationRequired, BadLoginError):
             log.debug("PasswordRequired exception")
@@ -527,6 +526,13 @@ class ConnectionManager(component.Component):
             d = dialog.run().addCallback(dialog_finished, host, port, user)
             return d
 
+        elif reason.trap(IncompatibleClient):
+            dialog = dialogs.ErrorDialog(
+                _("Incompatible Client"), reason.value.message
+            )
+            return dialog.run()
+
+
         if try_counter:
             log.info("Retrying connection.. Retries left: %s", try_counter)
             return reactor.callLater(

From 9b812a4eec6205b98d9d5c12c14f82611832217a Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Wed, 18 May 2011 03:56:17 +0100
Subject: [PATCH 263/329] Extend RPC Protocol.

While adding the multiuser auth related stuff, RPC_AUTH_EVENT was added, simply to not touch how RPC_ERROR was handled. It was created to allow recreating the exception on the client side. Instead of adding another rpc event type, extend RPC_ERROR to send the proper data to recreate the exception on the client side.
---
 deluge/core/rpcserver.py       | 23 ++++------
 deluge/error.py                | 40 +++++++++--------
 deluge/ui/client.py            | 79 +++++++++-------------------------
 deluge/ui/console/commander.py | 14 +++---
 4 files changed, 57 insertions(+), 99 deletions(-)

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index 7069ec6e9..24c894dbb 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -57,13 +57,12 @@ import deluge.component as component
 import deluge.configmanager
 from deluge.core.authmanager import (AUTH_LEVEL_NONE, AUTH_LEVEL_DEFAULT,
                                      AUTH_LEVEL_ADMIN)
-from deluge.error import (DelugeError, NotAuthorizedError, _PassthroughError,
-                          IncompatibleClient)
+from deluge.error import (DelugeError, NotAuthorizedError,
+                          _ClientSideRecreateError, IncompatibleClient)
 
 RPC_RESPONSE = 1
 RPC_ERROR = 2
 RPC_EVENT = 3
-RPC_EVENT_EXCEPTION = 4
 
 log = logging.getLogger(__name__)
 
@@ -247,13 +246,13 @@ class DelugeRPCProtocol(Protocol):
             Sends an error response with the contents of the exception that was raised.
             """
             exceptionType, exceptionValue, exceptionTraceback = sys.exc_info()
-
             self.sendData((
                 RPC_ERROR,
                 request_id,
-                (exceptionType.__name__,
-                exceptionValue.args[0] if len(exceptionValue.args) == 1 else "",
-                "".join(traceback.format_tb(exceptionTraceback)))
+                exceptionType.__name__,
+                exceptionValue._args,
+                exceptionValue._kwargs,
+                "".join(traceback.format_tb(exceptionTraceback))
             ))
 
         if method == "daemon.info":
@@ -273,14 +272,8 @@ class DelugeRPCProtocol(Protocol):
                     self.factory.authorized_sessions[self.transport.sessionno] = (ret, args[0])
                     self.factory.session_protocols[self.transport.sessionno] = self
             except Exception, e:
-                if isinstance(e, _PassthroughError):
-                    self.sendData(
-                        (RPC_EVENT_EXCEPTION, request_id,
-                         e.__class__.__name__,
-                         e._args, e._kwargs, args[0])
-                    )
-                else:
-                    sendError()
+                sendError()
+                if not isinstance(e, _ClientSideRecreateError):
                     log.exception(e)
             else:
                 self.sendData((RPC_RESPONSE, request_id, (ret)))
diff --git a/deluge/error.py b/deluge/error.py
index 14579d88a..ea7c64671 100644
--- a/deluge/error.py
+++ b/deluge/error.py
@@ -36,7 +36,21 @@
 
 
 class DelugeError(Exception):
-    pass
+    def _get_message(self):
+        return self._message
+    def _set_message(self, message):
+        self._message = message
+    message = property(_get_message, _set_message)
+    del _get_message, _set_message
+
+    def __str__(self):
+        return self.message
+
+    def __new__(cls, *args, **kwargs):
+        inst = super(DelugeError, cls).__new__(cls, *args, **kwargs)
+        inst._args = args
+        inst._kwargs = kwargs
+        return inst
 
 class NoCoreError(DelugeError):
     pass
@@ -50,30 +64,18 @@ class InvalidTorrentError(DelugeError):
 class InvalidPathError(DelugeError):
     pass
 
-class _PassthroughError(DelugeError):
+class _ClientSideRecreateError(DelugeError):
+    pass
 
-    def _get_message(self):
-        return self._message
-    def _set_message(self, message):
-        self._message = message
-    message = property(_get_message, _set_message)
-    del _get_message, _set_message
-
-    def __new__(cls, *args, **kwargs):
-        inst = super(_PassthroughError, cls).__new__(cls, *args, **kwargs)
-        inst._args = args
-        inst._kwargs = kwargs
-        return inst
-
-class IncompatibleClient(_PassthroughError):
+class IncompatibleClient(_ClientSideRecreateError):
     def __init__(self, daemon_version):
         self.daemon_version = daemon_version
         self.message = _(
             "Your deluge client is not compatible with the daemon. "
             "Please upgrade your client to %(daemon_version)s"
-        ) % {'daemon_version': self.daemon_version}
+        ) % dict(daemon_version=self.daemon_version)
 
-class NotAuthorizedError(_PassthroughError):
+class NotAuthorizedError(_ClientSideRecreateError):
 
     def __init__(self, current_level, required_level):
         self.message = _(
@@ -84,7 +86,7 @@ class NotAuthorizedError(_PassthroughError):
         self.required_level = required_level
 
 
-class _UsernameBasedPasstroughError(_PassthroughError):
+class _UsernameBasedPasstroughError(_ClientSideRecreateError):
 
     def _get_username(self):
         return self._username
diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index 794f3ed21..d356b228b 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -56,39 +56,12 @@ else:
 RPC_RESPONSE = 1
 RPC_ERROR = 2
 RPC_EVENT = 3
-RPC_EVENT_EXCEPTION = 4
 
 log = logging.getLogger(__name__)
 
 def format_kwargs(kwargs):
     return ", ".join([key + "=" + str(value) for key, value in kwargs.items()])
 
-class DelugeRPCError(object):
-    """
-    This object is passed to errback handlers in the event of a RPCError from the
-    daemon.
-    """
-    def __init__(self, method, args, kwargs, exception_type, exception_msg, traceback):
-        self.method = method
-        self.args = args
-        self.kwargs = kwargs
-        self.exception_type = exception_type
-        self.exception_msg = exception_msg
-        self.traceback = traceback
-
-    def logable(self):
-        # Create a delugerpcrequest to print out a nice RPCRequest string
-        r = DelugeRPCRequest()
-        r.method = self.method
-        r.args = self.args
-        r.kwargs = self.kwargs
-        msg = "RPCError Message Received!"
-        msg += "\n" + "-" * 80
-        msg += "\n" + "RPCRequest: " + r.__repr__()
-        msg += "\n" + "-" * 80
-        msg += "\n" + self.traceback + "\n" + self.exception_type + ": " + self.exception_msg
-        msg += "\n" + "-" * 80
-        return msg
 
 class DelugeRPCRequest(object):
     """
@@ -204,17 +177,29 @@ class DelugeRPCProtocol(Protocol):
             if message_type == RPC_RESPONSE:
                 # Run the callbacks registered with this Deferred object
                 d.callback(request[2])
-            elif message_type == RPC_EVENT_EXCEPTION:
-                # Recreate exception and errback'it
-                d.errback(getattr(error, request[2])(*request[3], **request[4]))
             elif message_type == RPC_ERROR:
-                # Create the DelugeRPCError to pass to the errback
-                r = self.__rpc_requests[request_id]
-                e = DelugeRPCError(r.method, r.args, r.kwargs, request[2][0],
-                                   request[2][1], request[2][2])
-                # Run the errbacks registered with this Deferred object
-                d.errback(e)
+                # Recreate exception and errback'it
+                exception_cls = getattr(error, request[2])
+                exception = exception_cls(*request[3], **request[4])
 
+                r = self.__rpc_requests[request_id]
+                msg = "RPCError Message Received!"
+                msg += "\n" + "-" * 80
+                msg += "\n" + "RPCRequest: " + r.__repr__()
+                msg += "\n" + "-" * 80
+                msg += "\n" + request[5] + "\n" + request[2] + ": "
+                msg += str(exception)
+                msg += "\n" + "-" * 80
+
+                if not isinstance(exception, error._ClientSideRecreateError):
+                    # Let's log these as errors
+                    log.error(msg)
+                else:
+                    # The rest just get's logged in debug level, just to log
+                    # what's happending
+                    log.debug(msg)
+
+                d.errback(exception)
             del self.__rpc_requests[request_id]
 
     def send_request(self, request):
@@ -347,7 +332,6 @@ class DaemonSSLProxy(DaemonProxy):
         # Create a Deferred object to return and add a default errback to print
         # the error.
         d = defer.Deferred()
-        d.addErrback(self.__rpcError)
 
         # Store the Deferred until we receive a response from the daemon
         self.__deferred[self.__request_counter] = d
@@ -405,27 +389,6 @@ class DaemonSSLProxy(DaemonProxy):
         if event in self.__factory.event_handlers and handler in self.__factory.event_handlers[event]:
             self.__factory.event_handlers[event].remove(handler)
 
-    def __rpcError(self, error_data):
-        """
-        Prints out a RPCError message to the error log.  This includes the daemon
-        traceback.
-
-        :param error_data: this is passed from the deferred errback with error.value
-            containing a `:class:DelugeRPCError` object.
-        """
-        try:
-            if isinstance(error_data.value, error.NotAuthorizedError):
-                # Still log these errors
-                log.error(error_data.value.logable())
-                return error_data
-            if isinstance(error_data.value, error._PassthroughError):
-                return error_data
-        except:
-            pass
-
-        log.error(error_data.value.logable())
-        return error_data
-
     def __on_connect(self, result):
         log.debug("__on_connect called")
 
diff --git a/deluge/ui/console/commander.py b/deluge/ui/console/commander.py
index 5f3503049..21680c06f 100644
--- a/deluge/ui/console/commander.py
+++ b/deluge/ui/console/commander.py
@@ -37,6 +37,7 @@
 
 from twisted.internet import defer, reactor
 import deluge.component as component
+from deluge.error import DelugeError
 from deluge.ui.client import client
 from deluge.ui.console import UI_PATH
 from colors import strip_colors
@@ -51,7 +52,7 @@ class Commander:
         self.interactive = interactive
 
     def write(self,line):
-        print(strip_colors(line))    
+        print(strip_colors(line))
 
     def do_command(self, cmd):
         """
@@ -128,12 +129,11 @@ class Commander:
                 self.console.started_deferred.addCallback(on_started)
             component.start().addCallback(on_started)
 
-        def on_connect_fail(result):
-            from deluge.ui.client import DelugeRPCError
-            if isinstance(result.value,DelugeRPCError):
-                rm = result.value.exception_msg
+        def on_connect_fail(reason):
+            if reason.check(DelugeError):
+                rm = reason.value.message
             else:
-                rm = result.getErrorMessage()
+                rm = reason.getErrorMessage()
             print "Could not connect to: %s:%d\n %s"%(host,port,rm)
             self.do_command("quit")
 
@@ -143,4 +143,4 @@ class Commander:
             d = client.connect()
         d.addCallback(on_connect)
         d.addErrback(on_connect_fail)
-        
+

From 19f32b14466d1e44942489ede29c0959c3e949a1 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Mon, 2 May 2011 18:29:50 +0100
Subject: [PATCH 264/329] Provided a method to get the pieces information.

Each piece will return 0 for a missing piece, 1 for a not downloaded piece, 2 for a downloading piece and 3 for a downloaded piece.
---
 deluge/core/torrent.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 5db3a4c67..7bde8b075 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -723,6 +723,10 @@ class Torrent(object):
             if self.handle.has_metadata():
                 return self.torrent_info.piece_length()
             return 0
+        def ti_pieces_info():
+            if self.handle.has_metadata():
+                return self.get_pieces_info()
+            return None
 
         fns = {
             "comment": ti_comment,
@@ -733,6 +737,7 @@ class Torrent(object):
             "name": ti_name,
             "num_files": ti_num_files,
             "num_pieces": ti_num_pieces,
+            "pieces": ti_pieces_info,
             "peers": self.get_peers,
             "piece_length": ti_piece_length,
             "private": ti_priv,
@@ -987,3 +992,18 @@ class Torrent(object):
         log.trace("Torrent %s has all the pieces. Setting last seen complete.",
                   self.torrent_id)
         self._last_seen_complete = time.time()
+
+    def get_pieces_info(self):
+        pieces = {}
+        for peer in self.handle.get_peer_info():
+            pieces[peer.downloading_piece_index] = 2
+        availability = self.handle.piece_availability()
+        for idx, piece in enumerate(self.handle.status().pieces):
+            if idx in pieces:
+                continue
+            pieces[idx] = 3 if piece else (availability[idx] > 1 and 1 or 0)
+
+        for piece in self.handle.get_download_queue():
+            pieces[piece['piece_index']] = 1
+        return pieces.values()
+

From 2d59b62317f0f46c32fa00dfe026464b12250f2f Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 3 May 2011 15:45:01 +0100
Subject: [PATCH 265/329] Provide the option to the user to use the pieces bar
 or not(Glade file only).

---
 .../ui/gtkui/glade/preferences_dialog.glade   | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 9dfb2c5f4..9c41900ff 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
     False
@@ -2237,6 +2237,33 @@ Disabled
                                             0
                                           
                                         
+                                        
+                                          
+                                            True
+                                            True
+                                            False
+                                            Besides being experimental, using the pieces bar
+will increase the bandwidth used between client
+and daemon(does not apply in classic mode).
+Use at your own risk if you wish to help us debug
+this new feature.
+                                            False
+                                            True
+                                            
+                                              
+                                                True
+                                                False
+                                                Show pieces bar instead of the progress bar (<b>EXPERIMENTAL!!!</b>)
+                                                True
+                                              
+                                            
+                                          
+                                          
+                                            True
+                                            True
+                                            1
+                                          
+                                        
                                       
                                     
                                   

From 438cbd2238e32a59424ae6e6ab0c2de6b6155ed6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Wed, 4 May 2011 23:24:00 +0100
Subject: [PATCH 266/329] Correct the pieces states "calculation".

---
 deluge/core/torrent.py | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 7bde8b075..aa727c130 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -995,15 +995,41 @@ class Torrent(object):
 
     def get_pieces_info(self):
         pieces = {}
-        for peer in self.handle.get_peer_info():
-            pieces[peer.downloading_piece_index] = 2
+        # First get the pieces availability.
         availability = self.handle.piece_availability()
+        # Now, the pieces being downloaded
+#        for piece in self.handle.get_download_queue():
+#            # In case the torrent is paused, the pieces in the download queue
+#            # will be shown as waiting
+##            pieces[piece['piece_index']] = self.handle.is_paused() and 1 or 2
+#            pieces[piece['piece_index']] = 1
+
+        # Pieces from connected peers
+        for peer_info in self.handle.get_peer_info():
+            if peer_info.downloading_piece_index < 0:
+                continue
+            pieces[peer_info.downloading_piece_index] = 2
+
+        # Now, the rest of the pieces
         for idx, piece in enumerate(self.handle.status().pieces):
             if idx in pieces:
+                # Piece beeing downloaded, handled above
                 continue
-            pieces[idx] = 3 if piece else (availability[idx] > 1 and 1 or 0)
-
-        for piece in self.handle.get_download_queue():
-            pieces[piece['piece_index']] = 1
-        return pieces.values()
+            elif piece:
+                # Completed Piece
+                pieces[idx] = 3
+                continue
+            elif availability[idx] > 1:
+                # Piece not downloaded nor beeing downloaded
+                pieces[idx] = 1
+                continue
+            # If we reached here, it means the piece is missing, ie, there's
+            # no known peer with this piece, or this piece has not been asked
+            # for so far.
+            pieces[idx] = 0
 
+        sorted_indexes = pieces.keys()
+        sorted_indexes.sort()
+        # Return only the piece states, no need for the piece index
+        # Keep the order
+        return [pieces[idx] for idx in sorted_indexes]

From da5c5d4b84578a742f196da7cf63dd1d0bd8a12b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Wed, 4 May 2011 23:26:46 +0100
Subject: [PATCH 267/329] PiecesBar implementation.

We now provide an option to the user to see the states of a torrent's pieces, ie, completed, downloading, waiting, missing.
If the user has this option enabled, another 3 will be shown to him(on the GTK UI), which will allow him to choose the colors for each piece state.
---
 deluge/ui/gtkui/glade/main_window.glade       | 168 +++++++++++-
 .../ui/gtkui/glade/preferences_dialog.glade   | 243 +++++++++++++++++-
 deluge/ui/gtkui/gtkui.py                      |  13 +-
 deluge/ui/gtkui/piecesbar.py                  | 184 +++++++++++++
 deluge/ui/gtkui/preferences.py                |  99 ++++++-
 deluge/ui/gtkui/status_tab.py                 |  34 ++-
 6 files changed, 732 insertions(+), 9 deletions(-)
 create mode 100644 deluge/ui/gtkui/piecesbar.py

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 43a10c8f0..10459355c 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -781,6 +781,152 @@
       
     
   
+  
+    True
+    False
+    
+      
+        gtk-open
+        True
+        False
+        False
+        True
+        True
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Expand All
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-zoom-fit
+            1
+          
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Do Not Download
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-no
+            1
+          
+        
+      
+    
+    
+      
+        _Normal Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-yes
+            1
+          
+        
+      
+    
+    
+      
+        _High Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-go-up
+            1
+          
+        
+      
+    
+    
+      
+        Hi_ghest Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-goto-top
+            1
+          
+        
+      
+    
+  
+  
+    True
+    False
+    
+      
+        _Add Peer
+        True
+        False
+        Add a peer by its IP
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-add
+            1
+          
+        
+      
+    
+  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -1255,15 +1401,29 @@
                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
                         5
                         
-                          
+                          
                             True
                             False
-                            True
-                            0.10000000149
+                            
+                              
+                                True
+                                False
+                                True
+                                0.10000000149
+                              
+                              
+                                False
+                                False
+                                0
+                              
+                            
+                            
+                              
+                            
                           
                           
                             False
-                            False
+                            True
                             0
                           
                         
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 9c41900ff..6f1b7c7ac 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -2249,11 +2249,13 @@ Use at your own risk if you wish to help us debug
 this new feature.
                                             False
                                             True
+                                            
                                             
                                               
                                                 True
                                                 False
-                                                Show pieces bar instead of the progress bar (<b>EXPERIMENTAL!!!</b>)
+                                                Show a pieces bar in the torrent's
+status tab (<b>EXPERIMENTAL!!!</b>)
                                                 True
                                               
                                             
@@ -2264,6 +2266,245 @@ this new feature.
                                             1
                                           
                                         
+                                        
+                                          
+                                            True
+                                            
+                                              
+                                                True
+                                                False
+                                                25
+                                                
+                                                  
+                                                    True
+                                                    False
+                                                    4
+                                                    3
+                                                    5
+                                                    1
+                                                    
+                                                      
+                                                        True
+                                                        False
+                                                        1
+                                                        Completed:
+                                                      
+                                                      
+                                                        GTK_FILL
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        True
+                                                        True
+                                                        False
+                                                        0
+                                                        #000000000000
+                                                        
+                                                      
+                                                      
+                                                        1
+                                                        2
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        False
+                                                        1
+                                                        Downloading:
+                                                      
+                                                      
+                                                        1
+                                                        2
+                                                        GTK_FILL
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        True
+                                                        True
+                                                        False
+                                                        0
+                                                        #000000000000
+                                                        
+                                                      
+                                                      
+                                                        1
+                                                        2
+                                                        1
+                                                        2
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        False
+                                                        1
+                                                        Waiting:
+                                                      
+                                                      
+                                                        2
+                                                        3
+                                                        GTK_FILL
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        True
+                                                        True
+                                                        False
+                                                        0
+                                                        #000000000000
+                                                        
+                                                      
+                                                      
+                                                        1
+                                                        2
+                                                        2
+                                                        3
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        False
+                                                        1
+                                                        Missing:
+                                                      
+                                                      
+                                                        3
+                                                        4
+                                                        GTK_FILL
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        True
+                                                        True
+                                                        True
+                                                        False
+                                                        0
+                                                        #000000000000
+                                                        
+                                                      
+                                                      
+                                                        1
+                                                        2
+                                                        3
+                                                        4
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        gtk-revert-to-saved
+                                                        True
+                                                        False
+                                                        True
+                                                        True
+                                                        Revert color to default
+                                                        False
+                                                        True
+                                                        right
+                                                        
+                                                      
+                                                      
+                                                        2
+                                                        3
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        gtk-revert-to-saved
+                                                        True
+                                                        False
+                                                        True
+                                                        True
+                                                        Revert color to default
+                                                        False
+                                                        True
+                                                        right
+                                                        
+                                                      
+                                                      
+                                                        2
+                                                        3
+                                                        1
+                                                        2
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        gtk-revert-to-saved
+                                                        True
+                                                        False
+                                                        True
+                                                        True
+                                                        Revert color to default
+                                                        False
+                                                        True
+                                                        right
+                                                        
+                                                      
+                                                      
+                                                        2
+                                                        3
+                                                        2
+                                                        3
+                                                        
+                                                      
+                                                    
+                                                    
+                                                      
+                                                        gtk-revert-to-saved
+                                                        True
+                                                        False
+                                                        True
+                                                        True
+                                                        Revert color to default
+                                                        False
+                                                        True
+                                                        right
+                                                        
+                                                      
+                                                      
+                                                        2
+                                                        3
+                                                        3
+                                                        4
+                                                        
+                                                      
+                                                    
+                                                  
+                                                
+                                              
+                                            
+                                            
+                                              
+                                                True
+                                                False
+                                                Piece Colors
+                                              
+                                              
+                                                label_item
+                                              
+                                            
+                                          
+                                          
+                                            False
+                                            False
+                                            2
+                                          
+                                        
                                       
                                     
                                   
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index b87c56a2f..92da7715e 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -157,7 +157,18 @@ DEFAULT_PREFS = {
     "sidebar_show_trackers": True,
     "sidebar_position": 170,
     "show_rate_in_title": False,
-    "createtorrent.trackers": []
+    "createtorrent.trackers": [],
+    "show_piecesbar": False,
+#    "pieces_colors": [
+#        [65535, 0, 0],
+#        [4874, 56494, 0],
+#        [65535, 55255, 0],
+#        [4883, 26985, 56540]
+#    ],
+    "pieces_color_missing": [65535, 0, 0],
+    "pieces_color_waiting": [4874, 56494, 0],
+    "pieces_color_downloading": [65535, 55255, 0],
+    "pieces_color_completed": [4883, 26985, 56540],
 }
 
 class GtkUI(object):
diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
new file mode 100644
index 000000000..9f358e5ef
--- /dev/null
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+#
+# listview.py
+#
+# Copyright (C) 2011 Pedro Algarvio 
+#
+# 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
+#    statement from all source files in the program, then also delete it here.
+#
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import gtk.gdk
+import cairo
+import logging
+from deluge.configmanager import ConfigManager
+
+log = logging.getLogger(__name__)
+
+
+COLOR_STATES = {
+    0: "missing",
+    1: "waiting",
+    2: "downloading",
+    3: "completed"
+}
+
+class PiecesBar(gtk.DrawingArea):
+    # Draw in response to an expose-event
+    __gsignals__ = {"expose-event": "override"}
+
+    def __init__(self):
+        gtk.DrawingArea.__init__(self)
+        self.set_size_request(-1, 25)
+        self.gtkui_config = ConfigManager("gtkui.conf")
+        self.width = 0
+        self.height = 0
+        self.pieces = ()
+        self.num_pieces = None
+        self.connect('size-allocate', self.do_size_allocate_event)
+        self.set_colormap(self.get_screen().get_rgba_colormap())
+        self.show()
+
+    def do_size_allocate_event(self, widget, size):
+        self.width = size.width
+        self.height = size.height
+
+    # Handle the expose-event by drawing
+    def do_expose_event(self, event=None):
+        # Create the cairo context
+        cr = self.window.cairo_create()
+
+        # Restrict Cairo to the exposed area; avoid extra work
+        cr.rectangle(event.area.x, event.area.y,
+                     event.area.width, event.area.height)
+        cr.clip()
+
+#            # Sets the operator to clear which deletes everything below where
+#            # an object is drawn
+#            cr.set_operator(cairo.OPERATOR_CLEAR)
+#            # Makes the mask fill the entire area
+#            cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
+#            # Deletes everything in the window (since the compositing operator
+#            # is clear and mask fills the entire window
+#            cr.fill()
+#            # Set the compositing operator back to the default
+#            cr.set_operator(cairo.OPERATOR_OVER)
+
+
+        cr.set_line_width(max(cr.device_to_user_distance(0.5, 0.5)))
+#        bgColor = self.window.get_style().copy().bg[gtk.STATE_NORMAL]
+#        cr.set_source_rgba(0.53, 0.53, 0.53, 1.0) # Transparent
+#        cr.set_source_rgba(0.8, 0.8, 0.8, 1.0) # Transparent
+#        cr.set_source_rgb(0.3, 0.3, 0.3) # Transparent
+        cr.set_source_rgb(0.1, 0.1, 0.1) # Transparent
+#        cr.set_source_rgb(bgColor.red/65535.0, bgColor.green/65535.0, bgColor.blue/65535.0)
+#        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
+        cr.stroke()
+#        # Set the compositing operator back to the default
+#        cr.set_operator(cairo.OPERATOR_OVER)
+
+
+        if not self.pieces and self.num_pieces is not None:
+            # Complete Torrent
+            piece_height = self.height - 2
+            piece_width = self.width*1.0/self.num_pieces
+            start = 1
+            for _ in range(self.num_pieces):
+                # Like this to keep same aspect ratio
+                color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]]
+                cr.set_source_rgb(
+                    color[0]/65535.0,
+                    color[1]/65535.0,
+                    color[2]/65535.0,
+                )
+#                cr.set_source_rgba(*list(self.colors[3])+[0.5])
+                cr.rectangle(start, 1, piece_width, piece_height)
+                cr.fill()
+                start += piece_width
+            return
+
+        if not self.pieces:
+            return
+
+        # Create the cairo context
+        start_pos = 1
+        num_pieces = self.num_pieces and self.num_pieces or len(self.pieces)
+        piece_width = self.width*1.0/num_pieces
+        piece_height = self.height - 2
+
+        for state in self.pieces:
+#            cr.set_source_rgb(*self.colors[state])
+#            cr.set_source_rgb(*self.colors[state])
+
+            color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
+            cr.set_source_rgb(
+                color[0]/65535.0,
+                color[1]/65535.0,
+                color[2]/65535.0,
+            )
+#            cr.set_source_rgba(*list(self.colors[state])+[0.5])
+            cr.rectangle(start_pos, 1, piece_width, piece_height)
+            cr.fill()
+            start_pos += piece_width
+
+    def set_pieces(self, pieces, num_pieces):
+        if pieces != self.pieces:
+            self.pieces = pieces
+            self.num_pieces = num_pieces
+            self.update()
+
+    def clear(self):
+        self.pieces = []
+        self.num_pieces = None
+        self.update()
+
+    def update(self):
+        self.queue_draw()
+
+    def get_text(self):
+        return ""
+
+    def set_text(self, text):
+        pass
+
+#    def on_pieces_colors_updated(self, key, colors):
+#        log.debug("Pieces bar got config change for key: %s  values: %s",
+#                  key, colors)
+#        if key != "pieces_colors":
+#            return
+#        # Make sure there's no state color missong
+#        self.colors[0] = [c/65535.0 for c in colors[0]]
+#        self.colors[1] = [c/65535.0 for c in colors[1]]
+#        self.colors[2] = [c/65535.0 for c in colors[2]]
+#        self.colors[3] = [c/65535.0 for c in colors[3]]
+#        self.update()
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index 96950e0da..aeadaf9cc 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -53,6 +53,14 @@ import deluge.configmanager
 log = logging.getLogger(__name__)
 
 ACCOUNTS_USERNAME, ACCOUNTS_LEVEL, ACCOUNTS_PASSWORD = range(3)
+COLOR_MISSING, COLOR_WAITING, COLOR_DOWNLOADING, COLOR_COMPLETED = range(4)
+
+COLOR_STATES = {
+    "missing": COLOR_MISSING,
+    "waiting": COLOR_WAITING,
+    "downloading": COLOR_DOWNLOADING,
+    "completed": COLOR_COMPLETED
+}
 
 class Preferences(component.Component):
     def __init__(self):
@@ -152,9 +160,24 @@ class Preferences(component.Component):
             "on_accounts_add_clicked": self._on_accounts_add_clicked,
             "on_accounts_delete_clicked": self._on_accounts_delete_clicked,
             "on_accounts_edit_clicked": self._on_accounts_edit_clicked,
-            "on_alocation_toggled": self._on_alocation_toggled
+            "on_alocation_toggled": self._on_alocation_toggled,
+            "on_piecesbar_toggle_toggled": self._on_piecesbar_toggle_toggled,
+            "on_completed_color_set": self._on_completed_color_set,
+            "on_revert_color_completed_clicked": self._on_revert_color_completed_clicked,
+            "on_downloading_color_set": self._on_downloading_color_set,
+            "on_revert_color_downloading_clicked": self._on_revert_color_downloading_clicked,
+            "on_waiting_color_set": self._on_waiting_color_set,
+            "on_revert_color_waiting_clicked": self._on_revert_color_waiting_clicked,
+            "on_missing_color_set": self._on_missing_color_set,
+            "on_revert_color_missing_clicked": self._on_revert_color_missing_clicked
         })
 
+        from deluge.ui.gtkui.gtkui import DEFAULT_PREFS
+        self.COLOR_DEFAULTS = {}
+        for key in ("missing", "waiting", "downloading", "completed"):
+            self.COLOR_DEFAULTS[key] = DEFAULT_PREFS["pieces_color_%s" % key][:]
+        del DEFAULT_PREFS
+
         # These get updated by requests done to the core
         self.all_plugins = []
         self.enabled_plugins = []
@@ -527,6 +550,13 @@ class Preferences(component.Component):
             self.gtkui_config["classic_mode"])
         self.glade.get_widget("chk_show_rate_in_title").set_active(
             self.gtkui_config["show_rate_in_title"])
+        self.glade.get_widget("piecesbar_toggle").set_active(
+            self.gtkui_config["show_piecesbar"]
+        )
+        self.__set_color("completed", from_config=True)
+        self.__set_color("downloading", from_config=True)
+        self.__set_color("waiting", from_config=True)
+        self.__set_color("missing", from_config=True)
 
         ## Other tab ##
         self.glade.get_widget("chk_show_new_releases").set_active(
@@ -578,6 +608,13 @@ class Preferences(component.Component):
             self.glade.get_widget("chk_show_dialog").get_active()
         new_gtkui_config["focus_add_dialog"] = \
             self.glade.get_widget("chk_focus_dialog").get_active()
+
+        for state in ("missing", "waiting", "downloading", "completed"):
+            color = self.glade.get_widget("%s_color" % state).get_color()
+            new_gtkui_config["pieces_color_%s" % state] = [
+                color.red, color.green, color.blue
+            ]
+
         new_core_config["copy_torrent_file"] = \
             self.glade.get_widget("chk_copy_torrent_file").get_active()
         new_core_config["del_copy_torrent_file"] = \
@@ -916,6 +953,7 @@ class Preferences(component.Component):
 
     def on_test_port_clicked(self, data):
         log.debug("on_test_port_clicked")
+
         def on_get_test(status):
             if status:
                 self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_YES, 4)
@@ -924,6 +962,8 @@ class Preferences(component.Component):
                 self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_DIALOG_WARNING, 4)
                 self.glade.get_widget("port_img").show()
         client.core.test_listen_port().addCallback(on_get_test)
+        # XXX: Consider using gtk.Spinner() instead of the loading gif
+        #      It requires gtk.ver > 2.12
         self.glade.get_widget("port_img").set_from_file(
             deluge.common.get_pixmap('loading.gif')
         )
@@ -1210,3 +1250,60 @@ class Preferences(component.Component):
         full_allocation_active = self.glade.get_widget("radio_full_allocation").get_active()
         self.glade.get_widget("chk_prioritize_first_last_pieces").set_sensitive(full_allocation_active)
         self.glade.get_widget("chk_sequential_download").set_sensitive(full_allocation_active)
+
+    def _on_piecesbar_toggle_toggled(self, widget):
+        self.gtkui_config['show_piecesbar'] = widget.get_active()
+        colors_widget = self.glade.get_widget("piecebar_colors_expander")
+        colors_widget.set_visible(widget.get_active())
+
+    def _on_completed_color_set(self, widget):
+        self.__set_color("completed")
+
+    def _on_revert_color_completed_clicked(self, widget):
+        self.__revert_color("completed")
+
+    def _on_downloading_color_set(self, widget):
+        self.__set_color("downloading")
+
+    def _on_revert_color_downloading_clicked(self, widget):
+        self.__revert_color("downloading")
+
+    def _on_waiting_color_set(self, widget):
+        self.__set_color("waiting")
+
+    def _on_revert_color_waiting_clicked(self, widget):
+        self.__revert_color("waiting")
+
+    def _on_missing_color_set(self, widget):
+        self.__set_color("missing")
+
+    def _on_revert_color_missing_clicked(self, widget):
+        self.__revert_color("missing")
+
+    def __set_color(self, state, from_config=False):
+        if from_config:
+            color = gtk.gdk.Color(*self.gtkui_config["pieces_color_%s" % state])
+            log.debug("Setting %r color state from config to %s", state,
+                      (color.red, color.green, color.blue))
+            self.glade.get_widget("%s_color" % state).set_color(color)
+        else:
+            color = self.glade.get_widget("%s_color" % state).get_color()
+            log.debug("Setting %r color state to %s", state,
+                      (color.red, color.green, color.blue))
+            self.gtkui_config["pieces_color_%s" % state] = [
+                color.red, color.green, color.blue
+            ]
+            self.gtkui_config.save()
+            self.gtkui_config.apply_set_functions("pieces_colors")
+
+        self.glade.get_widget("revert_color_%s" % state).set_sensitive(
+            [color.red, color.green, color.blue] != self.COLOR_DEFAULTS[state]
+        )
+
+    def __revert_color(self, state, from_config=False):
+        log.debug("Reverting %r color state", state)
+        self.glade.get_widget("%s_color" % state).set_color(
+            gtk.gdk.Color(*self.COLOR_DEFAULTS[state])
+        )
+        self.glade.get_widget("revert_color_%s" % state).set_sensitive(False)
+        self.gtkui_config.apply_set_functions("pieces_colors")
diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py
index 926957a8c..8d9c844b9 100644
--- a/deluge/ui/gtkui/status_tab.py
+++ b/deluge/ui/gtkui/status_tab.py
@@ -42,7 +42,9 @@ import logging
 from deluge.ui.client import client
 import deluge.component as component
 import deluge.common
+from deluge.configmanager import ConfigManager
 from deluge.ui.gtkui.torrentdetails import Tab
+from deluge.ui.gtkui.piecesbar import PiecesBar
 
 log = logging.getLogger(__name__)
 
@@ -71,12 +73,17 @@ class StatusTab(Tab):
         Tab.__init__(self)
         # Get the labels we need to update.
         # widgetname, modifier function, status keys
-        glade = component.get("MainWindow").main_glade
+        self.glade = glade = component.get("MainWindow").main_glade
 
         self._name = "Status"
         self._child_widget = glade.get_widget("status_tab")
         self._tab_label = glade.get_widget("status_tab_label")
-
+        self.config = ConfigManager("gtkui.conf")
+        self.config.register_set_function(
+            "show_piecesbar",
+            self.on_show_pieces_bar_config_changed,
+            apply_now=True
+        )
         self.label_widgets = [
             (glade.get_widget("summary_pieces"), fpeer_size_second, ("num_pieces", "piece_length")),
             (glade.get_widget("summary_availability"), fratio, ("distributed_copies",)),
@@ -118,6 +125,9 @@ class StatusTab(Tab):
             "tracker_status", "max_connections", "max_upload_slots",
             "max_upload_speed", "max_download_speed", "active_time",
             "seeding_time", "seed_rank", "is_auto_managed", "time_added"]
+        if self.config['show_piecesbar']:
+            status_keys.append("pieces")
+
 
         component.get("SessionProxy").get_torrent_status(
             selected, status_keys).addCallback(self._on_get_torrent_status)
@@ -155,9 +165,29 @@ class StatusTab(Tab):
         fraction = status["progress"] / 100
         if w.get_fraction() != fraction:
             w.set_fraction(fraction)
+        if self.config['show_piecesbar']:
+            self.piecesbar.set_pieces(status['pieces'], status["num_pieces"])
+
+    def on_show_pieces_bar_config_changed(self, key, show):
+        self.show_pieces_bar(show)
+
+    def show_pieces_bar(self, show):
+        if hasattr(self, 'piecesbar'):
+            if show:
+                self.piecesbar.show()
+            else:
+                self.piecesbar.hide()
+        else:
+            if show:
+                self.piecesbar = PiecesBar()
+                self.glade.get_widget("status_progress_vbox").pack_start(
+                    self.piecesbar, False, False, 5
+                )
 
     def clear(self):
         for widget in self.label_widgets:
             widget[0].set_text("")
 
         component.get("MainWindow").main_glade.get_widget("progressbar").set_fraction(0.0)
+        if self.config['show_piecesbar']:
+            self.piecesbar.clear()

From 427fe23bdccdc574da6d691afa3d26a4b7a9c1ca Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Wed, 4 May 2011 23:30:18 +0100
Subject: [PATCH 268/329] Minor comment cleanup.

---
 deluge/core/torrent.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index aa727c130..024458a4c 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -997,16 +997,11 @@ class Torrent(object):
         pieces = {}
         # First get the pieces availability.
         availability = self.handle.piece_availability()
-        # Now, the pieces being downloaded
-#        for piece in self.handle.get_download_queue():
-#            # In case the torrent is paused, the pieces in the download queue
-#            # will be shown as waiting
-##            pieces[piece['piece_index']] = self.handle.is_paused() and 1 or 2
-#            pieces[piece['piece_index']] = 1
-
         # Pieces from connected peers
         for peer_info in self.handle.get_peer_info():
             if peer_info.downloading_piece_index < 0:
+                # No piece index, then we're not downloading anything from
+                # this peer
                 continue
             pieces[peer_info.downloading_piece_index] = 2
 

From 28def22625d7969f1ec4ca95b6526192c5556404 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 5 May 2011 18:27:20 +0100
Subject: [PATCH 269/329] PiecesBar enhancement.

The pieces bar will now draw status text, like a regular progress bar does, and for the overall progress, a semi-transparent overlay is also drawn.
---
 deluge/ui/gtkui/gtkui.py      |   6 --
 deluge/ui/gtkui/piecesbar.py  | 136 +++++++++++++++++++++++-----------
 deluge/ui/gtkui/status_tab.py |   4 +-
 3 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index 92da7715e..234148d6d 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -159,12 +159,6 @@ DEFAULT_PREFS = {
     "show_rate_in_title": False,
     "createtorrent.trackers": [],
     "show_piecesbar": False,
-#    "pieces_colors": [
-#        [65535, 0, 0],
-#        [4874, 56494, 0],
-#        [65535, 55255, 0],
-#        [4883, 26985, 56540]
-#    ],
     "pieces_color_missing": [65535, 0, 0],
     "pieces_color_waiting": [4874, 56494, 0],
     "pieces_color_downloading": [65535, 55255, 0],
diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 9f358e5ef..71709d03c 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -34,11 +34,9 @@
 #
 #
 
-import pygtk
-pygtk.require('2.0')
 import gtk
-import gtk.gdk
-import cairo
+import pango
+import pangocairo
 import logging
 from deluge.configmanager import ConfigManager
 
@@ -58,12 +56,23 @@ class PiecesBar(gtk.DrawingArea):
 
     def __init__(self):
         gtk.DrawingArea.__init__(self)
+        # Get progress bar styles, in order to keep font consistency
+        pb = gtk.ProgressBar()
+        pb_style = pb.get_style()
+        self.text_font = pb_style.font_desc
+        self.text_font.set_weight(pango.WEIGHT_BOLD)
+        # Done with the ProgressBar styles, don't keep refs of it
+        del pb, pb_style
+
         self.set_size_request(-1, 25)
         self.gtkui_config = ConfigManager("gtkui.conf")
         self.width = 0
         self.height = 0
         self.pieces = ()
         self.num_pieces = None
+        self.text = ""
+        self.fraction = 0.0
+        self.torrent_state = None
         self.connect('size-allocate', self.do_size_allocate_event)
         self.set_colormap(self.get_screen().get_rgba_colormap())
         self.show()
@@ -82,30 +91,10 @@ class PiecesBar(gtk.DrawingArea):
                      event.area.width, event.area.height)
         cr.clip()
 
-#            # Sets the operator to clear which deletes everything below where
-#            # an object is drawn
-#            cr.set_operator(cairo.OPERATOR_CLEAR)
-#            # Makes the mask fill the entire area
-#            cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
-#            # Deletes everything in the window (since the compositing operator
-#            # is clear and mask fills the entire window
-#            cr.fill()
-#            # Set the compositing operator back to the default
-#            cr.set_operator(cairo.OPERATOR_OVER)
-
-
         cr.set_line_width(max(cr.device_to_user_distance(0.5, 0.5)))
-#        bgColor = self.window.get_style().copy().bg[gtk.STATE_NORMAL]
-#        cr.set_source_rgba(0.53, 0.53, 0.53, 1.0) # Transparent
-#        cr.set_source_rgba(0.8, 0.8, 0.8, 1.0) # Transparent
-#        cr.set_source_rgb(0.3, 0.3, 0.3) # Transparent
-        cr.set_source_rgb(0.1, 0.1, 0.1) # Transparent
-#        cr.set_source_rgb(bgColor.red/65535.0, bgColor.green/65535.0, bgColor.blue/65535.0)
-#        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.set_source_rgb(0.1, 0.1, 0.1)
         cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
         cr.stroke()
-#        # Set the compositing operator back to the default
-#        cr.set_operator(cairo.OPERATOR_OVER)
 
 
         if not self.pieces and self.num_pieces is not None:
@@ -121,13 +110,14 @@ class PiecesBar(gtk.DrawingArea):
                     color[1]/65535.0,
                     color[2]/65535.0,
                 )
-#                cr.set_source_rgba(*list(self.colors[3])+[0.5])
                 cr.rectangle(start, 1, piece_width, piece_height)
                 cr.fill()
                 start += piece_width
+            self.__write_text(cr, event)
             return
 
         if not self.pieces:
+            self.__write_text(cr, event)
             return
 
         # Create the cairo context
@@ -137,48 +127,106 @@ class PiecesBar(gtk.DrawingArea):
         piece_height = self.height - 2
 
         for state in self.pieces:
-#            cr.set_source_rgb(*self.colors[state])
-#            cr.set_source_rgb(*self.colors[state])
-
             color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
             cr.set_source_rgb(
                 color[0]/65535.0,
                 color[1]/65535.0,
                 color[2]/65535.0,
             )
-#            cr.set_source_rgba(*list(self.colors[state])+[0.5])
             cr.rectangle(start_pos, 1, piece_width, piece_height)
             cr.fill()
             start_pos += piece_width
 
+        self.__write_text(cr, event)
+
+    def __draw_progress_overlay(self, cr):
+        cr.set_source_rgba(0.1, 0.1, 0.1, 0.2) # Transparent
+        cr.rectangle(0.0, 0.0, self.width*self.fraction, self.height)
+        cr.fill()
+
+    def __write_text(self, cr, event):
+        if not self.torrent_state:
+            # Nothing useful to draw, return now!
+            return
+        self.__draw_progress_overlay(cr)
+
+        pg = pangocairo.CairoContext(cr)
+        pl = pg.create_layout()
+        pl.set_font_description(self.text_font)
+        pl.set_width(-1)    # No text wrapping
+
+        text = ""
+        if self.text:
+            text += self.text
+        else:
+            if self.torrent_state:
+                text += self.torrent_state + " "
+            if self.fraction == 1.0:
+                format = "%d%%"
+            else:
+                format = "%.2f%%"
+            text += format % (self.fraction*100)
+        log.debug("PiecesBar text %r", text)
+        pl.set_text(text)
+        plsize = pl.get_size()
+        text_width = plsize[0]/pango.SCALE
+        text_height = plsize[1]/pango.SCALE
+        area_width_without_text = event.area.width - text_width
+        area_height_without_text = event.area.height - text_height
+        cr.move_to(area_width_without_text/2, area_height_without_text/2)
+        cr.set_source_rgb(1.0, 1.0, 1.0)
+        pg.update_layout(pl)
+        pg.show_layout(pl)
+
+
+    def set_fraction(self, fraction):
+        self.fraction = fraction
+        self.update()
+
     def set_pieces(self, pieces, num_pieces):
         if pieces != self.pieces:
             self.pieces = pieces
             self.num_pieces = num_pieces
             self.update()
 
+    def update_from_status(self, status):
+        update = False
+
+        fraction = status["progress"]/100
+        if fraction != self.fraction:
+            self.fraction = fraction
+            update = True
+
+        torrent_state = status["state"]
+        if torrent_state != self.torrent_state:
+            self.torrent_state = torrent_state
+            update = True
+
+        if torrent_state == "Checking":
+            self.update()
+            # Skip the pieces assignment
+            return
+
+        if status['pieces'] != self.pieces:
+            self.pieces = status['pieces']
+            self.num_pieces = status['num_pieces']
+            update = True
+
+        if update:
+            self.update()
+
     def clear(self):
         self.pieces = []
         self.num_pieces = None
+        self.fraction = 0.0
         self.update()
 
     def update(self):
         self.queue_draw()
 
     def get_text(self):
-        return ""
+        return self.text
 
     def set_text(self, text):
-        pass
-
-#    def on_pieces_colors_updated(self, key, colors):
-#        log.debug("Pieces bar got config change for key: %s  values: %s",
-#                  key, colors)
-#        if key != "pieces_colors":
-#            return
-#        # Make sure there's no state color missong
-#        self.colors[0] = [c/65535.0 for c in colors[0]]
-#        self.colors[1] = [c/65535.0 for c in colors[1]]
-#        self.colors[2] = [c/65535.0 for c in colors[2]]
-#        self.colors[3] = [c/65535.0 for c in colors[3]]
-#        self.update()
+        self.text = text
+        self.update()
diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py
index 8d9c844b9..fee9509b0 100644
--- a/deluge/ui/gtkui/status_tab.py
+++ b/deluge/ui/gtkui/status_tab.py
@@ -126,7 +126,7 @@ class StatusTab(Tab):
             "max_upload_speed", "max_download_speed", "active_time",
             "seeding_time", "seed_rank", "is_auto_managed", "time_added"]
         if self.config['show_piecesbar']:
-            status_keys.append("pieces")
+            status_keys.extend(["pieces", "state"])
 
 
         component.get("SessionProxy").get_torrent_status(
@@ -166,7 +166,7 @@ class StatusTab(Tab):
         if w.get_fraction() != fraction:
             w.set_fraction(fraction)
         if self.config['show_piecesbar']:
-            self.piecesbar.set_pieces(status['pieces'], status["num_pieces"])
+            self.piecesbar.update_from_status(status)
 
     def on_show_pieces_bar_config_changed(self, key, show):
         self.show_pieces_bar(show)

From b3492b07a1d29c33f4ea130cf7e7263fe70bc9c6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 5 May 2011 18:38:52 +0100
Subject: [PATCH 270/329] PiecesBar

Now, either show the pieces bar or the progress bar, not both.
---
 deluge/ui/gtkui/status_tab.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py
index fee9509b0..1166140d2 100644
--- a/deluge/ui/gtkui/status_tab.py
+++ b/deluge/ui/gtkui/status_tab.py
@@ -74,6 +74,7 @@ class StatusTab(Tab):
         # Get the labels we need to update.
         # widgetname, modifier function, status keys
         self.glade = glade = component.get("MainWindow").main_glade
+        self.progressbar = component.get("MainWindow").main_glade.get_widget("progressbar")
 
         self._name = "Status"
         self._child_widget = glade.get_widget("status_tab")
@@ -161,12 +162,12 @@ class StatusTab(Tab):
                 widget[0].set_text(txt)
 
         # Do the progress bar because it's a special case (not a label)
-        w = component.get("MainWindow").main_glade.get_widget("progressbar")
-        fraction = status["progress"] / 100
-        if w.get_fraction() != fraction:
-            w.set_fraction(fraction)
         if self.config['show_piecesbar']:
             self.piecesbar.update_from_status(status)
+        else:
+            fraction = status["progress"] / 100
+            if self.progressbar.get_fraction() != fraction:
+                self.progressbar.set_fraction(fraction)
 
     def on_show_pieces_bar_config_changed(self, key, show):
         self.show_pieces_bar(show)
@@ -175,19 +176,23 @@ class StatusTab(Tab):
         if hasattr(self, 'piecesbar'):
             if show:
                 self.piecesbar.show()
+                self.progressbar.hide()
             else:
                 self.piecesbar.hide()
+                self.progressbar.show()
         else:
             if show:
                 self.piecesbar = PiecesBar()
                 self.glade.get_widget("status_progress_vbox").pack_start(
                     self.piecesbar, False, False, 5
                 )
+                self.progressbar.hide()
 
     def clear(self):
         for widget in self.label_widgets:
             widget[0].set_text("")
 
-        component.get("MainWindow").main_glade.get_widget("progressbar").set_fraction(0.0)
         if self.config['show_piecesbar']:
             self.piecesbar.clear()
+        else:
+            self.progressbar.set_fraction(0.0)

From 9b3f5783d57d340b39af8dc39d7cb8195f7f72a5 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 5 May 2011 18:41:20 +0100
Subject: [PATCH 271/329] Update ChangeLog.

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8a5f3f9b4..691fa87fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
 	these is missing, an authentication error will be sent to the client
 	which sould then ask the username/password to the user.
 	* Implemented sequential downloads.
+	* #378: Provide information about a torrent's pieces states
 
 ==== GtkUI ====
 	* Fix uncaught exception when closing deluge in classic mode
@@ -34,6 +35,8 @@
 	now also migrated from the old format were automatic localhost logins were
 	possible, which no longer is, this fixes #1814.
 	* Implemented sequential downloads UI handling.
+	* #378: Allow showing a pieces bar instead of a regular progress bar in a
+	torrent's status tab.
 
 ==== WebUI ====
 	* Migrate to ExtJS 3.1

From 6d57a29f1d3934ae64edcddc983ae227d522bacd Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Fri, 6 May 2011 09:38:10 +0100
Subject: [PATCH 272/329] PiecesBar rounded corners.

---
 deluge/ui/gtkui/piecesbar.py  | 46 +++++++++++++++++++++++------------
 deluge/ui/gtkui/status_tab.py |  2 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 71709d03c..180744c85 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -35,6 +35,7 @@
 #
 
 import gtk
+import cairo
 import pango
 import pangocairo
 import logging
@@ -82,7 +83,10 @@ class PiecesBar(gtk.DrawingArea):
         self.height = size.height
 
     # Handle the expose-event by drawing
-    def do_expose_event(self, event=None):
+    def do_expose_event(self, event):
+        self.draw_pieces(event)
+
+    def draw_pieces(self, event):
         # Create the cairo context
         cr = self.window.cairo_create()
 
@@ -90,18 +94,12 @@ class PiecesBar(gtk.DrawingArea):
         cr.rectangle(event.area.x, event.area.y,
                      event.area.width, event.area.height)
         cr.clip()
-
-        cr.set_line_width(max(cr.device_to_user_distance(0.5, 0.5)))
-        cr.set_source_rgb(0.1, 0.1, 0.1)
-        cr.rectangle(0.0, 0.0, event.area.width, event.area.height)
-        cr.stroke()
-
+        self.__roundcorners_clipping(cr, event)
 
         if not self.pieces and self.num_pieces is not None:
             # Complete Torrent
-            piece_height = self.height - 2
             piece_width = self.width*1.0/self.num_pieces
-            start = 1
+            start = 0
             for _ in range(self.num_pieces):
                 # Like this to keep same aspect ratio
                 color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]]
@@ -110,7 +108,7 @@ class PiecesBar(gtk.DrawingArea):
                     color[1]/65535.0,
                     color[2]/65535.0,
                 )
-                cr.rectangle(start, 1, piece_width, piece_height)
+                cr.rectangle(start, 0, piece_width, self.height)
                 cr.fill()
                 start += piece_width
             self.__write_text(cr, event)
@@ -120,11 +118,9 @@ class PiecesBar(gtk.DrawingArea):
             self.__write_text(cr, event)
             return
 
-        # Create the cairo context
-        start_pos = 1
+        start_pos = 0
         num_pieces = self.num_pieces and self.num_pieces or len(self.pieces)
         piece_width = self.width*1.0/num_pieces
-        piece_height = self.height - 2
 
         for state in self.pieces:
             color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
@@ -133,14 +129,32 @@ class PiecesBar(gtk.DrawingArea):
                 color[1]/65535.0,
                 color[2]/65535.0,
             )
-            cr.rectangle(start_pos, 1, piece_width, piece_height)
+            cr.rectangle(start_pos, 0, piece_width, self.height)
             cr.fill()
             start_pos += piece_width
-
         self.__write_text(cr, event)
 
+    def __roundcorners_clipping(self, cr, event):
+        from math import pi
+        x = 0
+        y = 0
+        width = event.area.width
+        height = event.area.height
+        aspect = 1.0
+        corner_radius = height/10.0
+        radius = corner_radius/aspect
+        degrees = pi/180.0
+
+        cr.new_sub_path()
+        cr.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
+        cr.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
+        cr.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
+        cr.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
+        cr.close_path()
+        cr.clip()
+
     def __draw_progress_overlay(self, cr):
-        cr.set_source_rgba(0.1, 0.1, 0.1, 0.2) # Transparent
+        cr.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent
         cr.rectangle(0.0, 0.0, self.width*self.fraction, self.height)
         cr.fill()
 
diff --git a/deluge/ui/gtkui/status_tab.py b/deluge/ui/gtkui/status_tab.py
index 1166140d2..01c062750 100644
--- a/deluge/ui/gtkui/status_tab.py
+++ b/deluge/ui/gtkui/status_tab.py
@@ -72,7 +72,7 @@ class StatusTab(Tab):
     def __init__(self):
         Tab.__init__(self)
         # Get the labels we need to update.
-        # widgetname, modifier function, status keys
+        # widget name, modifier function, status keys
         self.glade = glade = component.get("MainWindow").main_glade
         self.progressbar = component.get("MainWindow").main_glade.get_widget("progressbar")
 

From 25f086fa8583af21329df848acd09697c7292753 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Fri, 6 May 2011 18:12:16 +0100
Subject: [PATCH 273/329] PiecesBar caching.

The drawings made on the pieces bar are now cached in "sub-drawings" kept in memory. If no data has changed, those "sub-drawings" are used. If data changed, redraw whatever is necessary.
---
 deluge/ui/gtkui/piecesbar.py | 312 ++++++++++++++++++++---------------
 1 file changed, 181 insertions(+), 131 deletions(-)

diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 180744c85..4d45829b6 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -60,187 +60,237 @@ class PiecesBar(gtk.DrawingArea):
         # Get progress bar styles, in order to keep font consistency
         pb = gtk.ProgressBar()
         pb_style = pb.get_style()
-        self.text_font = pb_style.font_desc
-        self.text_font.set_weight(pango.WEIGHT_BOLD)
+        self.__text_font = pb_style.font_desc
+        self.__text_font.set_weight(pango.WEIGHT_BOLD)
         # Done with the ProgressBar styles, don't keep refs of it
         del pb, pb_style
 
         self.set_size_request(-1, 25)
         self.gtkui_config = ConfigManager("gtkui.conf")
-        self.width = 0
-        self.height = 0
-        self.pieces = ()
-        self.num_pieces = None
-        self.text = ""
-        self.fraction = 0.0
-        self.torrent_state = None
+        self.__width = self.__old_width = 0
+        self.__height = self.__old_height = 0
+        self.__pieces = self.__old_pieces = ()
+        self.__num_pieces = self.__old_num_pieces = None
+        self.__text = self.__old_text = ""
+        self.__fraction = self.__old_fraction = 0.0
+        self.__state = self.__old_state = None
+        self.__progress_overlay = self.__text_overlay = self.__pieces_overlay = None
+        self.__cr = None
+
         self.connect('size-allocate', self.do_size_allocate_event)
         self.set_colormap(self.get_screen().get_rgba_colormap())
         self.show()
 
     def do_size_allocate_event(self, widget, size):
-        self.width = size.width
-        self.height = size.height
+        self.__old_width = self.__width
+        self.__width = size.width
+        self.__old_height = self.__height
+        self.__height = size.height
 
     # Handle the expose-event by drawing
     def do_expose_event(self, event):
-        self.draw_pieces(event)
-
-    def draw_pieces(self, event):
-        # Create the cairo context
-        cr = self.window.cairo_create()
+        # Create cairo context
+        self.__cr = self.window.cairo_create()
 
         # Restrict Cairo to the exposed area; avoid extra work
-        cr.rectangle(event.area.x, event.area.y,
-                     event.area.width, event.area.height)
-        cr.clip()
-        self.__roundcorners_clipping(cr, event)
+        self.__roundcorners_clipping()
 
-        if not self.pieces and self.num_pieces is not None:
-            # Complete Torrent
-            piece_width = self.width*1.0/self.num_pieces
-            start = 0
-            for _ in range(self.num_pieces):
-                # Like this to keep same aspect ratio
-                color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]]
-                cr.set_source_rgb(
-                    color[0]/65535.0,
-                    color[1]/65535.0,
-                    color[2]/65535.0,
-                )
-                cr.rectangle(start, 0, piece_width, self.height)
-                cr.fill()
-                start += piece_width
-            self.__write_text(cr, event)
-            return
+        if not self.__pieces and self.__num_pieces is not None:
+            # Special case. Completed torrents do not send any pieces in their
+            # status.
+            self.__draw_pieces_completed()
+        elif self.__pieces:
+            self.__draw_pieces()
 
-        if not self.pieces:
-            self.__write_text(cr, event)
-            return
+        self.__draw_progress_overlay()
+        self.__write_text()
 
-        start_pos = 0
-        num_pieces = self.num_pieces and self.num_pieces or len(self.pieces)
-        piece_width = self.width*1.0/num_pieces
+        # Drawn once, update width, eight
+        if self.__resized():
+            self.__old_width = self.__width
+            self.__old_height = self.__height
 
-        for state in self.pieces:
-            color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
-            cr.set_source_rgb(
-                color[0]/65535.0,
-                color[1]/65535.0,
-                color[2]/65535.0,
-            )
-            cr.rectangle(start_pos, 0, piece_width, self.height)
-            cr.fill()
-            start_pos += piece_width
-        self.__write_text(cr, event)
-
-    def __roundcorners_clipping(self, cr, event):
+    def __roundcorners_clipping(self):
         from math import pi
         x = 0
         y = 0
-        width = event.area.width
-        height = event.area.height
+        width = self.__width
+        height = self.__height
         aspect = 1.0
         corner_radius = height/10.0
         radius = corner_radius/aspect
         degrees = pi/180.0
+        self.__cr.new_sub_path()
+        self.__cr.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
+        self.__cr.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
+        self.__cr.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
+        self.__cr.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
+        self.__cr.close_path()
+        self.__cr.clip()
 
-        cr.new_sub_path()
-        cr.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
-        cr.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
-        cr.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
-        cr.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
-        cr.close_path()
-        cr.clip()
+    def __draw_pieces(self):
+        if (self.__resized() or self.__pieces != self.__old_pieces or
+                self.__pieces_overlay == None):
+            # Need to recreate the cache drawing
+            self.__pieces_overlay = cairo.ImageSurface(
+                cairo.FORMAT_ARGB32, self.__width, self.__height
+            )
+            ctx = cairo.Context(self.__pieces_overlay)
+            start_pos = 0
+            num_pieces = self.__num_pieces and self.__num_pieces or len(self.__pieces)
+            piece_width = self.__width*1.0/num_pieces
 
-    def __draw_progress_overlay(self, cr):
-        cr.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent
-        cr.rectangle(0.0, 0.0, self.width*self.fraction, self.height)
-        cr.fill()
+            for state in self.__pieces:
+                color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[state]]
+                ctx.set_source_rgb(
+                    color[0]/65535.0,
+                    color[1]/65535.0,
+                    color[2]/65535.0,
+                )
+                ctx.rectangle(start_pos, 0, piece_width, self.__height)
+                ctx.fill()
+                start_pos += piece_width
 
-    def __write_text(self, cr, event):
-        if not self.torrent_state:
+        self.__cr.set_source_surface(self.__pieces_overlay)
+        self.__cr.paint()
+
+    def __draw_pieces_completed(self):
+        if (self.__resized() or self.__pieces != self.__old_pieces or
+                self.__pieces_overlay is None):
+            # Need to recreate the cache drawing
+            self.__pieces_overlay = cairo.ImageSurface(
+                cairo.FORMAT_ARGB32, self.__width, self.__height
+            )
+            ctx = cairo.Context(self.__pieces_overlay)
+            piece_width = self.__width*1.0/self.__num_pieces
+            start = 0
+            for _ in range(self.__num_pieces):
+                # Like this to keep same aspect ratio
+                color = self.gtkui_config["pieces_color_%s" % COLOR_STATES[3]]
+                ctx.set_source_rgb(
+                    color[0]/65535.0,
+                    color[1]/65535.0,
+                    color[2]/65535.0,
+                )
+                ctx.rectangle(start, 0, piece_width, self.__height)
+                ctx.fill()
+                start += piece_width
+
+        self.__cr.set_source_surface(self.__pieces_overlay)
+        self.__cr.paint()
+
+    def __draw_progress_overlay(self):
+        if not self.__state:
             # Nothing useful to draw, return now!
             return
-        self.__draw_progress_overlay(cr)
+        if (self.__resized() or self.__fraction != self.__old_fraction) or \
+                                                self.__progress_overlay is None:
+            # Need to recreate the cache drawing
+            self.__progress_overlay = cairo.ImageSurface(
+                cairo.FORMAT_ARGB32, self.__width, self.__height
+            )
+            ctx = cairo.Context(self.__progress_overlay)
+            ctx.set_source_rgba(0.1, 0.1, 0.1, 0.3) # Transparent
+            ctx.rectangle(0.0, 0.0, self.__width*self.__fraction, self.__height)
+            ctx.fill()
+        self.__cr.set_source_surface(self.__progress_overlay)
+        self.__cr.paint()
 
-        pg = pangocairo.CairoContext(cr)
-        pl = pg.create_layout()
-        pl.set_font_description(self.text_font)
-        pl.set_width(-1)    # No text wrapping
+    def __write_text(self):
+        if not self.__state:
+            # Nothing useful to draw, return now!
+            return
+        if (self.__resized() or self.__text != self.__old_text or
+                self.__fraction != self.__old_fraction or
+                self.__state != self.__old_state or
+                self.__text_overlay is None):
+            # Need to recreate the cache drawing
+            self.__text_overlay = cairo.ImageSurface(
+                cairo.FORMAT_ARGB32, self.__width, self.__height
+            )
+            ctx = cairo.Context(self.__text_overlay)
+            pg = pangocairo.CairoContext(ctx)
+            pl = pg.create_layout()
+            pl.set_font_description(self.__text_font)
+            pl.set_width(-1)    # No text wrapping
 
-        text = ""
-        if self.text:
-            text += self.text
-        else:
-            if self.torrent_state:
-                text += self.torrent_state + " "
-            if self.fraction == 1.0:
-                format = "%d%%"
+            text = ""
+            if self.__text:
+                text += self.__text
             else:
-                format = "%.2f%%"
-            text += format % (self.fraction*100)
-        log.debug("PiecesBar text %r", text)
-        pl.set_text(text)
-        plsize = pl.get_size()
-        text_width = plsize[0]/pango.SCALE
-        text_height = plsize[1]/pango.SCALE
-        area_width_without_text = event.area.width - text_width
-        area_height_without_text = event.area.height - text_height
-        cr.move_to(area_width_without_text/2, area_height_without_text/2)
-        cr.set_source_rgb(1.0, 1.0, 1.0)
-        pg.update_layout(pl)
-        pg.show_layout(pl)
+                if self.__state:
+                    text += self.__state + " "
+                if self.__fraction == 1.0:
+                    format = "%d%%"
+                else:
+                    format = "%.2f%%"
+                text += format % (self.__fraction*100)
+            log.debug("PiecesBar text %r", text)
+            pl.set_text(text)
+            plsize = pl.get_size()
+            text_width = plsize[0]/pango.SCALE
+            text_height = plsize[1]/pango.SCALE
+            area_width_without_text = self.__width - text_width
+            area_height_without_text = self.__height - text_height
+            ctx.move_to(area_width_without_text/2, area_height_without_text/2)
+            ctx.set_source_rgb(1.0, 1.0, 1.0)
+            pg.update_layout(pl)
+            pg.show_layout(pl)
+        self.__cr.set_source_surface(self.__text_overlay)
+        self.__cr.paint()
 
+    def __resized(self):
+        return (self.__old_width != self.__width or
+                self.__old_height != self.__height)
 
     def set_fraction(self, fraction):
-        self.fraction = fraction
-        self.update()
+        self.__old_fraction = self.__fraction
+        self.__fraction = fraction
+
+    def get_fraction(self):
+        return self.__fraction
+
+    def get_text(self):
+        return self.__text
+
+    def set_text(self, text):
+        self.__old_text = self.__text
+        self.__text = text
 
     def set_pieces(self, pieces, num_pieces):
-        if pieces != self.pieces:
-            self.pieces = pieces
-            self.num_pieces = num_pieces
-            self.update()
+        self.__old_pieces = self.__pieces
+        self.__pieces = pieces
+        self.__num_pieces = num_pieces
+
+    def get_pieces(self):
+        return self.__pieces
+
+    def set_state(self, state):
+        self.__old_state = self.__state
+        self.__state = state
+
+    def get_state(self):
+        return self.__state
 
     def update_from_status(self, status):
-        update = False
-
-        fraction = status["progress"]/100
-        if fraction != self.fraction:
-            self.fraction = fraction
-            update = True
-
+        log.debug("Updating PiecesBar from status")
+        self.set_fraction(status["progress"]/100)
         torrent_state = status["state"]
-        if torrent_state != self.torrent_state:
-            self.torrent_state = torrent_state
-            update = True
-
+        self.set_state(torrent_state)
         if torrent_state == "Checking":
             self.update()
             # Skip the pieces assignment
             return
 
-        if status['pieces'] != self.pieces:
-            self.pieces = status['pieces']
-            self.num_pieces = status['num_pieces']
-            update = True
-
-        if update:
-            self.update()
+        self.set_pieces(status['pieces'], status['num_pieces'])
+        self.update()
 
     def clear(self):
-        self.pieces = []
-        self.num_pieces = None
-        self.fraction = 0.0
+        self.__pieces = self.__old_pieces = ()
+        self.__num_pieces = self.__old_num_pieces = None
+        self.__text = self.__oldtext = ""
+        self.__fraction = self.__old_fraction = 0.0
         self.update()
 
     def update(self):
         self.queue_draw()
-
-    def get_text(self):
-        return self.text
-
-    def set_text(self, text):
-        self.text = text
-        self.update()

From 81637f457258761e0db78522f498914d4e905cbc Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Fri, 6 May 2011 18:45:55 +0100
Subject: [PATCH 274/329] Add a nice border to the pieces bar.

---
 deluge/ui/gtkui/piecesbar.py | 40 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 4d45829b6..633223bd2 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -39,6 +39,7 @@ import cairo
 import pango
 import pangocairo
 import logging
+from math import pi
 from deluge.configmanager import ConfigManager
 
 log = logging.getLogger(__name__)
@@ -91,6 +92,7 @@ class PiecesBar(gtk.DrawingArea):
     def do_expose_event(self, event):
         # Create cairo context
         self.__cr = self.window.cairo_create()
+        self.__cr.set_line_width(max(self.__cr.device_to_user_distance(0.5, 0.5)))
 
         # Restrict Cairo to the exposed area; avoid extra work
         self.__roundcorners_clipping()
@@ -104,6 +106,7 @@ class PiecesBar(gtk.DrawingArea):
 
         self.__draw_progress_overlay()
         self.__write_text()
+        self.__roundcorners_border()
 
         # Drawn once, update width, eight
         if self.__resized():
@@ -111,22 +114,30 @@ class PiecesBar(gtk.DrawingArea):
             self.__old_height = self.__height
 
     def __roundcorners_clipping(self):
-        from math import pi
-        x = 0
-        y = 0
-        width = self.__width
-        height = self.__height
+        self.__create_roundcorners_subpath(
+            self.__cr, 0, 0, self.__width, self.__height
+        )
+        self.__cr.clip()
+
+    def __roundcorners_border(self):
+        self.__create_roundcorners_subpath(
+            self.__cr, 0.5, 0.5, self.__width-1, self.__height-1
+        )
+        self.__cr.set_source_rgba(0.0, 0.0, 0.0, 0.9)
+        self.__cr.stroke()
+
+    def __create_roundcorners_subpath(self, ctx, x, y, width, height):
         aspect = 1.0
         corner_radius = height/10.0
         radius = corner_radius/aspect
         degrees = pi/180.0
-        self.__cr.new_sub_path()
-        self.__cr.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
-        self.__cr.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
-        self.__cr.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
-        self.__cr.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
-        self.__cr.close_path()
-        self.__cr.clip()
+        ctx.new_sub_path()
+        ctx.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees)
+        ctx.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees)
+        ctx.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees)
+        ctx.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees)
+        ctx.close_path()
+        return ctx
 
     def __draw_pieces(self):
         if (self.__resized() or self.__pieces != self.__old_pieces or
@@ -288,8 +299,11 @@ class PiecesBar(gtk.DrawingArea):
     def clear(self):
         self.__pieces = self.__old_pieces = ()
         self.__num_pieces = self.__old_num_pieces = None
-        self.__text = self.__oldtext = ""
+        self.__text = self.__old_text = ""
         self.__fraction = self.__old_fraction = 0.0
+        self.__state = self.__old_state = None
+        self.__progress_overlay = self.__text_overlay = self.__pieces_overlay = None
+        self.__cr = None
         self.update()
 
     def update(self):

From 0e4747bf223465b7dae7015f83f43700966d50cc Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Fri, 6 May 2011 19:04:01 +0100
Subject: [PATCH 275/329] Lower debug messages level.

---
 deluge/ui/gtkui/piecesbar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 633223bd2..8f95e000c 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -236,7 +236,7 @@ class PiecesBar(gtk.DrawingArea):
                 else:
                     format = "%.2f%%"
                 text += format % (self.__fraction*100)
-            log.debug("PiecesBar text %r", text)
+            log.trace("PiecesBar text %r", text)
             pl.set_text(text)
             plsize = pl.get_size()
             text_width = plsize[0]/pango.SCALE
@@ -284,7 +284,7 @@ class PiecesBar(gtk.DrawingArea):
         return self.__state
 
     def update_from_status(self, status):
-        log.debug("Updating PiecesBar from status")
+        log.trace("Updating PiecesBar from status")
         self.set_fraction(status["progress"]/100)
         torrent_state = status["state"]
         self.set_state(torrent_state)

From 99f2dbd17882442c48ca54a5f31c0219979ba12b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 7 May 2011 13:47:54 +0100
Subject: [PATCH 276/329] Minor __doc__ naming change.

---
 deluge/ui/gtkui/piecesbar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/piecesbar.py b/deluge/ui/gtkui/piecesbar.py
index 8f95e000c..55e7f7cb7 100644
--- a/deluge/ui/gtkui/piecesbar.py
+++ b/deluge/ui/gtkui/piecesbar.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# listview.py
+# piecesbar.py
 #
 # Copyright (C) 2011 Pedro Algarvio 
 #

From 856a6cd1ab6d132a4381121cc988b431df6942f4 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 7 May 2011 20:08:14 +0100
Subject: [PATCH 277/329] Pieces bar "calculation" bug fix.

---
 deluge/core/torrent.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 024458a4c..badb26b6b 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -1014,8 +1014,8 @@ class Torrent(object):
                 # Completed Piece
                 pieces[idx] = 3
                 continue
-            elif availability[idx] > 1:
-                # Piece not downloaded nor beeing downloaded
+            elif availability[idx] > 0:
+                # Piece not downloaded nor beeing downloaded but available
                 pieces[idx] = 1
                 continue
             # If we reached here, it means the piece is missing, ie, there's

From 71f411e458f11067c12cd17016055c37c5e3c25e Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 19 May 2011 00:29:30 +0100
Subject: [PATCH 278/329] Some comment explanation.

---
 deluge/ui/client.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index d356b228b..b2de0b138 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -182,6 +182,13 @@ class DelugeRPCProtocol(Protocol):
                 exception_cls = getattr(error, request[2])
                 exception = exception_cls(*request[3], **request[4])
 
+                # Ideally we would chain the deferreds instead of instance
+                # checking just to log them. But, that would mean that any
+                # errback on the fist deferred should returns it's failure
+                # so it could pass back to the 2nd deferred on the chain. But,
+                # that does not always happen.
+                # So, just do some instance checking and just log rpc error at
+                # diferent levels.
                 r = self.__rpc_requests[request_id]
                 msg = "RPCError Message Received!"
                 msg += "\n" + "-" * 80

From eb15c964030d16a3cf4ccfe661f0c1dfa56284fe Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sat, 21 May 2011 11:12:57 +0100
Subject: [PATCH 279/329] Add key shortcuts for menu items

---
 deluge/ui/gtkui/glade/main_window.glade | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 43a10c8f0..b8ed6e0ba 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -37,6 +37,7 @@
                         True
                         False
                         
+                        
                         
                           
                             True
@@ -56,6 +57,7 @@
                         True
                         False
                         
+                        
                         
                           
                             True
@@ -80,6 +82,7 @@
                         True
                         False
                         
+                        
                         
                           
                             True
@@ -131,6 +134,7 @@
                         True
                         True
                         
+                        
                       
                     
                     
@@ -143,6 +147,7 @@
                         True
                         False
                         
+                        
                         
                           
                             True
@@ -318,6 +323,7 @@
                         True
                         False
                         
+                        
                         
                           
                             True

From 445f3c0123211f112cd1e7c269da5fdce17b1bf5 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sat, 21 May 2011 16:06:46 +0100
Subject: [PATCH 280/329] Fix menu bug caused by Change Owner menuitem code

The right-click torrent menu would move/jump around when the option submenu was opened with the mouse, possibly due to a conflict between glade file and append menuitem code in menubar.py. Solution was to create a menuitem entry for Change Owner in glade file and update code to add submenu to this new entry.
---
 deluge/ui/gtkui/glade/torrent_menu.glade |  7 +++++++
 deluge/ui/gtkui/menubar.py               | 19 +++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/deluge/ui/gtkui/glade/torrent_menu.glade b/deluge/ui/gtkui/glade/torrent_menu.glade
index eef4f5adc..c7dfbe096 100644
--- a/deluge/ui/gtkui/glade/torrent_menu.glade
+++ b/deluge/ui/gtkui/glade/torrent_menu.glade
@@ -274,6 +274,13 @@
         True
       
     
+    
+      
+        False
+        _Change Ownership
+        True
+      
+    
   
   
     True
diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index b4b775c52..14754b06a 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -102,10 +102,6 @@ class MenuBar(component.Component):
         self.torrentmenu = self.torrentmenu_glade.get_widget("torrent_menu")
         self.menu_torrent = self.window.main_glade.get_widget("menu_torrent")
 
-        self.menuitem_change_owner = gtk.MenuItem(_("Change Ownership"))
-        self.torrentmenu_glade.get_widget("options_torrent_menu").append(self.menuitem_change_owner)
-
-
         # Attach the torrent_menu to the Torrent file menu
         self.menu_torrent.set_submenu(self.torrentmenu)
 
@@ -209,12 +205,8 @@ class MenuBar(component.Component):
         # Show the Torrent menu because we're connected to a host
         self.menu_torrent.show()
 
-        # Hide the change owner submenu until we get the accounts back from the
-        # demon.
-        self.menuitem_change_owner.set_visible(False)
-
         if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
-            # Get Known accounts to allow chaning ownership
+            # Get known accounts to allow changing ownership
             client.core.get_known_accounts().addCallback(
                 self._on_known_accounts).addErrback(self._on_known_accounts_fail
             )
@@ -234,7 +226,6 @@ class MenuBar(component.Component):
         self.window.main_glade.get_widget("separatormenuitem").hide()
         self.window.main_glade.get_widget("menuitem_quitdaemon").hide()
 
-
     def update_menu(self):
         selected = component.get('TorrentView').get_selected_torrents()
         if not selected or len(selected) == 0:
@@ -531,7 +522,7 @@ class MenuBar(component.Component):
         if len(known_accounts) <= 1:
             return
 
-        self.menuitem_change_owner.set_visible(True)
+        self.torrentmenu_glade.get_widget("menuitem_change_owner").set_visible(True)
 
         self.change_owner_submenu = gtk.Menu()
         self.change_owner_submenu_items = {}
@@ -549,13 +540,13 @@ class MenuBar(component.Component):
         self.change_owner_submenu.show_all()
         self.change_owner_submenu_items[None].set_active(True)
         self.change_owner_submenu_items[None].hide()
-        self.menuitem_change_owner.connect(
+        self.torrentmenu_glade.get_widget("menuitem_change_owner").connect(
             "activate", self._on_change_owner_submenu_active
         )
-        self.menuitem_change_owner.set_submenu(self.change_owner_submenu)
+        self.torrentmenu_glade.get_widget("menuitem_change_owner").set_submenu(self.change_owner_submenu)
 
     def _on_known_accounts_fail(self, reason):
-        self.menuitem_change_owner.set_visible(False)
+        self.torrentmenu_glade.get_widget("menuitem_change_owner").set_visible(False)
 
     def _on_change_owner_submenu_active(self, widget):
         log.debug("_on_change_owner_submenu_active")

From 1c58dce3c115c576f4908c360278c6cfbf9c692a Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sat, 21 May 2011 11:37:37 +0100
Subject: [PATCH 281/329] Supress gobject warning in filtertreeview and
 torrentview

In console the warning "g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed" will appear. Quick investigation could find no solution with suggestions a python issue.
---
 deluge/ui/gtkui/filtertreeview.py |  7 ++++++-
 deluge/ui/gtkui/torrentview.py    | 15 +++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py
index b7ba36e03..1c1309e6f 100644
--- a/deluge/ui/gtkui/filtertreeview.py
+++ b/deluge/ui/gtkui/filtertreeview.py
@@ -40,6 +40,7 @@ import gtk.glade
 import logging
 import pkg_resources
 import glib
+import warnings
 
 import deluge.component as component
 import deluge.common
@@ -259,7 +260,11 @@ class FilterTreeView(component.Component):
         value = model.get_value(row, 1)
         label = model.get_value(row, 2)
         count = model.get_value(row, 3)
-        pix = model.get_value(row, 4)
+
+        #Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            pix = model.get_value(row, 4)
 
         if pix:
             self.renderpix.set_property("visible", True)
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 4fc5ce331..638616dd5 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -43,6 +43,7 @@ import gtk.glade
 import gettext
 import gobject
 import logging
+import warnings
 from urlparse import urlparse
 
 import deluge.common
@@ -84,8 +85,11 @@ def cell_data_statusicon(column, cell, model, row, data):
     """Display text with an icon"""
     try:
         icon = ICON_STATE[model.get_value(row, data)]
-        if cell.get_property("pixbuf") != icon:
-            cell.set_property("pixbuf", icon)
+        #Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            if cell.get_property("pixbuf") != icon:
+                cell.set_property("pixbuf", icon)
     except KeyError:
         pass
 
@@ -104,8 +108,11 @@ def cell_data_trackericon(column, cell, model, row, data):
         else:
             icon = create_blank_icon()
 
-        if cell.get_property("pixbuf") != icon:
-            cell.set_property("pixbuf", icon)
+        #Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            if cell.get_property("pixbuf") != icon:
+                cell.set_property("pixbuf", icon)
 
     host = model[row][data]
     if host:

From edb0c2e71dbca84813fa468cab191f91db129492 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sat, 21 May 2011 13:00:59 +0100
Subject: [PATCH 282/329] Modify setup scripts to be executable

---
 create_potfiles_in.py | 1 +
 gettextize.sh         | 0
 msgfmt.py             | 1 +
 setup.py              | 1 +
 4 files changed, 3 insertions(+)
 mode change 100644 => 100755 create_potfiles_in.py
 mode change 100644 => 100755 gettextize.sh
 mode change 100644 => 100755 msgfmt.py

diff --git a/create_potfiles_in.py b/create_potfiles_in.py
old mode 100644
new mode 100755
index 6ccb39e1d..e500a0a06
--- a/create_potfiles_in.py
+++ b/create_potfiles_in.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import os
 
 # Paths to exclude
diff --git a/gettextize.sh b/gettextize.sh
old mode 100644
new mode 100755
diff --git a/msgfmt.py b/msgfmt.py
old mode 100644
new mode 100755
index d9133a2cc..4bda37ebb
--- a/msgfmt.py
+++ b/msgfmt.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: iso-8859-1 -*-
 # Written by Martin v. Lwis 
 # Plural forms support added by alexander smishlajev 
diff --git a/setup.py b/setup.py
index d5f13b11f..b065c1f08 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #
 # setup.py
 #

From 79c9dd30760281b3ceb05fe615df3a6df23bfa42 Mon Sep 17 00:00:00 2001
From: fuhry 
Date: Sun, 22 May 2011 19:16:07 +0100
Subject: [PATCH 283/329] Add libtorrent version to user_agent string

Example: Deluge/1.3.900-dev Libtorrent/0.15.5
---
 deluge/core/core.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 6537ce379..6b8cd3d74 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -88,7 +88,9 @@ class Core(component.Component):
 
         # Set the user agent
         self.settings = lt.session_settings()
-        self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
+        self.settings.user_agent = "Deluge/%(deluge_version)s Libtorrent/%(lt_version)s" % \
+                        { 'deluge_version': deluge.common.get_version(),
+                          'lt_version': self.get_libtorrent_version().rpartition(".")[0] }
 
         # Set session settings
         self.settings.send_redundant_have = True

From b3865d0a7f06d14d75dce978ac36049755c780b5 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 22 May 2011 21:56:16 +0100
Subject: [PATCH 284/329] Fix GTK UI edit trackers dialog.

Fix an issue with the edit trackers dialog where editing, adding or removing trackers was not "saved" in client/daemon mode.
---
 deluge/ui/gtkui/edittrackersdialog.py | 46 ++++++++++++---------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py
index ba39dcbb3..0571a6c64 100644
--- a/deluge/ui/gtkui/edittrackersdialog.py
+++ b/deluge/ui/gtkui/edittrackersdialog.py
@@ -74,8 +74,6 @@ class EditTrackersDialog:
             "on_button_edit_ok_clicked": self.on_button_edit_ok_clicked,
             "on_button_remove_clicked": self.on_button_remove_clicked,
             "on_button_down_clicked": self.on_button_down_clicked,
-            "on_button_ok_clicked": self.on_button_ok_clicked,
-            "on_button_cancel_clicked": self.on_button_cancel_clicked,
             "on_button_add_ok_clicked": self.on_button_add_ok_clicked,
             "on_button_add_cancel_clicked": self.on_button_add_cancel_clicked
         })
@@ -103,7 +101,9 @@ class EditTrackersDialog:
 
         # Get the trackers for this torrent
         session = component.get("SessionProxy")
-        session.get_torrent_status(self.torrent_id, ["trackers"]).addCallback(self._on_get_torrent_status)
+        session.get_torrent_status(
+            self.torrent_id, ["trackers"]
+        ).addCallback(self._on_get_torrent_status)
         client.force_call()
 
         self.deferred = defer.Deferred()
@@ -115,14 +115,29 @@ class EditTrackersDialog:
         self.dialog.destroy()
 
     def _on_response(self, widget, response):
-        self.deferred.callback(response)
+        if response == 1:
+            self.trackers = []
+            def each(model, path, iter, data):
+                tracker = {}
+                tracker["tier"] = model.get_value(iter, 0)
+                tracker["url"] = model.get_value(iter, 1)
+                self.trackers.append(tracker)
+            self.liststore.foreach(each, None)
+            if self.old_trackers != self.trackers:
+                # Set the torrens trackers
+                client.core.set_torrent_trackers(self.torrent_id, self.trackers)
+                self.deferred.callback(gtk.RESPONSE_OK)
+            else:
+                self.deferred.callback(gtk.RESPONSE_CANCEL)
+        else:
+            self.deferred.callback(gtk.RESPONSE_CANCEL)
         self.dialog.destroy()
 
     def _on_get_torrent_status(self, status):
         """Display trackers dialog"""
-        for tracker in status["trackers"]:
+        self.old_trackers = list(status["trackers"])
+        for tracker in self.old_trackers:
             self.add_tracker(tracker["tier"], tracker["url"])
-
         self.dialog.show()
 
     def add_tracker(self, tier, url):
@@ -194,25 +209,6 @@ class EditTrackersDialog:
             self.liststore.set_value(selected, 0, new_tier)
             self.changed = True
 
-    def on_button_ok_clicked(self, widget):
-        log.debug("on_button_ok_clicked")
-        self.trackers = []
-        def each(model, path, iter, data):
-            tracker = {}
-            tracker["tier"] = model.get_value(iter, 0)
-            tracker["url"] = model.get_value(iter, 1)
-            self.trackers.append(tracker)
-        self.liststore.foreach(each, None)
-        # Set the torrens trackers
-        client.core.set_torrent_trackers(self.torrent_id, self.trackers)
-        if self.changed:
-            self.dialog.response(gtk.RESPONSE_OK)
-        else:
-            self.dialog.response(gtk.RESPONSE_CANCEL)
-
-    def on_button_cancel_clicked(self, widget):
-        log.debug("on_button_cancel_clicked")
-        self.dialog.response(gtk.RESPONSE_CANCEL)
 
     def on_button_add_ok_clicked(self, widget):
         log.debug("on_button_add_ok_clicked")

From 974f48380f3c9b1f570902f1249cf05b8b7e393f Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sun, 22 May 2011 19:58:07 +0100
Subject: [PATCH 285/329] Change default value of close_to_tray to False

Prevents default install of Deluge disappearing if tray icon is missing.
---
 deluge/ui/gtkui/gtkui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index b87c56a2f..eed6551ae 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -114,7 +114,7 @@ DEFAULT_PREFS = {
     "interactive_add": True,
     "focus_add_dialog": True,
     "enable_system_tray": True,
-    "close_to_tray": True,
+    "close_to_tray": False,
     "start_in_tray": False,
     "enable_appindicator": False,
     "lock_tray": False,

From b0599313bc88ced60a5666d96b01d0579d92faee Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sun, 22 May 2011 22:35:20 +0100
Subject: [PATCH 286/329] Feature #1646: Add columns for per torrent upload and
 download speed limits

---
 deluge/ui/gtkui/listview.py    | 9 +++++++++
 deluge/ui/gtkui/torrentview.py | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py
index 7b43fb7cc..a9f8a892d 100644
--- a/deluge/ui/gtkui/listview.py
+++ b/deluge/ui/gtkui/listview.py
@@ -111,6 +111,15 @@ def cell_data_date_or_never(column, cell, model, row, data):
     else:
         cell.set_property('text', _("Never"))
 
+def cell_data_speed_limit(column, cell, model, row, data):
+    """Display value as a speed, eg. 2 KiB/s"""
+    speed = model.get_value(row, data)
+    speed_str = ""
+    if speed > 0:
+        speed_str = deluge.common.fspeed(speed * 1024)
+
+    cell.set_property('text', speed_str)
+
 class ListViewColumnState:
     """Used for saving/loading column state"""
     def __init__(self, name, position, width, visible, sort, sort_order):
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 638616dd5..bc0f99239 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -239,6 +239,10 @@ class TorrentView(listview.ListView, component.Component):
                              status_field=["download_payload_rate"])
         self.add_func_column(_("Up Speed"), listview.cell_data_speed, [float],
                              status_field=["upload_payload_rate"])
+        self.add_func_column(_("Down Limit"), listview.cell_data_speed_limit, [float],
+                             status_field=["max_download_speed"])
+        self.add_func_column(_("Up Limit"), listview.cell_data_speed_limit, [float],
+                             status_field=["max_upload_speed"])
         self.add_func_column(_("ETA"), listview.cell_data_time, [int],
                              status_field=["eta"], sort_func=eta_column_sort)
         self.add_func_column(_("Ratio"), listview.cell_data_ratio, [float],

From 85b4ceec3002f184e9a9b69fd4dc28a31cfa4d6d Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sun, 22 May 2011 22:48:03 +0100
Subject: [PATCH 287/329] Feature #1308: Add Seeds/Peers ratio to torrent list
 view

---
 deluge/core/torrent.py         | 8 ++++++++
 deluge/ui/gtkui/torrentview.py | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 5db3a4c67..723b7c583 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -620,6 +620,13 @@ class Torrent(object):
         if distributed_copies < 0:
             distributed_copies = 0.0
 
+        # Calculate the seeds:peers ratio
+        if self.status.num_incomplete == 0:
+            # Use -1.0 to signify infinity
+            seeds_peers_ratio = -1.0
+        else:
+            seeds_peers_ratio = self.status.num_complete / float(self.status.num_incomplete)
+
         full_status = {
             "active_time": self.status.active_time,
             "all_time_download": self.status.all_time_download,
@@ -651,6 +658,7 @@ class Torrent(object):
             "remove_at_ratio": self.options["remove_at_ratio"],
             "save_path": self.options["download_location"],
             "seeding_time": self.status.seeding_time,
+            "seeds_peers_ratio": seeds_peers_ratio,
             "seed_rank": self.status.seed_rank,
             "state": self.state,
             "stop_at_ratio": self.options["stop_at_ratio"],
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index bc0f99239..b95402a62 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -235,6 +235,8 @@ class TorrentView(listview.ListView, component.Component):
         self.add_func_column(_("Peers"), listview.cell_data_peer, [int, int],
                              status_field=["num_peers", "total_peers"],
                              sort_func=seed_peer_column_sort)
+        self.add_func_column(_("Seeders") + "/" + _("Peers"), listview.cell_data_ratio, [float],
+                             status_field=["seeds_peers_ratio"])
         self.add_func_column(_("Down Speed"), listview.cell_data_speed, [float],
                              status_field=["download_payload_rate"])
         self.add_func_column(_("Up Speed"), listview.cell_data_speed, [float],

From 2fb874d48696c4bf5f964dc1eb60910ec16fba72 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Sun, 22 May 2011 15:12:11 -0700
Subject: [PATCH 288/329] Add ability to set columns as not visible by default
 by setting the kwarg default to False when adding the column

---
 deluge/ui/gtkui/listview.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py
index 7b43fb7cc..87e69c55b 100644
--- a/deluge/ui/gtkui/listview.py
+++ b/deluge/ui/gtkui/listview.py
@@ -435,7 +435,7 @@ class ListView:
 
     def add_column(self, header, render, col_types, hidden, position,
             status_field, sortid, text=0, value=0, pixbuf=0, function=None,
-            column_type=None, sort_func=None, tooltip=None):
+            column_type=None, sort_func=None, tooltip=None, default=True):
         """Adds a column to the ListView"""
         # Add the column types to liststore_columns
         column_indices = []
@@ -516,10 +516,12 @@ class ListView:
             column.get_widget().set_tooltip_markup(tooltip)
 
         # Check for loaded state and apply
+        column_in_state = False
         if self.state != None:
             for column_state in self.state:
                 if header == column_state.name:
                     # We found a loaded state
+                    column_in_state = True
                     if column_state.width > 0:
                         column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
                         column.set_fixed_width(column_state.width)
@@ -530,7 +532,13 @@ class ListView:
                         )
                     column.set_visible(column_state.visible)
                     position = column_state.position
-
+                    break
+            
+        # Set this column to not visible if its not in the state and
+        # its not supposed to be shown by default
+        if not column_in_state and not default and not hidden:
+            column.set_visible(False)
+                
         if position is not None:
             self.treeview.insert_column(column, position)
         else:
@@ -546,64 +554,64 @@ class ListView:
 
     def add_text_column(self, header, col_type=str, hidden=False, position=None,
                         status_field=None, sortid=0, column_type="text",
-                        sort_func=None, tooltip=None):
+                        sort_func=None, tooltip=None, default=True):
         """Add a text column to the listview.  Only the header name is required.
         """
         render = gtk.CellRendererText()
         self.add_column(header, render, col_type, hidden, position,
                         status_field, sortid, column_type=column_type,
-                        sort_func=sort_func, tooltip=tooltip)
+                        sort_func=sort_func, tooltip=tooltip, default=default)
 
         return True
 
     def add_bool_column(self, header, col_type=bool, hidden=False,
                         position=None, status_field=None, sortid=0,
-                        column_type="bool", tooltip=None):
+                        column_type="bool", tooltip=None, default=True):
 
         """Add a bool column to the listview"""
         render = gtk.CellRendererToggle()
         self.add_column(header, render, col_type, hidden, position,
                         status_field, sortid, column_type=column_type,
-                        tooltip=tooltip)
+                        tooltip=tooltip, default=default)
 
     def add_func_column(self, header, function, col_types, sortid=0,
                         hidden=False, position=None, status_field=None,
-                        column_type="func", sort_func=None, tooltip=None):
+                        column_type="func", sort_func=None, tooltip=None, default=True):
         """Add a function column to the listview.  Need a header name, the
         function and the column types."""
 
         render = gtk.CellRendererText()
         self.add_column(header, render, col_types, hidden, position,
                         status_field, sortid, column_type=column_type,
-                        function=function, sort_func=sort_func, tooltip=tooltip)
+                        function=function, sort_func=sort_func, tooltip=tooltip, default=default)
 
         return True
 
     def add_progress_column(self, header, col_types=[float, str], sortid=0,
                             hidden=False, position=None, status_field=None,
                             function=None, column_type="progress",
-                            tooltip=None):
+                            tooltip=None, default=True):
         """Add a progress column to the listview."""
 
         render = gtk.CellRendererProgress()
         self.add_column(header, render, col_types, hidden, position,
                         status_field, sortid, function=function,
                         column_type=column_type, value=0, text=1,
-                        tooltip=tooltip)
+                        tooltip=tooltip, default=default)
 
         return True
 
     def add_texticon_column(self, header, col_types=[str, str], sortid=1,
                             hidden=False, position=None, status_field=None,
                             column_type="texticon", function=None,
-                            tooltip=None):
+                            tooltip=None, default=True):
         """Adds a texticon column to the listview."""
         render1 = gtk.CellRendererPixbuf()
         render2 = gtk.CellRendererText()
 
         self.add_column(header, (render1, render2), col_types, hidden, position,
                         status_field, sortid, column_type=column_type,
-                        function=function, pixbuf=0, text=1, tooltip=tooltip)
+                        function=function, pixbuf=0, text=1, tooltip=tooltip, default=default)
 
         return True
 

From 019f2a0619fef79864312a3c4b0da0844db0b90c Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sun, 22 May 2011 23:18:59 +0100
Subject: [PATCH 289/329] Fix Up/Down buttons in Edit Trackers Dialog

---
 deluge/ui/gtkui/edittrackersdialog.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py
index 0571a6c64..7864b7549 100644
--- a/deluge/ui/gtkui/edittrackersdialog.py
+++ b/deluge/ui/gtkui/edittrackersdialog.py
@@ -149,17 +149,6 @@ class EditTrackersDialog:
         """Returns the selected tracker"""
         return self.treeview.get_selection().get_selected()[1]
 
-    def on_button_up_clicked(self, widget):
-        log.debug("on_button_up_clicked")
-        selected = self.get_selected()
-        num_rows = self.liststore.iter_n_children(None)
-        if selected != None and num_rows > 1:
-            tier = self.liststore.get_value(selected, 0)
-            new_tier = tier + 1
-            # Now change the tier for this tracker
-            self.liststore.set_value(selected, 0, new_tier)
-            self.changed = True
-
     def on_button_add_clicked(self, widget):
         log.debug("on_button_add_clicked")
         # Show the add tracker dialog
@@ -196,8 +185,8 @@ class EditTrackersDialog:
         self.edit_tracker_entry.hide()
         self.changed = True
 
-    def on_button_down_clicked(self, widget):
-        log.debug("on_button_down_clicked")
+    def on_button_up_clicked(self, widget):
+        log.debug("on_button_up_clicked")
         selected = self.get_selected()
         num_rows = self.liststore.iter_n_children(None)
         if selected != None and num_rows > 1:
@@ -209,6 +198,16 @@ class EditTrackersDialog:
             self.liststore.set_value(selected, 0, new_tier)
             self.changed = True
 
+    def on_button_down_clicked(self, widget):
+        log.debug("on_button_down_clicked")
+        selected = self.get_selected()
+        num_rows = self.liststore.iter_n_children(None)
+        if selected != None and num_rows > 1:
+            tier = self.liststore.get_value(selected, 0)
+            new_tier = tier + 1
+            # Now change the tier for this tracker
+            self.liststore.set_value(selected, 0, new_tier)
+            self.changed = True
 
     def on_button_add_ok_clicked(self, widget):
         log.debug("on_button_add_ok_clicked")

From 13a379ef6c428f64babef100fcb8e79ebfd6f8aa Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Mon, 23 May 2011 01:06:37 +0100
Subject: [PATCH 290/329] Update certain torrentview columns to default to not
 visible

---
 deluge/ui/gtkui/torrentview.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index b95402a62..8952c02ea 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -221,51 +221,51 @@ class TorrentView(listview.ListView, component.Component):
                              status_field=["total_wanted"])
         self.add_func_column(_("Downloaded"), listview.cell_data_size,
                              [gobject.TYPE_UINT64],
-                             status_field=["all_time_download"])
+                             status_field=["all_time_download"], default=False)
         self.add_func_column(_("Uploaded"), listview.cell_data_size,
                              [gobject.TYPE_UINT64],
-                             status_field=["total_uploaded"])
+                             status_field=["total_uploaded"], default=False)
         self.add_progress_column(_("Progress"),
                                  status_field=["progress", "state"],
                                  col_types=[float, str],
                                  function=cell_data_progress)
         self.add_func_column(_("Seeders"), listview.cell_data_peer, [int, int],
                              status_field=["num_seeds", "total_seeds"],
-                             sort_func=seed_peer_column_sort)
+                             sort_func=seed_peer_column_sort, default=False)
         self.add_func_column(_("Peers"), listview.cell_data_peer, [int, int],
                              status_field=["num_peers", "total_peers"],
-                             sort_func=seed_peer_column_sort)
+                             sort_func=seed_peer_column_sort, default=False)
         self.add_func_column(_("Seeders") + "/" + _("Peers"), listview.cell_data_ratio, [float],
-                             status_field=["seeds_peers_ratio"])
+                             status_field=["seeds_peers_ratio"], default=False)
         self.add_func_column(_("Down Speed"), listview.cell_data_speed, [float],
                              status_field=["download_payload_rate"])
         self.add_func_column(_("Up Speed"), listview.cell_data_speed, [float],
                              status_field=["upload_payload_rate"])
         self.add_func_column(_("Down Limit"), listview.cell_data_speed_limit, [float],
-                             status_field=["max_download_speed"])
+                             status_field=["max_download_speed"], default=False)
         self.add_func_column(_("Up Limit"), listview.cell_data_speed_limit, [float],
-                             status_field=["max_upload_speed"])
+                             status_field=["max_upload_speed"], default=False)
         self.add_func_column(_("ETA"), listview.cell_data_time, [int],
                              status_field=["eta"], sort_func=eta_column_sort)
         self.add_func_column(_("Ratio"), listview.cell_data_ratio, [float],
-                             status_field=["ratio"])
+                             status_field=["ratio"], default=False)
         self.add_func_column(_("Avail"), listview.cell_data_ratio, [float],
-                             status_field=["distributed_copies"])
+                             status_field=["distributed_copies"], default=False)
         self.add_func_column(_("Added"), listview.cell_data_date, [float],
-                             status_field=["time_added"])
+                             status_field=["time_added"], default=False)
         self.add_func_column(_("Last Seen Complete"),
                              listview.cell_data_date_or_never, [float],
-                             status_field=["last_seen_complete"])
+                             status_field=["last_seen_complete"], default=False)
         self.add_texticon_column(_("Tracker"),
                                  status_field=["tracker_host", "tracker_host"],
-                                 function=cell_data_trackericon)
-        self.add_text_column(_("Save Path"), status_field=["save_path"])
-        self.add_text_column(_("Owner"), status_field=["owner"])
-        self.add_bool_column(_("Public"), status_field=["public"])
+                                 function=cell_data_trackericon, default=False)
+        self.add_text_column(_("Save Path"), status_field=["save_path"], default=False)
+        self.add_text_column(_("Owner"), status_field=["owner"], default=False)
+        self.add_bool_column(_("Public"), status_field=["public"], default=False)
         self.restore_columns_order_from_state()
         self.add_bool_column(_("Shared"), status_field=["shared"],
                              tooltip=_("Torrent is shared between other Deluge "
-                                       "users or not."))
+                                       "users or not."), default=False)
 
         # Set filter to None for now
         self.filter = None

From b08e90ac2a2e353c37bd749a6c859708862228b6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Mon, 23 May 2011 09:37:02 +0100
Subject: [PATCH 291/329] GTK UI edit trackers dialog. Remove un-used
 attribute.

---
 deluge/ui/gtkui/edittrackersdialog.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/deluge/ui/gtkui/edittrackersdialog.py b/deluge/ui/gtkui/edittrackersdialog.py
index 7864b7549..aa109dd7a 100644
--- a/deluge/ui/gtkui/edittrackersdialog.py
+++ b/deluge/ui/gtkui/edittrackersdialog.py
@@ -92,7 +92,6 @@ class EditTrackersDialog:
 
         self.dialog.connect("delete-event", self._on_delete_event)
         self.dialog.connect("response", self._on_response)
-        self.changed = False
 
     def run(self):
         # Make sure we have a torrent_id.. if not just return
@@ -143,7 +142,6 @@ class EditTrackersDialog:
     def add_tracker(self, tier, url):
         """Adds a tracker to the list"""
         self.liststore.append([tier, url])
-        self.changed = True
 
     def get_selected(self):
         """Returns the selected tracker"""
@@ -154,14 +152,12 @@ class EditTrackersDialog:
         # Show the add tracker dialog
         self.add_tracker_dialog.show()
         self.glade.get_widget("textview_trackers").grab_focus()
-        self.changed = True
 
     def on_button_remove_clicked(self, widget):
         log.debug("on_button_remove_clicked")
         selected = self.get_selected()
         if selected != None:
             self.liststore.remove(selected)
-            self.changed = True
 
     def on_button_edit_clicked(self, widget):
         """edits an existing tracker"""
@@ -183,7 +179,6 @@ class EditTrackersDialog:
         tracker = self.glade.get_widget("entry_edit_tracker").get_text()
         self.liststore.set_value(selected, 1, tracker)
         self.edit_tracker_entry.hide()
-        self.changed = True
 
     def on_button_up_clicked(self, widget):
         log.debug("on_button_up_clicked")
@@ -196,7 +191,6 @@ class EditTrackersDialog:
             new_tier = tier - 1
             # Now change the tier for this tracker
             self.liststore.set_value(selected, 0, new_tier)
-            self.changed = True
 
     def on_button_down_clicked(self, widget):
         log.debug("on_button_down_clicked")
@@ -207,7 +201,6 @@ class EditTrackersDialog:
             new_tier = tier + 1
             # Now change the tier for this tracker
             self.liststore.set_value(selected, 0, new_tier)
-            self.changed = True
 
     def on_button_add_ok_clicked(self, widget):
         log.debug("on_button_add_ok_clicked")

From b8fad45eaa172e4ad368de5179dedafd2eaab872 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Mon, 23 May 2011 22:20:10 +0100
Subject: [PATCH 292/329] Change Connection Manager Key Shortcut to Ctrl-M

---
 deluge/ui/gtkui/glade/main_window.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index b8ed6e0ba..8fb2302e4 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -147,7 +147,7 @@
                         True
                         False
                         
-                        
+                        
                         
                           
                             True

From 8464a938b218cb80c4472cfb101409308f40bfde Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Mon, 23 May 2011 17:09:16 -0700
Subject: [PATCH 293/329] Fix up displaying versions in the about dialog

---
 deluge/ui/gtkui/aboutdialog.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py
index 5dd9d32dd..13199bc83 100644
--- a/deluge/ui/gtkui/aboutdialog.py
+++ b/deluge/ui/gtkui/aboutdialog.py
@@ -59,8 +59,8 @@ class AboutDialog:
         self.about.set_copyright(u'Copyright \u00A9 2007-2009 Deluge Team')
         self.about.set_comments(
             "A peer-to-peer file sharing program\nutilizing the Bittorrent "
-            "protocol.\n\nCore Version: %coreversion%\nlibtorrent version: "
-            "%ltversion%")
+            "protocol.\n\n"
+            "Client Version: %s\n" % version)
         self.about.set_version(version)
         self.about.set_authors([
             "Current Developers:", "Andrew Resch", "Damien Churchill",
@@ -279,6 +279,13 @@ class AboutDialog:
         ))
 
         if client.connected():
+            if not client.is_classicmode():
+                self.about.set_comments(
+                    self.about.get_comments() + "Server Version: %coreversion%\n")
+            
+            self.about.set_comments(
+                self.about.get_comments() + "libtorrent Version: %ltversion%\n")
+                
             def on_lt_version(result):
                 c = self.about.get_comments()
                 c = c.replace("%ltversion%", result)
@@ -290,7 +297,10 @@ class AboutDialog:
                 self.about.set_comments(c)
                 client.core.get_libtorrent_version().addCallback(on_lt_version)
 
-            client.daemon.info().addCallback(on_info)
+            if not client.is_classicmode():
+                client.daemon.info().addCallback(on_info)
+            else:
+                client.core.get_libtorrent_version().addCallback(on_lt_version)
 
     def run(self):
         self.about.show_all()

From bd43f3c464c513a93b846d166fea3b2c04b3a39e Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Tue, 24 May 2011 01:58:40 +0100
Subject: [PATCH 294/329] Small text updates

---
 deluge/plugins/autoadd/setup.py       |  2 +-
 deluge/plugins/label/setup.py         | 10 +++-------
 deluge/plugins/notifications/setup.py | 11 +++++++----
 deluge/ui/gtkui/aboutdialog.py        | 22 +++++++++++++---------
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/deluge/plugins/autoadd/setup.py b/deluge/plugins/autoadd/setup.py
index 5ce62fe1e..fc563fae7 100644
--- a/deluge/plugins/autoadd/setup.py
+++ b/deluge/plugins/autoadd/setup.py
@@ -44,7 +44,7 @@ __plugin_name__ = "AutoAdd"
 __author__ = "Chase Sterling, Pedro Algarvio"
 __author_email__ = "chase.sterling@gmail.com, pedro@algarvio.me"
 __version__ = "1.02"
-__url__ = "http://forum.deluge-torrent.org/viewtopic.php?f=9&t=26775"
+__url__ = "http://dev.deluge-torrent.org/wiki/Plugins/AutoAdd"
 __license__ = "GPLv3"
 __description__ = "Monitors folders for .torrent files."
 __long_description__ = """"""
diff --git a/deluge/plugins/label/setup.py b/deluge/plugins/label/setup.py
index 4fc344484..d196edaf1 100644
--- a/deluge/plugins/label/setup.py
+++ b/deluge/plugins/label/setup.py
@@ -39,15 +39,11 @@ __author_email__ = "mvoncken@gmail.com"
 __version__ = "0.1"
 __url__ = "http://deluge-torrent.org"
 __license__ = "GPLv3"
-__description__ = "Label plugin."
+__description__ = "Allows labels to be assigned to torrents"
 __long_description__ = """
-Label plugin.
-
-Offers filters on state,tracker and keyword.
-adds a tracker column.
-
-future: Real labels.
+Allows labels to be assigned to torrents
 
+Also offers filters on state, tracker and keywords
 """
 __pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
 
diff --git a/deluge/plugins/notifications/setup.py b/deluge/plugins/notifications/setup.py
index b9834ff8b..a12a67e37 100755
--- a/deluge/plugins/notifications/setup.py
+++ b/deluge/plugins/notifications/setup.py
@@ -46,10 +46,13 @@ __version__ = "0.1"
 __url__ = "http://dev.deluge-torrent.org/"
 __license__ = "GPLv3"
 __description__ = "Plugin which provides notifications to Deluge."
-__long_description__ = __description__ + """\
- Email, Popup, Blink and Sound notifications are supported.
-The plugin also allows other plugins to make use of itself for their own custom
-notifications.
+__long_description__ =  """
+Plugin which provides notifications to Deluge
+
+Email, Popup, Blink and Sound notifications
+ 
+The plugin also allows other plugins to make
+ use of itself for their own custom notifications
 """
 __pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
 
diff --git a/deluge/ui/gtkui/aboutdialog.py b/deluge/ui/gtkui/aboutdialog.py
index 13199bc83..3d91609ee 100644
--- a/deluge/ui/gtkui/aboutdialog.py
+++ b/deluge/ui/gtkui/aboutdialog.py
@@ -56,10 +56,10 @@ class AboutDialog:
 
         version = deluge.common.get_version()
 
-        self.about.set_copyright(u'Copyright \u00A9 2007-2009 Deluge Team')
+        self.about.set_copyright(u'Copyright \u00A9 2007-2011 Deluge Team')
         self.about.set_comments(
-            "A peer-to-peer file sharing program\nutilizing the Bittorrent "
-            "protocol.\n\n"
+            "A peer-to-peer file sharing program\nutilizing the BitTorrent "
+            "protocol\n\n"
             "Client Version: %s\n" % version)
         self.about.set_version(version)
         self.about.set_authors([
@@ -253,17 +253,21 @@ class AboutDialog:
             "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 "
+            "the License, or (at your option) any later version. \n\n"
+            "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 "
+            "General Public License for more details. \n\n"
+            "You should have received "
             "a copy of the GNU General Public License along with this program; "
-            "if not, see . In addition, as a "
+            "if not, see . \n\n"
+            "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) "
+            "all of the code used other than OpenSSL. \n\n"
+            "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 "
@@ -271,7 +275,7 @@ class AboutDialog:
             "source files in the program, then also delete it here."
         ))
         self.about.set_website("http://deluge-torrent.org")
-        self.about.set_website_label("http://deluge-torrent.org")
+        self.about.set_website_label("www.deluge-torrent.org")
 
         self.about.set_icon(common.get_deluge_icon())
         self.about.set_logo(gtk.gdk.pixbuf_new_from_file(
@@ -284,7 +288,7 @@ class AboutDialog:
                     self.about.get_comments() + "Server Version: %coreversion%\n")
             
             self.about.set_comments(
-                self.about.get_comments() + "libtorrent Version: %ltversion%\n")
+                self.about.get_comments() + "Libtorrent Version: %ltversion%\n")
                 
             def on_lt_version(result):
                 c = self.about.get_comments()

From 724025092a0ae78da58f95d3ec28c36289eff72f Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Wed, 25 May 2011 13:17:41 -0700
Subject: [PATCH 295/329] Set the WM_CLASS name to Deluge

---
 deluge/ui/gtkui/gtkui.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index eed6551ae..1263f4127 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -33,11 +33,13 @@
 #
 #
 
+import gobject
+gobject.set_prgname("deluge")
+
 # Install the twisted reactor
 from twisted.internet import gtk2reactor
 reactor = gtk2reactor.install()
 
-import gobject
 import gettext
 import locale
 import pkg_resources

From d42778afa35ede14fde2871dd2dab00d27dcc1c6 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Wed, 25 May 2011 13:21:16 -0700
Subject: [PATCH 296/329] Show the checking icon for the Checking Resume Data
 state

---
 deluge/ui/gtkui/torrentview.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 8952c02ea..ab23f45ad 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -78,7 +78,8 @@ ICON_STATE = {
     "Seeding": icon_seeding,
     "Paused": icon_inactive,
     "Error": icon_alert,
-    "Queued": icon_queued
+    "Queued": icon_queued,
+    "Checking Resume Data": icon_checking
 }
 
 def cell_data_statusicon(column, cell, model, row, data):

From 3a7c182f830940817b4ce2d5e54625340e882a24 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Thu, 26 May 2011 01:11:09 +0100
Subject: [PATCH 297/329] Add XDG_DOWNLOAD_DIR for default download folder
 #1788

---
 deluge/common.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deluge/common.py b/deluge/common.py
index 533094f96..ed875f11d 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -166,6 +166,18 @@ def get_default_download_dir():
     if windows_check():
         return os.path.expanduser("~")
     else:
+        from xdg.BaseDirectory import xdg_config_home
+        userdir_file = os.path.join(xdg_config_home, 'user-dirs.dirs')
+        try:
+            for line in open(userdir_file, 'r'):
+                if not line.startswith('#') and 'XDG_DOWNLOAD_DIR' in line:
+                        download_dir = os.path.expandvars(\
+                                        line.partition("=")[2].rstrip().strip('"'))
+                        if os.path.isdir(download_dir):
+                            return download_dir
+        except IOError:
+            pass
+
         return os.environ.get("HOME")
 
 def windows_check():

From a710bcaed400bad95eee6c88a8da96aac2c39876 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Thu, 26 May 2011 19:17:34 +0100
Subject: [PATCH 298/329] Add F2 key shortcut to rename files in Files Tab

---
 deluge/ui/gtkui/files_tab.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 10b15bda8..4c04d298a 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -122,7 +122,8 @@ class FilesTab(Tab):
         self._editing_index = None
 
         # Filename column
-        column = gtk.TreeViewColumn(_("Filename"))
+        self.filename_column_name = _("Filename")
+        column = gtk.TreeViewColumn(self.filename_column_name)
         render = gtk.CellRendererPixbuf()
         column.pack_start(render, False)
         column.add_attribute(render, "stock-id", 6)
@@ -523,16 +524,25 @@ class FilesTab(Tab):
             return True
 
     def _on_key_press_event(self, widget, event):
-        # Menu key
-        if gtk.gdk.keyval_name(event.keyval) != "Menu":
-            return
-
         if not self.get_selected_files():
             return
 
+        keyname = gtk.gdk.keyval_name(event.keyval)
+        func = getattr(self, 'keypress_' + keyname, None)
+        if func:
+            return func(event)
+
+    def keypress_Menu(self, event):
         self.file_menu.popup(None, None, None, 3, event.time)
         return True
 
+    def keypress_F2(self, event):
+        path, col = self.listview.get_cursor()
+        for column in self.listview.get_columns():
+            if column.get_title() == self.filename_column_name:
+                self.listview.set_cursor(path, column, True)
+                return True
+
     def _on_menuitem_open_file_activate(self, menuitem):
         self._on_row_activated(None, None, None)
 

From 82712c80e148b903a0a00256cfd00e61cf5c52d8 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Fri, 27 May 2011 01:05:22 +0100
Subject: [PATCH 299/329] Fix #1195 - Right-click selecting issue when
 switching between files and folders

---
 deluge/ui/gtkui/files_tab.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 4c04d298a..4e5af32e0 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -505,17 +505,15 @@ class FilesTab(Tab):
         # We only care about right-clicks
         if event.button == 3:
             x, y = event.get_coords()
-            path = self.listview.get_path_at_pos(int(x), int(y))
-            if not path:
+            cursor_path = self.listview.get_path_at_pos(int(x), int(y))
+            if not cursor_path:
                 return
-            row = self.treestore.get_iter(path[0])
 
-            if self.get_selected_files():
-                if self.treestore.get_value(row, 5) not in self.get_selected_files():
+            paths = self.listview.get_selection().get_selected_rows()[1]
+            if cursor_path[0] not in paths:
+                    row = self.treestore.get_iter(cursor_path[0])
                     self.listview.get_selection().unselect_all()
                     self.listview.get_selection().select_iter(row)
-            else:
-                self.listview.get_selection().select_iter(row)
 
             for widget in self.file_menu_priority_items:
                 widget.set_sensitive(not self.__compact)
@@ -524,13 +522,13 @@ class FilesTab(Tab):
             return True
 
     def _on_key_press_event(self, widget, event):
-        if not self.get_selected_files():
-            return
-
         keyname = gtk.gdk.keyval_name(event.keyval)
         func = getattr(self, 'keypress_' + keyname, None)
-        if func:
+        selected_rows = self.listview.get_selection().get_selected_rows()[1]
+        if func and selected_rows:
             return func(event)
+        else:
+            return
 
     def keypress_Menu(self, event):
         self.file_menu.popup(None, None, None, 3, event.time)

From dd78a75ca837b55a355a64c741cf83082a33573a Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Fri, 27 May 2011 19:02:56 +0100
Subject: [PATCH 300/329] Fix #1860 - Files Tab TypeError (could not parse
 subscript as a tree path)

---
 deluge/ui/gtkui/files_tab.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 4e5af32e0..1f570a386 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -441,9 +441,8 @@ class FilesTab(Tab):
         """
         Go through the tree and update the folder complete percentages.
         """
-
         root = self.treestore.get_iter_root()
-        if self.treestore[root][5] != -1:
+        if root is None or self.treestore[root][5] != -1:
             return
 
         def get_completed_bytes(row):

From e0443943b5979e4e6663eb08b126d581a1208e57 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Fri, 27 May 2011 19:06:55 +0100
Subject: [PATCH 301/329] Catch an IndexError occurring in Files Tab when
 scrolling through long list of torrents

---
 deluge/ui/gtkui/files_tab.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 1f570a386..f3431ecc5 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -485,7 +485,10 @@ class FilesTab(Tab):
             if self._editing_index == row[5]:
                 continue
 
-            progress_string = "%.2f%%" % (status["file_progress"][index] * 100)
+            try:
+                progress_string = "%.2f%%" % (status["file_progress"][index] * 100)
+            except IndexError:
+                continue
             if row[2] != progress_string:
                 row[2] = progress_string
             progress_value = status["file_progress"][index] * 100

From 94a7b2ebf18a8f69b6150cc9bea7bc26af4fb4b9 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sat, 28 May 2011 00:14:01 +0100
Subject: [PATCH 302/329] Fix #1861 - AutoAdd Warning (column number is a
 boolean)

---
 deluge/plugins/autoadd/autoadd/gtkui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py
index d06daaec1..25d3eea9b 100644
--- a/deluge/plugins/autoadd/autoadd/gtkui.py
+++ b/deluge/plugins/autoadd/autoadd/gtkui.py
@@ -384,7 +384,7 @@ class GtkUI(GtkPluginBase):
     def create_columns(self, treeView):
         rendererToggle = gtk.CellRendererToggle()
         column = gtk.TreeViewColumn(
-            _("Active"), rendererToggle, activatable=True, active=1
+            _("Active"), rendererToggle, activatable=1, active=1
         )
         column.set_sort_column_id(1)
         treeView.append_column(column)

From 67b5cde128f4282141fb009f403818b5c5f7968f Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 28 May 2011 11:42:09 +0100
Subject: [PATCH 303/329] Fix #1867.

Now, if any option is changed on a torrent's options tab on the GTK UI, the apply button is set to sensitive.
---
 deluge/ui/gtkui/glade/main_window.glade | 17 ++++++++++-------
 deluge/ui/gtkui/options_tab.py          | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 8fb2302e4..3ad32b7f6 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -37,7 +37,7 @@
                         True
                         False
                         
-                        
+                        
                         
                           
                             True
@@ -57,7 +57,7 @@
                         True
                         False
                         
-                        
+                        
                         
                           
                             True
@@ -82,7 +82,7 @@
                         True
                         False
                         
-                        
+                        
                         
                           
                             True
@@ -134,7 +134,7 @@
                         True
                         True
                         
-                        
+                        
                       
                     
                     
@@ -147,7 +147,7 @@
                         True
                         False
                         
-                        
+                        
                         
                           
                             True
@@ -2826,6 +2826,7 @@
                                             select-folder
                                             False
                                             Select A Folder
+                                            
                                           
                                           
                                             False
@@ -2916,6 +2917,7 @@
                                         If checked this torrent won't be shared among trackers, DHT nodes, etc...
                                         False
                                         True
+                                        
                                       
                                       
                                         False
@@ -2931,6 +2933,7 @@
                                         False
                                         False
                                         True
+                                        
                                       
                                       
                                         False
@@ -2953,7 +2956,7 @@ distribution negatively in the swarm. It should be
 used sparingly.
                                         False
                                         True
-                                        
+                                        
                                       
                                       
                                         True
@@ -2970,7 +2973,7 @@ used sparingly.
                                         Torrent is shared between other Deluge users or not.
                                         False
                                         True
-                                        
+                                        
                                       
                                       
                                         True
diff --git a/deluge/ui/gtkui/options_tab.py b/deluge/ui/gtkui/options_tab.py
index 7d61870cf..4360ec76a 100644
--- a/deluge/ui/gtkui/options_tab.py
+++ b/deluge/ui/gtkui/options_tab.py
@@ -72,10 +72,9 @@ class OptionsTab(Tab):
             "on_button_edit_trackers_clicked": self._on_button_edit_trackers_clicked,
             "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled,
             "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled,
-            "on_chk_shared_toggled": self._on_chk_shared_toggled,
+            "on_chk_toggled": self._on_chk_toggled,
             "on_spin_value_changed": self._on_spin_value_changed,
-            "on_chk_sequential_download_toggled": \
-                                        self._on_chk_sequential_download_toggled
+            "on_move_completed_file_set": self._on_move_completed_file_set
         })
 
     def start(self):
@@ -85,6 +84,9 @@ class OptionsTab(Tab):
         else:
             self.filechooser_move_completed.hide()
             self.entry_move_completed.show()
+            self.entry_move_completed.connect(
+                "changed", self._on_entry_move_completed_changed
+            )
 
     def stop(self):
         pass
@@ -278,7 +280,7 @@ class OptionsTab(Tab):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
-    def _on_chk_shared_toggled(self, widget):
+    def _on_chk_toggled(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
@@ -286,6 +288,10 @@ class OptionsTab(Tab):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
-    def _on_chk_sequential_download_toggled(self, widget):
+    def _on_move_completed_file_set(self, widget):
+        if not self.button_apply.is_sensitive():
+            self.button_apply.set_sensitive(True)
+
+    def _on_entry_move_completed_changed(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)

From dc514d308c1185ff8563d91648c4b8bd9f145f6b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 28 May 2011 18:59:04 +0100
Subject: [PATCH 304/329] GTK ui dialogs now have deluge's icon set.

---
 deluge/ui/gtkui/dialogs.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deluge/ui/gtkui/dialogs.py b/deluge/ui/gtkui/dialogs.py
index 805398bd7..ead22f349 100644
--- a/deluge/ui/gtkui/dialogs.py
+++ b/deluge/ui/gtkui/dialogs.py
@@ -36,6 +36,7 @@ import gtk
 
 from twisted.internet import defer
 
+from deluge.ui.gtkui import common
 import deluge.component as component
 
 
@@ -58,6 +59,8 @@ class BaseDialog(gtk.Dialog):
             flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR,
             buttons=buttons)
 
+        self.set_icon(common.get_deluge_icon())
+
         self.connect("delete-event", self._on_delete_event)
         self.connect("response", self._on_response)
 

From eb639c3722c0bb113af2f424f342a87761cf0487 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 28 May 2011 19:43:25 +0100
Subject: [PATCH 305/329] AutoAdd plugin auto fill.

When adding new entries, the dialog is auto-filled with what's defined for the Downloads entry in the preferences.
When showing errors, use the dialogs module.
Added some tooltips to the dialog.
---
 .../autoadd/data/autoadd_options.glade        | 101 +++---------------
 deluge/plugins/autoadd/autoadd/gtkui.py       |  93 +++++++++++-----
 2 files changed, 85 insertions(+), 109 deletions(-)

diff --git a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
index 8e69ba9a6..ea7167e9d 100644
--- a/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
+++ b/deluge/plugins/autoadd/autoadd/data/autoadd_options.glade
@@ -2,89 +2,6 @@
 
   
   
-  
-    False
-    6
-    AutoAdd Error
-    False
-    True
-    dialog
-    
-    
-      
-        True
-        False
-        
-          
-            True
-            False
-            end
-            
-              
-                gtk-ok
-                -5
-                True
-                True
-                True
-                False
-                False
-                True
-                
-              
-              
-                False
-                False
-                0
-              
-            
-          
-          
-            False
-            True
-            end
-            0
-          
-        
-        
-          
-            True
-            False
-            
-              
-                True
-                False
-                gtk-dialog-error
-              
-              
-                False
-                True
-                0
-              
-            
-            
-              
-                True
-                False
-                0.46000000834465027
-                Error
-                True
-              
-              
-                False
-                False
-                1
-              
-            
-          
-          
-            True
-            True
-            2
-          
-        
-      
-    
-  
   
     False
     Watch Folder Properties
@@ -196,6 +113,8 @@
                                       
                                         True
                                         True
+                                        If a .torrent file is added to this directory,
+it will be added to the session.
                                         ●
                                         False
                                         False
@@ -212,6 +131,8 @@
                                       
                                         True
                                         False
+                                        If a .torrent file is added to this directory,
+it will be added to the session.
                                         select-folder
                                         Select A Folder
                                       
@@ -282,6 +203,7 @@
                               
                                 True
                                 False
+                                The user selected here will be the owner of the torrent.
                               
                             
                           
@@ -329,6 +251,8 @@
                                         True
                                         True
                                         False
+                                        Once the torrent is added to the session, 
+the .torrent will be deleted.
                                         False
                                         True
                                         
@@ -349,6 +273,9 @@
                                             True
                                             True
                                             False
+                                            Once the torrent is added to the session, 
+an extension will be appended to the .torrent
+and it will remain in the same directory.
                                             False
                                             True
                                             isnt_append_extension
@@ -396,6 +323,9 @@
                                             True
                                             True
                                             False
+                                            Once the torrent is added to the session, 
+the .torrent will copied to the chosen directory
+and deleted from the watch folder.
                                             False
                                             True
                                             isnt_append_extension
@@ -448,8 +378,8 @@
                                             True
                                             False
                                             True
-                                            Delete the copy of the torrent file
-created when the torrent is removed
+                                            Once the torrent is deleted from the session, 
+also delete the .torrent file used to add it.
                                             False
                                             True
                                           
@@ -512,6 +442,7 @@ created when the torrent is removed
                                     True
                                     True
                                     False
+                                    This directory will be the download location
                                     False
                                     True
                                     True
diff --git a/deluge/plugins/autoadd/autoadd/gtkui.py b/deluge/plugins/autoadd/autoadd/gtkui.py
index 25d3eea9b..e32d37ff6 100644
--- a/deluge/plugins/autoadd/autoadd/gtkui.py
+++ b/deluge/plugins/autoadd/autoadd/gtkui.py
@@ -41,6 +41,7 @@ import gtk
 
 from deluge.log import getPluginLogger
 from deluge.ui.client import client
+from deluge.ui.gtkui import dialogs
 from deluge.plugins.pluginbase import GtkPluginBase
 import deluge.component as component
 import deluge.common
@@ -50,6 +51,9 @@ from common import get_resource
 
 log = getPluginLogger(__name__)
 
+class IncompatibleOption(Exception):
+    pass
+
 class OptionsDialog():
     spin_ids = ["max_download_speed", "max_upload_speed", "stop_ratio"]
     spin_int_ids = ["max_upload_slots", "max_connections"]
@@ -59,6 +63,7 @@ class OptionsDialog():
     def __init__(self):
         self.accounts = gtk.ListStore(str)
         self.labels = gtk.ListStore(str)
+        self.core_config = {}
 
     def show(self, options={}, watchdir_id=None):
         self.glade = gtk.glade.XML(get_resource("autoadd_options.glade"))
@@ -67,14 +72,10 @@ class OptionsDialog():
             "on_opts_apply":self.on_apply,
             "on_opts_cancel":self.on_cancel,
             "on_options_dialog_close":self.on_cancel,
-            "on_error_ok":self.on_error_ok,
-            "on_error_dialog_close":self.on_error_ok,
             "on_toggle_toggled":self.on_toggle_toggled
         })
         self.dialog = self.glade.get_widget("options_dialog")
         self.dialog.set_transient_for(component.get("Preferences").pref_dialog)
-        self.err_dialog = self.glade.get_widget("error_dialog")
-        self.err_dialog.set_transient_for(self.dialog)
 
         if watchdir_id:
             #We have an existing watchdir_id, we are editing
@@ -91,7 +92,7 @@ class OptionsDialog():
         self.dialog.run()
 
     def load_options(self, options):
-        self.glade.get_widget('enabled').set_active(options.get('enabled', False))
+        self.glade.get_widget('enabled').set_active(options.get('enabled', True))
         self.glade.get_widget('append_extension_toggle').set_active(
             options.get('append_extension_toggle', False)
         )
@@ -149,17 +150,55 @@ class OptionsDialog():
                 self.glade.get_widget(field+"_chooser").hide()
         self.set_sensitive()
 
+        def on_core_config(config):
+            if client.is_localhost():
+                self.glade.get_widget('download_location_chooser').set_current_folder(
+                    options.get('download_location', config["download_location"])
+                )
+                if options.get('move_completed_toggle', config["move_completed"]):
+                    self.glade.get_widget('move_completed_toggle').set_active(True)
+                    self.glade.get_widget('move_completed_path_chooser').set_current_folder(
+                        options.get('move_completed_path', config["move_completed_path"])
+                    )
+                if options.get('copy_torrent_toggle', config["copy_torrent_file"]):
+                    self.glade.get_widget('copy_torrent_toggle').set_active(True)
+                    self.glade.get_widget('copy_torrent_chooser').set_current_folder(
+                        options.get('copy_torrent', config["torrentfiles_location"])
+                    )
+            else:
+                self.glade.get_widget('download_location_entry').set_text(
+                    options.get('download_location', config["download_location"])
+                )
+                if options.get('move_completed_toggle', config["move_completed"]):
+                    self.glade.get_widget('move_completed_toggle').set_active(
+                        options.get('move_completed_toggle', False)
+                    )
+                    self.glade.get_widget('move_completed_path_entry').set_text(
+                        options.get('move_completed_path', config["move_completed_path"])
+                    )
+                if options.get('copy_torrent_toggle', config["copy_torrent_file"]):
+                    self.glade.get_widget('copy_torrent_toggle').set_active(True)
+                    self.glade.get_widget('copy_torrent_entry').set_text(
+                        options.get('copy_torrent', config["torrentfiles_location"])
+                    )
+
+            if options.get('delete_copy_torrent_toggle', config["del_copy_torrent_file"]):
+                self.glade.get_widget('delete_copy_torrent_toggle').set_active(True)
+
+        if not options:
+            client.core.get_config().addCallback(on_core_config)
+
         def on_accounts(accounts, owner):
             log.debug("Got Accounts")
-            selected_idx = None
-            for idx, account in enumerate(accounts):
+            selected_iter = None
+            for account in accounts:
                 iter = self.accounts.append()
                 self.accounts.set_value(
                     iter, 0, account['username']
                 )
                 if account['username'] == owner:
-                    selected_idx = idx
-            self.glade.get_widget('OwnerCombobox').set_active(selected_idx)
+                    selected_iter = iter
+            self.glade.get_widget('OwnerCombobox').set_active_iter(selected_iter)
 
         def on_accounts_failure(failure):
             log.debug("Failed to get accounts!!! %s", failure)
@@ -190,7 +229,7 @@ class OptionsDialog():
         client.core.get_enabled_plugins().addCallback(on_get_enabled_plugins)
         if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
             client.core.get_known_accounts().addCallback(
-                on_accounts, options.get('owner', 'localclient')
+                on_accounts, options.get('owner', client.get_auth_user())
             ).addErrback(on_accounts_failure)
         else:
             iter = self.accounts.append()
@@ -249,27 +288,29 @@ class OptionsDialog():
             self.glade.get_widget('remove_at_ratio').set_sensitive(isactive)
 
     def on_apply(self, Event=None):
-        client.autoadd.set_options(
-            str(self.watchdir_id), self.generate_opts()
-        ).addCallbacks(self.on_added, self.on_error_show)
+        try:
+            options = self.generate_opts()
+            client.autoadd.set_options(
+                str(self.watchdir_id), options
+            ).addCallbacks(self.on_added, self.on_error_show)
+        except IncompatibleOption, err:
+            dialogs.ErrorDialog(_("Incompatible Option"), str(err), self.dialog).run()
+
 
     def on_error_show(self, result):
-        self.glade.get_widget('error_label').set_text(result.value.exception_msg)
-        self.err_dialog = self.glade.get_widget('error_dialog')
-        self.err_dialog.set_transient_for(self.dialog)
+        d = dialogs.ErrorDialog(_("Error"), result.value.exception_msg, self.dialog)
         result.cleanFailure()
-        self.err_dialog.show()
+        d.run()
 
     def on_added(self, result):
         self.dialog.destroy()
 
-    def on_error_ok(self, Event=None):
-        self.err_dialog.hide()
-
     def on_add(self, Event=None):
-        client.autoadd.add(
-            self.generate_opts()
-        ).addCallbacks(self.on_added, self.on_error_show)
+        try:
+            options = self.generate_opts()
+            client.autoadd.add(options).addCallbacks(self.on_added, self.on_error_show)
+        except IncompatibleOption, err:
+            dialogs.ErrorDialog(_("Incompatible Option"), str(err), self.dialog).run()
 
     def on_cancel(self, Event=None):
         self.dialog.destroy()
@@ -314,6 +355,10 @@ class OptionsDialog():
         for id in self.chk_ids:
             options[id] = self.glade.get_widget(id).get_active()
             options[id+'_toggle'] = self.glade.get_widget(id+'_toggle').get_active()
+
+        if options['copy_torrent_toggle'] and options['path'] == options['copy_torrent']:
+            raise IncompatibleOption(_("\"Watch Folder\" directory and \"Copy of .torrent"
+                                       " files to\" directory cannot be the same!"))
         return options
 
 
@@ -458,7 +503,7 @@ class GtkUI(GtkPluginBase):
 
     def cb_get_config(self, watchdirs):
         """callback for on show_prefs"""
-        log.debug("Got whatchdirs from core: %s", watchdirs)
+        log.trace("Got whatchdirs from core: %s", watchdirs)
         self.watchdirs = watchdirs or {}
         self.store.clear()
         for watchdir_id, watchdir in self.watchdirs.iteritems():

From 6dc393ed231d7f6aad05a7a99c0e9cf2d5e30dde Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Sat, 28 May 2011 18:25:58 -0700
Subject: [PATCH 306/329] Allow a smtp port higher than 100 Add a shadow to
 scrolled window

---
 deluge/plugins/notifications/notifications/data/config.glade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deluge/plugins/notifications/notifications/data/config.glade b/deluge/plugins/notifications/notifications/data/config.glade
index f1603505d..4da1de6bd 100644
--- a/deluge/plugins/notifications/notifications/data/config.glade
+++ b/deluge/plugins/notifications/notifications/data/config.glade
@@ -213,7 +213,7 @@
                                             65535
                                             ●
                                             5
-                                            25 1 100 1 10 0
+                                            25 1 65535 0 10 0
                                             1
                                             True
                                             True
@@ -292,6 +292,7 @@
                                                         True
                                                         automatic
                                                         automatic
+                                                        in
                                                         
                                                           
                                                             True

From af245428561211067bafd785c306ba854cc37ad4 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 29 May 2011 11:35:12 +0100
Subject: [PATCH 307/329] AutoAdd plugin fix for #1863

In some cases, using `os.rename` between different mount points can trigger an `OSError`. Try to address these issues properly.
---
 deluge/plugins/autoadd/autoadd/core.py | 36 +++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py
index bfea91e17..791217d6a 100644
--- a/deluge/plugins/autoadd/autoadd/core.py
+++ b/deluge/plugins/autoadd/autoadd/core.py
@@ -226,9 +226,10 @@ class Core(CorePluginBase):
                     if filename in self.invalid_torrents:
                         self.invalid_torrents[filename] += 1
                         if self.invalid_torrents[filename] >= MAX_NUM_ATTEMPTS:
-                            log.warning("Maximum attepts reached while trying "
-                                        "to add the torrent file with the path"
-                                        " %s", filepath)
+                            log.warning(
+                                "Maximum attempts reached while trying to add the "
+                                "torrent file with the path %s", filepath
+                            )
                             os.rename(filepath, filepath + ".invalid")
                             del self.invalid_torrents[filename]
                     else:
@@ -261,16 +262,37 @@ class Core(CorePluginBase):
                     os.rename(filepath, filepath + watchdir['append_extension'])
                 elif watchdir.get('copy_torrent_toggle'):
                     copy_torrent_path = watchdir['copy_torrent']
+                    copy_torrent_file = os.path.join(copy_torrent_path, filename)
                     log.debug("Moving added torrent file \"%s\" to \"%s\"",
                               os.path.basename(filepath), copy_torrent_path)
-                    os.rename(
-                        filepath, os.path.join(copy_torrent_path, filename)
-                    )
+                    try:
+                        os.rename(filepath, copy_torrent_file)
+                    except OSError, why:
+                        if why.errno == 18:
+                            # This can happen for different mount points
+                            from shutil import copyfile
+                            try:
+                                copyfile(filepath, copy_torrent_file)
+                                os.remove(filepath)
+                            except OSError:
+                                # Last Resort!
+                                try:
+                                    open(copy_torrent_file, 'wb').write(
+                                        open(filepath, 'rb').read()
+                                    )
+                                except OSError, why:
+                                    raise why
+                                else:
+                                    os.remove(filepath)
+                            else:
+                                os.remove(filepath)
+                        else:
+                            raise why
                 else:
                     os.remove(filepath)
 
     def on_update_watchdir_error(self, failure, watchdir_id):
-        """Disables any watch folders with unhandled exceptions."""
+        """Disables any watch folders with un-handled exceptions."""
         self.disable_watchdir(watchdir_id)
         log.error("Disabling '%s', error during update: %s",
                   self.watchdirs[watchdir_id]["path"], failure)

From 042ddd2891facd4f6b5522da9448f6796a96bfca Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 29 May 2011 14:36:26 +0100
Subject: [PATCH 308/329] Checkbox had no signal.

---
 deluge/ui/gtkui/glade/main_window.glade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 3ad32b7f6..4dd91c296 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -2717,6 +2717,7 @@
                                     False
                                     False
                                     True
+                                    
                                   
                                   
                                     False
@@ -2789,6 +2790,7 @@
                                             False
                                             False
                                             True
+                                            
                                           
                                         
                                       

From 4d4c6404b152396b3d531f130d8318c1b41a2c92 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sat, 28 May 2011 16:27:26 +0100
Subject: [PATCH 309/329] Log exception occurring while sending RPC errors to
 clients.

---
 deluge/core/rpcserver.py | 22 ++++++++++++++--------
 deluge/core/torrent.py   |  6 +++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/deluge/core/rpcserver.py b/deluge/core/rpcserver.py
index 24c894dbb..d176ff01b 100644
--- a/deluge/core/rpcserver.py
+++ b/deluge/core/rpcserver.py
@@ -246,14 +246,20 @@ class DelugeRPCProtocol(Protocol):
             Sends an error response with the contents of the exception that was raised.
             """
             exceptionType, exceptionValue, exceptionTraceback = sys.exc_info()
-            self.sendData((
-                RPC_ERROR,
-                request_id,
-                exceptionType.__name__,
-                exceptionValue._args,
-                exceptionValue._kwargs,
-                "".join(traceback.format_tb(exceptionTraceback))
-            ))
+            try:
+                self.sendData((
+                    RPC_ERROR,
+                    request_id,
+                    exceptionType.__name__,
+                    exceptionValue._args,
+                    exceptionValue._kwargs,
+                    "".join(traceback.format_tb(exceptionTraceback))
+                ))
+            except Exception, err:
+                log.error("An exception occurred while sending RPC_ERROR to "
+                          "client. Error to send(exception goes next): %s",
+                          "".join(traceback.format_tb(exceptionTraceback)))
+                log.exception(err)
 
         if method == "daemon.info":
             # This is a special case and used in the initial connection process
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 723b7c583..0b32d545a 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -189,14 +189,14 @@ class Torrent(object):
         else:
             self.owner = owner
 
-        # Keep trac of last seen complete
+        # Keep track of last seen complete
         if state:
             self._last_seen_complete = state.last_seen_complete or 0.0
         else:
             self._last_seen_complete = 0.0
 
         # Keep track if we're forcing a recheck of the torrent so that we can
-        # repause it after its done if necessary
+        # re-pause it after its done if necessary
         self.forcing_recheck = False
         self.forcing_recheck_paused = False
 
@@ -359,7 +359,7 @@ class Torrent(object):
         # Set the tracker list in the torrent object
         self.trackers = trackers
         if len(trackers) > 0:
-            # Force a reannounce if there is at least 1 tracker
+            # Force a re-announce if there is at least 1 tracker
             self.force_reannounce()
 
         self.tracker_host = None

From c66637116ba25c05588957f9c976182a83704fcd Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 29 May 2011 17:10:57 +0100
Subject: [PATCH 310/329] Allow searching torrents by name on the GTK UI.

---
 deluge/core/filtermanager.py            |   7 +
 deluge/ui/gtkui/glade/main_window.glade | 487 ++++++++++--------------
 deluge/ui/gtkui/torrentview.py          |  37 ++
 3 files changed, 236 insertions(+), 295 deletions(-)

diff --git a/deluge/core/filtermanager.py b/deluge/core/filtermanager.py
index e04cb9dbb..c52fec29b 100644
--- a/deluge/core/filtermanager.py
+++ b/deluge/core/filtermanager.py
@@ -78,6 +78,12 @@ def filter_one_keyword(torrent_ids, keyword):
                     yield torrent_id
                     break
 
+def filter_by_name(torrent_ids, search_string):
+    all_torrents = component.get("TorrentManager").torrents
+    for torrent_id in torrent_ids:
+        if search_string[0].lower() in all_torrents[torrent_id].filename.lower():
+            yield torrent_id
+
 def tracker_error_filter(torrent_ids, values):
     filtered_torrent_ids = []
     tm = component.get("TorrentManager")
@@ -108,6 +114,7 @@ class FilterManager(component.Component):
         self.torrents = core.torrentmanager
         self.registered_filters = {}
         self.register_filter("keyword", filter_keywords)
+        self.register_filter("name", filter_by_name)
         self.tree_fields = {}
 
         self.register_tree_field("state", self._init_state_tree)
diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 4dd91c296..97dbd5509 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -384,174 +384,217 @@
           
         
         
-          
+          
             True
             False
             
-              
+              
                 True
-                False
                 False
-                Add torrent
-                False
-                Add Torrent
-                True
-                gtk-add
-                
+                
+                  
+                    True
+                    False
+                    False
+                    True
+                    Add torrent
+                    False
+                    Add Torrent
+                    True
+                    gtk-add
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    True
+                    Remove torrent
+                    False
+                    Remove Torrent
+                    gtk-remove
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                  
+                  
+                    False
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    True
+                    Pause the selected torrents
+                    False
+                    Pause
+                    True
+                    gtk-media-pause
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    True
+                    Resume the selected torrents
+                    False
+                    Resume
+                    gtk-media-play
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                  
+                  
+                    False
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    True
+                    Queue Torrent Up
+                    False
+                    Queue Up
+                    gtk-go-up
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    True
+                    Queue Torrent Down
+                    False
+                    Queue Down
+                    gtk-go-down
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                  
+                  
+                    False
+                  
+                
+                
+                  
+                    True
+                    False
+                    True
+                    Preferences
+                    False
+                    Preferences
+                    True
+                    gtk-preferences
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
+                
+                  
+                    True
+                    False
+                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                    True
+                    Connection Manager
+                    False
+                    Connection Manager
+                    gtk-network
+                    
+                  
+                  
+                    False
+                    True
+                  
+                
               
               
-                False
-                True
+                True
+                True
+                0
               
             
             
-              
+              
                 True
-                False
-                False
-                Remove torrent
-                False
-                Remove Torrent
-                gtk-remove
-                
+                True
+                Search torrents by name
+                •
+                True
+                False
+                gtk-clear
+                False
+                True
+                False
+                True
+                Clear the search
+                
+                
               
               
                 False
-                True
-              
-            
-            
-              
-                True
-                False
-              
-              
-                False
-              
-            
-            
-              
-                True
-                False
-                False
-                Pause the selected torrents
-                False
-                Pause
-                True
-                gtk-media-pause
-                
-              
-              
-                False
-                True
-              
-            
-            
-              
-                True
-                False
-                False
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                Resume the selected torrents
-                False
-                Resume
-                gtk-media-play
-                
-              
-              
-                False
-                True
-              
-            
-            
-              
-                True
-                False
-              
-              
-                False
-              
-            
-            
-              
-                True
-                False
-                False
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                Queue Torrent Up
-                False
-                Queue Up
-                gtk-go-up
-                
-              
-              
-                False
-                True
-              
-            
-            
-              
-                True
-                False
-                False
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                Queue Torrent Down
-                False
-                Queue Down
-                gtk-go-down
-                
-              
-              
-                False
-                True
-              
-            
-            
-              
-                True
-                False
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-              
-              
-                False
-              
-            
-            
-              
-                True
-                False
-                Preferences
-                False
-                Preferences
-                True
-                gtk-preferences
-                
-              
-              
-                False
-                True
-              
-            
-            
-              
-                True
-                False
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                Connection Manager
-                False
-                Connection Manager
-                gtk-network
-                
-              
-              
-                False
-                True
+                False
+                5
+                1
               
             
           
           
             False
-            True
+            False
             1
           
         
@@ -641,152 +684,6 @@
       
     
   
-  
-    True
-    False
-    
-      
-        gtk-open
-        True
-        False
-        False
-        True
-        True
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Expand All
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-zoom-fit
-            1
-          
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Do Not Download
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-no
-            1
-          
-        
-      
-    
-    
-      
-        _Normal Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-yes
-            1
-          
-        
-      
-    
-    
-      
-        _High Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-go-up
-            1
-          
-        
-      
-    
-    
-      
-        Hi_ghest Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-goto-top
-            1
-          
-        
-      
-    
-  
-  
-    True
-    False
-    
-      
-        _Add Peer
-        True
-        False
-        Add a peer by its IP
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-add
-            1
-          
-        
-      
-    
-  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index ab23f45ad..67fae6adf 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -287,6 +287,15 @@ class TorrentView(listview.ListView, component.Component):
         self.treeview.connect("key-press-event", self.on_key_press_event)
         self.treeview.connect("columns-changed", self.on_columns_changed_event)
 
+        self.search_torrents_entry = self.window.main_glade.get_widget("search_torrents_entry")
+        self.search_torrents_entry.connect(
+            "icon-press", self.on_search_torrents_entry_icon_press
+        )
+        self.search_torrents_entry.connect(
+            "changed", self.on_search_torrents_entry_changed
+        )
+
+
         client.register_event_handler("TorrentStateChangedEvent", self.on_torrentstatechanged_event)
         client.register_event_handler("TorrentAddedEvent", self.on_torrentadded_event)
         client.register_event_handler("TorrentRemovedEvent", self.on_torrentremoved_event)
@@ -319,6 +328,8 @@ class TorrentView(listview.ListView, component.Component):
         # We need to clear the liststore
         self.liststore.clear()
         self.prev_status = {}
+        self.filter = None
+        self.search_torrents_entry.set_text("")
 
     def shutdown(self):
         """Called when GtkUi is exiting"""
@@ -335,7 +346,10 @@ class TorrentView(listview.ListView, component.Component):
         """Sets filters for the torrentview..
         see: core.get_torrents_status
         """
+        search_filter = self.filter and self.filter.get('name', None) or None
         self.filter = dict(filter_dict) #copied version of filter_dict.
+        if search_filter and 'name' not in filter_dict:
+            self.filter['name'] = search_filter
         self.update()
 
     def set_columns_to_update(self, columns=None):
@@ -600,3 +614,26 @@ class TorrentView(listview.ListView, component.Component):
         torrentmenu = component.get("MenuBar").torrentmenu
         torrentmenu.popup(None, None, None, 3, event.time)
         return True
+
+    def on_search_torrents_entry_icon_press(self, entry, icon, event):
+        if icon != gtk.ENTRY_ICON_SECONDARY:
+            return
+
+        entry.set_text("")
+        if self.filter and 'name' in self.filter:
+            self.filter.pop('name', None)
+            self.update()
+
+    def on_search_torrents_entry_changed(self, widget):
+        search_string = widget.get_text().lower()
+        if not search_string:
+            if self.filter and 'name' in self.filter:
+                self.filter.pop('name', None)
+                self.update()
+            return
+
+        if self.filter is None:
+            self.filter = {}
+
+        self.filter['name'] = search_string
+        self.update()

From feed806983edbe3799b44f5000235c5140b4856f Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 29 May 2011 19:02:33 +0100
Subject: [PATCH 311/329] Wait at least 0.7 secs before triggering an update
 because of the search box, ie, allows typing the full search string before
 making the request.

---
 deluge/ui/gtkui/torrentview.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 67fae6adf..9221d3bf7 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -46,6 +46,8 @@ import logging
 import warnings
 from urlparse import urlparse
 
+from twisted.internet import reactor
+
 import deluge.common
 import deluge.component as component
 from deluge.ui.client import client
@@ -270,6 +272,7 @@ class TorrentView(listview.ListView, component.Component):
 
         # Set filter to None for now
         self.filter = None
+        self.search_pending = None
 
         ### Connect Signals ###
         # Connect to the 'button-press-event' to know when to bring up the
@@ -393,6 +396,9 @@ class TorrentView(listview.ListView, component.Component):
 
     def update(self):
         if self.got_state:
+            if self.search_pending is not None and self.search_pending.active():
+                # An update request is scheduled, let's wait for that one
+                return
             # Send a status request
             gobject.idle_add(self.send_status_request)
 
@@ -619,21 +625,28 @@ class TorrentView(listview.ListView, component.Component):
         if icon != gtk.ENTRY_ICON_SECONDARY:
             return
 
+        if self.search_pending and self.search_pending.active():
+            self.search_pending.cancel()
+
         entry.set_text("")
         if self.filter and 'name' in self.filter:
             self.filter.pop('name', None)
-            self.update()
+            self.search_pending = reactor.callLater(0.7, self.update)
 
     def on_search_torrents_entry_changed(self, widget):
         search_string = widget.get_text().lower()
+
+        if self.search_pending and self.search_pending.active():
+            self.search_pending.cancel()
+
         if not search_string:
             if self.filter and 'name' in self.filter:
                 self.filter.pop('name', None)
-                self.update()
+                self.search_pending = reactor.callLater(0.7, self.update)
             return
 
         if self.filter is None:
             self.filter = {}
 
         self.filter['name'] = search_string
-        self.update()
+        self.search_pending = reactor.callLater(0.7, self.update)

From cfd955a6058e67de121799a3fe84d9539ec5cf7b Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Sun, 29 May 2011 19:06:54 +0100
Subject: [PATCH 312/329] AutoAdd plugin: Don't try to remove the same path
 twice!

---
 deluge/plugins/autoadd/autoadd/core.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/deluge/plugins/autoadd/autoadd/core.py b/deluge/plugins/autoadd/autoadd/core.py
index 791217d6a..e0b3f5b53 100644
--- a/deluge/plugins/autoadd/autoadd/core.py
+++ b/deluge/plugins/autoadd/autoadd/core.py
@@ -280,12 +280,9 @@ class Core(CorePluginBase):
                                     open(copy_torrent_file, 'wb').write(
                                         open(filepath, 'rb').read()
                                     )
+                                    os.remove(filepath)
                                 except OSError, why:
                                     raise why
-                                else:
-                                    os.remove(filepath)
-                            else:
-                                os.remove(filepath)
                         else:
                             raise why
                 else:

From 27cd89c4ad91206d69a290c47692488419c6ab36 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Sun, 29 May 2011 18:09:04 -0700
Subject: [PATCH 313/329] Remove setting the resume_data key to '' in the
 add_torrent_params as this causes libtorrent 0.16 to crash

---
 deluge/core/torrentmanager.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 54f183005..014bfad6d 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -423,7 +423,6 @@ class TorrentManager(component.Component):
                     torrent_info.rename_file(index, utf8_encoded(name))
 
             add_torrent_params["ti"] = torrent_info
-            add_torrent_params["resume_data"] = ""
 
         #log.info("Adding torrent: %s", filename)
         log.debug("options: %s", options)

From 937b53b35532a5c97e77ef4b82e33bcf4d85e249 Mon Sep 17 00:00:00 2001
From: Justin Noah 
Date: Thu, 28 Apr 2011 21:25:54 -0700
Subject: [PATCH 314/329] pixmaps and icons moved to ui/data, all necessary
 references changed.

---
 README                                        |   4 +-
 createicons.sh                                |   8 ++--
 deluge/common.py                              |   4 +-
 .../icons/hicolor/128x128/apps/deluge.png     | Bin
 .../data/icons/hicolor/16x16/apps/deluge.png  | Bin
 .../icons/hicolor/192x192/apps/deluge.png     | Bin
 .../data/icons/hicolor/22x22/apps/deluge.png  | Bin
 .../data/icons/hicolor/24x24/apps/deluge.png  | Bin
 .../icons/hicolor/256x256/apps/deluge.png     | Bin
 .../data/icons/hicolor/32x32/apps/deluge.png  | Bin
 .../data/icons/hicolor/36x36/apps/deluge.png  | Bin
 .../data/icons/hicolor/48x48/apps/deluge.png  | Bin
 .../data/icons/hicolor/64x64/apps/deluge.png  | Bin
 .../data/icons/hicolor/72x72/apps/deluge.png  | Bin
 .../data/icons/hicolor/96x96/apps/deluge.png  | Bin
 .../data/icons/scalable/apps/deluge.svg       |   0
 deluge/{ => ui}/data/pixmaps/active.svg       |   0
 deluge/{ => ui}/data/pixmaps/active16.png     | Bin
 deluge/{ => ui}/data/pixmaps/alert.svg        |   0
 deluge/{ => ui}/data/pixmaps/alert16.png      | Bin
 deluge/{ => ui}/data/pixmaps/all.svg          |   0
 deluge/{ => ui}/data/pixmaps/all16.png        | Bin
 deluge/{ => ui}/data/pixmaps/checking.svg     |   0
 deluge/{ => ui}/data/pixmaps/checking16.png   | Bin
 deluge/{ => ui}/data/pixmaps/deluge-about.png | Bin
 deluge/{ => ui}/data/pixmaps/deluge.ico       | Bin
 deluge/{ => ui}/data/pixmaps/deluge.png       | Bin
 deluge/{ => ui}/data/pixmaps/deluge.svg       |   0
 deluge/{ => ui}/data/pixmaps/deluge.xpm       |   0
 deluge/{ => ui}/data/pixmaps/deluge16.png     | Bin
 deluge/{ => ui}/data/pixmaps/dht.svg          |   0
 deluge/{ => ui}/data/pixmaps/dht16.png        | Bin
 deluge/{ => ui}/data/pixmaps/downloading.svg  |   0
 .../{ => ui}/data/pixmaps/downloading16.png   | Bin
 .../{ => ui}/data/pixmaps/flags/FLAGS_LICENCE |   0
 deluge/{ => ui}/data/pixmaps/flags/ad.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ae.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/af.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ag.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ai.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/al.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/am.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/an.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ao.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/aq.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ar.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/as.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/at.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/au.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/aw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ax.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/az.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ba.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bb.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bd.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/be.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bi.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bj.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bo.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/br.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bs.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/by.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/bz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ca.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cd.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ch.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ci.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ck.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/co.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cs.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cx.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cy.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/cz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/de.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/dj.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/dk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/dm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/do.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/dz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ec.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ee.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/eg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/eh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/er.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/es.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/et.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fi.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fj.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fo.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/fx.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ga.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gb.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gd.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ge.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gi.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gp.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gq.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gs.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/gy.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/hk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/hm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/hn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/hr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ht.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/hu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/id.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ie.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/il.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/in.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/io.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/iq.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ir.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/is.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/it.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/je.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/jm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/jo.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/jp.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ke.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ki.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/km.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kp.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ky.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/kz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/la.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lb.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/li.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ls.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/lv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ly.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ma.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/md.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/me.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ml.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mo.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mp.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mq.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ms.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mx.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/my.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/mz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/na.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ne.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ng.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ni.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/no.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/np.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/nz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/om.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pa.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pe.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ph.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ps.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/pw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/py.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/qa.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/re.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ro.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/rs.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ru.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/rw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sa.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sb.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sd.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/se.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sh.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/si.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sj.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/so.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/st.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sy.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/sz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/td.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/th.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tj.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tk.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tl.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/to.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tp.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tr.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tv.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tw.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/tz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ua.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ug.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/um.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/us.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/uy.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/uz.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/va.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/vc.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ve.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/vg.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/vi.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/vn.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/vu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/wf.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ws.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/ye.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/yt.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/yu.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/za.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/zm.png     | Bin
 deluge/{ => ui}/data/pixmaps/flags/zw.png     | Bin
 deluge/{ => ui}/data/pixmaps/inactive.svg     |   0
 deluge/{ => ui}/data/pixmaps/inactive16.png   | Bin
 deluge/{ => ui}/data/pixmaps/loading.gif      | Bin
 deluge/{ => ui}/data/pixmaps/lock48.png       | Bin
 deluge/{ => ui}/data/pixmaps/magnet.png       | Bin
 deluge/{ => ui}/data/pixmaps/queued.svg       |   0
 deluge/{ => ui}/data/pixmaps/queued16.png     | Bin
 deluge/{ => ui}/data/pixmaps/seeding.svg      |   0
 deluge/{ => ui}/data/pixmaps/seeding16.png    | Bin
 .../{ => ui}/data/pixmaps/tracker_all16.png   | Bin
 .../data/pixmaps/tracker_warning16.png        | Bin
 deluge/{ => ui}/data/pixmaps/traffic.svg      |   0
 deluge/{ => ui}/data/pixmaps/traffic16.png    | Bin
 .../data/share/applications/deluge.desktop    |   0
 setup.py                                      |  40 +++++++++---------
 297 files changed, 28 insertions(+), 28 deletions(-)
 rename deluge/{ => ui}/data/icons/hicolor/128x128/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/16x16/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/192x192/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/22x22/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/24x24/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/256x256/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/32x32/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/36x36/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/48x48/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/64x64/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/72x72/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/hicolor/96x96/apps/deluge.png (100%)
 rename deluge/{ => ui}/data/icons/scalable/apps/deluge.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/active.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/active16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/alert.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/alert16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/all.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/all16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/checking.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/checking16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge-about.png (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge.ico (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge.png (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge.xpm (100%)
 rename deluge/{ => ui}/data/pixmaps/deluge16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/dht.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/dht16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/downloading.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/downloading16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/FLAGS_LICENCE (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ad.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ae.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/af.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ag.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ai.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/al.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/am.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/an.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ao.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/aq.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ar.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/as.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/at.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/au.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/aw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ax.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/az.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ba.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bb.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bd.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/be.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bi.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bj.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bo.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/br.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bs.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/by.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/bz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ca.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cd.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ch.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ci.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ck.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/co.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cs.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cx.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cy.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/cz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/de.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/dj.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/dk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/dm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/do.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/dz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ec.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ee.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/eg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/eh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/er.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/es.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/et.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fi.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fj.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fo.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/fx.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ga.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gb.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gd.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ge.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gi.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gp.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gq.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gs.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/gy.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/hk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/hm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/hn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/hr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ht.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/hu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/id.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ie.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/il.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/in.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/io.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/iq.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ir.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/is.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/it.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/je.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/jm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/jo.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/jp.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ke.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ki.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/km.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kp.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ky.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/kz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/la.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lb.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/li.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ls.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/lv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ly.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ma.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/md.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/me.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ml.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mo.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mp.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mq.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ms.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mx.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/my.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/mz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/na.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ne.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ng.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ni.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/no.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/np.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/nz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/om.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pa.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pe.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ph.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ps.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/pw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/py.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/qa.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/re.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ro.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/rs.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ru.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/rw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sa.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sb.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sd.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/se.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sh.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/si.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sj.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/so.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/st.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sy.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/sz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/td.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/th.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tj.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tk.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tl.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/to.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tp.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tr.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tv.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/tz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ua.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ug.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/um.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/us.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/uy.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/uz.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/va.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/vc.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ve.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/vg.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/vi.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/vn.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/vu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/wf.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ws.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/ye.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/yt.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/yu.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/za.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/zm.png (100%)
 rename deluge/{ => ui}/data/pixmaps/flags/zw.png (100%)
 rename deluge/{ => ui}/data/pixmaps/inactive.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/inactive16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/loading.gif (100%)
 rename deluge/{ => ui}/data/pixmaps/lock48.png (100%)
 rename deluge/{ => ui}/data/pixmaps/magnet.png (100%)
 rename deluge/{ => ui}/data/pixmaps/queued.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/queued16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/seeding.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/seeding16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/tracker_all16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/tracker_warning16.png (100%)
 rename deluge/{ => ui}/data/pixmaps/traffic.svg (100%)
 rename deluge/{ => ui}/data/pixmaps/traffic16.png (100%)
 rename deluge/{ => ui}/data/share/applications/deluge.desktop (100%)

diff --git a/README b/README
index 0befe28f9..3ad036bb2 100644
--- a/README
+++ b/README
@@ -15,9 +15,9 @@ For past developers and contributers see: http://dev.deluge-torrent.org/wiki/Abo
 License
 ==========================
 Deluge is under the GNU GPLv3 license.
-Icon data/pixmaps/deluge.svg and derivatives in data/icons are copyright
+Icon ui/data/pixmaps/deluge.svg and derivatives in ui/data/icons are copyright
 Andrew Wedderburn and are under the GNU GPLv3.
-All other icons in data/pixmaps are copyright Andrew Resch and are under
+All other icons in ui/data/pixmaps are copyright Andrew Resch and are under
 the GNU GPLv3.
 
 ==========================
diff --git a/createicons.sh b/createicons.sh
index 114a822c5..9303e5adb 100755
--- a/createicons.sh
+++ b/createicons.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-for size in 16 22 24 32 36 48 64 72 96 128 192 256; do mkdir -p deluge/data/\
+for size in 16 22 24 32 36 48 64 72 96 128 192 256; do mkdir -p deluge/ui/data/\
 icons/hicolor/${size}x${size}/apps; rsvg-convert -w ${size} -h ${size} \
--o deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png deluge/data/pixmaps\
-/deluge.svg; mkdir -p deluge/data/icons/scalable/apps/; cp deluge/data/pixmaps/\
-deluge.svg deluge/data/icons/scalable/apps/deluge.svg; done
+-o deluge/ui/data/icons/hicolor/${size}x${size}/apps/deluge.png deluge/ui/data/pixmaps\
+/deluge.svg; mkdir -p deluge/ui/data/icons/scalable/apps/; cp deluge/ui/data/pixmaps/\
+deluge.svg deluge/ui/data/icons/scalable/apps/deluge.svg; done
diff --git a/deluge/common.py b/deluge/common.py
index ed875f11d..8e8926803 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -212,7 +212,7 @@ def osx_check():
 
 def get_pixmap(fname):
     """
-    Provides easy access to files in the deluge/data/pixmaps folder within the Deluge egg
+    Provides easy access to files in the deluge/ui/data/pixmaps folder within the Deluge egg
 
     :param fname: the filename to look for
     :type fname: string
@@ -220,7 +220,7 @@ def get_pixmap(fname):
     :rtype: string
 
     """
-    return pkg_resources.resource_filename("deluge", os.path.join("data", \
+    return pkg_resources.resource_filename("deluge", os.path.join("ui/data", \
                                            "pixmaps", fname))
 
 def open_file(path):
diff --git a/deluge/data/icons/hicolor/128x128/apps/deluge.png b/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/128x128/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/128x128/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/16x16/apps/deluge.png b/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/16x16/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/16x16/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/192x192/apps/deluge.png b/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/192x192/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/192x192/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/22x22/apps/deluge.png b/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/22x22/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/22x22/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/24x24/apps/deluge.png b/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/24x24/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/24x24/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/256x256/apps/deluge.png b/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/256x256/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/256x256/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/32x32/apps/deluge.png b/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/32x32/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/32x32/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/36x36/apps/deluge.png b/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/36x36/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/36x36/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/48x48/apps/deluge.png b/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/48x48/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/48x48/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/64x64/apps/deluge.png b/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/64x64/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/64x64/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/72x72/apps/deluge.png b/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/72x72/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/72x72/apps/deluge.png
diff --git a/deluge/data/icons/hicolor/96x96/apps/deluge.png b/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png
similarity index 100%
rename from deluge/data/icons/hicolor/96x96/apps/deluge.png
rename to deluge/ui/data/icons/hicolor/96x96/apps/deluge.png
diff --git a/deluge/data/icons/scalable/apps/deluge.svg b/deluge/ui/data/icons/scalable/apps/deluge.svg
similarity index 100%
rename from deluge/data/icons/scalable/apps/deluge.svg
rename to deluge/ui/data/icons/scalable/apps/deluge.svg
diff --git a/deluge/data/pixmaps/active.svg b/deluge/ui/data/pixmaps/active.svg
similarity index 100%
rename from deluge/data/pixmaps/active.svg
rename to deluge/ui/data/pixmaps/active.svg
diff --git a/deluge/data/pixmaps/active16.png b/deluge/ui/data/pixmaps/active16.png
similarity index 100%
rename from deluge/data/pixmaps/active16.png
rename to deluge/ui/data/pixmaps/active16.png
diff --git a/deluge/data/pixmaps/alert.svg b/deluge/ui/data/pixmaps/alert.svg
similarity index 100%
rename from deluge/data/pixmaps/alert.svg
rename to deluge/ui/data/pixmaps/alert.svg
diff --git a/deluge/data/pixmaps/alert16.png b/deluge/ui/data/pixmaps/alert16.png
similarity index 100%
rename from deluge/data/pixmaps/alert16.png
rename to deluge/ui/data/pixmaps/alert16.png
diff --git a/deluge/data/pixmaps/all.svg b/deluge/ui/data/pixmaps/all.svg
similarity index 100%
rename from deluge/data/pixmaps/all.svg
rename to deluge/ui/data/pixmaps/all.svg
diff --git a/deluge/data/pixmaps/all16.png b/deluge/ui/data/pixmaps/all16.png
similarity index 100%
rename from deluge/data/pixmaps/all16.png
rename to deluge/ui/data/pixmaps/all16.png
diff --git a/deluge/data/pixmaps/checking.svg b/deluge/ui/data/pixmaps/checking.svg
similarity index 100%
rename from deluge/data/pixmaps/checking.svg
rename to deluge/ui/data/pixmaps/checking.svg
diff --git a/deluge/data/pixmaps/checking16.png b/deluge/ui/data/pixmaps/checking16.png
similarity index 100%
rename from deluge/data/pixmaps/checking16.png
rename to deluge/ui/data/pixmaps/checking16.png
diff --git a/deluge/data/pixmaps/deluge-about.png b/deluge/ui/data/pixmaps/deluge-about.png
similarity index 100%
rename from deluge/data/pixmaps/deluge-about.png
rename to deluge/ui/data/pixmaps/deluge-about.png
diff --git a/deluge/data/pixmaps/deluge.ico b/deluge/ui/data/pixmaps/deluge.ico
similarity index 100%
rename from deluge/data/pixmaps/deluge.ico
rename to deluge/ui/data/pixmaps/deluge.ico
diff --git a/deluge/data/pixmaps/deluge.png b/deluge/ui/data/pixmaps/deluge.png
similarity index 100%
rename from deluge/data/pixmaps/deluge.png
rename to deluge/ui/data/pixmaps/deluge.png
diff --git a/deluge/data/pixmaps/deluge.svg b/deluge/ui/data/pixmaps/deluge.svg
similarity index 100%
rename from deluge/data/pixmaps/deluge.svg
rename to deluge/ui/data/pixmaps/deluge.svg
diff --git a/deluge/data/pixmaps/deluge.xpm b/deluge/ui/data/pixmaps/deluge.xpm
similarity index 100%
rename from deluge/data/pixmaps/deluge.xpm
rename to deluge/ui/data/pixmaps/deluge.xpm
diff --git a/deluge/data/pixmaps/deluge16.png b/deluge/ui/data/pixmaps/deluge16.png
similarity index 100%
rename from deluge/data/pixmaps/deluge16.png
rename to deluge/ui/data/pixmaps/deluge16.png
diff --git a/deluge/data/pixmaps/dht.svg b/deluge/ui/data/pixmaps/dht.svg
similarity index 100%
rename from deluge/data/pixmaps/dht.svg
rename to deluge/ui/data/pixmaps/dht.svg
diff --git a/deluge/data/pixmaps/dht16.png b/deluge/ui/data/pixmaps/dht16.png
similarity index 100%
rename from deluge/data/pixmaps/dht16.png
rename to deluge/ui/data/pixmaps/dht16.png
diff --git a/deluge/data/pixmaps/downloading.svg b/deluge/ui/data/pixmaps/downloading.svg
similarity index 100%
rename from deluge/data/pixmaps/downloading.svg
rename to deluge/ui/data/pixmaps/downloading.svg
diff --git a/deluge/data/pixmaps/downloading16.png b/deluge/ui/data/pixmaps/downloading16.png
similarity index 100%
rename from deluge/data/pixmaps/downloading16.png
rename to deluge/ui/data/pixmaps/downloading16.png
diff --git a/deluge/data/pixmaps/flags/FLAGS_LICENCE b/deluge/ui/data/pixmaps/flags/FLAGS_LICENCE
similarity index 100%
rename from deluge/data/pixmaps/flags/FLAGS_LICENCE
rename to deluge/ui/data/pixmaps/flags/FLAGS_LICENCE
diff --git a/deluge/data/pixmaps/flags/ad.png b/deluge/ui/data/pixmaps/flags/ad.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ad.png
rename to deluge/ui/data/pixmaps/flags/ad.png
diff --git a/deluge/data/pixmaps/flags/ae.png b/deluge/ui/data/pixmaps/flags/ae.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ae.png
rename to deluge/ui/data/pixmaps/flags/ae.png
diff --git a/deluge/data/pixmaps/flags/af.png b/deluge/ui/data/pixmaps/flags/af.png
similarity index 100%
rename from deluge/data/pixmaps/flags/af.png
rename to deluge/ui/data/pixmaps/flags/af.png
diff --git a/deluge/data/pixmaps/flags/ag.png b/deluge/ui/data/pixmaps/flags/ag.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ag.png
rename to deluge/ui/data/pixmaps/flags/ag.png
diff --git a/deluge/data/pixmaps/flags/ai.png b/deluge/ui/data/pixmaps/flags/ai.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ai.png
rename to deluge/ui/data/pixmaps/flags/ai.png
diff --git a/deluge/data/pixmaps/flags/al.png b/deluge/ui/data/pixmaps/flags/al.png
similarity index 100%
rename from deluge/data/pixmaps/flags/al.png
rename to deluge/ui/data/pixmaps/flags/al.png
diff --git a/deluge/data/pixmaps/flags/am.png b/deluge/ui/data/pixmaps/flags/am.png
similarity index 100%
rename from deluge/data/pixmaps/flags/am.png
rename to deluge/ui/data/pixmaps/flags/am.png
diff --git a/deluge/data/pixmaps/flags/an.png b/deluge/ui/data/pixmaps/flags/an.png
similarity index 100%
rename from deluge/data/pixmaps/flags/an.png
rename to deluge/ui/data/pixmaps/flags/an.png
diff --git a/deluge/data/pixmaps/flags/ao.png b/deluge/ui/data/pixmaps/flags/ao.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ao.png
rename to deluge/ui/data/pixmaps/flags/ao.png
diff --git a/deluge/data/pixmaps/flags/aq.png b/deluge/ui/data/pixmaps/flags/aq.png
similarity index 100%
rename from deluge/data/pixmaps/flags/aq.png
rename to deluge/ui/data/pixmaps/flags/aq.png
diff --git a/deluge/data/pixmaps/flags/ar.png b/deluge/ui/data/pixmaps/flags/ar.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ar.png
rename to deluge/ui/data/pixmaps/flags/ar.png
diff --git a/deluge/data/pixmaps/flags/as.png b/deluge/ui/data/pixmaps/flags/as.png
similarity index 100%
rename from deluge/data/pixmaps/flags/as.png
rename to deluge/ui/data/pixmaps/flags/as.png
diff --git a/deluge/data/pixmaps/flags/at.png b/deluge/ui/data/pixmaps/flags/at.png
similarity index 100%
rename from deluge/data/pixmaps/flags/at.png
rename to deluge/ui/data/pixmaps/flags/at.png
diff --git a/deluge/data/pixmaps/flags/au.png b/deluge/ui/data/pixmaps/flags/au.png
similarity index 100%
rename from deluge/data/pixmaps/flags/au.png
rename to deluge/ui/data/pixmaps/flags/au.png
diff --git a/deluge/data/pixmaps/flags/aw.png b/deluge/ui/data/pixmaps/flags/aw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/aw.png
rename to deluge/ui/data/pixmaps/flags/aw.png
diff --git a/deluge/data/pixmaps/flags/ax.png b/deluge/ui/data/pixmaps/flags/ax.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ax.png
rename to deluge/ui/data/pixmaps/flags/ax.png
diff --git a/deluge/data/pixmaps/flags/az.png b/deluge/ui/data/pixmaps/flags/az.png
similarity index 100%
rename from deluge/data/pixmaps/flags/az.png
rename to deluge/ui/data/pixmaps/flags/az.png
diff --git a/deluge/data/pixmaps/flags/ba.png b/deluge/ui/data/pixmaps/flags/ba.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ba.png
rename to deluge/ui/data/pixmaps/flags/ba.png
diff --git a/deluge/data/pixmaps/flags/bb.png b/deluge/ui/data/pixmaps/flags/bb.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bb.png
rename to deluge/ui/data/pixmaps/flags/bb.png
diff --git a/deluge/data/pixmaps/flags/bd.png b/deluge/ui/data/pixmaps/flags/bd.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bd.png
rename to deluge/ui/data/pixmaps/flags/bd.png
diff --git a/deluge/data/pixmaps/flags/be.png b/deluge/ui/data/pixmaps/flags/be.png
similarity index 100%
rename from deluge/data/pixmaps/flags/be.png
rename to deluge/ui/data/pixmaps/flags/be.png
diff --git a/deluge/data/pixmaps/flags/bf.png b/deluge/ui/data/pixmaps/flags/bf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bf.png
rename to deluge/ui/data/pixmaps/flags/bf.png
diff --git a/deluge/data/pixmaps/flags/bg.png b/deluge/ui/data/pixmaps/flags/bg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bg.png
rename to deluge/ui/data/pixmaps/flags/bg.png
diff --git a/deluge/data/pixmaps/flags/bh.png b/deluge/ui/data/pixmaps/flags/bh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bh.png
rename to deluge/ui/data/pixmaps/flags/bh.png
diff --git a/deluge/data/pixmaps/flags/bi.png b/deluge/ui/data/pixmaps/flags/bi.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bi.png
rename to deluge/ui/data/pixmaps/flags/bi.png
diff --git a/deluge/data/pixmaps/flags/bj.png b/deluge/ui/data/pixmaps/flags/bj.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bj.png
rename to deluge/ui/data/pixmaps/flags/bj.png
diff --git a/deluge/data/pixmaps/flags/bm.png b/deluge/ui/data/pixmaps/flags/bm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bm.png
rename to deluge/ui/data/pixmaps/flags/bm.png
diff --git a/deluge/data/pixmaps/flags/bn.png b/deluge/ui/data/pixmaps/flags/bn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bn.png
rename to deluge/ui/data/pixmaps/flags/bn.png
diff --git a/deluge/data/pixmaps/flags/bo.png b/deluge/ui/data/pixmaps/flags/bo.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bo.png
rename to deluge/ui/data/pixmaps/flags/bo.png
diff --git a/deluge/data/pixmaps/flags/br.png b/deluge/ui/data/pixmaps/flags/br.png
similarity index 100%
rename from deluge/data/pixmaps/flags/br.png
rename to deluge/ui/data/pixmaps/flags/br.png
diff --git a/deluge/data/pixmaps/flags/bs.png b/deluge/ui/data/pixmaps/flags/bs.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bs.png
rename to deluge/ui/data/pixmaps/flags/bs.png
diff --git a/deluge/data/pixmaps/flags/bt.png b/deluge/ui/data/pixmaps/flags/bt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bt.png
rename to deluge/ui/data/pixmaps/flags/bt.png
diff --git a/deluge/data/pixmaps/flags/bv.png b/deluge/ui/data/pixmaps/flags/bv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bv.png
rename to deluge/ui/data/pixmaps/flags/bv.png
diff --git a/deluge/data/pixmaps/flags/bw.png b/deluge/ui/data/pixmaps/flags/bw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bw.png
rename to deluge/ui/data/pixmaps/flags/bw.png
diff --git a/deluge/data/pixmaps/flags/by.png b/deluge/ui/data/pixmaps/flags/by.png
similarity index 100%
rename from deluge/data/pixmaps/flags/by.png
rename to deluge/ui/data/pixmaps/flags/by.png
diff --git a/deluge/data/pixmaps/flags/bz.png b/deluge/ui/data/pixmaps/flags/bz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/bz.png
rename to deluge/ui/data/pixmaps/flags/bz.png
diff --git a/deluge/data/pixmaps/flags/ca.png b/deluge/ui/data/pixmaps/flags/ca.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ca.png
rename to deluge/ui/data/pixmaps/flags/ca.png
diff --git a/deluge/data/pixmaps/flags/cc.png b/deluge/ui/data/pixmaps/flags/cc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cc.png
rename to deluge/ui/data/pixmaps/flags/cc.png
diff --git a/deluge/data/pixmaps/flags/cd.png b/deluge/ui/data/pixmaps/flags/cd.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cd.png
rename to deluge/ui/data/pixmaps/flags/cd.png
diff --git a/deluge/data/pixmaps/flags/cf.png b/deluge/ui/data/pixmaps/flags/cf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cf.png
rename to deluge/ui/data/pixmaps/flags/cf.png
diff --git a/deluge/data/pixmaps/flags/cg.png b/deluge/ui/data/pixmaps/flags/cg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cg.png
rename to deluge/ui/data/pixmaps/flags/cg.png
diff --git a/deluge/data/pixmaps/flags/ch.png b/deluge/ui/data/pixmaps/flags/ch.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ch.png
rename to deluge/ui/data/pixmaps/flags/ch.png
diff --git a/deluge/data/pixmaps/flags/ci.png b/deluge/ui/data/pixmaps/flags/ci.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ci.png
rename to deluge/ui/data/pixmaps/flags/ci.png
diff --git a/deluge/data/pixmaps/flags/ck.png b/deluge/ui/data/pixmaps/flags/ck.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ck.png
rename to deluge/ui/data/pixmaps/flags/ck.png
diff --git a/deluge/data/pixmaps/flags/cl.png b/deluge/ui/data/pixmaps/flags/cl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cl.png
rename to deluge/ui/data/pixmaps/flags/cl.png
diff --git a/deluge/data/pixmaps/flags/cm.png b/deluge/ui/data/pixmaps/flags/cm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cm.png
rename to deluge/ui/data/pixmaps/flags/cm.png
diff --git a/deluge/data/pixmaps/flags/cn.png b/deluge/ui/data/pixmaps/flags/cn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cn.png
rename to deluge/ui/data/pixmaps/flags/cn.png
diff --git a/deluge/data/pixmaps/flags/co.png b/deluge/ui/data/pixmaps/flags/co.png
similarity index 100%
rename from deluge/data/pixmaps/flags/co.png
rename to deluge/ui/data/pixmaps/flags/co.png
diff --git a/deluge/data/pixmaps/flags/cr.png b/deluge/ui/data/pixmaps/flags/cr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cr.png
rename to deluge/ui/data/pixmaps/flags/cr.png
diff --git a/deluge/data/pixmaps/flags/cs.png b/deluge/ui/data/pixmaps/flags/cs.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cs.png
rename to deluge/ui/data/pixmaps/flags/cs.png
diff --git a/deluge/data/pixmaps/flags/cu.png b/deluge/ui/data/pixmaps/flags/cu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cu.png
rename to deluge/ui/data/pixmaps/flags/cu.png
diff --git a/deluge/data/pixmaps/flags/cv.png b/deluge/ui/data/pixmaps/flags/cv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cv.png
rename to deluge/ui/data/pixmaps/flags/cv.png
diff --git a/deluge/data/pixmaps/flags/cx.png b/deluge/ui/data/pixmaps/flags/cx.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cx.png
rename to deluge/ui/data/pixmaps/flags/cx.png
diff --git a/deluge/data/pixmaps/flags/cy.png b/deluge/ui/data/pixmaps/flags/cy.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cy.png
rename to deluge/ui/data/pixmaps/flags/cy.png
diff --git a/deluge/data/pixmaps/flags/cz.png b/deluge/ui/data/pixmaps/flags/cz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/cz.png
rename to deluge/ui/data/pixmaps/flags/cz.png
diff --git a/deluge/data/pixmaps/flags/de.png b/deluge/ui/data/pixmaps/flags/de.png
similarity index 100%
rename from deluge/data/pixmaps/flags/de.png
rename to deluge/ui/data/pixmaps/flags/de.png
diff --git a/deluge/data/pixmaps/flags/dj.png b/deluge/ui/data/pixmaps/flags/dj.png
similarity index 100%
rename from deluge/data/pixmaps/flags/dj.png
rename to deluge/ui/data/pixmaps/flags/dj.png
diff --git a/deluge/data/pixmaps/flags/dk.png b/deluge/ui/data/pixmaps/flags/dk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/dk.png
rename to deluge/ui/data/pixmaps/flags/dk.png
diff --git a/deluge/data/pixmaps/flags/dm.png b/deluge/ui/data/pixmaps/flags/dm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/dm.png
rename to deluge/ui/data/pixmaps/flags/dm.png
diff --git a/deluge/data/pixmaps/flags/do.png b/deluge/ui/data/pixmaps/flags/do.png
similarity index 100%
rename from deluge/data/pixmaps/flags/do.png
rename to deluge/ui/data/pixmaps/flags/do.png
diff --git a/deluge/data/pixmaps/flags/dz.png b/deluge/ui/data/pixmaps/flags/dz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/dz.png
rename to deluge/ui/data/pixmaps/flags/dz.png
diff --git a/deluge/data/pixmaps/flags/ec.png b/deluge/ui/data/pixmaps/flags/ec.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ec.png
rename to deluge/ui/data/pixmaps/flags/ec.png
diff --git a/deluge/data/pixmaps/flags/ee.png b/deluge/ui/data/pixmaps/flags/ee.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ee.png
rename to deluge/ui/data/pixmaps/flags/ee.png
diff --git a/deluge/data/pixmaps/flags/eg.png b/deluge/ui/data/pixmaps/flags/eg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/eg.png
rename to deluge/ui/data/pixmaps/flags/eg.png
diff --git a/deluge/data/pixmaps/flags/eh.png b/deluge/ui/data/pixmaps/flags/eh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/eh.png
rename to deluge/ui/data/pixmaps/flags/eh.png
diff --git a/deluge/data/pixmaps/flags/er.png b/deluge/ui/data/pixmaps/flags/er.png
similarity index 100%
rename from deluge/data/pixmaps/flags/er.png
rename to deluge/ui/data/pixmaps/flags/er.png
diff --git a/deluge/data/pixmaps/flags/es.png b/deluge/ui/data/pixmaps/flags/es.png
similarity index 100%
rename from deluge/data/pixmaps/flags/es.png
rename to deluge/ui/data/pixmaps/flags/es.png
diff --git a/deluge/data/pixmaps/flags/et.png b/deluge/ui/data/pixmaps/flags/et.png
similarity index 100%
rename from deluge/data/pixmaps/flags/et.png
rename to deluge/ui/data/pixmaps/flags/et.png
diff --git a/deluge/data/pixmaps/flags/fi.png b/deluge/ui/data/pixmaps/flags/fi.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fi.png
rename to deluge/ui/data/pixmaps/flags/fi.png
diff --git a/deluge/data/pixmaps/flags/fj.png b/deluge/ui/data/pixmaps/flags/fj.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fj.png
rename to deluge/ui/data/pixmaps/flags/fj.png
diff --git a/deluge/data/pixmaps/flags/fk.png b/deluge/ui/data/pixmaps/flags/fk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fk.png
rename to deluge/ui/data/pixmaps/flags/fk.png
diff --git a/deluge/data/pixmaps/flags/fm.png b/deluge/ui/data/pixmaps/flags/fm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fm.png
rename to deluge/ui/data/pixmaps/flags/fm.png
diff --git a/deluge/data/pixmaps/flags/fo.png b/deluge/ui/data/pixmaps/flags/fo.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fo.png
rename to deluge/ui/data/pixmaps/flags/fo.png
diff --git a/deluge/data/pixmaps/flags/fr.png b/deluge/ui/data/pixmaps/flags/fr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fr.png
rename to deluge/ui/data/pixmaps/flags/fr.png
diff --git a/deluge/data/pixmaps/flags/fx.png b/deluge/ui/data/pixmaps/flags/fx.png
similarity index 100%
rename from deluge/data/pixmaps/flags/fx.png
rename to deluge/ui/data/pixmaps/flags/fx.png
diff --git a/deluge/data/pixmaps/flags/ga.png b/deluge/ui/data/pixmaps/flags/ga.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ga.png
rename to deluge/ui/data/pixmaps/flags/ga.png
diff --git a/deluge/data/pixmaps/flags/gb.png b/deluge/ui/data/pixmaps/flags/gb.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gb.png
rename to deluge/ui/data/pixmaps/flags/gb.png
diff --git a/deluge/data/pixmaps/flags/gd.png b/deluge/ui/data/pixmaps/flags/gd.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gd.png
rename to deluge/ui/data/pixmaps/flags/gd.png
diff --git a/deluge/data/pixmaps/flags/ge.png b/deluge/ui/data/pixmaps/flags/ge.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ge.png
rename to deluge/ui/data/pixmaps/flags/ge.png
diff --git a/deluge/data/pixmaps/flags/gf.png b/deluge/ui/data/pixmaps/flags/gf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gf.png
rename to deluge/ui/data/pixmaps/flags/gf.png
diff --git a/deluge/data/pixmaps/flags/gg.png b/deluge/ui/data/pixmaps/flags/gg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gg.png
rename to deluge/ui/data/pixmaps/flags/gg.png
diff --git a/deluge/data/pixmaps/flags/gh.png b/deluge/ui/data/pixmaps/flags/gh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gh.png
rename to deluge/ui/data/pixmaps/flags/gh.png
diff --git a/deluge/data/pixmaps/flags/gi.png b/deluge/ui/data/pixmaps/flags/gi.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gi.png
rename to deluge/ui/data/pixmaps/flags/gi.png
diff --git a/deluge/data/pixmaps/flags/gl.png b/deluge/ui/data/pixmaps/flags/gl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gl.png
rename to deluge/ui/data/pixmaps/flags/gl.png
diff --git a/deluge/data/pixmaps/flags/gm.png b/deluge/ui/data/pixmaps/flags/gm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gm.png
rename to deluge/ui/data/pixmaps/flags/gm.png
diff --git a/deluge/data/pixmaps/flags/gn.png b/deluge/ui/data/pixmaps/flags/gn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gn.png
rename to deluge/ui/data/pixmaps/flags/gn.png
diff --git a/deluge/data/pixmaps/flags/gp.png b/deluge/ui/data/pixmaps/flags/gp.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gp.png
rename to deluge/ui/data/pixmaps/flags/gp.png
diff --git a/deluge/data/pixmaps/flags/gq.png b/deluge/ui/data/pixmaps/flags/gq.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gq.png
rename to deluge/ui/data/pixmaps/flags/gq.png
diff --git a/deluge/data/pixmaps/flags/gr.png b/deluge/ui/data/pixmaps/flags/gr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gr.png
rename to deluge/ui/data/pixmaps/flags/gr.png
diff --git a/deluge/data/pixmaps/flags/gs.png b/deluge/ui/data/pixmaps/flags/gs.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gs.png
rename to deluge/ui/data/pixmaps/flags/gs.png
diff --git a/deluge/data/pixmaps/flags/gt.png b/deluge/ui/data/pixmaps/flags/gt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gt.png
rename to deluge/ui/data/pixmaps/flags/gt.png
diff --git a/deluge/data/pixmaps/flags/gu.png b/deluge/ui/data/pixmaps/flags/gu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gu.png
rename to deluge/ui/data/pixmaps/flags/gu.png
diff --git a/deluge/data/pixmaps/flags/gw.png b/deluge/ui/data/pixmaps/flags/gw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gw.png
rename to deluge/ui/data/pixmaps/flags/gw.png
diff --git a/deluge/data/pixmaps/flags/gy.png b/deluge/ui/data/pixmaps/flags/gy.png
similarity index 100%
rename from deluge/data/pixmaps/flags/gy.png
rename to deluge/ui/data/pixmaps/flags/gy.png
diff --git a/deluge/data/pixmaps/flags/hk.png b/deluge/ui/data/pixmaps/flags/hk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/hk.png
rename to deluge/ui/data/pixmaps/flags/hk.png
diff --git a/deluge/data/pixmaps/flags/hm.png b/deluge/ui/data/pixmaps/flags/hm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/hm.png
rename to deluge/ui/data/pixmaps/flags/hm.png
diff --git a/deluge/data/pixmaps/flags/hn.png b/deluge/ui/data/pixmaps/flags/hn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/hn.png
rename to deluge/ui/data/pixmaps/flags/hn.png
diff --git a/deluge/data/pixmaps/flags/hr.png b/deluge/ui/data/pixmaps/flags/hr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/hr.png
rename to deluge/ui/data/pixmaps/flags/hr.png
diff --git a/deluge/data/pixmaps/flags/ht.png b/deluge/ui/data/pixmaps/flags/ht.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ht.png
rename to deluge/ui/data/pixmaps/flags/ht.png
diff --git a/deluge/data/pixmaps/flags/hu.png b/deluge/ui/data/pixmaps/flags/hu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/hu.png
rename to deluge/ui/data/pixmaps/flags/hu.png
diff --git a/deluge/data/pixmaps/flags/id.png b/deluge/ui/data/pixmaps/flags/id.png
similarity index 100%
rename from deluge/data/pixmaps/flags/id.png
rename to deluge/ui/data/pixmaps/flags/id.png
diff --git a/deluge/data/pixmaps/flags/ie.png b/deluge/ui/data/pixmaps/flags/ie.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ie.png
rename to deluge/ui/data/pixmaps/flags/ie.png
diff --git a/deluge/data/pixmaps/flags/il.png b/deluge/ui/data/pixmaps/flags/il.png
similarity index 100%
rename from deluge/data/pixmaps/flags/il.png
rename to deluge/ui/data/pixmaps/flags/il.png
diff --git a/deluge/data/pixmaps/flags/in.png b/deluge/ui/data/pixmaps/flags/in.png
similarity index 100%
rename from deluge/data/pixmaps/flags/in.png
rename to deluge/ui/data/pixmaps/flags/in.png
diff --git a/deluge/data/pixmaps/flags/io.png b/deluge/ui/data/pixmaps/flags/io.png
similarity index 100%
rename from deluge/data/pixmaps/flags/io.png
rename to deluge/ui/data/pixmaps/flags/io.png
diff --git a/deluge/data/pixmaps/flags/iq.png b/deluge/ui/data/pixmaps/flags/iq.png
similarity index 100%
rename from deluge/data/pixmaps/flags/iq.png
rename to deluge/ui/data/pixmaps/flags/iq.png
diff --git a/deluge/data/pixmaps/flags/ir.png b/deluge/ui/data/pixmaps/flags/ir.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ir.png
rename to deluge/ui/data/pixmaps/flags/ir.png
diff --git a/deluge/data/pixmaps/flags/is.png b/deluge/ui/data/pixmaps/flags/is.png
similarity index 100%
rename from deluge/data/pixmaps/flags/is.png
rename to deluge/ui/data/pixmaps/flags/is.png
diff --git a/deluge/data/pixmaps/flags/it.png b/deluge/ui/data/pixmaps/flags/it.png
similarity index 100%
rename from deluge/data/pixmaps/flags/it.png
rename to deluge/ui/data/pixmaps/flags/it.png
diff --git a/deluge/data/pixmaps/flags/je.png b/deluge/ui/data/pixmaps/flags/je.png
similarity index 100%
rename from deluge/data/pixmaps/flags/je.png
rename to deluge/ui/data/pixmaps/flags/je.png
diff --git a/deluge/data/pixmaps/flags/jm.png b/deluge/ui/data/pixmaps/flags/jm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/jm.png
rename to deluge/ui/data/pixmaps/flags/jm.png
diff --git a/deluge/data/pixmaps/flags/jo.png b/deluge/ui/data/pixmaps/flags/jo.png
similarity index 100%
rename from deluge/data/pixmaps/flags/jo.png
rename to deluge/ui/data/pixmaps/flags/jo.png
diff --git a/deluge/data/pixmaps/flags/jp.png b/deluge/ui/data/pixmaps/flags/jp.png
similarity index 100%
rename from deluge/data/pixmaps/flags/jp.png
rename to deluge/ui/data/pixmaps/flags/jp.png
diff --git a/deluge/data/pixmaps/flags/ke.png b/deluge/ui/data/pixmaps/flags/ke.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ke.png
rename to deluge/ui/data/pixmaps/flags/ke.png
diff --git a/deluge/data/pixmaps/flags/kg.png b/deluge/ui/data/pixmaps/flags/kg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kg.png
rename to deluge/ui/data/pixmaps/flags/kg.png
diff --git a/deluge/data/pixmaps/flags/kh.png b/deluge/ui/data/pixmaps/flags/kh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kh.png
rename to deluge/ui/data/pixmaps/flags/kh.png
diff --git a/deluge/data/pixmaps/flags/ki.png b/deluge/ui/data/pixmaps/flags/ki.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ki.png
rename to deluge/ui/data/pixmaps/flags/ki.png
diff --git a/deluge/data/pixmaps/flags/km.png b/deluge/ui/data/pixmaps/flags/km.png
similarity index 100%
rename from deluge/data/pixmaps/flags/km.png
rename to deluge/ui/data/pixmaps/flags/km.png
diff --git a/deluge/data/pixmaps/flags/kn.png b/deluge/ui/data/pixmaps/flags/kn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kn.png
rename to deluge/ui/data/pixmaps/flags/kn.png
diff --git a/deluge/data/pixmaps/flags/kp.png b/deluge/ui/data/pixmaps/flags/kp.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kp.png
rename to deluge/ui/data/pixmaps/flags/kp.png
diff --git a/deluge/data/pixmaps/flags/kr.png b/deluge/ui/data/pixmaps/flags/kr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kr.png
rename to deluge/ui/data/pixmaps/flags/kr.png
diff --git a/deluge/data/pixmaps/flags/kw.png b/deluge/ui/data/pixmaps/flags/kw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kw.png
rename to deluge/ui/data/pixmaps/flags/kw.png
diff --git a/deluge/data/pixmaps/flags/ky.png b/deluge/ui/data/pixmaps/flags/ky.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ky.png
rename to deluge/ui/data/pixmaps/flags/ky.png
diff --git a/deluge/data/pixmaps/flags/kz.png b/deluge/ui/data/pixmaps/flags/kz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/kz.png
rename to deluge/ui/data/pixmaps/flags/kz.png
diff --git a/deluge/data/pixmaps/flags/la.png b/deluge/ui/data/pixmaps/flags/la.png
similarity index 100%
rename from deluge/data/pixmaps/flags/la.png
rename to deluge/ui/data/pixmaps/flags/la.png
diff --git a/deluge/data/pixmaps/flags/lb.png b/deluge/ui/data/pixmaps/flags/lb.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lb.png
rename to deluge/ui/data/pixmaps/flags/lb.png
diff --git a/deluge/data/pixmaps/flags/lc.png b/deluge/ui/data/pixmaps/flags/lc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lc.png
rename to deluge/ui/data/pixmaps/flags/lc.png
diff --git a/deluge/data/pixmaps/flags/li.png b/deluge/ui/data/pixmaps/flags/li.png
similarity index 100%
rename from deluge/data/pixmaps/flags/li.png
rename to deluge/ui/data/pixmaps/flags/li.png
diff --git a/deluge/data/pixmaps/flags/lk.png b/deluge/ui/data/pixmaps/flags/lk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lk.png
rename to deluge/ui/data/pixmaps/flags/lk.png
diff --git a/deluge/data/pixmaps/flags/lr.png b/deluge/ui/data/pixmaps/flags/lr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lr.png
rename to deluge/ui/data/pixmaps/flags/lr.png
diff --git a/deluge/data/pixmaps/flags/ls.png b/deluge/ui/data/pixmaps/flags/ls.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ls.png
rename to deluge/ui/data/pixmaps/flags/ls.png
diff --git a/deluge/data/pixmaps/flags/lt.png b/deluge/ui/data/pixmaps/flags/lt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lt.png
rename to deluge/ui/data/pixmaps/flags/lt.png
diff --git a/deluge/data/pixmaps/flags/lu.png b/deluge/ui/data/pixmaps/flags/lu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lu.png
rename to deluge/ui/data/pixmaps/flags/lu.png
diff --git a/deluge/data/pixmaps/flags/lv.png b/deluge/ui/data/pixmaps/flags/lv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/lv.png
rename to deluge/ui/data/pixmaps/flags/lv.png
diff --git a/deluge/data/pixmaps/flags/ly.png b/deluge/ui/data/pixmaps/flags/ly.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ly.png
rename to deluge/ui/data/pixmaps/flags/ly.png
diff --git a/deluge/data/pixmaps/flags/ma.png b/deluge/ui/data/pixmaps/flags/ma.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ma.png
rename to deluge/ui/data/pixmaps/flags/ma.png
diff --git a/deluge/data/pixmaps/flags/mc.png b/deluge/ui/data/pixmaps/flags/mc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mc.png
rename to deluge/ui/data/pixmaps/flags/mc.png
diff --git a/deluge/data/pixmaps/flags/md.png b/deluge/ui/data/pixmaps/flags/md.png
similarity index 100%
rename from deluge/data/pixmaps/flags/md.png
rename to deluge/ui/data/pixmaps/flags/md.png
diff --git a/deluge/data/pixmaps/flags/me.png b/deluge/ui/data/pixmaps/flags/me.png
similarity index 100%
rename from deluge/data/pixmaps/flags/me.png
rename to deluge/ui/data/pixmaps/flags/me.png
diff --git a/deluge/data/pixmaps/flags/mg.png b/deluge/ui/data/pixmaps/flags/mg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mg.png
rename to deluge/ui/data/pixmaps/flags/mg.png
diff --git a/deluge/data/pixmaps/flags/mh.png b/deluge/ui/data/pixmaps/flags/mh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mh.png
rename to deluge/ui/data/pixmaps/flags/mh.png
diff --git a/deluge/data/pixmaps/flags/mk.png b/deluge/ui/data/pixmaps/flags/mk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mk.png
rename to deluge/ui/data/pixmaps/flags/mk.png
diff --git a/deluge/data/pixmaps/flags/ml.png b/deluge/ui/data/pixmaps/flags/ml.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ml.png
rename to deluge/ui/data/pixmaps/flags/ml.png
diff --git a/deluge/data/pixmaps/flags/mm.png b/deluge/ui/data/pixmaps/flags/mm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mm.png
rename to deluge/ui/data/pixmaps/flags/mm.png
diff --git a/deluge/data/pixmaps/flags/mn.png b/deluge/ui/data/pixmaps/flags/mn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mn.png
rename to deluge/ui/data/pixmaps/flags/mn.png
diff --git a/deluge/data/pixmaps/flags/mo.png b/deluge/ui/data/pixmaps/flags/mo.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mo.png
rename to deluge/ui/data/pixmaps/flags/mo.png
diff --git a/deluge/data/pixmaps/flags/mp.png b/deluge/ui/data/pixmaps/flags/mp.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mp.png
rename to deluge/ui/data/pixmaps/flags/mp.png
diff --git a/deluge/data/pixmaps/flags/mq.png b/deluge/ui/data/pixmaps/flags/mq.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mq.png
rename to deluge/ui/data/pixmaps/flags/mq.png
diff --git a/deluge/data/pixmaps/flags/mr.png b/deluge/ui/data/pixmaps/flags/mr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mr.png
rename to deluge/ui/data/pixmaps/flags/mr.png
diff --git a/deluge/data/pixmaps/flags/ms.png b/deluge/ui/data/pixmaps/flags/ms.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ms.png
rename to deluge/ui/data/pixmaps/flags/ms.png
diff --git a/deluge/data/pixmaps/flags/mt.png b/deluge/ui/data/pixmaps/flags/mt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mt.png
rename to deluge/ui/data/pixmaps/flags/mt.png
diff --git a/deluge/data/pixmaps/flags/mu.png b/deluge/ui/data/pixmaps/flags/mu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mu.png
rename to deluge/ui/data/pixmaps/flags/mu.png
diff --git a/deluge/data/pixmaps/flags/mv.png b/deluge/ui/data/pixmaps/flags/mv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mv.png
rename to deluge/ui/data/pixmaps/flags/mv.png
diff --git a/deluge/data/pixmaps/flags/mw.png b/deluge/ui/data/pixmaps/flags/mw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mw.png
rename to deluge/ui/data/pixmaps/flags/mw.png
diff --git a/deluge/data/pixmaps/flags/mx.png b/deluge/ui/data/pixmaps/flags/mx.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mx.png
rename to deluge/ui/data/pixmaps/flags/mx.png
diff --git a/deluge/data/pixmaps/flags/my.png b/deluge/ui/data/pixmaps/flags/my.png
similarity index 100%
rename from deluge/data/pixmaps/flags/my.png
rename to deluge/ui/data/pixmaps/flags/my.png
diff --git a/deluge/data/pixmaps/flags/mz.png b/deluge/ui/data/pixmaps/flags/mz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/mz.png
rename to deluge/ui/data/pixmaps/flags/mz.png
diff --git a/deluge/data/pixmaps/flags/na.png b/deluge/ui/data/pixmaps/flags/na.png
similarity index 100%
rename from deluge/data/pixmaps/flags/na.png
rename to deluge/ui/data/pixmaps/flags/na.png
diff --git a/deluge/data/pixmaps/flags/nc.png b/deluge/ui/data/pixmaps/flags/nc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nc.png
rename to deluge/ui/data/pixmaps/flags/nc.png
diff --git a/deluge/data/pixmaps/flags/ne.png b/deluge/ui/data/pixmaps/flags/ne.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ne.png
rename to deluge/ui/data/pixmaps/flags/ne.png
diff --git a/deluge/data/pixmaps/flags/nf.png b/deluge/ui/data/pixmaps/flags/nf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nf.png
rename to deluge/ui/data/pixmaps/flags/nf.png
diff --git a/deluge/data/pixmaps/flags/ng.png b/deluge/ui/data/pixmaps/flags/ng.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ng.png
rename to deluge/ui/data/pixmaps/flags/ng.png
diff --git a/deluge/data/pixmaps/flags/ni.png b/deluge/ui/data/pixmaps/flags/ni.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ni.png
rename to deluge/ui/data/pixmaps/flags/ni.png
diff --git a/deluge/data/pixmaps/flags/nl.png b/deluge/ui/data/pixmaps/flags/nl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nl.png
rename to deluge/ui/data/pixmaps/flags/nl.png
diff --git a/deluge/data/pixmaps/flags/no.png b/deluge/ui/data/pixmaps/flags/no.png
similarity index 100%
rename from deluge/data/pixmaps/flags/no.png
rename to deluge/ui/data/pixmaps/flags/no.png
diff --git a/deluge/data/pixmaps/flags/np.png b/deluge/ui/data/pixmaps/flags/np.png
similarity index 100%
rename from deluge/data/pixmaps/flags/np.png
rename to deluge/ui/data/pixmaps/flags/np.png
diff --git a/deluge/data/pixmaps/flags/nr.png b/deluge/ui/data/pixmaps/flags/nr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nr.png
rename to deluge/ui/data/pixmaps/flags/nr.png
diff --git a/deluge/data/pixmaps/flags/nu.png b/deluge/ui/data/pixmaps/flags/nu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nu.png
rename to deluge/ui/data/pixmaps/flags/nu.png
diff --git a/deluge/data/pixmaps/flags/nz.png b/deluge/ui/data/pixmaps/flags/nz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/nz.png
rename to deluge/ui/data/pixmaps/flags/nz.png
diff --git a/deluge/data/pixmaps/flags/om.png b/deluge/ui/data/pixmaps/flags/om.png
similarity index 100%
rename from deluge/data/pixmaps/flags/om.png
rename to deluge/ui/data/pixmaps/flags/om.png
diff --git a/deluge/data/pixmaps/flags/pa.png b/deluge/ui/data/pixmaps/flags/pa.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pa.png
rename to deluge/ui/data/pixmaps/flags/pa.png
diff --git a/deluge/data/pixmaps/flags/pe.png b/deluge/ui/data/pixmaps/flags/pe.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pe.png
rename to deluge/ui/data/pixmaps/flags/pe.png
diff --git a/deluge/data/pixmaps/flags/pf.png b/deluge/ui/data/pixmaps/flags/pf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pf.png
rename to deluge/ui/data/pixmaps/flags/pf.png
diff --git a/deluge/data/pixmaps/flags/pg.png b/deluge/ui/data/pixmaps/flags/pg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pg.png
rename to deluge/ui/data/pixmaps/flags/pg.png
diff --git a/deluge/data/pixmaps/flags/ph.png b/deluge/ui/data/pixmaps/flags/ph.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ph.png
rename to deluge/ui/data/pixmaps/flags/ph.png
diff --git a/deluge/data/pixmaps/flags/pk.png b/deluge/ui/data/pixmaps/flags/pk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pk.png
rename to deluge/ui/data/pixmaps/flags/pk.png
diff --git a/deluge/data/pixmaps/flags/pl.png b/deluge/ui/data/pixmaps/flags/pl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pl.png
rename to deluge/ui/data/pixmaps/flags/pl.png
diff --git a/deluge/data/pixmaps/flags/pm.png b/deluge/ui/data/pixmaps/flags/pm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pm.png
rename to deluge/ui/data/pixmaps/flags/pm.png
diff --git a/deluge/data/pixmaps/flags/pn.png b/deluge/ui/data/pixmaps/flags/pn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pn.png
rename to deluge/ui/data/pixmaps/flags/pn.png
diff --git a/deluge/data/pixmaps/flags/pr.png b/deluge/ui/data/pixmaps/flags/pr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pr.png
rename to deluge/ui/data/pixmaps/flags/pr.png
diff --git a/deluge/data/pixmaps/flags/ps.png b/deluge/ui/data/pixmaps/flags/ps.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ps.png
rename to deluge/ui/data/pixmaps/flags/ps.png
diff --git a/deluge/data/pixmaps/flags/pt.png b/deluge/ui/data/pixmaps/flags/pt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pt.png
rename to deluge/ui/data/pixmaps/flags/pt.png
diff --git a/deluge/data/pixmaps/flags/pw.png b/deluge/ui/data/pixmaps/flags/pw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/pw.png
rename to deluge/ui/data/pixmaps/flags/pw.png
diff --git a/deluge/data/pixmaps/flags/py.png b/deluge/ui/data/pixmaps/flags/py.png
similarity index 100%
rename from deluge/data/pixmaps/flags/py.png
rename to deluge/ui/data/pixmaps/flags/py.png
diff --git a/deluge/data/pixmaps/flags/qa.png b/deluge/ui/data/pixmaps/flags/qa.png
similarity index 100%
rename from deluge/data/pixmaps/flags/qa.png
rename to deluge/ui/data/pixmaps/flags/qa.png
diff --git a/deluge/data/pixmaps/flags/re.png b/deluge/ui/data/pixmaps/flags/re.png
similarity index 100%
rename from deluge/data/pixmaps/flags/re.png
rename to deluge/ui/data/pixmaps/flags/re.png
diff --git a/deluge/data/pixmaps/flags/ro.png b/deluge/ui/data/pixmaps/flags/ro.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ro.png
rename to deluge/ui/data/pixmaps/flags/ro.png
diff --git a/deluge/data/pixmaps/flags/rs.png b/deluge/ui/data/pixmaps/flags/rs.png
similarity index 100%
rename from deluge/data/pixmaps/flags/rs.png
rename to deluge/ui/data/pixmaps/flags/rs.png
diff --git a/deluge/data/pixmaps/flags/ru.png b/deluge/ui/data/pixmaps/flags/ru.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ru.png
rename to deluge/ui/data/pixmaps/flags/ru.png
diff --git a/deluge/data/pixmaps/flags/rw.png b/deluge/ui/data/pixmaps/flags/rw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/rw.png
rename to deluge/ui/data/pixmaps/flags/rw.png
diff --git a/deluge/data/pixmaps/flags/sa.png b/deluge/ui/data/pixmaps/flags/sa.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sa.png
rename to deluge/ui/data/pixmaps/flags/sa.png
diff --git a/deluge/data/pixmaps/flags/sb.png b/deluge/ui/data/pixmaps/flags/sb.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sb.png
rename to deluge/ui/data/pixmaps/flags/sb.png
diff --git a/deluge/data/pixmaps/flags/sc.png b/deluge/ui/data/pixmaps/flags/sc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sc.png
rename to deluge/ui/data/pixmaps/flags/sc.png
diff --git a/deluge/data/pixmaps/flags/sd.png b/deluge/ui/data/pixmaps/flags/sd.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sd.png
rename to deluge/ui/data/pixmaps/flags/sd.png
diff --git a/deluge/data/pixmaps/flags/se.png b/deluge/ui/data/pixmaps/flags/se.png
similarity index 100%
rename from deluge/data/pixmaps/flags/se.png
rename to deluge/ui/data/pixmaps/flags/se.png
diff --git a/deluge/data/pixmaps/flags/sg.png b/deluge/ui/data/pixmaps/flags/sg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sg.png
rename to deluge/ui/data/pixmaps/flags/sg.png
diff --git a/deluge/data/pixmaps/flags/sh.png b/deluge/ui/data/pixmaps/flags/sh.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sh.png
rename to deluge/ui/data/pixmaps/flags/sh.png
diff --git a/deluge/data/pixmaps/flags/si.png b/deluge/ui/data/pixmaps/flags/si.png
similarity index 100%
rename from deluge/data/pixmaps/flags/si.png
rename to deluge/ui/data/pixmaps/flags/si.png
diff --git a/deluge/data/pixmaps/flags/sj.png b/deluge/ui/data/pixmaps/flags/sj.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sj.png
rename to deluge/ui/data/pixmaps/flags/sj.png
diff --git a/deluge/data/pixmaps/flags/sk.png b/deluge/ui/data/pixmaps/flags/sk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sk.png
rename to deluge/ui/data/pixmaps/flags/sk.png
diff --git a/deluge/data/pixmaps/flags/sl.png b/deluge/ui/data/pixmaps/flags/sl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sl.png
rename to deluge/ui/data/pixmaps/flags/sl.png
diff --git a/deluge/data/pixmaps/flags/sm.png b/deluge/ui/data/pixmaps/flags/sm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sm.png
rename to deluge/ui/data/pixmaps/flags/sm.png
diff --git a/deluge/data/pixmaps/flags/sn.png b/deluge/ui/data/pixmaps/flags/sn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sn.png
rename to deluge/ui/data/pixmaps/flags/sn.png
diff --git a/deluge/data/pixmaps/flags/so.png b/deluge/ui/data/pixmaps/flags/so.png
similarity index 100%
rename from deluge/data/pixmaps/flags/so.png
rename to deluge/ui/data/pixmaps/flags/so.png
diff --git a/deluge/data/pixmaps/flags/sr.png b/deluge/ui/data/pixmaps/flags/sr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sr.png
rename to deluge/ui/data/pixmaps/flags/sr.png
diff --git a/deluge/data/pixmaps/flags/st.png b/deluge/ui/data/pixmaps/flags/st.png
similarity index 100%
rename from deluge/data/pixmaps/flags/st.png
rename to deluge/ui/data/pixmaps/flags/st.png
diff --git a/deluge/data/pixmaps/flags/sv.png b/deluge/ui/data/pixmaps/flags/sv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sv.png
rename to deluge/ui/data/pixmaps/flags/sv.png
diff --git a/deluge/data/pixmaps/flags/sy.png b/deluge/ui/data/pixmaps/flags/sy.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sy.png
rename to deluge/ui/data/pixmaps/flags/sy.png
diff --git a/deluge/data/pixmaps/flags/sz.png b/deluge/ui/data/pixmaps/flags/sz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/sz.png
rename to deluge/ui/data/pixmaps/flags/sz.png
diff --git a/deluge/data/pixmaps/flags/tc.png b/deluge/ui/data/pixmaps/flags/tc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tc.png
rename to deluge/ui/data/pixmaps/flags/tc.png
diff --git a/deluge/data/pixmaps/flags/td.png b/deluge/ui/data/pixmaps/flags/td.png
similarity index 100%
rename from deluge/data/pixmaps/flags/td.png
rename to deluge/ui/data/pixmaps/flags/td.png
diff --git a/deluge/data/pixmaps/flags/tf.png b/deluge/ui/data/pixmaps/flags/tf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tf.png
rename to deluge/ui/data/pixmaps/flags/tf.png
diff --git a/deluge/data/pixmaps/flags/tg.png b/deluge/ui/data/pixmaps/flags/tg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tg.png
rename to deluge/ui/data/pixmaps/flags/tg.png
diff --git a/deluge/data/pixmaps/flags/th.png b/deluge/ui/data/pixmaps/flags/th.png
similarity index 100%
rename from deluge/data/pixmaps/flags/th.png
rename to deluge/ui/data/pixmaps/flags/th.png
diff --git a/deluge/data/pixmaps/flags/tj.png b/deluge/ui/data/pixmaps/flags/tj.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tj.png
rename to deluge/ui/data/pixmaps/flags/tj.png
diff --git a/deluge/data/pixmaps/flags/tk.png b/deluge/ui/data/pixmaps/flags/tk.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tk.png
rename to deluge/ui/data/pixmaps/flags/tk.png
diff --git a/deluge/data/pixmaps/flags/tl.png b/deluge/ui/data/pixmaps/flags/tl.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tl.png
rename to deluge/ui/data/pixmaps/flags/tl.png
diff --git a/deluge/data/pixmaps/flags/tm.png b/deluge/ui/data/pixmaps/flags/tm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tm.png
rename to deluge/ui/data/pixmaps/flags/tm.png
diff --git a/deluge/data/pixmaps/flags/tn.png b/deluge/ui/data/pixmaps/flags/tn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tn.png
rename to deluge/ui/data/pixmaps/flags/tn.png
diff --git a/deluge/data/pixmaps/flags/to.png b/deluge/ui/data/pixmaps/flags/to.png
similarity index 100%
rename from deluge/data/pixmaps/flags/to.png
rename to deluge/ui/data/pixmaps/flags/to.png
diff --git a/deluge/data/pixmaps/flags/tp.png b/deluge/ui/data/pixmaps/flags/tp.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tp.png
rename to deluge/ui/data/pixmaps/flags/tp.png
diff --git a/deluge/data/pixmaps/flags/tr.png b/deluge/ui/data/pixmaps/flags/tr.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tr.png
rename to deluge/ui/data/pixmaps/flags/tr.png
diff --git a/deluge/data/pixmaps/flags/tt.png b/deluge/ui/data/pixmaps/flags/tt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tt.png
rename to deluge/ui/data/pixmaps/flags/tt.png
diff --git a/deluge/data/pixmaps/flags/tv.png b/deluge/ui/data/pixmaps/flags/tv.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tv.png
rename to deluge/ui/data/pixmaps/flags/tv.png
diff --git a/deluge/data/pixmaps/flags/tw.png b/deluge/ui/data/pixmaps/flags/tw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tw.png
rename to deluge/ui/data/pixmaps/flags/tw.png
diff --git a/deluge/data/pixmaps/flags/tz.png b/deluge/ui/data/pixmaps/flags/tz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/tz.png
rename to deluge/ui/data/pixmaps/flags/tz.png
diff --git a/deluge/data/pixmaps/flags/ua.png b/deluge/ui/data/pixmaps/flags/ua.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ua.png
rename to deluge/ui/data/pixmaps/flags/ua.png
diff --git a/deluge/data/pixmaps/flags/ug.png b/deluge/ui/data/pixmaps/flags/ug.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ug.png
rename to deluge/ui/data/pixmaps/flags/ug.png
diff --git a/deluge/data/pixmaps/flags/um.png b/deluge/ui/data/pixmaps/flags/um.png
similarity index 100%
rename from deluge/data/pixmaps/flags/um.png
rename to deluge/ui/data/pixmaps/flags/um.png
diff --git a/deluge/data/pixmaps/flags/us.png b/deluge/ui/data/pixmaps/flags/us.png
similarity index 100%
rename from deluge/data/pixmaps/flags/us.png
rename to deluge/ui/data/pixmaps/flags/us.png
diff --git a/deluge/data/pixmaps/flags/uy.png b/deluge/ui/data/pixmaps/flags/uy.png
similarity index 100%
rename from deluge/data/pixmaps/flags/uy.png
rename to deluge/ui/data/pixmaps/flags/uy.png
diff --git a/deluge/data/pixmaps/flags/uz.png b/deluge/ui/data/pixmaps/flags/uz.png
similarity index 100%
rename from deluge/data/pixmaps/flags/uz.png
rename to deluge/ui/data/pixmaps/flags/uz.png
diff --git a/deluge/data/pixmaps/flags/va.png b/deluge/ui/data/pixmaps/flags/va.png
similarity index 100%
rename from deluge/data/pixmaps/flags/va.png
rename to deluge/ui/data/pixmaps/flags/va.png
diff --git a/deluge/data/pixmaps/flags/vc.png b/deluge/ui/data/pixmaps/flags/vc.png
similarity index 100%
rename from deluge/data/pixmaps/flags/vc.png
rename to deluge/ui/data/pixmaps/flags/vc.png
diff --git a/deluge/data/pixmaps/flags/ve.png b/deluge/ui/data/pixmaps/flags/ve.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ve.png
rename to deluge/ui/data/pixmaps/flags/ve.png
diff --git a/deluge/data/pixmaps/flags/vg.png b/deluge/ui/data/pixmaps/flags/vg.png
similarity index 100%
rename from deluge/data/pixmaps/flags/vg.png
rename to deluge/ui/data/pixmaps/flags/vg.png
diff --git a/deluge/data/pixmaps/flags/vi.png b/deluge/ui/data/pixmaps/flags/vi.png
similarity index 100%
rename from deluge/data/pixmaps/flags/vi.png
rename to deluge/ui/data/pixmaps/flags/vi.png
diff --git a/deluge/data/pixmaps/flags/vn.png b/deluge/ui/data/pixmaps/flags/vn.png
similarity index 100%
rename from deluge/data/pixmaps/flags/vn.png
rename to deluge/ui/data/pixmaps/flags/vn.png
diff --git a/deluge/data/pixmaps/flags/vu.png b/deluge/ui/data/pixmaps/flags/vu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/vu.png
rename to deluge/ui/data/pixmaps/flags/vu.png
diff --git a/deluge/data/pixmaps/flags/wf.png b/deluge/ui/data/pixmaps/flags/wf.png
similarity index 100%
rename from deluge/data/pixmaps/flags/wf.png
rename to deluge/ui/data/pixmaps/flags/wf.png
diff --git a/deluge/data/pixmaps/flags/ws.png b/deluge/ui/data/pixmaps/flags/ws.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ws.png
rename to deluge/ui/data/pixmaps/flags/ws.png
diff --git a/deluge/data/pixmaps/flags/ye.png b/deluge/ui/data/pixmaps/flags/ye.png
similarity index 100%
rename from deluge/data/pixmaps/flags/ye.png
rename to deluge/ui/data/pixmaps/flags/ye.png
diff --git a/deluge/data/pixmaps/flags/yt.png b/deluge/ui/data/pixmaps/flags/yt.png
similarity index 100%
rename from deluge/data/pixmaps/flags/yt.png
rename to deluge/ui/data/pixmaps/flags/yt.png
diff --git a/deluge/data/pixmaps/flags/yu.png b/deluge/ui/data/pixmaps/flags/yu.png
similarity index 100%
rename from deluge/data/pixmaps/flags/yu.png
rename to deluge/ui/data/pixmaps/flags/yu.png
diff --git a/deluge/data/pixmaps/flags/za.png b/deluge/ui/data/pixmaps/flags/za.png
similarity index 100%
rename from deluge/data/pixmaps/flags/za.png
rename to deluge/ui/data/pixmaps/flags/za.png
diff --git a/deluge/data/pixmaps/flags/zm.png b/deluge/ui/data/pixmaps/flags/zm.png
similarity index 100%
rename from deluge/data/pixmaps/flags/zm.png
rename to deluge/ui/data/pixmaps/flags/zm.png
diff --git a/deluge/data/pixmaps/flags/zw.png b/deluge/ui/data/pixmaps/flags/zw.png
similarity index 100%
rename from deluge/data/pixmaps/flags/zw.png
rename to deluge/ui/data/pixmaps/flags/zw.png
diff --git a/deluge/data/pixmaps/inactive.svg b/deluge/ui/data/pixmaps/inactive.svg
similarity index 100%
rename from deluge/data/pixmaps/inactive.svg
rename to deluge/ui/data/pixmaps/inactive.svg
diff --git a/deluge/data/pixmaps/inactive16.png b/deluge/ui/data/pixmaps/inactive16.png
similarity index 100%
rename from deluge/data/pixmaps/inactive16.png
rename to deluge/ui/data/pixmaps/inactive16.png
diff --git a/deluge/data/pixmaps/loading.gif b/deluge/ui/data/pixmaps/loading.gif
similarity index 100%
rename from deluge/data/pixmaps/loading.gif
rename to deluge/ui/data/pixmaps/loading.gif
diff --git a/deluge/data/pixmaps/lock48.png b/deluge/ui/data/pixmaps/lock48.png
similarity index 100%
rename from deluge/data/pixmaps/lock48.png
rename to deluge/ui/data/pixmaps/lock48.png
diff --git a/deluge/data/pixmaps/magnet.png b/deluge/ui/data/pixmaps/magnet.png
similarity index 100%
rename from deluge/data/pixmaps/magnet.png
rename to deluge/ui/data/pixmaps/magnet.png
diff --git a/deluge/data/pixmaps/queued.svg b/deluge/ui/data/pixmaps/queued.svg
similarity index 100%
rename from deluge/data/pixmaps/queued.svg
rename to deluge/ui/data/pixmaps/queued.svg
diff --git a/deluge/data/pixmaps/queued16.png b/deluge/ui/data/pixmaps/queued16.png
similarity index 100%
rename from deluge/data/pixmaps/queued16.png
rename to deluge/ui/data/pixmaps/queued16.png
diff --git a/deluge/data/pixmaps/seeding.svg b/deluge/ui/data/pixmaps/seeding.svg
similarity index 100%
rename from deluge/data/pixmaps/seeding.svg
rename to deluge/ui/data/pixmaps/seeding.svg
diff --git a/deluge/data/pixmaps/seeding16.png b/deluge/ui/data/pixmaps/seeding16.png
similarity index 100%
rename from deluge/data/pixmaps/seeding16.png
rename to deluge/ui/data/pixmaps/seeding16.png
diff --git a/deluge/data/pixmaps/tracker_all16.png b/deluge/ui/data/pixmaps/tracker_all16.png
similarity index 100%
rename from deluge/data/pixmaps/tracker_all16.png
rename to deluge/ui/data/pixmaps/tracker_all16.png
diff --git a/deluge/data/pixmaps/tracker_warning16.png b/deluge/ui/data/pixmaps/tracker_warning16.png
similarity index 100%
rename from deluge/data/pixmaps/tracker_warning16.png
rename to deluge/ui/data/pixmaps/tracker_warning16.png
diff --git a/deluge/data/pixmaps/traffic.svg b/deluge/ui/data/pixmaps/traffic.svg
similarity index 100%
rename from deluge/data/pixmaps/traffic.svg
rename to deluge/ui/data/pixmaps/traffic.svg
diff --git a/deluge/data/pixmaps/traffic16.png b/deluge/ui/data/pixmaps/traffic16.png
similarity index 100%
rename from deluge/data/pixmaps/traffic16.png
rename to deluge/ui/data/pixmaps/traffic16.png
diff --git a/deluge/data/share/applications/deluge.desktop b/deluge/ui/data/share/applications/deluge.desktop
similarity index 100%
rename from deluge/data/share/applications/deluge.desktop
rename to deluge/ui/data/share/applications/deluge.desktop
diff --git a/setup.py b/setup.py
index b065c1f08..113be4c0d 100644
--- a/setup.py
+++ b/setup.py
@@ -401,21 +401,21 @@ cmdclass = {
 
 # Data files to be installed to the system
 _data_files = [
-    ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
-    ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
-    ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
-    ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-    ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']),
-    ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']),
-    ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']),
-    ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']),
-    ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']),
-    ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']),
-    ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
-    ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
-    ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
-    ('share/applications', ['deluge/data/share/applications/deluge.desktop']),
-    ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
+    ('share/icons/scalable/apps', ['deluge/ui/data/icons/scalable/apps/deluge.svg']),
+    ('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']),
+    ('share/icons/hicolor/16x16/apps', ['deluge/ui/data/icons/hicolor/16x16/apps/deluge.png']),
+    ('share/icons/hicolor/192x192/apps', ['deluge/ui/data/icons/hicolor/192x192/apps/deluge.png']),
+    ('share/icons/hicolor/22x22/apps', ['deluge/ui/data/icons/hicolor/22x22/apps/deluge.png']),
+    ('share/icons/hicolor/24x24/apps', ['deluge/ui/data/icons/hicolor/24x24/apps/deluge.png']),
+    ('share/icons/hicolor/256x256/apps', ['deluge/ui/data/icons/hicolor/256x256/apps/deluge.png']),
+    ('share/icons/hicolor/32x32/apps', ['deluge/ui/data/icons/hicolor/32x32/apps/deluge.png']),
+    ('share/icons/hicolor/36x36/apps', ['deluge/ui/data/icons/hicolor/36x36/apps/deluge.png']),
+    ('share/icons/hicolor/48x48/apps', ['deluge/ui/data/icons/hicolor/48x48/apps/deluge.png']),
+    ('share/icons/hicolor/64x64/apps', ['deluge/ui/data/icons/hicolor/64x64/apps/deluge.png']),
+    ('share/icons/hicolor/72x72/apps', ['deluge/ui/data/icons/hicolor/72x72/apps/deluge.png']),
+    ('share/icons/hicolor/96x96/apps', ['deluge/ui/data/icons/hicolor/96x96/apps/deluge.png']),
+    ('share/applications', ['deluge/ui/data/share/applications/deluge.desktop']),
+    ('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/ui/data/pixmaps/deluge.xpm']),
     ('share/man/man1', [
         'docs/man/deluge.1',
         'docs/man/deluged.1',
@@ -461,11 +461,11 @@ setup(
     ext_package = "deluge",
     ext_modules = _ext_modules,
     package_data = {"deluge": ["ui/gtkui/glade/*.glade",
-                                "data/pixmaps/*.png",
-                                "data/pixmaps/*.svg",
-                                "data/pixmaps/*.ico",
-                                "data/pixmaps/*.gif",
-                                "data/pixmaps/flags/*.png",
+                                "ui/data/pixmaps/*.png",
+                                "ui/data/pixmaps/*.svg",
+                                "ui/data/pixmaps/*.ico",
+                                "ui/data/pixmaps/*.gif",
+                                "ui/data/pixmaps/flags/*.png",
                                 "plugins/*.egg",
                                 "i18n/*.pot",
                                 "i18n/*/LC_MESSAGES/*.mo",

From c70c8ea45d44dd8379babeccd478ac992cf2546f Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Sun, 29 May 2011 12:08:55 +0100
Subject: [PATCH 315/329] Add check to key_press_event for keyname returning
 None

---
 deluge/ui/gtkui/files_tab.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index f3431ecc5..a9476caac 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -525,12 +525,11 @@ class FilesTab(Tab):
 
     def _on_key_press_event(self, widget, event):
         keyname = gtk.gdk.keyval_name(event.keyval)
-        func = getattr(self, 'keypress_' + keyname, None)
-        selected_rows = self.listview.get_selection().get_selected_rows()[1]
-        if func and selected_rows:
-            return func(event)
-        else:
-            return
+        if keyname is not None:
+            func = getattr(self, 'keypress_' + keyname, None)
+            selected_rows = self.listview.get_selection().get_selected_rows()[1]
+            if func and selected_rows:
+                return func(event)
 
     def keypress_Menu(self, event):
         self.file_menu.popup(None, None, None, 3, event.time)

From 53370e4639a360846dbdb1e2ea514a3f21a941f8 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Mon, 30 May 2011 21:33:17 +0100
Subject: [PATCH 316/329] Fix peers tab flags missing

---
 deluge/ui/gtkui/peers_tab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py
index b4a39ce55..526c496b0 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -273,7 +273,7 @@ class PeersTab(Tab):
                 self.cached_flag_pixbufs[country] = gtk.gdk.pixbuf_new_from_file(
                     pkg_resources.resource_filename(
                         "deluge",
-                         os.path.join("data", "pixmaps", "flags", country.lower() + ".png")))
+                         os.path.join("ui/data", "pixmaps", "flags", country.lower() + ".png")))
             except Exception, e:
                 log.debug("Unable to load flag: %s", e)
                 return None

From 0ba51d0e514cf03ee3b76dae81a3bde9bafa9e16 Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Mon, 30 May 2011 22:14:36 +0100
Subject: [PATCH 317/329] Fix peers tab flagsos.path.join

---
 deluge/ui/gtkui/peers_tab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py
index 526c496b0..cebf1feed 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -273,7 +273,7 @@ class PeersTab(Tab):
                 self.cached_flag_pixbufs[country] = gtk.gdk.pixbuf_new_from_file(
                     pkg_resources.resource_filename(
                         "deluge",
-                         os.path.join("ui/data", "pixmaps", "flags", country.lower() + ".png")))
+                         os.path.join("ui", "data", "pixmaps", "flags", country.lower() + ".png")))
             except Exception, e:
                 log.debug("Unable to load flag: %s", e)
                 return None

From ea438609bff982ae64e98c8484908c579495f009 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 31 May 2011 13:38:48 +0100
Subject: [PATCH 318/329] GTK UI search by torrent name filter as a "toolbar".

Now, instead of permanently having a search box to filter the visible torrents by name, we now, mimic a toolbar just for that, mapped to CTRL-F. There's also a menu item in the "View" menu and a toolbar icon to toggle it. Implemented "Match Case" for the search.
---
 deluge/core/filtermanager.py            |  17 +-
 deluge/core/torrent.py                  |  52 +-
 deluge/ui/gtkui/glade/main_window.glade | 717 ++++++++++--------------
 deluge/ui/gtkui/toolbar.py              |   4 +-
 deluge/ui/gtkui/torrentview.py          | 126 +++--
 5 files changed, 436 insertions(+), 480 deletions(-)

diff --git a/deluge/core/filtermanager.py b/deluge/core/filtermanager.py
index c52fec29b..a4fd54d8e 100644
--- a/deluge/core/filtermanager.py
+++ b/deluge/core/filtermanager.py
@@ -80,8 +80,23 @@ def filter_one_keyword(torrent_ids, keyword):
 
 def filter_by_name(torrent_ids, search_string):
     all_torrents = component.get("TorrentManager").torrents
+    try:
+        search_string, match_case = search_string[0].split('::match')
+    except ValueError:
+        search_string = search_string[0]
+        match_case = False
+
+    if match_case is False:
+        search_string = search_string.lower()
+
     for torrent_id in torrent_ids:
-        if search_string[0].lower() in all_torrents[torrent_id].filename.lower():
+        torrent_name = all_torrents[torrent_id].get_name()
+        if match_case is False:
+            torrent_name = all_torrents[torrent_id].get_name().lower()
+        else:
+            torrent_name = all_torrents[torrent_id].get_name()
+
+        if search_string in torrent_name:
             yield torrent_id
 
 def tracker_error_filter(torrent_ids, values):
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index db3952142..3c0d4ce24 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -225,6 +225,30 @@ class Torrent(object):
     def get_options(self):
         return self.options
 
+    def get_name(self):
+        if self.handle.has_metadata():
+            name = self.torrent_info.file_at(0).path.split("/", 1)[0]
+            if not name:
+                name = self.torrent_info.name()
+            try:
+                return name.decode("utf8", "ignore")
+            except UnicodeDecodeError:
+                return name
+        elif self.magnet:
+            try:
+                keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')])
+                name = keys.get('dn')
+                if not name:
+                    return self.torrent_id
+                name = unquote(name).replace('+', ' ')
+                try:
+                    return name.decode("utf8", "ignore")
+                except UnicodeDecodeError:
+                    return name
+            except:
+                pass
+        return self.torrent_id
+
     def set_owner(self, account):
         self.owner = account
 
@@ -685,32 +709,6 @@ class Torrent(object):
                     return self.torrent_info.comment()
             return ""
 
-        def ti_name():
-            if self.handle.has_metadata():
-                name = self.torrent_info.file_at(0).path.split("/", 1)[0]
-                if not name:
-                    name = self.torrent_info.name()
-                try:
-                    return name.decode("utf8", "ignore")
-                except UnicodeDecodeError:
-                    return name
-
-            elif self.magnet:
-                try:
-                    keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')])
-                    name = keys.get('dn')
-                    if not name:
-                        return self.torrent_id
-                    name = unquote(name).replace('+', ' ')
-                    try:
-                        return name.decode("utf8", "ignore")
-                    except UnicodeDecodeError:
-                        return name
-                except:
-                    pass
-
-            return self.torrent_id
-
         def ti_priv():
             if self.handle.has_metadata():
                 return self.torrent_info.priv()
@@ -742,7 +740,7 @@ class Torrent(object):
             "file_progress": self.get_file_progress,
             "files": self.get_files,
             "is_seed": self.handle.is_seed,
-            "name": ti_name,
+            "name": self.get_name,
             "num_files": ti_num_files,
             "num_pieces": ti_num_pieces,
             "pieces": ti_pieces_info,
diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index cb0db23b8..c82aaf8d3 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -38,14 +38,6 @@
                         False
                         
                         
-                        
-                          
-                            True
-                            False
-                            gtk-add
-                            1
-                          
-                        
                       
                     
                     
@@ -58,14 +50,6 @@
                         False
                         
                         
-                        
-                          
-                            True
-                            False
-                            gtk-new
-                            1
-                          
-                        
                       
                     
                     
@@ -83,14 +67,6 @@
                         False
                         
                         
-                        
-                          
-                            True
-                            False
-                            gtk-quit
-                            1
-                          
-                        
                       
                     
                     
@@ -148,14 +124,6 @@
                         False
                         
                         
-                        
-                          
-                            True
-                            False
-                            gtk-network
-                            1
-                          
-                        
                       
                     
                   
@@ -239,6 +207,18 @@
                         True
                       
                     
+                    
+                      
+                        True
+                        False
+                        False
+                        False
+                        _Find ...
+                        True
+                        
+                        
+                      
+                    
                     
                       
                         True
@@ -302,14 +282,6 @@
                         True
                         False
                         
-                        
-                          
-                            True
-                            False
-                            gtk-home
-                            1
-                          
-                        
                       
                     
                     
@@ -324,14 +296,6 @@
                         False
                         
                         
-                        
-                          
-                            True
-                            False
-                            gtk-dialog-question
-                            1
-                          
-                        
                       
                     
                     
@@ -344,15 +308,6 @@
                         True
                         False
                         
-                        
-                          
-                            True
-                            False
-                            0.4699999988079071
-                            gtk-info
-                            1
-                          
-                        
                       
                     
                     
@@ -384,217 +339,201 @@
           
         
         
-          
+          
             True
             False
             
-              
+              
                 True
+                False
                 False
-                
-                  
-                    True
-                    False
-                    False
-                    True
-                    Add torrent
-                    False
-                    Add Torrent
-                    True
-                    gtk-add
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                    False
-                    True
-                    Remove torrent
-                    False
-                    Remove Torrent
-                    gtk-remove
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                  
-                  
-                    False
-                  
-                
-                
-                  
-                    True
-                    False
-                    False
-                    True
-                    Pause the selected torrents
-                    False
-                    Pause
-                    True
-                    gtk-media-pause
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                    False
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    True
-                    Resume the selected torrents
-                    False
-                    Resume
-                    gtk-media-play
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                  
-                  
-                    False
-                  
-                
-                
-                  
-                    True
-                    False
-                    False
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    True
-                    Queue Torrent Up
-                    False
-                    Queue Up
-                    gtk-go-up
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                    False
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    True
-                    Queue Torrent Down
-                    False
-                    Queue Down
-                    gtk-go-down
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                  
-                  
-                    False
-                  
-                
-                
-                  
-                    True
-                    False
-                    True
-                    Preferences
-                    False
-                    Preferences
-                    True
-                    gtk-preferences
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-                
-                  
-                    True
-                    False
-                    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                    True
-                    Connection Manager
-                    False
-                    Connection Manager
-                    gtk-network
-                    
-                  
-                  
-                    False
-                    True
-                  
-                
-              
-              
-                True
-                True
-                0
-              
-            
-            
-              
-                True
-                True
-                Search torrents by name
-                •
-                True
-                False
-                gtk-clear
-                False
-                True
-                False
-                True
-                Clear the search
-                
-                
+                True
+                Add torrent
+                False
+                Add Torrent
+                True
+                gtk-add
+                
               
               
                 False
-                False
-                5
-                1
+                True
+              
+            
+            
+              
+                True
+                False
+                False
+                True
+                Remove torrent
+                False
+                Remove Torrent
+                gtk-remove
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+                False
+                Filter torrents by name.
+This will filter torrents for the current selection on the sidebar.
+                False
+                _Filter
+                True
+                gtk-find
+                
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+              
+              
+                False
+              
+            
+            
+              
+                True
+                False
+                False
+                True
+                Pause the selected torrents
+                False
+                Pause
+                True
+                gtk-media-pause
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                True
+                Resume the selected torrents
+                False
+                Resume
+                gtk-media-play
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+              
+              
+                False
+              
+            
+            
+              
+                True
+                False
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                True
+                Queue Torrent Up
+                False
+                Queue Up
+                gtk-go-up
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                True
+                Queue Torrent Down
+                False
+                Queue Down
+                gtk-go-down
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+              
+              
+                False
+              
+            
+            
+              
+                True
+                False
+                True
+                Preferences
+                False
+                Preferences
+                True
+                gtk-preferences
+                
+              
+              
+                False
+                True
+              
+            
+            
+              
+                True
+                False
+                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                True
+                Connection Manager
+                False
+                Connection Manager
+                gtk-network
+                
+              
+              
+                False
+                True
               
             
           
           
             False
-            False
+            True
             1
           
         
@@ -624,24 +563,130 @@
                       
                     
                     
-                      
+                      
                         True
                         False
-                        automatic
-                        automatic
-                        out
                         
-                          
+                          
+                            False
+                            
+                              
+                                True
+                                True
+                                True
+                                True
+                                Close
+                                False
+                                none
+                                
+                                
+                                  
+                                    True
+                                    False
+                                    gtk-close
+                                    2
+                                  
+                                
+                              
+                              
+                                False
+                                False
+                                0
+                              
+                            
+                            
+                              
+                                True
+                                False
+                                Filter:
+                              
+                              
+                                False
+                                False
+                                1
+                                1
+                              
+                            
+                            
+                              
+                                350
+                                True
+                                True
+                                True
+                                Filter torrents by name.
+This will filter torrents for the current selection on the sidebar.
+                                •
+                                True
+                                True
+                                False
+                                gtk-clear
+                                True
+                                True
+                                False
+                                True
+                                Clear the search
+                                Clear the search
+                                
+                                
+                              
+                              
+                                False
+                                False
+                                1
+                                2
+                              
+                            
+                            
+                              
+                                _Match Case
+                                True
+                                True
+                                False
+                                False
+                                True
+                                True
+                                
+                              
+                              
+                                True
+                                True
+                                1
+                                3
+                              
+                            
+                          
+                          
+                            False
+                            True
+                            0
+                          
+                        
+                        
+                          
                             True
                             True
-                            True
-                            False
+                            automatic
+                            automatic
+                            out
+                            
+                              
+                                True
+                                True
+                                True
+                                False
+                              
+                            
                           
+                          
+                            True
+                            True
+                            1
+                          
                         
                       
                       
                         True
-                        False
+                        True
                       
                     
                   
@@ -684,152 +729,6 @@
       
     
   
-  
-    True
-    False
-    
-      
-        gtk-open
-        True
-        False
-        False
-        True
-        True
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Expand All
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-zoom-fit
-            1
-          
-        
-      
-    
-    
-      
-        True
-        False
-      
-    
-    
-      
-        _Do Not Download
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-no
-            1
-          
-        
-      
-    
-    
-      
-        _Normal Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-yes
-            1
-          
-        
-      
-    
-    
-      
-        _High Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-go-up
-            1
-          
-        
-      
-    
-    
-      
-        Hi_ghest Priority
-        True
-        False
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-goto-top
-            1
-          
-        
-      
-    
-  
-  
-    True
-    False
-    
-      
-        _Add Peer
-        True
-        False
-        Add a peer by its IP
-        False
-        True
-        False
-        
-        
-          
-            True
-            False
-            gtk-add
-            1
-          
-        
-      
-    
-  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
diff --git a/deluge/ui/gtkui/toolbar.py b/deluge/ui/gtkui/toolbar.py
index 5099fd54d..858b7e86e 100644
--- a/deluge/ui/gtkui/toolbar.py
+++ b/deluge/ui/gtkui/toolbar.py
@@ -74,7 +74,9 @@ class ToolBar(component.Component):
             "toolbutton_pause",
             "toolbutton_resume",
             "toolbutton_queue_up",
-            "toolbutton_queue_down"
+            "toolbutton_queue_down",
+            "toolbutton_filter",
+            "find_menuitem"
         ]
 
         self.config.register_set_function("classic_mode", self._on_classic_mode, True)
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 9221d3bf7..1e90db432 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -184,6 +184,86 @@ def seed_peer_column_sort(model, iter1, iter2, data):
         return queue_peer_seed_sort_function(v2, v4)
     return queue_peer_seed_sort_function(v1, v3)
 
+class SearchBox(object):
+    def __init__(self, torrentview):
+        self.torrentview = torrentview
+        self.window = torrentview.window
+
+        self.visible = False
+        self.search_pending = None
+
+        self.search_box = self.window.main_glade.get_widget("search_box")
+        self.search_torrents_entry = self.window.main_glade.get_widget("search_torrents_entry")
+        self.close_search_button = self.window.main_glade.get_widget("close_search_button")
+        self.match_search_button = self.window.main_glade.get_widget("search_torrents_match")
+        self.window.main_glade.signal_autoconnect(self)
+
+    def show(self):
+        self.visible = True
+        self.search_box.show_all()
+
+    def hide(self):
+        self.visible = False
+        self.clear_search()
+        self.search_box.hide_all()
+
+    def clear_search(self):
+        if self.search_pending and self.search_pending.active():
+            self.search_pending.cancel()
+
+        self.search_torrents_entry.set_text("")
+        if self.torrentview.filter and 'name' in self.torrentview.filter:
+            self.torrentview.filter.pop('name', None)
+            self.search_pending = reactor.callLater(0.5, self.torrentview.update)
+
+    def set_search_filter(self):
+        if self.search_pending and self.search_pending.active():
+            self.search_pending.cancel()
+
+        if self.torrentview.filter and 'name' in self.torrentview.filter:
+            self.torrentview.filter.pop('name', None)
+
+        elif self.torrentview.filter is None:
+            self.torrentview.filter = {}
+
+        search_string = self.search_torrents_entry.get_text()
+        if not search_string:
+            self.clear_search()
+        else:
+            if self.match_search_button.get_active():
+                search_string += '::match'
+            self.torrentview.filter['name'] = search_string
+
+    def on_close_search_button_clicked(self, widget):
+        self.hide()
+
+    def on_find_menuitem_activate(self, widget):
+        if self.visible:
+            self.hide()
+        else:
+            self.show()
+
+    def on_toolbutton_filter_clicked(self, widget):
+        if self.visible:
+            self.hide()
+        else:
+            self.show()
+
+    def on_search_torrents_match_toggled(self, widget):
+        if self.search_torrents_entry.get_text():
+            self.set_search_filter()
+            self.search_pending = reactor.callLater(0.5, self.torrentview.update)
+
+    def on_search_torrents_entry_icon_press(self, entry, icon, event):
+        if icon != gtk.ENTRY_ICON_SECONDARY:
+            return
+        self.clear_search()
+
+    def on_search_torrents_entry_changed(self, widget):
+        self.set_search_filter()
+        self.search_pending = reactor.callLater(0.7, self.torrentview.update)
+
+
 class TorrentView(listview.ListView, component.Component):
     """TorrentView handles the listing of torrents."""
     def __init__(self):
@@ -272,7 +352,6 @@ class TorrentView(listview.ListView, component.Component):
 
         # Set filter to None for now
         self.filter = None
-        self.search_pending = None
 
         ### Connect Signals ###
         # Connect to the 'button-press-event' to know when to bring up the
@@ -290,15 +369,6 @@ class TorrentView(listview.ListView, component.Component):
         self.treeview.connect("key-press-event", self.on_key_press_event)
         self.treeview.connect("columns-changed", self.on_columns_changed_event)
 
-        self.search_torrents_entry = self.window.main_glade.get_widget("search_torrents_entry")
-        self.search_torrents_entry.connect(
-            "icon-press", self.on_search_torrents_entry_icon_press
-        )
-        self.search_torrents_entry.connect(
-            "changed", self.on_search_torrents_entry_changed
-        )
-
-
         client.register_event_handler("TorrentStateChangedEvent", self.on_torrentstatechanged_event)
         client.register_event_handler("TorrentAddedEvent", self.on_torrentadded_event)
         client.register_event_handler("TorrentRemovedEvent", self.on_torrentremoved_event)
@@ -306,6 +376,8 @@ class TorrentView(listview.ListView, component.Component):
         client.register_event_handler("SessionResumedEvent", self.on_sessionresumed_event)
         client.register_event_handler("TorrentQueueChangedEvent", self.on_torrentqueuechanged_event)
 
+        self.search_box = SearchBox(self)
+
     def start(self):
         """Start the torrentview"""
         # We need to get the core session state to know which torrents are in
@@ -332,7 +404,7 @@ class TorrentView(listview.ListView, component.Component):
         self.liststore.clear()
         self.prev_status = {}
         self.filter = None
-        self.search_torrents_entry.set_text("")
+        self.search_box.hide()
 
     def shutdown(self):
         """Called when GtkUi is exiting"""
@@ -396,7 +468,7 @@ class TorrentView(listview.ListView, component.Component):
 
     def update(self):
         if self.got_state:
-            if self.search_pending is not None and self.search_pending.active():
+            if self.search_box.search_pending is not None and self.search_box.search_pending.active():
                 # An update request is scheduled, let's wait for that one
                 return
             # Send a status request
@@ -620,33 +692,3 @@ class TorrentView(listview.ListView, component.Component):
         torrentmenu = component.get("MenuBar").torrentmenu
         torrentmenu.popup(None, None, None, 3, event.time)
         return True
-
-    def on_search_torrents_entry_icon_press(self, entry, icon, event):
-        if icon != gtk.ENTRY_ICON_SECONDARY:
-            return
-
-        if self.search_pending and self.search_pending.active():
-            self.search_pending.cancel()
-
-        entry.set_text("")
-        if self.filter and 'name' in self.filter:
-            self.filter.pop('name', None)
-            self.search_pending = reactor.callLater(0.7, self.update)
-
-    def on_search_torrents_entry_changed(self, widget):
-        search_string = widget.get_text().lower()
-
-        if self.search_pending and self.search_pending.active():
-            self.search_pending.cancel()
-
-        if not search_string:
-            if self.filter and 'name' in self.filter:
-                self.filter.pop('name', None)
-                self.search_pending = reactor.callLater(0.7, self.update)
-            return
-
-        if self.filter is None:
-            self.filter = {}
-
-        self.filter['name'] = search_string
-        self.search_pending = reactor.callLater(0.7, self.update)

From b521b3065be1b725c5d851cab73ac4d7991b64f1 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 31 May 2011 14:36:05 +0100
Subject: [PATCH 319/329] GTK UI search box pre-filter implementation.

Implement a pre-filter for the search-box which will filter the currently visible torrents while waiting for the filter request to sent to the demon. This will make the searches seem way faster :)
---
 deluge/ui/gtkui/glade/main_window.glade |  4 +-
 deluge/ui/gtkui/torrentview.py          | 57 +++++++++++++++++++++----
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index c82aaf8d3..d21dc52de 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -215,7 +215,7 @@
                         False
                         _Find ...
                         True
-                        
+                        
                         
                       
                     
@@ -388,7 +388,7 @@ This will filter torrents for the current selection on the sidebar.
                 _Filter
                 True
                 gtk-find
-                
+                
                 
               
               
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 1e90db432..b687326a1 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -190,7 +190,7 @@ class SearchBox(object):
         self.window = torrentview.window
 
         self.visible = False
-        self.search_pending = None
+        self.search_pending = self.prefiltered = None
 
         self.search_box = self.window.main_glade.get_widget("search_box")
         self.search_torrents_entry = self.window.main_glade.get_widget("search_torrents_entry")
@@ -206,11 +206,14 @@ class SearchBox(object):
         self.visible = False
         self.clear_search()
         self.search_box.hide_all()
+        self.search_pending = self.prefiltered = None
 
     def clear_search(self):
         if self.search_pending and self.search_pending.active():
             self.search_pending.cancel()
 
+        self.prefiltered = None
+
         self.search_torrents_entry.set_text("")
         if self.torrentview.filter and 'name' in self.torrentview.filter:
             self.torrentview.filter.pop('name', None)
@@ -233,17 +236,51 @@ class SearchBox(object):
             if self.match_search_button.get_active():
                 search_string += '::match'
             self.torrentview.filter['name'] = search_string
+        self.prefilter_torrentview()
+
+    def prefilter_torrentview(self):
+        filter_column = self.torrentview.columns["filter"].column_indices[0]
+        torrent_id_column = self.torrentview.columns["torrent_id"].column_indices[0]
+        torrent_name_column = self.torrentview.columns[_("Name")].column_indices[1]
+
+        match_case = self.match_search_button.get_active()
+        if match_case:
+            search_string = self.search_torrents_entry.get_text()
+        else:
+            search_string = self.search_torrents_entry.get_text().lower()
+
+        if self.prefiltered is None:
+            self.prefiltered = []
+
+        for row in self.torrentview.liststore:
+            torrent_id = row[torrent_id_column]
+
+            if torrent_id in self.prefiltered:
+                # Reset to previous filter state
+                self.prefiltered.pop(self.prefiltered.index(torrent_id))
+                row[filter_column] = not row[filter_column]
+
+
+            if not row[filter_column]:
+                # Row is not visible(filtered out, but not by our filter), skip it
+                continue
+
+            if match_case:
+                torrent_name = row[torrent_name_column]
+            else:
+                torrent_name = row[torrent_name_column].lower()
+
+            if search_string in torrent_name and not row[filter_column]:
+                row[filter_column] = True
+                self.prefiltered.append(torrent_id)
+            elif search_string not in torrent_name and row[filter_column]:
+                row[filter_column] = False
+                self.prefiltered.append(torrent_id)
 
     def on_close_search_button_clicked(self, widget):
         self.hide()
 
-    def on_find_menuitem_activate(self, widget):
-        if self.visible:
-            self.hide()
-        else:
-            self.show()
-
-    def on_toolbutton_filter_clicked(self, widget):
+    def on_search_filter_toggle(self, widget):
         if self.visible:
             self.hide()
         else:
@@ -252,7 +289,7 @@ class SearchBox(object):
     def on_search_torrents_match_toggled(self, widget):
         if self.search_torrents_entry.get_text():
             self.set_search_filter()
-            self.search_pending = reactor.callLater(0.5, self.torrentview.update)
+            self.search_pending = reactor.callLater(0.7, self.torrentview.update)
 
     def on_search_torrents_entry_icon_press(self, entry, icon, event):
         if icon != gtk.ENTRY_ICON_SECONDARY:
@@ -517,6 +554,8 @@ class TorrentView(listview.ListView, component.Component):
         """Callback function for get_torrents_status().  'status' should be a
         dictionary of {torrent_id: {key, value}}."""
         self.status = status
+        if self.search_box.prefiltered is not None:
+            self.search_box.prefiltered = None
         if self.status == self.prev_status and self.prev_status:
             # We do not bother updating since the status hasn't changed
             self.prev_status = self.status

From f14de6553ac4e2af93f03de141124e2ba5303d47 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Tue, 31 May 2011 15:20:15 +0100
Subject: [PATCH 320/329] GTK UI search box grab_focus() on show.

---
 deluge/ui/gtkui/torrentview.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index b687326a1..42e11b590 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -201,6 +201,7 @@ class SearchBox(object):
     def show(self):
         self.visible = True
         self.search_box.show_all()
+        self.search_torrents_entry.grab_focus()
 
     def hide(self):
         self.visible = False

From a96aeed706253d81a93d5b515c9baac2f1987863 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Tue, 31 May 2011 09:56:23 -0700
Subject: [PATCH 321/329] Fix #1869: Set the disk io read/write to bypass OS
 cache in Windows as suggested in
 http://code.google.com/p/libtorrent/issues/detail?id=166

---
 deluge/core/core.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 6b8cd3d74..1cd3e3cc3 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -94,6 +94,11 @@ class Core(component.Component):
 
         # Set session settings
         self.settings.send_redundant_have = True
+        if deluge.common.windows_check():
+            self.settings.disk_io_write_mode = \
+                lt.io_buffer_mode_t.disable_os_cache_for_aligned_files
+            self.settings.disk_io_read_mode = \
+                lt.io_buffer_mode_t.disable_os_cache_for_aligned_files
         self.session.set_settings(self.settings)
 
         # Load metadata extension

From bb981127db1a3e23f8307dc34862a9152e800d89 Mon Sep 17 00:00:00 2001
From: Damien Churchill 
Date: Wed, 1 Jun 2011 20:29:38 +0100
Subject: [PATCH 322/329] spaces FTW

---
 .../web/js/deluge-all/AddConnectionWindow.js  | 152 ++--
 .../ui/web/js/deluge-all/AddTrackerWindow.js  |  98 +--
 deluge/ui/web/js/deluge-all/Client.js         | 302 ++++----
 .../ui/web/js/deluge-all/ConnectionManager.js | 622 +++++++--------
 deluge/ui/web/js/deluge-all/Deluge.js         | 206 ++---
 .../ui/web/js/deluge-all/EditTrackerWindow.js | 106 +--
 .../web/js/deluge-all/EditTrackersWindow.js   | 330 ++++----
 deluge/ui/web/js/deluge-all/EventsManager.js  | 134 ++--
 deluge/ui/web/js/deluge-all/FileBrowser.js    |  44 +-
 deluge/ui/web/js/deluge-all/FilterPanel.js    | 218 +++---
 deluge/ui/web/js/deluge-all/Formatters.js     | 214 +++---
 deluge/ui/web/js/deluge-all/Keys.js           |  42 +-
 deluge/ui/web/js/deluge-all/LoginWindow.js    | 236 +++---
 deluge/ui/web/js/deluge-all/Menus.js          | 460 +++++------
 deluge/ui/web/js/deluge-all/MoveStorage.js    | 120 +--
 .../web/js/deluge-all/MultiOptionsManager.js  | 324 ++++----
 deluge/ui/web/js/deluge-all/OptionsManager.js | 446 +++++------
 .../ui/web/js/deluge-all/OtherLimitWindow.js  | 108 +--
 deluge/ui/web/js/deluge-all/Plugin.js         | 154 ++--
 deluge/ui/web/js/deluge-all/RemoveWindow.js   |  90 +--
 deluge/ui/web/js/deluge-all/Sidebar.js        | 206 ++---
 deluge/ui/web/js/deluge-all/Statusbar.js      | 548 ++++++-------
 deluge/ui/web/js/deluge-all/StatusbarMenu.js  |  56 +-
 deluge/ui/web/js/deluge-all/Toolbar.js        | 304 ++++----
 deluge/ui/web/js/deluge-all/TorrentGrid.js    | 618 ++++++++-------
 deluge/ui/web/js/deluge-all/UI.js             | 398 +++++-----
 deluge/ui/web/js/deluge-all/add/AddWindow.js  | 348 ++++-----
 deluge/ui/web/js/deluge-all/add/FileWindow.js | 148 ++--
 deluge/ui/web/js/deluge-all/add/FilesTab.js   | 134 ++--
 .../ui/web/js/deluge-all/add/OptionsPanel.js  | 218 +++---
 deluge/ui/web/js/deluge-all/add/OptionsTab.js | 270 +++----
 deluge/ui/web/js/deluge-all/add/Window.js     |   6 +-
 .../ui/web/js/deluge-all/data/PeerRecord.js   |  46 +-
 deluge/ui/web/js/deluge-all/data/SortTypes.js |  14 +-
 .../web/js/deluge-all/data/TorrentRecord.js   |  96 +--
 .../web/js/deluge-all/details/DetailsPanel.js | 130 ++--
 .../web/js/deluge-all/details/DetailsTab.js   | 182 ++---
 .../ui/web/js/deluge-all/details/FilesTab.js  | 366 ++++-----
 .../web/js/deluge-all/details/OptionsTab.js   | 686 ++++++++---------
 .../ui/web/js/deluge-all/details/PeersTab.js  | 212 ++---
 .../ui/web/js/deluge-all/details/StatusTab.js | 170 ++--
 .../deluge-all/preferences/BandwidthPage.js   | 270 +++----
 .../js/deluge-all/preferences/CachePage.js    |  68 +-
 .../js/deluge-all/preferences/DaemonPage.js   | 112 +--
 .../deluge-all/preferences/DownloadsPage.js   | 208 ++---
 .../deluge-all/preferences/EncryptionPage.js  | 148 ++--
 .../preferences/InstallPluginWindow.js        | 116 +--
 .../deluge-all/preferences/InterfacePage.js   | 428 +++++------
 .../js/deluge-all/preferences/NetworkPage.js  | 380 ++++-----
 .../js/deluge-all/preferences/OtherPage.js    | 138 ++--
 .../js/deluge-all/preferences/PluginsPage.js  | 410 +++++-----
 .../preferences/PreferencesWindow.js          | 378 ++++-----
 .../js/deluge-all/preferences/ProxyField.js   | 222 +++---
 .../js/deluge-all/preferences/ProxyPage.js    | 120 +--
 .../js/deluge-all/preferences/QueuePage.js    | 324 ++++----
 deluge/ui/web/js/ext-extensions/JSLoader.js   |  62 +-
 deluge/ui/web/js/ext-extensions/Spinner.js    | 726 +++++++++---------
 deluge/ui/web/js/ext-extensions/StatusBar.js  |  30 +-
 .../js/ext-extensions/form/RadioGroupFix.js   |  48 +-
 .../js/ext-extensions/form/SpinnerField.js    |  64 +-
 .../js/ext-extensions/form/SpinnerFieldFix.js |   2 +-
 .../js/ext-extensions/form/SpinnerGroup.js    |  56 +-
 .../web/js/ext-extensions/form/ToggleField.js |  80 +-
 .../web/js/ext-extensions/grid/BufferView.js  | 368 ++++-----
 .../js/ext-extensions/layout/FormLayoutFix.js |  38 +-
 .../tree/MultiSelectionModelFix.js            |  92 +--
 .../tree/TreeGridColumnResizer.js             |   4 +-
 .../ext-extensions/tree/TreeGridNodeUIFix.js  |  30 +-
 .../tree/TreeGridRenderColumn.js              |  14 +-
 .../js/ext-extensions/tree/TreeGridSorter.js  |  14 +-
 70 files changed, 7268 insertions(+), 7244 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/AddConnectionWindow.js b/deluge/ui/web/js/deluge-all/AddConnectionWindow.js
index 417363948..67e15b6d5 100644
--- a/deluge/ui/web/js/deluge-all/AddConnectionWindow.js
+++ b/deluge/ui/web/js/deluge-all/AddConnectionWindow.js
@@ -37,86 +37,86 @@ Ext.ns('Deluge');
  */
 Deluge.AddConnectionWindow = Ext.extend(Ext.Window, {
 
-	title: _('Add Connection'),
-	iconCls: 'x-deluge-add-window-icon',
+    title: _('Add Connection'),
+    iconCls: 'x-deluge-add-window-icon',
 
-	layout: 'fit',
-	width:  300,
-	height: 195,
+    layout: 'fit',
+    width:  300,
+    height: 195,
 
-	bodyStyle: 'padding: 10px 5px;',
-	closeAction: 'hide',
+    bodyStyle: 'padding: 10px 5px;',
+    closeAction: 'hide',
 
-	initComponent: function() {
-		Deluge.AddConnectionWindow.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.AddConnectionWindow.superclass.initComponent.call(this);
 
-		this.addEvents('hostadded');
-	
-		this.addButton(_('Close'), this.hide, this);
-		this.addButton(_('Add'), this.onAddClick, this);
-	
-		this.on('hide', this.onHide, this);
-	
-		this.form = this.add({
-			xtype: 'form',
-			defaultType: 'textfield',
-			baseCls: 'x-plain',
-			labelWidth: 60,
-			items: [{
-				fieldLabel: _('Host'),
-				name: 'host',
-				anchor: '75%',
-				value: ''
-			}, {
-				xtype: 'spinnerfield',
-				fieldLabel: _('Port'),
-				name: 'port',
-				strategy: {
-					xtype: 'number',
-					decimalPrecision: 0,
-					minValue: -1,
-					maxValue: 65535
-				},
-				value: '58846',
-				anchor: '40%'
-			}, {
-				fieldLabel: _('Username'),
-				name: 'username',
-				anchor: '75%',
-				value: ''
-			}, {
-				fieldLabel: _('Password'),
-				anchor: '75%',
-				name: 'password',
-				inputType: 'password',
-				value: ''
-			}]
-		});
-	},
+        this.addEvents('hostadded');
+    
+        this.addButton(_('Close'), this.hide, this);
+        this.addButton(_('Add'), this.onAddClick, this);
+    
+        this.on('hide', this.onHide, this);
+    
+        this.form = this.add({
+            xtype: 'form',
+            defaultType: 'textfield',
+            baseCls: 'x-plain',
+            labelWidth: 60,
+            items: [{
+                fieldLabel: _('Host'),
+                name: 'host',
+                anchor: '75%',
+                value: ''
+            }, {
+                xtype: 'spinnerfield',
+                fieldLabel: _('Port'),
+                name: 'port',
+                strategy: {
+                    xtype: 'number',
+                    decimalPrecision: 0,
+                    minValue: -1,
+                    maxValue: 65535
+                },
+                value: '58846',
+                anchor: '40%'
+            }, {
+                fieldLabel: _('Username'),
+                name: 'username',
+                anchor: '75%',
+                value: ''
+            }, {
+                fieldLabel: _('Password'),
+                anchor: '75%',
+                name: 'password',
+                inputType: 'password',
+                value: ''
+            }]
+        });
+    },
 
-	onAddClick: function() {
-		var values = this.form.getForm().getValues();
-		deluge.client.web.add_host(values.host, values.port, values.username, values.password, {
-			success: function(result) {
-				if (!result[0]) {
-					Ext.MessageBox.show({
-						title: _('Error'),
-						msg: "Unable to add host: " + result[1],
-						buttons: Ext.MessageBox.OK,
-						modal: false,
-						icon: Ext.MessageBox.ERROR,
-						iconCls: 'x-deluge-icon-error'
-					});
-				} else {
-					this.fireEvent('hostadded');
-				}
-				this.hide();
-			},
-			scope: this
-		});
-	},
+    onAddClick: function() {
+        var values = this.form.getForm().getValues();
+        deluge.client.web.add_host(values.host, values.port, values.username, values.password, {
+            success: function(result) {
+                if (!result[0]) {
+                    Ext.MessageBox.show({
+                        title: _('Error'),
+                        msg: "Unable to add host: " + result[1],
+                        buttons: Ext.MessageBox.OK,
+                        modal: false,
+                        icon: Ext.MessageBox.ERROR,
+                        iconCls: 'x-deluge-icon-error'
+                    });
+                } else {
+                    this.fireEvent('hostadded');
+                }
+                this.hide();
+            },
+            scope: this
+        });
+    },
 
-	onHide: function() {
-		this.form.getForm().reset();
-	}
+    onHide: function() {
+        this.form.getForm().reset();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/AddTrackerWindow.js b/deluge/ui/web/js/deluge-all/AddTrackerWindow.js
index 4d3081d19..a921ec2cc 100644
--- a/deluge/ui/web/js/deluge-all/AddTrackerWindow.js
+++ b/deluge/ui/web/js/deluge-all/AddTrackerWindow.js
@@ -36,57 +36,57 @@ Ext.ns('Deluge');
  * @extends Ext.Window
  */
 Deluge.AddTrackerWindow = Ext.extend(Ext.Window, {
-	
-	title: _('Add Tracker'),
-	layout: 'fit',
-	width: 375,
-	height: 150,
-	plain: true,
-	closable: true,
-	resizable: false,
+    
+    title: _('Add Tracker'),
+    layout: 'fit',
+    width: 375,
+    height: 150,
+    plain: true,
+    closable: true,
+    resizable: false,
 
-	bodyStyle: 'padding: 5px',
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	iconCls: 'x-deluge-edit-trackers',
+    bodyStyle: 'padding: 5px',
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    iconCls: 'x-deluge-edit-trackers',
 
-	initComponent: function() {
-		Deluge.AddTrackerWindow.superclass.initComponent.call(this);
-	
-		this.addButton(_('Cancel'), this.onCancelClick, this);
-		this.addButton(_('Add'), this.onAddClick, this);
-		this.addEvents('add');
-	
-		this.form = this.add({
-			xtype: 'form',
-			defaultType: 'textarea',
-			baseCls: 'x-plain',
-			labelWidth: 55,
-			items: [{
-				fieldLabel: _('Trackers'),
-				name: 'trackers',
-				anchor: '100%'
-			}]
-		})
-	},
+    initComponent: function() {
+        Deluge.AddTrackerWindow.superclass.initComponent.call(this);
+    
+        this.addButton(_('Cancel'), this.onCancelClick, this);
+        this.addButton(_('Add'), this.onAddClick, this);
+        this.addEvents('add');
+    
+        this.form = this.add({
+            xtype: 'form',
+            defaultType: 'textarea',
+            baseCls: 'x-plain',
+            labelWidth: 55,
+            items: [{
+                fieldLabel: _('Trackers'),
+                name: 'trackers',
+                anchor: '100%'
+            }]
+        })
+    },
 
-	onAddClick: function() {
-		var trackers = this.form.getForm().findField('trackers').getValue();
-		trackers = trackers.split('\n');
-	
-		var cleaned = [];
-		Ext.each(trackers, function(tracker) {
-			if (Ext.form.VTypes.url(tracker)) {
-				cleaned.push(tracker);
-			}
-		}, this);
-		this.fireEvent('add', cleaned);
-		this.hide();
-		this.form.getForm().findField('trackers').setValue('');
-	},
+    onAddClick: function() {
+        var trackers = this.form.getForm().findField('trackers').getValue();
+        trackers = trackers.split('\n');
+    
+        var cleaned = [];
+        Ext.each(trackers, function(tracker) {
+            if (Ext.form.VTypes.url(tracker)) {
+                cleaned.push(tracker);
+            }
+        }, this);
+        this.fireEvent('add', cleaned);
+        this.hide();
+        this.form.getForm().findField('trackers').setValue('');
+    },
 
-	onCancelClick: function() {
-		this.form.getForm().findField('trackers').setValue('');
-		this.hide();
-	}
+    onCancelClick: function() {
+        this.form.getForm().findField('trackers').setValue('');
+        this.hide();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Client.js b/deluge/ui/web/js/deluge-all/Client.js
index 4483f34c8..658cf7127 100644
--- a/deluge/ui/web/js/deluge-all/Client.js
+++ b/deluge/ui/web/js/deluge-all/Client.js
@@ -39,157 +39,157 @@ Ext.namespace('Ext.ux.util');
  */
 Ext.ux.util.RpcClient = Ext.extend(Ext.util.Observable, {
 
-	_components: [],
-	
-	_methods: [],
-	
-	_requests: {},
-	
-	_url: null,
-	
-	_optionKeys: ['scope', 'success', 'failure'],
-	
-	constructor: function(config) {
-		Ext.ux.util.RpcClient.superclass.constructor.call(this, config);
-		this._url = config.url || null;
-		this._id = 0;
-		
-		this.addEvents(
-			// raw events
-			/**
-			 * @event connected
-			 * Fires when the client has retrieved the list of methods from the server.
-			 * @param {Ext.ux.util.RpcClient} this
-			 */
-			 'connected',
-			 
-			 'error'
-		);
-		this.reloadMethods();
-	},
-	
-	reloadMethods: function() {
-		Ext.each(this._components, function(component) {
-			delete this[component];
-		}, this);
-		this._execute('system.listMethods', {
-			success: this._setMethods,
-			scope: this
-		});
-	},
+    _components: [],
+    
+    _methods: [],
+    
+    _requests: {},
+    
+    _url: null,
+    
+    _optionKeys: ['scope', 'success', 'failure'],
+    
+    constructor: function(config) {
+        Ext.ux.util.RpcClient.superclass.constructor.call(this, config);
+        this._url = config.url || null;
+        this._id = 0;
+        
+        this.addEvents(
+            // raw events
+            /**
+             * @event connected
+             * Fires when the client has retrieved the list of methods from the server.
+             * @param {Ext.ux.util.RpcClient} this
+             */
+             'connected',
+             
+             'error'
+        );
+        this.reloadMethods();
+    },
+    
+    reloadMethods: function() {
+        Ext.each(this._components, function(component) {
+            delete this[component];
+        }, this);
+        this._execute('system.listMethods', {
+            success: this._setMethods,
+            scope: this
+        });
+    },
 
-	_execute: function(method, options) {
-		options = options || {};
-		options.params = options.params || [];
-		options.id = this._id;
-		
-		var request = Ext.encode({
-			method: method,
-			params: options.params,
-			id: options.id
-		});
-		this._id++;
-		
-		return Ext.Ajax.request({
-			url: this._url,
-			method: 'POST',
-			success: this._onSuccess,
-			failure: this._onFailure,
-			scope: this,
-			jsonData: request,
-			options: options
-		});
-	},
-	
-	_onFailure: function(response, requestOptions) {
-		var options = requestOptions.options;
-		errorObj = {
-			id: options.id,
-			result: null,
-			error: {
-				msg: 'HTTP: ' + response.status + ' ' + response.statusText,
-				code: 255
-			}
-		}
-		
-		this.fireEvent('error', errorObj, response, requestOptions)
-		
-		if (Ext.type(options.failure) != 'function') return;
-		if (options.scope) {
-			options.failure.call(options.scope, errorObj, response, requestOptions);
-		} else {
-			options.failure(errorObj, response, requestOptions);
-		}            
-	},
-	
-	_onSuccess: function(response, requestOptions) {
-		var responseObj = Ext.decode(response.responseText);
-		var options = requestOptions.options;
-		if (responseObj.error) {
-			this.fireEvent('error', responseObj, response, requestOptions);
-			
-			if (Ext.type(options.failure) != 'function') return;
-			if (options.scope) {
-				options.failure.call(options.scope, responseObj, response, requestOptions);
-			} else {
-				options.failure(responseObj, response, requestOptions);
-			}
-		} else {
-			if (Ext.type(options.success) != 'function') return;
-			if (options.scope) {
-				options.success.call(options.scope, responseObj.result, responseObj, response, requestOptions);
-			} else {
-				options.success(responseObj.result, responseObj, response, requestOptions);
-			}
-		}
-	},
-	
-	_parseArgs: function(args) {
-		var params = [];
-		Ext.each(args, function(arg) {
-			params.push(arg);
-		});
-		
-		var options = params[params.length - 1];
-		if (Ext.type(options) == 'object') {
-			var keys = Ext.keys(options), isOption = false;
-			
-			Ext.each(this._optionKeys, function(key) {
-				if (keys.indexOf(key) > -1) isOption = true;
-			});
-			
-			if (isOption) {
-				params.remove(options)
-			} else {
-				options = {}
-			}
-		} else {
-			options = {}
-		}
-		options.params = params;
-		return options;
-	},
+    _execute: function(method, options) {
+        options = options || {};
+        options.params = options.params || [];
+        options.id = this._id;
+        
+        var request = Ext.encode({
+            method: method,
+            params: options.params,
+            id: options.id
+        });
+        this._id++;
+        
+        return Ext.Ajax.request({
+            url: this._url,
+            method: 'POST',
+            success: this._onSuccess,
+            failure: this._onFailure,
+            scope: this,
+            jsonData: request,
+            options: options
+        });
+    },
+    
+    _onFailure: function(response, requestOptions) {
+        var options = requestOptions.options;
+        errorObj = {
+            id: options.id,
+            result: null,
+            error: {
+                msg: 'HTTP: ' + response.status + ' ' + response.statusText,
+                code: 255
+            }
+        }
+        
+        this.fireEvent('error', errorObj, response, requestOptions)
+        
+        if (Ext.type(options.failure) != 'function') return;
+        if (options.scope) {
+            options.failure.call(options.scope, errorObj, response, requestOptions);
+        } else {
+            options.failure(errorObj, response, requestOptions);
+        }            
+    },
+    
+    _onSuccess: function(response, requestOptions) {
+        var responseObj = Ext.decode(response.responseText);
+        var options = requestOptions.options;
+        if (responseObj.error) {
+            this.fireEvent('error', responseObj, response, requestOptions);
+            
+            if (Ext.type(options.failure) != 'function') return;
+            if (options.scope) {
+                options.failure.call(options.scope, responseObj, response, requestOptions);
+            } else {
+                options.failure(responseObj, response, requestOptions);
+            }
+        } else {
+            if (Ext.type(options.success) != 'function') return;
+            if (options.scope) {
+                options.success.call(options.scope, responseObj.result, responseObj, response, requestOptions);
+            } else {
+                options.success(responseObj.result, responseObj, response, requestOptions);
+            }
+        }
+    },
+    
+    _parseArgs: function(args) {
+        var params = [];
+        Ext.each(args, function(arg) {
+            params.push(arg);
+        });
+        
+        var options = params[params.length - 1];
+        if (Ext.type(options) == 'object') {
+            var keys = Ext.keys(options), isOption = false;
+            
+            Ext.each(this._optionKeys, function(key) {
+                if (keys.indexOf(key) > -1) isOption = true;
+            });
+            
+            if (isOption) {
+                params.remove(options)
+            } else {
+                options = {}
+            }
+        } else {
+            options = {}
+        }
+        options.params = params;
+        return options;
+    },
 
-	_setMethods: function(methods) {
-		var components = {}, self = this;
-		
-		Ext.each(methods, function(method) {
-			var parts = method.split('.');
-			var component = components[parts[0]] || {};
-			
-			var fn = function() {
-				var options = self._parseArgs(arguments);
-				return self._execute(method, options);
-			}
-			component[parts[1]] = fn;
-			components[parts[0]] = component;
-		});
-		
-		for (var name in components) {
-			self[name] = components[name];
-		}
-		
-		this._components = Ext.keys(components);
-		this.fireEvent('connected', this);
-	}
+    _setMethods: function(methods) {
+        var components = {}, self = this;
+        
+        Ext.each(methods, function(method) {
+            var parts = method.split('.');
+            var component = components[parts[0]] || {};
+            
+            var fn = function() {
+                var options = self._parseArgs(arguments);
+                return self._execute(method, options);
+            }
+            component[parts[1]] = fn;
+            components[parts[0]] = component;
+        });
+        
+        for (var name in components) {
+            self[name] = components[name];
+        }
+        
+        this._components = Ext.keys(components);
+        this.fireEvent('connected', this);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/ConnectionManager.js b/deluge/ui/web/js/deluge-all/ConnectionManager.js
index c7f8121b9..f3d44e70d 100644
--- a/deluge/ui/web/js/deluge-all/ConnectionManager.js
+++ b/deluge/ui/web/js/deluge-all/ConnectionManager.js
@@ -32,345 +32,345 @@
 
 Deluge.ConnectionManager = Ext.extend(Ext.Window, {
 
-	layout: 'fit',
-	width: 300,
-	height: 220,
-	bodyStyle: 'padding: 10px 5px;',
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	closable: true,
-	plain: true,
-	title: _('Connection Manager'),
-	iconCls: 'x-deluge-connect-window-icon',
+    layout: 'fit',
+    width: 300,
+    height: 220,
+    bodyStyle: 'padding: 10px 5px;',
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    closable: true,
+    plain: true,
+    title: _('Connection Manager'),
+    iconCls: 'x-deluge-connect-window-icon',
 
-	initComponent: function() {
-		Deluge.ConnectionManager.superclass.initComponent.call(this);
-		this.on('hide',  this.onHide, this);
-		this.on('show', this.onShow, this);
+    initComponent: function() {
+        Deluge.ConnectionManager.superclass.initComponent.call(this);
+        this.on('hide',  this.onHide, this);
+        this.on('show', this.onShow, this);
 
-		deluge.events.on('login', this.onLogin, this);
-		deluge.events.on('logout', this.onLogout, this);
+        deluge.events.on('login', this.onLogin, this);
+        deluge.events.on('logout', this.onLogout, this);
 
-		this.addButton(_('Close'), this.onClose, this);
-		this.addButton(_('Connect'), this.onConnect, this);
+        this.addButton(_('Close'), this.onClose, this);
+        this.addButton(_('Connect'), this.onConnect, this);
 
-		this.list = new Ext.list.ListView({
-			store: new Ext.data.ArrayStore({
-				fields: [
-					{name: 'status', mapping: 3},
-					{name: 'host', mapping: 1},
-					{name: 'port', mapping: 2},
-					{name: 'version', mapping: 4}
-				],
-				id: 0
-			}),
-			columns: [{
-				header: _('Status'),
-				width: .24,
-				sortable: true,
-				dataIndex: 'status'
-			}, {
-				id:'host',
-				header: _('Host'),
-				width: .51,
-				sortable: true,
-				tpl: '{host}:{port}',
-				dataIndex: 'host'
-			}, {
-				header: _('Version'),
-				width: .25,
-				sortable: true,
-				tpl: '{version}',
-				dataIndex: 'version'
-			}],
-			singleSelect: true,
-			listeners: {
-				'selectionchange': {fn: this.onSelectionChanged, scope: this}
-			}
-		});
+        this.list = new Ext.list.ListView({
+            store: new Ext.data.ArrayStore({
+                fields: [
+                    {name: 'status', mapping: 3},
+                    {name: 'host', mapping: 1},
+                    {name: 'port', mapping: 2},
+                    {name: 'version', mapping: 4}
+                ],
+                id: 0
+            }),
+            columns: [{
+                header: _('Status'),
+                width: .24,
+                sortable: true,
+                dataIndex: 'status'
+            }, {
+                id:'host',
+                header: _('Host'),
+                width: .51,
+                sortable: true,
+                tpl: '{host}:{port}',
+                dataIndex: 'host'
+            }, {
+                header: _('Version'),
+                width: .25,
+                sortable: true,
+                tpl: '{version}',
+                dataIndex: 'version'
+            }],
+            singleSelect: true,
+            listeners: {
+                'selectionchange': {fn: this.onSelectionChanged, scope: this}
+            }
+        });
 
-		this.panel = this.add({
-			autoScroll: true,
-			items: [this.list],
-			bbar: new Ext.Toolbar({
-				buttons: [
-					{
-						id: 'cm-add',
-						cls: 'x-btn-text-icon',
-						text: _('Add'),
-						iconCls: 'icon-add',
-						handler: this.onAddClick,
-						scope: this
-					}, {
-						id: 'cm-remove',
-						cls: 'x-btn-text-icon',
-						text: _('Remove'),
-						iconCls: 'icon-remove',
-						handler: this.onRemoveClick,
-						disabled: true,
-						scope: this
-					}, '->', {
-						id: 'cm-stop',
-						cls: 'x-btn-text-icon',
-						text: _('Stop Daemon'),
-						iconCls: 'icon-error',
-						handler: this.onStopClick,
-						disabled: true,
-						scope: this
-					}
-				]
-			})
-		});
-		this.update = this.update.createDelegate(this);
-	},
+        this.panel = this.add({
+            autoScroll: true,
+            items: [this.list],
+            bbar: new Ext.Toolbar({
+                buttons: [
+                    {
+                        id: 'cm-add',
+                        cls: 'x-btn-text-icon',
+                        text: _('Add'),
+                        iconCls: 'icon-add',
+                        handler: this.onAddClick,
+                        scope: this
+                    }, {
+                        id: 'cm-remove',
+                        cls: 'x-btn-text-icon',
+                        text: _('Remove'),
+                        iconCls: 'icon-remove',
+                        handler: this.onRemoveClick,
+                        disabled: true,
+                        scope: this
+                    }, '->', {
+                        id: 'cm-stop',
+                        cls: 'x-btn-text-icon',
+                        text: _('Stop Daemon'),
+                        iconCls: 'icon-error',
+                        handler: this.onStopClick,
+                        disabled: true,
+                        scope: this
+                    }
+                ]
+            })
+        });
+        this.update = this.update.createDelegate(this);
+    },
 
-	/**
-	 * Check to see if the the web interface is currently connected
-	 * to a Deluge Daemon and show the Connection Manager if not.
-	 */
-	checkConnected: function() {
-		deluge.client.web.connected({
-			success: function(connected) {
-				if (connected) {
-					deluge.events.fire('connect');
-				} else {
-					this.show();
-				}
-			},
-			scope: this
-		});
-	},
+    /**
+     * Check to see if the the web interface is currently connected
+     * to a Deluge Daemon and show the Connection Manager if not.
+     */
+    checkConnected: function() {
+        deluge.client.web.connected({
+            success: function(connected) {
+                if (connected) {
+                    deluge.events.fire('connect');
+                } else {
+                    this.show();
+                }
+            },
+            scope: this
+        });
+    },
 
-	disconnect: function(show) {
-		deluge.events.fire('disconnect');
-		if (show) {
-			if (this.isVisible()) return;
-			this.show();
-		}
-	},
+    disconnect: function(show) {
+        deluge.events.fire('disconnect');
+        if (show) {
+            if (this.isVisible()) return;
+            this.show();
+        }
+    },
 
-	loadHosts: function() {
-		deluge.client.web.get_hosts({
-			success: this.onGetHosts,
-			scope: this
-		});
-	},
+    loadHosts: function() {
+        deluge.client.web.get_hosts({
+            success: this.onGetHosts,
+            scope: this
+        });
+    },
 
-	update: function() {
-		this.list.getStore().each(function(r) {
-			deluge.client.web.get_host_status(r.id, {
-				success: this.onGetHostStatus,
-				scope: this
-			});
-		}, this);
-	},
+    update: function() {
+        this.list.getStore().each(function(r) {
+            deluge.client.web.get_host_status(r.id, {
+                success: this.onGetHostStatus,
+                scope: this
+            });
+        }, this);
+    },
 
-	/**
-	 * Updates the buttons in the Connection Manager UI according to the
-	 * passed in records host state.
-	 * @param {Ext.data.Record} record The hosts record to update the UI for
-	 */
-	updateButtons: function(record) {
-		var button = this.buttons[1], status = record.get('status');
+    /**
+     * Updates the buttons in the Connection Manager UI according to the
+     * passed in records host state.
+     * @param {Ext.data.Record} record The hosts record to update the UI for
+     */
+    updateButtons: function(record) {
+        var button = this.buttons[1], status = record.get('status');
 
-		// Update the Connect/Disconnect button
-		if (status == _('Connected')) {
-			button.enable();
-			button.setText(_('Disconnect'));
-		} else if (status == _('Offline')) {
-			button.disable();
-		} else {
-			button.enable();
-			button.setText(_('Connect'));
-		}
+        // Update the Connect/Disconnect button
+        if (status == _('Connected')) {
+            button.enable();
+            button.setText(_('Disconnect'));
+        } else if (status == _('Offline')) {
+            button.disable();
+        } else {
+            button.enable();
+            button.setText(_('Connect'));
+        }
 
-		// Update the Stop/Start Daemon button
-		if (status == _('Offline')) {
-			if (record.get('host') == '127.0.0.1' || record.get('host') == 'localhost') {
-				this.stopHostButton.enable();
-				this.stopHostButton.setText(_('Start Daemon'));
-			} else {
-				this.stopHostButton.disable();
-			}
-		} else {
-			this.stopHostButton.enable();
-			this.stopHostButton.setText(_('Stop Daemon'));
-		}
-	},
+        // Update the Stop/Start Daemon button
+        if (status == _('Offline')) {
+            if (record.get('host') == '127.0.0.1' || record.get('host') == 'localhost') {
+                this.stopHostButton.enable();
+                this.stopHostButton.setText(_('Start Daemon'));
+            } else {
+                this.stopHostButton.disable();
+            }
+        } else {
+            this.stopHostButton.enable();
+            this.stopHostButton.setText(_('Stop Daemon'));
+        }
+    },
 
-	// private
-	onAddClick: function(button, e) {
-		if (!this.addWindow) {
-			this.addWindow = new Deluge.AddConnectionWindow();
-			this.addWindow.on('hostadded', this.onHostAdded, this);
-		}
-		this.addWindow.show();
-	},
+    // private
+    onAddClick: function(button, e) {
+        if (!this.addWindow) {
+            this.addWindow = new Deluge.AddConnectionWindow();
+            this.addWindow.on('hostadded', this.onHostAdded, this);
+        }
+        this.addWindow.show();
+    },
 
-	// private
-	onHostAdded: function() {
-		this.loadHosts();
-	},
+    // private
+    onHostAdded: function() {
+        this.loadHosts();
+    },
 
-	// private
-	onClose: function(e) {
-		this.hide();
-	},
+    // private
+    onClose: function(e) {
+        this.hide();
+    },
 
-	// private
-	onConnect: function(e) {
-		var selected = this.list.getSelectedRecords()[0];
-		if (!selected) return;
+    // private
+    onConnect: function(e) {
+        var selected = this.list.getSelectedRecords()[0];
+        if (!selected) return;
 
-		if (selected.get('status') == _('Connected')) {
-			deluge.client.web.disconnect({
-				success: function(result) {
-					this.update(this);
-					deluge.events.fire('disconnect');
-				},
-				scope: this
-			});
-		} else {
-			var id = selected.id;
-			deluge.client.web.connect(id, {
-				success: function(methods) {
-					deluge.client.reloadMethods();
-					deluge.client.on('connected', function(e) {
-						deluge.events.fire('connect');
-					}, this, {single: true});
-				}
-			});
-			this.hide();
-		}
-	},
+        if (selected.get('status') == _('Connected')) {
+            deluge.client.web.disconnect({
+                success: function(result) {
+                    this.update(this);
+                    deluge.events.fire('disconnect');
+                },
+                scope: this
+            });
+        } else {
+            var id = selected.id;
+            deluge.client.web.connect(id, {
+                success: function(methods) {
+                    deluge.client.reloadMethods();
+                    deluge.client.on('connected', function(e) {
+                        deluge.events.fire('connect');
+                    }, this, {single: true});
+                }
+            });
+            this.hide();
+        }
+    },
 
-	// private
-	onGetHosts: function(hosts) {
-		this.list.getStore().loadData(hosts);
-		Ext.each(hosts, function(host) {
-			deluge.client.web.get_host_status(host[0], {
-				success: this.onGetHostStatus,
-				scope: this
-			});
-		}, this);
-	},
+    // private
+    onGetHosts: function(hosts) {
+        this.list.getStore().loadData(hosts);
+        Ext.each(hosts, function(host) {
+            deluge.client.web.get_host_status(host[0], {
+                success: this.onGetHostStatus,
+                scope: this
+            });
+        }, this);
+    },
 
-	// private
-	onGetHostStatus: function(host) {
-		var record = this.list.getStore().getById(host[0]);
-		record.set('status', host[3])
-		record.set('version', host[4])
-		record.commit();
-		if (this.list.getSelectedRecords()[0] == record) this.updateButtons(record);
-	},
+    // private
+    onGetHostStatus: function(host) {
+        var record = this.list.getStore().getById(host[0]);
+        record.set('status', host[3])
+        record.set('version', host[4])
+        record.commit();
+        if (this.list.getSelectedRecords()[0] == record) this.updateButtons(record);
+    },
 
-	// private
-	onHide: function() {
-		if (this.running) window.clearInterval(this.running);
-	},
+    // private
+    onHide: function() {
+        if (this.running) window.clearInterval(this.running);
+    },
 
-	// private
-	onLogin: function() {
-		if (deluge.config.first_login) {
-			Ext.MessageBox.confirm('Change password',
-				'As this is your first login, we recommend that you ' +
-				'change your password. Would you like to ' +
-				'do this now?', function(res) {
-					this.checkConnected();
-					if (res == 'yes') {
-						deluge.preferences.show();
-						deluge.preferences.selectPage('Interface');
-					}
-					deluge.client.web.set_config({first_login: false});
-				}, this);
-		} else {
-			this.checkConnected();
-		}
-	},
+    // private
+    onLogin: function() {
+        if (deluge.config.first_login) {
+            Ext.MessageBox.confirm('Change password',
+                'As this is your first login, we recommend that you ' +
+                'change your password. Would you like to ' +
+                'do this now?', function(res) {
+                    this.checkConnected();
+                    if (res == 'yes') {
+                        deluge.preferences.show();
+                        deluge.preferences.selectPage('Interface');
+                    }
+                    deluge.client.web.set_config({first_login: false});
+                }, this);
+        } else {
+            this.checkConnected();
+        }
+    },
 
-	// private
-	onLogout: function() {
-		this.disconnect();
-		if (!this.hidden && this.rendered) {
-			this.hide();
-		}
-	},
+    // private
+    onLogout: function() {
+        this.disconnect();
+        if (!this.hidden && this.rendered) {
+            this.hide();
+        }
+    },
 
-	// private
-	onRemoveClick: function(button) {
-		var connection = this.list.getSelectedRecords()[0];
-		if (!connection) return;
+    // private
+    onRemoveClick: function(button) {
+        var connection = this.list.getSelectedRecords()[0];
+        if (!connection) return;
 
-		deluge.client.web.remove_host(connection.id, {
-			success: function(result) {
-				if (!result) {
-					Ext.MessageBox.show({
-						title: _('Error'),
-						msg: result[1],
-						buttons: Ext.MessageBox.OK,
-						modal: false,
-						icon: Ext.MessageBox.ERROR,
-						iconCls: 'x-deluge-icon-error'
-					});
-				} else {
-					this.list.getStore().remove(connection);
-				}
-			},
-			scope: this
-		});
-	},
+        deluge.client.web.remove_host(connection.id, {
+            success: function(result) {
+                if (!result) {
+                    Ext.MessageBox.show({
+                        title: _('Error'),
+                        msg: result[1],
+                        buttons: Ext.MessageBox.OK,
+                        modal: false,
+                        icon: Ext.MessageBox.ERROR,
+                        iconCls: 'x-deluge-icon-error'
+                    });
+                } else {
+                    this.list.getStore().remove(connection);
+                }
+            },
+            scope: this
+        });
+    },
 
-	// private
-	onSelectionChanged: function(list, selections) {
-		if (selections[0]) {
-			this.removeHostButton.enable();
-			this.stopHostButton.enable();
-			this.stopHostButton.setText(_('Stop Daemon'));
-			this.updateButtons(this.list.getRecord(selections[0]));
-		} else {
-			this.removeHostButton.disable();
-			this.stopHostButton.disable();
-		}
-	},
+    // private
+    onSelectionChanged: function(list, selections) {
+        if (selections[0]) {
+            this.removeHostButton.enable();
+            this.stopHostButton.enable();
+            this.stopHostButton.setText(_('Stop Daemon'));
+            this.updateButtons(this.list.getRecord(selections[0]));
+        } else {
+            this.removeHostButton.disable();
+            this.stopHostButton.disable();
+        }
+    },
 
     // FIXME: Find out why this is being fired twice
-	// private
-	onShow: function() {
-		if (!this.addHostButton) {
-			var bbar = this.panel.getBottomToolbar();
-			this.addHostButton = bbar.items.get('cm-add');
-			this.removeHostButton = bbar.items.get('cm-remove');
-			this.stopHostButton = bbar.items.get('cm-stop');
-		}
-		this.loadHosts();
+    // private
+    onShow: function() {
+        if (!this.addHostButton) {
+            var bbar = this.panel.getBottomToolbar();
+            this.addHostButton = bbar.items.get('cm-add');
+            this.removeHostButton = bbar.items.get('cm-remove');
+            this.stopHostButton = bbar.items.get('cm-stop');
+        }
+        this.loadHosts();
         if (this.running) return;
-		this.running = window.setInterval(this.update, 2000, this);
-	},
+        this.running = window.setInterval(this.update, 2000, this);
+    },
 
-	// private
-	onStopClick: function(button, e) {
-		var connection = this.list.getSelectedRecords()[0];
-		if (!connection) return;
+    // private
+    onStopClick: function(button, e) {
+        var connection = this.list.getSelectedRecords()[0];
+        if (!connection) return;
 
-		if (connection.get('status') == 'Offline') {
-			// This means we need to start the daemon
-			deluge.client.web.start_daemon(connection.get('port'));
-		} else {
-			// This means we need to stop the daemon
-			deluge.client.web.stop_daemon(connection.id, {
-				success: function(result) {
-					if (!result[0]) {
-						Ext.MessageBox.show({
-							title: _('Error'),
-							msg: result[1],
-							buttons: Ext.MessageBox.OK,
-							modal: false,
-							icon: Ext.MessageBox.ERROR,
-							iconCls: 'x-deluge-icon-error'
-						});
-					}
-				}
-			});
-		}
-	}
+        if (connection.get('status') == 'Offline') {
+            // This means we need to start the daemon
+            deluge.client.web.start_daemon(connection.get('port'));
+        } else {
+            // This means we need to stop the daemon
+            deluge.client.web.stop_daemon(connection.id, {
+                success: function(result) {
+                    if (!result[0]) {
+                        Ext.MessageBox.show({
+                            title: _('Error'),
+                            msg: result[1],
+                            buttons: Ext.MessageBox.OK,
+                            modal: false,
+                            icon: Ext.MessageBox.ERROR,
+                            iconCls: 'x-deluge-icon-error'
+                        });
+                    }
+                }
+            });
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Deluge.js b/deluge/ui/web/js/deluge-all/Deluge.js
index 382b611dd..2e9c0fded 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.js
@@ -36,50 +36,50 @@ Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
 // Add some additional functions to ext and setup some of the
 // configurable parameters
 Ext.apply(Ext, {
-	escapeHTML: function(text) {
-		text = String(text).replace('<', '<').replace('>', '>');
-		return text.replace('&', '&');
-	},
+    escapeHTML: function(text) {
+        text = String(text).replace('<', '<').replace('>', '>');
+        return text.replace('&', '&');
+    },
 
-	isObjectEmpty: function(obj) {
-		for(var i in obj) { return false; }
-		return true;
-	},
+    isObjectEmpty: function(obj) {
+        for(var i in obj) { return false; }
+        return true;
+    },
 
-	areObjectsEqual: function(obj1, obj2) {
-		var equal = true;
-		if (!obj1 || !obj2) return false;
-		for (var i in obj1) {
-			if (obj1[i] != obj2[i]) {
-				equal = false;
-			}
-		}
-		return equal;
-	},
-	
-	keys: function(obj) {
-		var keys = [];
-		for (var i in obj) if (obj.hasOwnProperty(i))
-		{
-			keys.push(i);
-		}
-		return keys;
-	},
+    areObjectsEqual: function(obj1, obj2) {
+        var equal = true;
+        if (!obj1 || !obj2) return false;
+        for (var i in obj1) {
+            if (obj1[i] != obj2[i]) {
+                equal = false;
+            }
+        }
+        return equal;
+    },
+    
+    keys: function(obj) {
+        var keys = [];
+        for (var i in obj) if (obj.hasOwnProperty(i))
+        {
+            keys.push(i);
+        }
+        return keys;
+    },
 
-	values: function(obj) {
-		var values = [];
-		for (var i in obj) {
-			if (obj.hasOwnProperty(i)) {
-				values.push(obj[i]);
-			}
-		}
-		return values;
-	},
-		
-	splat: function(obj) {
-		var type = Ext.type(obj);
-		return (type) ? ((type != 'array') ? [obj] : obj) : [];
-	}
+    values: function(obj) {
+        var values = [];
+        for (var i in obj) {
+            if (obj.hasOwnProperty(i)) {
+                values.push(obj[i]);
+            }
+        }
+        return values;
+    },
+        
+    splat: function(obj) {
+        var type = Ext.type(obj);
+        return (type) ? ((type != 'array') ? [obj] : obj) : [];
+    }
 });
 Ext.getKeys = Ext.keys;
 Ext.BLANK_IMAGE_URL = deluge.config.base + 'images/s.gif';
@@ -88,65 +88,65 @@ Ext.USE_NATIVE_JSON = true;
 // Create the Deluge namespace
 Ext.apply(Deluge, {
 
-	// private
-	pluginStore: {},
-	
-	// private
-	progressTpl:	'
' +
-						'
' +
-							'
' +
-								'
' +
-									'
{0}
' +
-								'
' +
-							'
' +
-							'
' +
-								'
{0}
' +
-							'
' +
-						'
' +
-					'
',
+    // private
+    pluginStore: {},
+    
+    // private
+    progressTpl:    '
' +
+                        '
' +
+                            '
' +
+                                '
' +
+                                    '
{0}
' +
+                                '
' +
+                            '
' +
+                            '
' +
+                                '
{0}
' +
+                            '
' +
+                        '
' +
+                    '
',
 
-	
-	/**
-	 * A method to create a progress bar that can be used by renderers
-	 * to display a bar within a grid or tree.
-	 * @param {Number} progress The bars progress
-	 * @param {Number} width The width of the bar
-	 * @param {String} text The text to display on the bar
-	 * @param {Number} modified Amount to subtract from the width allowing for fixes
-	 */
-	progressBar: function(progress, width, text, modifier) {
-		modifier = Ext.value(modifier, 10);
-		var progressWidth = ((width / 100.0) * progress).toFixed(0);
-		var barWidth = progressWidth - 1;
-		var textWidth = ((progressWidth - modifier) > 0 ? progressWidth - modifier : 0);
-		return String.format(Deluge.progressTpl, text, width, barWidth, textWidth);
-	},
+    
+    /**
+     * A method to create a progress bar that can be used by renderers
+     * to display a bar within a grid or tree.
+     * @param {Number} progress The bars progress
+     * @param {Number} width The width of the bar
+     * @param {String} text The text to display on the bar
+     * @param {Number} modified Amount to subtract from the width allowing for fixes
+     */
+    progressBar: function(progress, width, text, modifier) {
+        modifier = Ext.value(modifier, 10);
+        var progressWidth = ((width / 100.0) * progress).toFixed(0);
+        var barWidth = progressWidth - 1;
+        var textWidth = ((progressWidth - modifier) > 0 ? progressWidth - modifier : 0);
+        return String.format(Deluge.progressTpl, text, width, barWidth, textWidth);
+    },
 
-	/**
-	 * Constructs a new instance of the specified plugin.
-	 * @param {String} name The plugin name to create
-	 */
-	createPlugin: function(name) {
-		return new Deluge.pluginStore[name]();
-	},
+    /**
+     * Constructs a new instance of the specified plugin.
+     * @param {String} name The plugin name to create
+     */
+    createPlugin: function(name) {
+        return new Deluge.pluginStore[name]();
+    },
 
-	/**
-	 * Check to see if a plugin has been registered.
-	 * @param {String} name The plugin name to check
-	 */
-	hasPlugin: function(name) {
-		return (Deluge.pluginStore[name]) ? true : false;
-	},
+    /**
+     * Check to see if a plugin has been registered.
+     * @param {String} name The plugin name to check
+     */
+    hasPlugin: function(name) {
+        return (Deluge.pluginStore[name]) ? true : false;
+    },
 
-	/**
-	 * Register a plugin with the Deluge interface.
-	 * @param {String} name The plugin name to register
-	 * @param {Plugin} plugin The plugin to register
-	 */
-	registerPlugin: function(name, plugin) {
-		Deluge.pluginStore[name] = plugin;
-	}
-	
+    /**
+     * Register a plugin with the Deluge interface.
+     * @param {String} name The plugin name to register
+     * @param {Plugin} plugin The plugin to register
+     */
+    registerPlugin: function(name, plugin) {
+        Deluge.pluginStore[name] = plugin;
+    }
+    
 });
 
 // Setup a space for plugins to insert themselves
@@ -158,12 +158,12 @@ deluge.plugins = {};
 // _('High Priority')
 // _('Highest Priority')
 FILE_PRIORITY = {
-	9: 'Mixed',
+    9: 'Mixed',
     0: 'Do Not Download',
     1: 'Normal Priority',
     2: 'High Priority',
     5: 'Highest Priority',
-	'Mixed': 9,
+    'Mixed': 9,
     'Do Not Download': 0,
     'Normal Priority': 1,
     'High Priority': 2,
@@ -171,9 +171,9 @@ FILE_PRIORITY = {
 }
 
 FILE_PRIORITY_CSS = {
-	9: 'x-mixed-download',
-	0: 'x-no-download',
-	1: 'x-normal-download',
-	2: 'x-high-download',
-	5: 'x-highest-download'
+    9: 'x-mixed-download',
+    0: 'x-no-download',
+    1: 'x-normal-download',
+    2: 'x-high-download',
+    5: 'x-highest-download'
 }
diff --git a/deluge/ui/web/js/deluge-all/EditTrackerWindow.js b/deluge/ui/web/js/deluge-all/EditTrackerWindow.js
index 59a0a0fc1..32bcef175 100644
--- a/deluge/ui/web/js/deluge-all/EditTrackerWindow.js
+++ b/deluge/ui/web/js/deluge-all/EditTrackerWindow.js
@@ -37,58 +37,58 @@ Ext.ns('Deluge');
  */
 Deluge.EditTrackerWindow = Ext.extend(Ext.Window, {
 
-	title: _('Edit Tracker'),
-	layout: 'fit',
-	width: 375,
-	height: 110,
-	plain: true,
-	closable: true,
-	resizable: false,
+    title: _('Edit Tracker'),
+    layout: 'fit',
+    width: 375,
+    height: 110,
+    plain: true,
+    closable: true,
+    resizable: false,
 
-	bodyStyle: 'padding: 5px',
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	iconCls: 'x-deluge-edit-trackers',
-	
-	initComponent: function() {
-		Deluge.EditTrackerWindow.superclass.initComponent.call(this);
-		
-		this.addButton(_('Cancel'), this.onCancelClick, this);
-		this.addButton(_('Save'), this.onSaveClick, this);
-		this.on('hide', this.onHide, this);
-		
-		this.form = this.add({
-			xtype: 'form',
-			defaultType: 'textfield',
-			baseCls: 'x-plain',
-			labelWidth: 55,
-			items: [{
-				fieldLabel: _('Tracker'),
-				name: 'tracker',
-				anchor: '100%'
-			}]
-		});
-	},
-	
-	show: function(record) {
-		Deluge.EditTrackerWindow.superclass.show.call(this);
-		
-		this.record = record;
-		this.form.getForm().findField('tracker').setValue(record.data['url']);
-	},
-	
-	onCancelClick: function() {
-		this.hide();
-	},
-	
-	onHide: function() {
-		this.form.getForm().findField('tracker').setValue('');
-	},
-	
-	onSaveClick: function() {
-		var url = this.form.getForm().findField('tracker').getValue();
-		this.record.set('url', url);
-		this.record.commit();
-		this.hide();
-	}
+    bodyStyle: 'padding: 5px',
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    iconCls: 'x-deluge-edit-trackers',
+    
+    initComponent: function() {
+        Deluge.EditTrackerWindow.superclass.initComponent.call(this);
+        
+        this.addButton(_('Cancel'), this.onCancelClick, this);
+        this.addButton(_('Save'), this.onSaveClick, this);
+        this.on('hide', this.onHide, this);
+        
+        this.form = this.add({
+            xtype: 'form',
+            defaultType: 'textfield',
+            baseCls: 'x-plain',
+            labelWidth: 55,
+            items: [{
+                fieldLabel: _('Tracker'),
+                name: 'tracker',
+                anchor: '100%'
+            }]
+        });
+    },
+    
+    show: function(record) {
+        Deluge.EditTrackerWindow.superclass.show.call(this);
+        
+        this.record = record;
+        this.form.getForm().findField('tracker').setValue(record.data['url']);
+    },
+    
+    onCancelClick: function() {
+        this.hide();
+    },
+    
+    onHide: function() {
+        this.form.getForm().findField('tracker').setValue('');
+    },
+    
+    onSaveClick: function() {
+        var url = this.form.getForm().findField('tracker').getValue();
+        this.record.set('url', url);
+        this.record.commit();
+        this.hide();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
index e67f85944..ed3672079 100644
--- a/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
+++ b/deluge/ui/web/js/deluge-all/EditTrackersWindow.js
@@ -37,203 +37,203 @@ Ext.ns('Deluge');
  */
 Deluge.EditTrackersWindow = Ext.extend(Ext.Window, {
 
-	title: _('Edit Trackers'),
-	layout: 'fit',
-	width: 350,
-	height: 220,
-	plain: true,
-	closable: true,
-	resizable: true,
+    title: _('Edit Trackers'),
+    layout: 'fit',
+    width: 350,
+    height: 220,
+    plain: true,
+    closable: true,
+    resizable: true,
 
-	bodyStyle: 'padding: 5px',
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	iconCls: 'x-deluge-edit-trackers',
+    bodyStyle: 'padding: 5px',
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    iconCls: 'x-deluge-edit-trackers',
 
-	initComponent: function() {
-		Deluge.EditTrackersWindow.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.EditTrackersWindow.superclass.initComponent.call(this);
 
-		this.addButton(_('Cancel'), this.onCancelClick, this);
-		this.addButton(_('Ok'), this.onOkClick, this);
-		this.addEvents('save');
+        this.addButton(_('Cancel'), this.onCancelClick, this);
+        this.addButton(_('Ok'), this.onOkClick, this);
+        this.addEvents('save');
 
-		this.on('show', this.onShow, this);
-		this.on('save', this.onSave, this);
+        this.on('show', this.onShow, this);
+        this.on('save', this.onSave, this);
 
-		this.addWindow = new Deluge.AddTrackerWindow();
-		this.addWindow.on('add', this.onAddTrackers, this);
-		this.editWindow = new Deluge.EditTrackerWindow();
+        this.addWindow = new Deluge.AddTrackerWindow();
+        this.addWindow.on('add', this.onAddTrackers, this);
+        this.editWindow = new Deluge.EditTrackerWindow();
 
-		this.list = new Ext.list.ListView({
-			store: new Ext.data.JsonStore({
-				root: 'trackers',
-				fields: [
-					'tier',
-					'url'
-				]
-			}),
-			columns: [{
-				header: _('Tier'),
-				width: .1,
-				dataIndex: 'tier'
-			}, {
-				header: _('Tracker'),
-				width: .9,
-				dataIndex: 'url'
-			}],
-			columnSort: {
-				sortClasses: ['', '']
-			},
-			stripeRows: true,
-			singleSelect: true,
-			listeners: {
-				'dblclick': {fn: this.onListNodeDblClicked, scope: this},
-				'selectionchange': {fn: this.onSelect, scope: this}
-			}
-		});
+        this.list = new Ext.list.ListView({
+            store: new Ext.data.JsonStore({
+                root: 'trackers',
+                fields: [
+                    'tier',
+                    'url'
+                ]
+            }),
+            columns: [{
+                header: _('Tier'),
+                width: .1,
+                dataIndex: 'tier'
+            }, {
+                header: _('Tracker'),
+                width: .9,
+                dataIndex: 'url'
+            }],
+            columnSort: {
+                sortClasses: ['', '']
+            },
+            stripeRows: true,
+            singleSelect: true,
+            listeners: {
+                'dblclick': {fn: this.onListNodeDblClicked, scope: this},
+                'selectionchange': {fn: this.onSelect, scope: this}
+            }
+        });
 
-		this.panel = this.add({
-			margins: '0 0 0 0',
-			items: [this.list],
-			autoScroll: true,
-			bbar: new Ext.Toolbar({
-				items: [
-					{
-						text: _('Up'),
-						iconCls: 'icon-up',
-						handler: this.onUpClick,
-						scope: this
-					}, {
-						text: _('Down'),
-						iconCls: 'icon-down',
-						handler: this.onDownClick,
-						scope: this
-					}, '->', {
-						text: _('Add'),
-						iconCls: 'icon-add',
-						handler: this.onAddClick,
-						scope: this
-					}, {
-						text: _('Edit'),
-						iconCls: 'icon-edit-trackers',
-						handler: this.onEditClick,
-						scope: this
-					}, {
-						text: _('Remove'),
-						iconCls: 'icon-remove',
-						handler: this.onRemoveClick,
-						scope: this
-					}
-				]
-			})
-		});
-	},
+        this.panel = this.add({
+            margins: '0 0 0 0',
+            items: [this.list],
+            autoScroll: true,
+            bbar: new Ext.Toolbar({
+                items: [
+                    {
+                        text: _('Up'),
+                        iconCls: 'icon-up',
+                        handler: this.onUpClick,
+                        scope: this
+                    }, {
+                        text: _('Down'),
+                        iconCls: 'icon-down',
+                        handler: this.onDownClick,
+                        scope: this
+                    }, '->', {
+                        text: _('Add'),
+                        iconCls: 'icon-add',
+                        handler: this.onAddClick,
+                        scope: this
+                    }, {
+                        text: _('Edit'),
+                        iconCls: 'icon-edit-trackers',
+                        handler: this.onEditClick,
+                        scope: this
+                    }, {
+                        text: _('Remove'),
+                        iconCls: 'icon-remove',
+                        handler: this.onRemoveClick,
+                        scope: this
+                    }
+                ]
+            })
+        });
+    },
 
-	onAddClick: function() {
-		this.addWindow.show();
-	},
+    onAddClick: function() {
+        this.addWindow.show();
+    },
 
-	onAddTrackers: function(trackers) {
-		var store = this.list.getStore();
-		Ext.each(trackers, function(tracker) {
-			var duplicate = false, heightestTier = -1;
-			store.each(function(record) {
-				if (record.get('tier') > heightestTier) {
-					heightestTier = record.get('tier');
-				}
-				if (tracker == record.get('tracker')) {
-					duplicate = true;
-					return false;
-				}
-			}, this);
-			if (duplicate) return;
-			store.add(new store.recordType({'tier': heightestTier + 1, 'url': tracker}));
-		}, this);
-	},
+    onAddTrackers: function(trackers) {
+        var store = this.list.getStore();
+        Ext.each(trackers, function(tracker) {
+            var duplicate = false, heightestTier = -1;
+            store.each(function(record) {
+                if (record.get('tier') > heightestTier) {
+                    heightestTier = record.get('tier');
+                }
+                if (tracker == record.get('tracker')) {
+                    duplicate = true;
+                    return false;
+                }
+            }, this);
+            if (duplicate) return;
+            store.add(new store.recordType({'tier': heightestTier + 1, 'url': tracker}));
+        }, this);
+    },
 
-	onCancelClick: function() {
-		this.hide();
-	},
+    onCancelClick: function() {
+        this.hide();
+    },
 
-	onEditClick: function() {
-		this.editWindow.show(this.list.getSelectedRecords()[0]);
-	},
+    onEditClick: function() {
+        this.editWindow.show(this.list.getSelectedRecords()[0]);
+    },
 
-	onHide: function() {
-		this.list.getStore().removeAll();
-	},
+    onHide: function() {
+        this.list.getStore().removeAll();
+    },
 
-	onListNodeDblClicked: function(list, index, node, e) {
-		this.editWindow.show(this.list.getRecord(node));
-	},
+    onListNodeDblClicked: function(list, index, node, e) {
+        this.editWindow.show(this.list.getRecord(node));
+    },
 
-	onOkClick: function() {
-		var trackers = [];
-		this.list.getStore().each(function(record) {
-			trackers.push({
-				'tier': record.get('tier'),
-				'url': record.get('url')
-			})
-		}, this);
+    onOkClick: function() {
+        var trackers = [];
+        this.list.getStore().each(function(record) {
+            trackers.push({
+                'tier': record.get('tier'),
+                'url': record.get('url')
+            })
+        }, this);
 
-		deluge.client.core.set_torrent_trackers(this.torrentId, trackers, {
-			failure: this.onSaveFail,
-			scope: this
-		});
+        deluge.client.core.set_torrent_trackers(this.torrentId, trackers, {
+            failure: this.onSaveFail,
+            scope: this
+        });
 
-		this.hide();
-	},
+        this.hide();
+    },
 
-	onRemoveClick: function() {
-		// Remove from the grid
-		this.list.getStore().remove(this.list.getSelectedRecords()[0]);
-	},
+    onRemoveClick: function() {
+        // Remove from the grid
+        this.list.getStore().remove(this.list.getSelectedRecords()[0]);
+    },
 
-	onRequestComplete: function(status) {
-		this.list.getStore().loadData(status);
-		this.list.getStore().sort('tier', 'ASC');
-	},
+    onRequestComplete: function(status) {
+        this.list.getStore().loadData(status);
+        this.list.getStore().sort('tier', 'ASC');
+    },
 
-	onSaveFail: function() {
+    onSaveFail: function() {
 
-	},
+    },
 
-	onSelect: function(list) {
-		if (list.getSelectionCount()) {
-			this.panel.getBottomToolbar().items.get(4).enable();
-		}
-	},
+    onSelect: function(list) {
+        if (list.getSelectionCount()) {
+            this.panel.getBottomToolbar().items.get(4).enable();
+        }
+    },
 
-	onShow: function() {
-		this.panel.getBottomToolbar().items.get(4).disable();
-		var r = deluge.torrents.getSelected();
-		this.torrentId = r.id;
-		deluge.client.core.get_torrent_status(r.id, ['trackers'], {
-			success: this.onRequestComplete,
-			scope: this
-		});
-	},
+    onShow: function() {
+        this.panel.getBottomToolbar().items.get(4).disable();
+        var r = deluge.torrents.getSelected();
+        this.torrentId = r.id;
+        deluge.client.core.get_torrent_status(r.id, ['trackers'], {
+            success: this.onRequestComplete,
+            scope: this
+        });
+    },
 
-	onDownClick: function() {
-		var r = this.list.getSelectedRecords()[0];
+    onDownClick: function() {
+        var r = this.list.getSelectedRecords()[0];
         if (!r) return;
 
-		r.set('tier', r.get('tier') + 1);
-		r.store.sort('tier', 'ASC');
+        r.set('tier', r.get('tier') + 1);
+        r.store.sort('tier', 'ASC');
         r.store.commitChanges();
 
         this.list.select(r.store.indexOf(r));
-	},
+    },
 
-	onUpClick: function() {
-		var r = this.list.getSelectedRecords()[0];
+    onUpClick: function() {
+        var r = this.list.getSelectedRecords()[0];
         if (!r) return;
 
-		if (r.get('tier') == 0) return;
-		r.set('tier', r.get('tier') - 1);
-		r.store.sort('tier', 'ASC');
+        if (r.get('tier') == 0) return;
+        r.set('tier', r.get('tier') - 1);
+        r.store.sort('tier', 'ASC');
         r.store.commitChanges();
 
         this.list.select(r.store.indexOf(r));
-	}
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/EventsManager.js b/deluge/ui/web/js/deluge-all/EventsManager.js
index 0981d4393..9a799d53d 100644
--- a/deluge/ui/web/js/deluge-all/EventsManager.js
+++ b/deluge/ui/web/js/deluge-all/EventsManager.js
@@ -37,79 +37,79 @@
  * Class for holding global events that occur within the UI.
  */
 Deluge.EventsManager = Ext.extend(Ext.util.Observable, {
-	constructor: function() {
-		this.toRegister = [];
-		this.on('login', this.onLogin, this);
-		Deluge.EventsManager.superclass.constructor.call(this);
-	},
-	
-	/**
-	 * Append an event handler to this object.
-	 */
-	addListener: function(eventName, fn, scope, o) {
-		this.addEvents(eventName);
-		if (/[A-Z]/.test(eventName.substring(0, 1))) {
-			if (!deluge.client) {
-				this.toRegister.push(eventName);
-			} else {
-				deluge.client.web.register_event_listener(eventName);
-			}
-		}
-		Deluge.EventsManager.superclass.addListener.call(this, eventName, fn, scope, o);
-	},
+    constructor: function() {
+        this.toRegister = [];
+        this.on('login', this.onLogin, this);
+        Deluge.EventsManager.superclass.constructor.call(this);
+    },
+    
+    /**
+     * Append an event handler to this object.
+     */
+    addListener: function(eventName, fn, scope, o) {
+        this.addEvents(eventName);
+        if (/[A-Z]/.test(eventName.substring(0, 1))) {
+            if (!deluge.client) {
+                this.toRegister.push(eventName);
+            } else {
+                deluge.client.web.register_event_listener(eventName);
+            }
+        }
+        Deluge.EventsManager.superclass.addListener.call(this, eventName, fn, scope, o);
+    },
 
-	getEvents: function() {
-		deluge.client.web.get_events({
-			success: this.onGetEventsSuccess,
-			failure: this.onGetEventsFailure,
-			scope: this
-		});
-	},
+    getEvents: function() {
+        deluge.client.web.get_events({
+            success: this.onGetEventsSuccess,
+            failure: this.onGetEventsFailure,
+            scope: this
+        });
+    },
 
-	/**
-	 * Starts the EventsManagerManager checking for events.
-	 */
-	start: function() {
-		Ext.each(this.toRegister, function(eventName) {
-			deluge.client.web.register_event_listener(eventName);
-		});
-		this.running = true;
-		this.errorCount = 0;
-		this.getEvents();
-	},
+    /**
+     * Starts the EventsManagerManager checking for events.
+     */
+    start: function() {
+        Ext.each(this.toRegister, function(eventName) {
+            deluge.client.web.register_event_listener(eventName);
+        });
+        this.running = true;
+        this.errorCount = 0;
+        this.getEvents();
+    },
 
-	/**
-	 * Stops the EventsManagerManager checking for events.
-	 */
-	stop: function() {
-		this.running = false;
-	},
+    /**
+     * Stops the EventsManagerManager checking for events.
+     */
+    stop: function() {
+        this.running = false;
+    },
 
-	// private
-	onLogin: function() {
-		this.start();
-	},
+    // private
+    onLogin: function() {
+        this.start();
+    },
 
-	onGetEventsSuccess: function(events) {
-		if (!events) return;
-		Ext.each(events, function(event) {
-			var name = event[0], args = event[1];
-			args.splice(0, 0, name);
-			this.fireEvent.apply(this, args);
-		}, this);
-		if (this.running) this.getEvents();
-	},
+    onGetEventsSuccess: function(events) {
+        if (!events) return;
+        Ext.each(events, function(event) {
+            var name = event[0], args = event[1];
+            args.splice(0, 0, name);
+            this.fireEvent.apply(this, args);
+        }, this);
+        if (this.running) this.getEvents();
+    },
 
-	// private
-	onGetEventsFailure: function(result, error) {
-		// the request timed out or we had a communication failure
-		if (!this.running) return;
-		if (!error.isTimeout && this.errorCount++ >= 3) {
-			this.stop();
-			return;
-		}
-		this.getEvents();
-	}
+    // private
+    onGetEventsFailure: function(result, error) {
+        // the request timed out or we had a communication failure
+        if (!this.running) return;
+        if (!error.isTimeout && this.errorCount++ >= 3) {
+            this.stop();
+            return;
+        }
+        this.getEvents();
+    }
 });
 
 /**
diff --git a/deluge/ui/web/js/deluge-all/FileBrowser.js b/deluge/ui/web/js/deluge-all/FileBrowser.js
index 0bb89236d..0487847bd 100644
--- a/deluge/ui/web/js/deluge-all/FileBrowser.js
+++ b/deluge/ui/web/js/deluge-all/FileBrowser.js
@@ -33,30 +33,30 @@
 Ext.namespace('Deluge');
 Deluge.FileBrowser = Ext.extend(Ext.Window, {
 
-	title: _('File Browser'),
+    title: _('File Browser'),
 
-	width:  500,
-	height: 400,
+    width:  500,
+    height: 400,
 
-	initComponent: function() {
-		Deluge.FileBrowser.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.FileBrowser.superclass.initComponent.call(this);
 
-		this.add({
-			xtype: 'toolbar',
-			items: [{
-				text: _('Back'),
-				iconCls: 'icon-back'
-			}, {
-				text: _('Forward'),
-				iconCls: 'icon-forward'
-			}, {
-				text: _('Up'),
-				iconCls: 'icon-up'
-			}, {
-				text: _('Home'),
-				iconCls: 'icon-home'
-			}]
-		});
-	}
+        this.add({
+            xtype: 'toolbar',
+            items: [{
+                text: _('Back'),
+                iconCls: 'icon-back'
+            }, {
+                text: _('Forward'),
+                iconCls: 'icon-forward'
+            }, {
+                text: _('Up'),
+                iconCls: 'icon-up'
+            }, {
+                text: _('Home'),
+                iconCls: 'icon-home'
+            }]
+        });
+    }
 
 });
diff --git a/deluge/ui/web/js/deluge-all/FilterPanel.js b/deluge/ui/web/js/deluge-all/FilterPanel.js
index 5e68daf36..703836d77 100644
--- a/deluge/ui/web/js/deluge-all/FilterPanel.js
+++ b/deluge/ui/web/js/deluge-all/FilterPanel.js
@@ -39,132 +39,132 @@ Deluge.FilterPanel = Ext.extend(Ext.Panel, {
 
     autoScroll: true,
 
-	border: false,
+    border: false,
 
-	show_zero: null,
+    show_zero: null,
 
-	initComponent: function() {
-		Deluge.FilterPanel.superclass.initComponent.call(this);
-		this.filterType = this.initialConfig.filter;
+    initComponent: function() {
+        Deluge.FilterPanel.superclass.initComponent.call(this);
+        this.filterType = this.initialConfig.filter;
 
-		var title = this.filterType.replace('_', ' '),
-			parts = title.split(' '),
-			title = '';
-		Ext.each(parts, function(p) {
-			fl = p.substring(0, 1).toUpperCase();
-			title += fl + p.substring(1) + ' ';
-		});
-		this.setTitle(_(title));
+        var title = this.filterType.replace('_', ' '),
+            parts = title.split(' '),
+            title = '';
+        Ext.each(parts, function(p) {
+            fl = p.substring(0, 1).toUpperCase();
+            title += fl + p.substring(1) + ' ';
+        });
+        this.setTitle(_(title));
 
-		if (Deluge.FilterPanel.templates[this.filterType]) {
-			var tpl = Deluge.FilterPanel.templates[this.filterType];
-		} else {
-			var tpl = '
{filter} ({count})
';
-		}
+        if (Deluge.FilterPanel.templates[this.filterType]) {
+            var tpl = Deluge.FilterPanel.templates[this.filterType];
+        } else {
+            var tpl = '
{filter} ({count})
';
+        }
 
-		this.list = this.add({
-			xtype: 'listview',
-			singleSelect: true,
-			hideHeaders: true,
-			reserveScrollOffset: true,
-			store: new Ext.data.ArrayStore({
-				idIndex: 0,
-				fields: ['filter', 'count']
-			}),
-			columns: [{
-				id: 'filter',
-				sortable: false,
-				tpl: tpl,
-				dataIndex: 'filter'
-			}]
-		});
-		this.relayEvents(this.list, ['selectionchange']);
-	},
+        this.list = this.add({
+            xtype: 'listview',
+            singleSelect: true,
+            hideHeaders: true,
+            reserveScrollOffset: true,
+            store: new Ext.data.ArrayStore({
+                idIndex: 0,
+                fields: ['filter', 'count']
+            }),
+            columns: [{
+                id: 'filter',
+                sortable: false,
+                tpl: tpl,
+                dataIndex: 'filter'
+            }]
+        });
+        this.relayEvents(this.list, ['selectionchange']);
+    },
 
-	/**
-	 * Return the currently selected filter state
-	 * @returns {String} the current filter state
-	 */
-	getState: function() {
-		if (!this.list.getSelectionCount()) return;
+    /**
+     * Return the currently selected filter state
+     * @returns {String} the current filter state
+     */
+    getState: function() {
+        if (!this.list.getSelectionCount()) return;
 
-		var state = this.list.getSelectedRecords()[0];
-		if (state.id == 'All') return;
-		return state.id;
-	},
+        var state = this.list.getSelectedRecords()[0];
+        if (state.id == 'All') return;
+        return state.id;
+    },
 
-	/**
-	 * Return the current states in the filter
-	 */
-	getStates: function() {
-		return this.states;
-	},
+    /**
+     * Return the current states in the filter
+     */
+    getStates: function() {
+        return this.states;
+    },
 
-	/**
-	 * Return the Store for the ListView of the FilterPanel
-	 * @returns {Ext.data.Store} the ListView store
-	 */
-	getStore: function() {
-		return this.list.getStore();
-	},
+    /**
+     * Return the Store for the ListView of the FilterPanel
+     * @returns {Ext.data.Store} the ListView store
+     */
+    getStore: function() {
+        return this.list.getStore();
+    },
 
-	/**
-	 * Update the states in the FilterPanel
-	 */
-	updateStates: function(states) {
-		this.states = {};
-		Ext.each(states, function(state) {
-			this.states[state[0]] = state[1];
-		}, this);
+    /**
+     * Update the states in the FilterPanel
+     */
+    updateStates: function(states) {
+        this.states = {};
+        Ext.each(states, function(state) {
+            this.states[state[0]] = state[1];
+        }, this);
 
-		var show_zero = (this.show_zero == null) ? deluge.config.sidebar_show_zero : this.show_zero;
-		if (!show_zero) {
-			var newStates = [];
-			Ext.each(states, function(state) {
-				if (state[1] > 0 || state[0] == _('All')) {
-					newStates.push(state);
-				}
-			});
-			states = newStates;
-		}
+        var show_zero = (this.show_zero == null) ? deluge.config.sidebar_show_zero : this.show_zero;
+        if (!show_zero) {
+            var newStates = [];
+            Ext.each(states, function(state) {
+                if (state[1] > 0 || state[0] == _('All')) {
+                    newStates.push(state);
+                }
+            });
+            states = newStates;
+        }
 
-		var store = this.getStore();
-		var filters = {};
-		Ext.each(states, function(s, i) {
-			var record = store.getById(s[0]);
-			if (!record) {
-				record = new store.recordType({
-					filter: s[0],
-					count: s[1]
-				});
-				record.id = s[0];
-				store.insert(i, record);
-			}
-			record.beginEdit();
-			record.set('filter', s[0]);
-			record.set('count', s[1]);
-			record.endEdit();
-			filters[s[0]] = true;
-		}, this);
+        var store = this.getStore();
+        var filters = {};
+        Ext.each(states, function(s, i) {
+            var record = store.getById(s[0]);
+            if (!record) {
+                record = new store.recordType({
+                    filter: s[0],
+                    count: s[1]
+                });
+                record.id = s[0];
+                store.insert(i, record);
+            }
+            record.beginEdit();
+            record.set('filter', s[0]);
+            record.set('count', s[1]);
+            record.endEdit();
+            filters[s[0]] = true;
+        }, this);
 
-		store.each(function(record) {
-			if (filters[record.id]) return;
-			var r = this.list.getSelectedRecords()[0];
-			store.remove(record);
-			if (r.id == record.id) {
-				this.list.select(0);
-			}
-		}, this);
+        store.each(function(record) {
+            if (filters[record.id]) return;
+            var r = this.list.getSelectedRecords()[0];
+            store.remove(record);
+            if (r.id == record.id) {
+                this.list.select(0);
+            }
+        }, this);
 
-		store.commitChanges();
+        store.commitChanges();
 
-		if (!this.list.getSelectionCount()) {
-			this.list.select(0);
-		}
-	}
+        if (!this.list.getSelectionCount()) {
+            this.list.select(0);
+        }
+    }
 
 });
 
 Deluge.FilterPanel.templates = {
-	'tracker_host':  '
{filter} ({count})
'
+    'tracker_host':  '
{filter} ({count})
'
 }
diff --git a/deluge/ui/web/js/deluge-all/Formatters.js b/deluge/ui/web/js/deluge-all/Formatters.js
index 902922461..0ea3b6903 100644
--- a/deluge/ui/web/js/deluge-all/Formatters.js
+++ b/deluge/ui/web/js/deluge-all/Formatters.js
@@ -38,115 +38,115 @@
  * @singleton
  */
 Deluge.Formatters = {
-	/**
-	 * Formats a date string in the locale's date representation based on the
-	 * systems timezone.
-	 *
-	 * @param {Number} timestamp time in seconds since the Epoch
-	 * @return {String} a string in the locale's date representation or ""
-	 * if seconds < 0
-	 */
-	date: function(timestamp) {
-		function zeroPad(num, count) {
-			var numZeropad = num + '';
-			while (numZeropad.length < count) {
-				numZeropad = '0' + numZeropad;
-			}
-			return numZeropad;
-		}
-		timestamp = timestamp * 1000;
-		var date = new Date(timestamp);
-		return String.format('{0}/{1}/{2} {3}:{4}:{5}',
-			zeroPad(date.getDate(), 2), zeroPad(date.getMonth() + 1, 2), date.getFullYear(),
-			zeroPad(date.getHours(), 2), zeroPad(date.getMinutes(), 2), zeroPad(date.getSeconds(), 2));
-	},
-	
-	/**
-	 * Formats the bytes value into a string with KiB, MiB or GiB units.
-	 *
-	 * @param {Number} bytes the filesize in bytes
-	 * @param {Boolean} showZero pass in true to displays 0 values
-	 * @return {String} formatted string with KiB, MiB or GiB units.
-	 */
-	size: function(bytes, showZero) {
-		if (!bytes && !showZero) return '';
-		bytes = bytes / 1024.0;
-	
-		if (bytes < 1024) { return bytes.toFixed(1)  + ' KiB'; }
-		else { bytes = bytes / 1024; }
-	
-		if (bytes < 1024) { return bytes.toFixed(1)  + ' MiB'; }
-		else { bytes = bytes / 1024; }
-	
-		return bytes.toFixed(1) + ' GiB'
-	},
-	
-	/**
-	 * Formats a string to display a transfer speed utilizing {@link #size}
-	 *
-	 * @param {Number} bytes the number of bytes per second
-	 * @param {Boolean} showZero pass in true to displays 0 values
-	 * @return {String} formatted string with KiB, MiB or GiB units.
-	 */
-	speed: function(bytes, showZero) {
-		return (!bytes && !showZero) ? '' : fsize(bytes, showZero) + '/s';
-	},
-	
-	/**
-	 * Formats a string to show time in a human readable form.
-	 *
-	 * @param {Number} time the number of seconds
-	 * @return {String} a formatted time string. will return '' if seconds == 0
-	 */
-	timeRemaining: function(time) {
-		if (time == 0) { return '∞' }
+    /**
+     * Formats a date string in the locale's date representation based on the
+     * systems timezone.
+     *
+     * @param {Number} timestamp time in seconds since the Epoch
+     * @return {String} a string in the locale's date representation or ""
+     * if seconds < 0
+     */
+    date: function(timestamp) {
+        function zeroPad(num, count) {
+            var numZeropad = num + '';
+            while (numZeropad.length < count) {
+                numZeropad = '0' + numZeropad;
+            }
+            return numZeropad;
+        }
+        timestamp = timestamp * 1000;
+        var date = new Date(timestamp);
+        return String.format('{0}/{1}/{2} {3}:{4}:{5}',
+            zeroPad(date.getDate(), 2), zeroPad(date.getMonth() + 1, 2), date.getFullYear(),
+            zeroPad(date.getHours(), 2), zeroPad(date.getMinutes(), 2), zeroPad(date.getSeconds(), 2));
+    },
+    
+    /**
+     * Formats the bytes value into a string with KiB, MiB or GiB units.
+     *
+     * @param {Number} bytes the filesize in bytes
+     * @param {Boolean} showZero pass in true to displays 0 values
+     * @return {String} formatted string with KiB, MiB or GiB units.
+     */
+    size: function(bytes, showZero) {
+        if (!bytes && !showZero) return '';
+        bytes = bytes / 1024.0;
+    
+        if (bytes < 1024) { return bytes.toFixed(1)  + ' KiB'; }
+        else { bytes = bytes / 1024; }
+    
+        if (bytes < 1024) { return bytes.toFixed(1)  + ' MiB'; }
+        else { bytes = bytes / 1024; }
+    
+        return bytes.toFixed(1) + ' GiB'
+    },
+    
+    /**
+     * Formats a string to display a transfer speed utilizing {@link #size}
+     *
+     * @param {Number} bytes the number of bytes per second
+     * @param {Boolean} showZero pass in true to displays 0 values
+     * @return {String} formatted string with KiB, MiB or GiB units.
+     */
+    speed: function(bytes, showZero) {
+        return (!bytes && !showZero) ? '' : fsize(bytes, showZero) + '/s';
+    },
+    
+    /**
+     * Formats a string to show time in a human readable form.
+     *
+     * @param {Number} time the number of seconds
+     * @return {String} a formatted time string. will return '' if seconds == 0
+     */
+    timeRemaining: function(time) {
+        if (time == 0) { return '∞' }
         time = time.toFixed(0);
-		if (time < 60) { return time + 's'; }
-		else { time = time / 60; }
-	
-		if (time < 60) {
-			var minutes = Math.floor(time)
-			var seconds = Math.round(60 * (time - minutes))
-			if (seconds > 0) {
-				return minutes + 'm ' + seconds + 's';
-			} else {
-				return minutes + 'm'; }
-			}
-		else { time = time / 60; }
-	
-		if (time < 24) { 
-			var hours = Math.floor(time)
-			var minutes = Math.round(60 * (time - hours))
-			if (minutes > 0) {
-				return hours + 'h ' + minutes + 'm';
-			} else {
-				return hours + 'h';
-			}			
-		}
-		else { time = time / 24; }
-	
-		var days = Math.floor(time)
-		var hours = Math.round(24 * (time - days))
-		if (hours > 0) {
-			return days + 'd ' + hours + 'h';
-		} else {
-			return days + 'd';
-		}
-	},
-	
-	/**
-	 * Simply returns the value untouched, for when no formatting is required.
-	 *
-	 * @param {Mixed} value the value to be displayed
-	 * @return the untouched value.
-	 */
-	plain: function(value) {
-		return value;
-	},
+        if (time < 60) { return time + 's'; }
+        else { time = time / 60; }
+    
+        if (time < 60) {
+            var minutes = Math.floor(time)
+            var seconds = Math.round(60 * (time - minutes))
+            if (seconds > 0) {
+                return minutes + 'm ' + seconds + 's';
+            } else {
+                return minutes + 'm'; }
+            }
+        else { time = time / 60; }
+    
+        if (time < 24) { 
+            var hours = Math.floor(time)
+            var minutes = Math.round(60 * (time - hours))
+            if (minutes > 0) {
+                return hours + 'h ' + minutes + 'm';
+            } else {
+                return hours + 'h';
+            }            
+        }
+        else { time = time / 24; }
+    
+        var days = Math.floor(time)
+        var hours = Math.round(24 * (time - days))
+        if (hours > 0) {
+            return days + 'd ' + hours + 'h';
+        } else {
+            return days + 'd';
+        }
+    },
+    
+    /**
+     * Simply returns the value untouched, for when no formatting is required.
+     *
+     * @param {Mixed} value the value to be displayed
+     * @return the untouched value.
+     */
+    plain: function(value) {
+        return value;
+    },
 
-	cssClassEscape: function(value) {
-		return value.toLowerCase().replace('.', '_');
-	}
+    cssClassEscape: function(value) {
+        return value.toLowerCase().replace('.', '_');
+    }
 }
 var fsize = Deluge.Formatters.size;
 var fspeed = Deluge.Formatters.speed;
diff --git a/deluge/ui/web/js/deluge-all/Keys.js b/deluge/ui/web/js/deluge-all/Keys.js
index cb74db3dd..f41f53ae5 100644
--- a/deluge/ui/web/js/deluge-all/Keys.js
+++ b/deluge/ui/web/js/deluge-all/Keys.js
@@ -37,13 +37,13 @@
  */
 Deluge.Keys = {
 
-	/**
-	 * Keys that are used within the torrent grid.
-	 * 
['queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
-	 * 'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
-	 * 'upload_payload_rate', 'eta', 'ratio', 'distributed_copies',
-	 * 'is_auto_managed', 'time_added', 'tracker_host']

-	 */
+    /**
+     * Keys that are used within the torrent grid.
+     * 
['queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
+     * 'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
+     * 'upload_payload_rate', 'eta', 'ratio', 'distributed_copies',
+     * 'is_auto_managed', 'time_added', 'tracker_host']

+     */
     Grid: [
         'queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
         'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
@@ -54,22 +54,22 @@ Deluge.Keys = {
     /**
      * Keys used in the status tab of the statistics panel.
      * These get updated to include the keys in {@link #Grid}.
-	 * 
['total_done', 'total_payload_download', 'total_uploaded',
-	 * 'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
-	 * 'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
-	 * 'seed_rank']

-	 */
+     * 
['total_done', 'total_payload_download', 'total_uploaded',
+     * 'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
+     * 'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
+     * 'seed_rank']

+     */
     Status: [
         'total_done', 'total_payload_download', 'total_uploaded',
         'total_payload_upload', 'next_announce', 'tracker_status', 'num_pieces',
         'piece_length', 'is_auto_managed', 'active_time', 'seeding_time',
-        'seed_rank'
+        'seed_rank', 'last_seen_complete', 'owner', 'public', 'shared'
     ],
 
     /**
      * Keys used in the files tab of the statistics panel.
      * 
['files', 'file_progress', 'file_priorities']

-	 */
+     */
     Files: [
         'files', 'file_progress', 'file_priorities'
     ],
@@ -77,25 +77,25 @@ Deluge.Keys = {
     /**
      * Keys used in the peers tab of the statistics panel.
      * 
['peers']

-	 */
+     */
     Peers: [
         'peers'
     ],
 
     /**
      * Keys used in the details tab of the statistics panel.
-	 */
+     */
     Details: [
         'name', 'save_path', 'total_size', 'num_files', 'message',
         'tracker', 'comment'
     ],
 
     /**
-	 * Keys used in the options tab of the statistics panel.
-	 * 
['max_download_speed', 'max_upload_speed', 'max_connections', 'max_upload_slots',
-	 *  'is_auto_managed', 'stop_at_ratio', 'stop_ratio', 'remove_at_ratio', 'private',
-	 *  'prioritize_first_last']

-	 */
+     * Keys used in the options tab of the statistics panel.
+     * 
['max_download_speed', 'max_upload_speed', 'max_connections', 'max_upload_slots',
+     *  'is_auto_managed', 'stop_at_ratio', 'stop_ratio', 'remove_at_ratio', 'private',
+     *  'prioritize_first_last']

+     */
     Options: [
         'max_download_speed', 'max_upload_speed', 'max_connections',
         'max_upload_slots','is_auto_managed', 'stop_at_ratio', 'stop_ratio',
diff --git a/deluge/ui/web/js/deluge-all/LoginWindow.js b/deluge/ui/web/js/deluge-all/LoginWindow.js
index 527c21842..37b18a184 100644
--- a/deluge/ui/web/js/deluge-all/LoginWindow.js
+++ b/deluge/ui/web/js/deluge-all/LoginWindow.js
@@ -31,123 +31,123 @@
  */
 
 Deluge.LoginWindow = Ext.extend(Ext.Window, {
-	
-	firstShow:   true,
-	bodyStyle:   'padding: 10px 5px;',
-	buttonAlign: 'center',
-	closable:    false,
-	closeAction: 'hide',
-	iconCls:     'x-deluge-login-window-icon',
-	layout:      'fit',
-	modal:       true,
-	plain:       true,
-	resizable:   false,
-	title:       _('Login'),
-	width:       300,
-	height:      120,
-	
-	initComponent: function() {
-		Deluge.LoginWindow.superclass.initComponent.call(this);
-		this.on('show', this.onShow, this);
-		
-		this.addButton({
-			text: _('Login'),
-			handler: this.onLogin,
-			scope: this
-		});
-		
-		this.form = this.add({
-			xtype: 'form',
-			baseCls: 'x-plain',
-			labelWidth: 55,
-			width: 300,
-			defaults: {width: 200},
-			defaultType: 'textfield'
-		});
+    
+    firstShow:   true,
+    bodyStyle:   'padding: 10px 5px;',
+    buttonAlign: 'center',
+    closable:    false,
+    closeAction: 'hide',
+    iconCls:     'x-deluge-login-window-icon',
+    layout:      'fit',
+    modal:       true,
+    plain:       true,
+    resizable:   false,
+    title:       _('Login'),
+    width:       300,
+    height:      120,
+    
+    initComponent: function() {
+        Deluge.LoginWindow.superclass.initComponent.call(this);
+        this.on('show', this.onShow, this);
+        
+        this.addButton({
+            text: _('Login'),
+            handler: this.onLogin,
+            scope: this
+        });
+        
+        this.form = this.add({
+            xtype: 'form',
+            baseCls: 'x-plain',
+            labelWidth: 55,
+            width: 300,
+            defaults: {width: 200},
+            defaultType: 'textfield'
+        });
 
-		this.passwordField = this.form.add({
-			xtype: 'textfield',
-			fieldLabel: _('Password'),
-			id: '_password',
-			name: 'password',
-			inputType: 'password'
-		});
-		this.passwordField.on('specialkey', this.onSpecialKey, this);
-	},
-	
-	logout: function() {
-		deluge.events.fire('logout');
-		deluge.client.auth.delete_session({
-			success: function(result) {
-				this.show(true);
-			},
-			scope: this
-		});
-	},
-	
-	show: function(skipCheck) {
-		if (this.firstShow) {
-			deluge.client.on('error', this.onClientError, this);
-			this.firstShow = false;
-		}
-		
-		if (skipCheck) {
-			return Deluge.LoginWindow.superclass.show.call(this);
-		}
-		
-		deluge.client.auth.check_session({
-			success: function(result) {
-				if (result) {
-					deluge.events.fire('login');
-				} else {
-					this.show(true);
-				}
-			},
-			failure: function(result) {
-				this.show(true);
-			},
-			scope: this
-		});
-	},
-	
-	onSpecialKey: function(field, e) {
-		if (e.getKey() == 13) this.onLogin();
-	},
-	
-	onLogin: function() {
-		var passwordField = this.passwordField;
-		deluge.client.auth.login(passwordField.getValue(), {
-			success: function(result) {
-				if (result) {
-					deluge.events.fire('login');
-					this.hide();
-					passwordField.setRawValue('');
-				} else {
-					Ext.MessageBox.show({
-						title: _('Login Failed'),
-						msg: _('You entered an incorrect password'),
-						buttons: Ext.MessageBox.OK,
-						modal: false,
-						fn: function() {
-							passwordField.focus(true, 10);
-						},
-						icon: Ext.MessageBox.WARNING,
-						iconCls: 'x-deluge-icon-warning'
-					});
-				}
-			},
-			scope: this
-		});
-	},
-	
-	onClientError: function(errorObj, response, requestOptions) {
-		if (errorObj.error.code == 1) {
-			deluge.events.fire('logout');
-			this.show(true);
-		}
-	},
-	
-	onShow: function() {
-		this.passwordField.focus(true, true);
-	}
+        this.passwordField = this.form.add({
+            xtype: 'textfield',
+            fieldLabel: _('Password'),
+            id: '_password',
+            name: 'password',
+            inputType: 'password'
+        });
+        this.passwordField.on('specialkey', this.onSpecialKey, this);
+    },
+    
+    logout: function() {
+        deluge.events.fire('logout');
+        deluge.client.auth.delete_session({
+            success: function(result) {
+                this.show(true);
+            },
+            scope: this
+        });
+    },
+    
+    show: function(skipCheck) {
+        if (this.firstShow) {
+            deluge.client.on('error', this.onClientError, this);
+            this.firstShow = false;
+        }
+        
+        if (skipCheck) {
+            return Deluge.LoginWindow.superclass.show.call(this);
+        }
+        
+        deluge.client.auth.check_session({
+            success: function(result) {
+                if (result) {
+                    deluge.events.fire('login');
+                } else {
+                    this.show(true);
+                }
+            },
+            failure: function(result) {
+                this.show(true);
+            },
+            scope: this
+        });
+    },
+    
+    onSpecialKey: function(field, e) {
+        if (e.getKey() == 13) this.onLogin();
+    },
+    
+    onLogin: function() {
+        var passwordField = this.passwordField;
+        deluge.client.auth.login(passwordField.getValue(), {
+            success: function(result) {
+                if (result) {
+                    deluge.events.fire('login');
+                    this.hide();
+                    passwordField.setRawValue('');
+                } else {
+                    Ext.MessageBox.show({
+                        title: _('Login Failed'),
+                        msg: _('You entered an incorrect password'),
+                        buttons: Ext.MessageBox.OK,
+                        modal: false,
+                        fn: function() {
+                            passwordField.focus(true, 10);
+                        },
+                        icon: Ext.MessageBox.WARNING,
+                        iconCls: 'x-deluge-icon-warning'
+                    });
+                }
+            },
+            scope: this
+        });
+    },
+    
+    onClientError: function(errorObj, response, requestOptions) {
+        if (errorObj.error.code == 1) {
+            deluge.events.fire('logout');
+            this.show(true);
+        }
+    },
+    
+    onShow: function() {
+        this.passwordField.focus(true, true);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Menus.js b/deluge/ui/web/js/deluge-all/Menus.js
index 78c5ac108..3f71ef94c 100644
--- a/deluge/ui/web/js/deluge-all/Menus.js
+++ b/deluge/ui/web/js/deluge-all/Menus.js
@@ -31,240 +31,240 @@
  */
 
 deluge.menus = {
-	onTorrentAction: function(item, e) {
-		var ids = deluge.torrents.getSelectedIds();
-		var action = item.initialConfig.torrentAction;
-		
-		switch (action) {
-			case 'pause':
-			case 'resume':
-				deluge.client.core[action + '_torrent'](ids, {
-					success: function() {
-						deluge.ui.update();
-					}
-				});
-				break;
-			case 'top':
-			case 'up':
-			case 'down':
-			case 'bottom':
-				deluge.client.core['queue_' + action](ids, {
-					success: function() {
-						deluge.ui.update();
-					}
-				});
-				break;
-			case 'edit_trackers':
-				deluge.editTrackers.show();
-				break;
-			case 'update':
-				deluge.client.core.force_reannounce(ids, {
-					success: function() {
-						deluge.ui.update();
-					}
-				});
-				break;
-			case 'remove':
-				deluge.removeWindow.show(ids);
-				break;
-			case 'recheck':
-				deluge.client.core.force_recheck(ids, {
-					success: function() {	
-						deluge.ui.update();
-					}
-				});
-				break;
-			case 'move':
-				deluge.moveStorage.show(ids);
-				break;
-		}
-	}
+    onTorrentAction: function(item, e) {
+        var ids = deluge.torrents.getSelectedIds();
+        var action = item.initialConfig.torrentAction;
+        
+        switch (action) {
+            case 'pause':
+            case 'resume':
+                deluge.client.core[action + '_torrent'](ids, {
+                    success: function() {
+                        deluge.ui.update();
+                    }
+                });
+                break;
+            case 'top':
+            case 'up':
+            case 'down':
+            case 'bottom':
+                deluge.client.core['queue_' + action](ids, {
+                    success: function() {
+                        deluge.ui.update();
+                    }
+                });
+                break;
+            case 'edit_trackers':
+                deluge.editTrackers.show();
+                break;
+            case 'update':
+                deluge.client.core.force_reannounce(ids, {
+                    success: function() {
+                        deluge.ui.update();
+                    }
+                });
+                break;
+            case 'remove':
+                deluge.removeWindow.show(ids);
+                break;
+            case 'recheck':
+                deluge.client.core.force_recheck(ids, {
+                    success: function() {    
+                        deluge.ui.update();
+                    }
+                });
+                break;
+            case 'move':
+                deluge.moveStorage.show(ids);
+                break;
+        }
+    }
 }
 
 deluge.menus.torrent = new Ext.menu.Menu({
-	id: 'torrentMenu',
-	items: [{
-		torrentAction: 'pause',
-		text: _('Pause'),
-		iconCls: 'icon-pause',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, {
-		torrentAction: 'resume',
-		text: _('Resume'),
-		iconCls: 'icon-resume',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, '-', {
-		text: _('Options'),
-		iconCls: 'icon-options',
-		menu: new Ext.menu.Menu({
-			items: [{
-				text: _('D/L Speed Limit'),
-				iconCls: 'x-deluge-downloading',
-				menu: new Ext.menu.Menu({
-					items: [{
-						text: _('5 KiB/s')
-					}, {
-						text: _('10 KiB/s')
-					}, {
-						text: _('30 KiB/s')
-					}, {
-						text: _('80 KiB/s')
-					}, {
-						text: _('300 KiB/s')
-					},{
-						text: _('Unlimited')
-					}]
-				})
-			}, {
-				text: _('U/L Speed Limit'),
-				iconCls: 'x-deluge-seeding',
-				menu: new Ext.menu.Menu({
-					items: [{
-						text: _('5 KiB/s')
-					}, {
-						text: _('10 KiB/s')
-					}, {
-						text: _('30 KiB/s')
-					}, {
-						text: _('80 KiB/s')
-					}, {
-						text: _('300 KiB/s')
-					},{
-						text: _('Unlimited')
-					}]
-				})
-			}, {
-				text: _('Connection Limit'),
-				iconCls: 'x-deluge-connections',
-				menu: new Ext.menu.Menu({
-					items: [{
-						text: _('50')
-					}, {
-						text: _('100')
-					}, {
-						text: _('200')
-					}, {
-						text: _('300')
-					}, {
-						text: _('500')
-					},{
-						text: _('Unlimited')
-					}]
-				})
-			}, {
-				text: _('Upload Slot Limit'),
-				iconCls: 'icon-upload-slots',
-				menu: new Ext.menu.Menu({
-					items: [{
-						text: _('0')
-					}, {
-						text: _('1')
-					}, {
-						text: _('2')
-					}, {
-						text: _('3')
-					}, {
-						text: _('5')
-					},{
-						text: _('Unlimited')
-					}]
-				})
-			}, {
-				id: 'auto_managed',
-				text: _('Auto Managed'),
-				checked: false
-			}]
-		})
-	}, '-', {
-		text: _('Queue'),
-		iconCls: 'icon-queue',
-		menu: new Ext.menu.Menu({
-			items: [{
-				torrentAction: 'top',
-				text: _('Top'),
-				iconCls: 'icon-top',
-				handler: deluge.menus.onTorrentAction,
-				scope: deluge.menus
-			},{
-				torrentAction: 'up',
-				text: _('Up'),
-				iconCls: 'icon-up',
-				handler: deluge.menus.onTorrentAction,
-				scope: deluge.menus
-			},{
-				torrentAction: 'down',
-				text: _('Down'),
-				iconCls: 'icon-down',
-				handler: deluge.menus.onTorrentAction,
-				scope: deluge.menus
-			},{
-				torrentAction: 'bottom',
-				text: _('Bottom'),
-				iconCls: 'icon-bottom',
-				handler: deluge.menus.onTorrentAction,
-				scope: deluge.menus
-			}]
-		})
-	}, '-', {
-		torrentAction: 'update',
-		text: _('Update Tracker'),
-		iconCls: 'icon-update-tracker',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, {
-		torrentAction: 'edit_trackers',
-		text: _('Edit Trackers'),
-		iconCls: 'icon-edit-trackers',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, '-', {
-		torrentAction: 'remove',
-		text: _('Remove Torrent'),
-		iconCls: 'icon-remove',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, '-', {
-		torrentAction: 'recheck',
-		text: _('Force Recheck'),
-		iconCls: 'icon-recheck',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}, {
-		torrentAction: 'move',
-		text: _('Move Storage'),
-		iconCls: 'icon-move',
-		handler: deluge.menus.onTorrentAction,
-		scope: deluge.menus
-	}]
+    id: 'torrentMenu',
+    items: [{
+        torrentAction: 'pause',
+        text: _('Pause'),
+        iconCls: 'icon-pause',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, {
+        torrentAction: 'resume',
+        text: _('Resume'),
+        iconCls: 'icon-resume',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, '-', {
+        text: _('Options'),
+        iconCls: 'icon-options',
+        menu: new Ext.menu.Menu({
+            items: [{
+                text: _('D/L Speed Limit'),
+                iconCls: 'x-deluge-downloading',
+                menu: new Ext.menu.Menu({
+                    items: [{
+                        text: _('5 KiB/s')
+                    }, {
+                        text: _('10 KiB/s')
+                    }, {
+                        text: _('30 KiB/s')
+                    }, {
+                        text: _('80 KiB/s')
+                    }, {
+                        text: _('300 KiB/s')
+                    },{
+                        text: _('Unlimited')
+                    }]
+                })
+            }, {
+                text: _('U/L Speed Limit'),
+                iconCls: 'x-deluge-seeding',
+                menu: new Ext.menu.Menu({
+                    items: [{
+                        text: _('5 KiB/s')
+                    }, {
+                        text: _('10 KiB/s')
+                    }, {
+                        text: _('30 KiB/s')
+                    }, {
+                        text: _('80 KiB/s')
+                    }, {
+                        text: _('300 KiB/s')
+                    },{
+                        text: _('Unlimited')
+                    }]
+                })
+            }, {
+                text: _('Connection Limit'),
+                iconCls: 'x-deluge-connections',
+                menu: new Ext.menu.Menu({
+                    items: [{
+                        text: _('50')
+                    }, {
+                        text: _('100')
+                    }, {
+                        text: _('200')
+                    }, {
+                        text: _('300')
+                    }, {
+                        text: _('500')
+                    },{
+                        text: _('Unlimited')
+                    }]
+                })
+            }, {
+                text: _('Upload Slot Limit'),
+                iconCls: 'icon-upload-slots',
+                menu: new Ext.menu.Menu({
+                    items: [{
+                        text: _('0')
+                    }, {
+                        text: _('1')
+                    }, {
+                        text: _('2')
+                    }, {
+                        text: _('3')
+                    }, {
+                        text: _('5')
+                    },{
+                        text: _('Unlimited')
+                    }]
+                })
+            }, {
+                id: 'auto_managed',
+                text: _('Auto Managed'),
+                checked: false
+            }]
+        })
+    }, '-', {
+        text: _('Queue'),
+        iconCls: 'icon-queue',
+        menu: new Ext.menu.Menu({
+            items: [{
+                torrentAction: 'top',
+                text: _('Top'),
+                iconCls: 'icon-top',
+                handler: deluge.menus.onTorrentAction,
+                scope: deluge.menus
+            },{
+                torrentAction: 'up',
+                text: _('Up'),
+                iconCls: 'icon-up',
+                handler: deluge.menus.onTorrentAction,
+                scope: deluge.menus
+            },{
+                torrentAction: 'down',
+                text: _('Down'),
+                iconCls: 'icon-down',
+                handler: deluge.menus.onTorrentAction,
+                scope: deluge.menus
+            },{
+                torrentAction: 'bottom',
+                text: _('Bottom'),
+                iconCls: 'icon-bottom',
+                handler: deluge.menus.onTorrentAction,
+                scope: deluge.menus
+            }]
+        })
+    }, '-', {
+        torrentAction: 'update',
+        text: _('Update Tracker'),
+        iconCls: 'icon-update-tracker',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, {
+        torrentAction: 'edit_trackers',
+        text: _('Edit Trackers'),
+        iconCls: 'icon-edit-trackers',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, '-', {
+        torrentAction: 'remove',
+        text: _('Remove Torrent'),
+        iconCls: 'icon-remove',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, '-', {
+        torrentAction: 'recheck',
+        text: _('Force Recheck'),
+        iconCls: 'icon-recheck',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }, {
+        torrentAction: 'move',
+        text: _('Move Storage'),
+        iconCls: 'icon-move',
+        handler: deluge.menus.onTorrentAction,
+        scope: deluge.menus
+    }]
 });
 
 deluge.menus.filePriorities = new Ext.menu.Menu({
-	id: 'filePrioritiesMenu',
-	items: [{
-		id: 'expandAll',
-		text: _('Expand All'),
-		iconCls: 'icon-expand-all'
-	}, '-', {
-		id: 'no_download',
-		text: _('Do Not Download'),
-		iconCls: 'icon-do-not-download',
-		filePriority: 0
-	}, {
-		id: 'normal',
-		text: _('Normal Priority'),
-		iconCls: 'icon-normal',
-		filePriority: 1
-	}, {
-		id: 'high',
-		text: _('High Priority'),
-		iconCls: 'icon-high',
-		filePriority: 2
-	}, {
-		id: 'highest',
-		text: _('Highest Priority'),
-		iconCls: 'icon-highest',
-		filePriority: 5
-	}]
+    id: 'filePrioritiesMenu',
+    items: [{
+        id: 'expandAll',
+        text: _('Expand All'),
+        iconCls: 'icon-expand-all'
+    }, '-', {
+        id: 'no_download',
+        text: _('Do Not Download'),
+        iconCls: 'icon-do-not-download',
+        filePriority: 0
+    }, {
+        id: 'normal',
+        text: _('Normal Priority'),
+        iconCls: 'icon-normal',
+        filePriority: 1
+    }, {
+        id: 'high',
+        text: _('High Priority'),
+        iconCls: 'icon-high',
+        filePriority: 2
+    }, {
+        id: 'highest',
+        text: _('Highest Priority'),
+        iconCls: 'icon-highest',
+        filePriority: 5
+    }]
 });
diff --git a/deluge/ui/web/js/deluge-all/MoveStorage.js b/deluge/ui/web/js/deluge-all/MoveStorage.js
index 67c5f6b6c..f9342df38 100644
--- a/deluge/ui/web/js/deluge-all/MoveStorage.js
+++ b/deluge/ui/web/js/deluge-all/MoveStorage.js
@@ -32,73 +32,73 @@
 
 Ext.namespace('Deluge');
 Deluge.MoveStorage = Ext.extend(Ext.Window, {
-	
-	constructor: function(config) {
-		config = Ext.apply({
-			title: _('Move Storage'),
-			width: 375,
-			height: 110,
-			layout: 'fit',
-			buttonAlign: 'right',
-			closeAction: 'hide',
-			closable: true,
-			iconCls: 'x-deluge-move-storage',
-			plain: true,
-			resizable: false
-		}, config);
-		Deluge.MoveStorage.superclass.constructor.call(this, config);
-	},
+    
+    constructor: function(config) {
+        config = Ext.apply({
+            title: _('Move Storage'),
+            width: 375,
+            height: 110,
+            layout: 'fit',
+            buttonAlign: 'right',
+            closeAction: 'hide',
+            closable: true,
+            iconCls: 'x-deluge-move-storage',
+            plain: true,
+            resizable: false
+        }, config);
+        Deluge.MoveStorage.superclass.constructor.call(this, config);
+    },
 
-	initComponent: function() {
-		Deluge.MoveStorage.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.MoveStorage.superclass.initComponent.call(this);
 
-		this.addButton(_('Cancel'), this.onCancel, this);
-		this.addButton(_('Move'), this.onMove, this);
+        this.addButton(_('Cancel'), this.onCancel, this);
+        this.addButton(_('Move'), this.onMove, this);
 
-		this.form = this.add({
-			xtype: 'form',
-			border: false,
-			defaultType: 'textfield',
-			width: 300,
-			bodyStyle: 'padding: 5px'
-		});
+        this.form = this.add({
+            xtype: 'form',
+            border: false,
+            defaultType: 'textfield',
+            width: 300,
+            bodyStyle: 'padding: 5px'
+        });
 
-		this.moveLocation = this.form.add({
-			fieldLabel: _('Location'),
-			name: 'location',
-			width: 240
-		});
-		//this.form.add({
-		//	xtype: 'button',
-		//	text: _('Browse'),
-		//	handler: function() {
-		//		if (!this.fileBrowser) {
-		//			this.fileBrowser = new Deluge.FileBrowser();
-		//		}
-		//		this.fileBrowser.show();
-		//	},
-		//	scope: this
-		//});
-	},
+        this.moveLocation = this.form.add({
+            fieldLabel: _('Location'),
+            name: 'location',
+            width: 240
+        });
+        //this.form.add({
+        //    xtype: 'button',
+        //    text: _('Browse'),
+        //    handler: function() {
+        //        if (!this.fileBrowser) {
+        //            this.fileBrowser = new Deluge.FileBrowser();
+        //        }
+        //        this.fileBrowser.show();
+        //    },
+        //    scope: this
+        //});
+    },
 
-	hide: function() {
-		Deluge.MoveStorage.superclass.hide.call(this);
-		this.torrentIds = null;
-	},
+    hide: function() {
+        Deluge.MoveStorage.superclass.hide.call(this);
+        this.torrentIds = null;
+    },
 
-	show: function(torrentIds) {
-		Deluge.MoveStorage.superclass.show.call(this);
-		this.torrentIds = torrentIds;
-	},
+    show: function(torrentIds) {
+        Deluge.MoveStorage.superclass.show.call(this);
+        this.torrentIds = torrentIds;
+    },
 
-	onCancel: function() {
-		this.hide();
-	},
+    onCancel: function() {
+        this.hide();
+    },
 
-	onMove: function() {
-		var dest = this.moveLocation.getValue();
-		deluge.client.core.move_storage(this.torrentIds, dest);
-		this.hide();
-	}
+    onMove: function() {
+        var dest = this.moveLocation.getValue();
+        deluge.client.core.move_storage(this.torrentIds, dest);
+        this.hide();
+    }
 });
 deluge.moveStorage = new Deluge.MoveStorage();
diff --git a/deluge/ui/web/js/deluge-all/MultiOptionsManager.js b/deluge/ui/web/js/deluge-all/MultiOptionsManager.js
index 4d2a23c3f..fac4c666f 100644
--- a/deluge/ui/web/js/deluge-all/MultiOptionsManager.js
+++ b/deluge/ui/web/js/deluge-all/MultiOptionsManager.js
@@ -38,177 +38,177 @@
  */
 Deluge.MultiOptionsManager = Ext.extend(Deluge.OptionsManager, {
 
-	constructor: function(config) {
-		this.currentId = null;
-		this.stored = {};
-		Deluge.MultiOptionsManager.superclass.constructor.call(this, config);
-	},
-	
-	/**
-	 * Changes bound fields to use the specified id.
-	 * @param {String} id
-	 */
-	changeId: function(id, dontUpdateBinds) {
-		var oldId = this.currentId;
-		this.currentId = id;
-		if (!dontUpdateBinds) {
-			for (var option in this.options) {
-				if (!this.binds[option]) continue;
-				Ext.each(this.binds[option], function(bind) {
-					bind.setValue(this.get(option));
-				}, this);
-			}
-		}
-		return oldId;
-	},
+    constructor: function(config) {
+        this.currentId = null;
+        this.stored = {};
+        Deluge.MultiOptionsManager.superclass.constructor.call(this, config);
+    },
+    
+    /**
+     * Changes bound fields to use the specified id.
+     * @param {String} id
+     */
+    changeId: function(id, dontUpdateBinds) {
+        var oldId = this.currentId;
+        this.currentId = id;
+        if (!dontUpdateBinds) {
+            for (var option in this.options) {
+                if (!this.binds[option]) continue;
+                Ext.each(this.binds[option], function(bind) {
+                    bind.setValue(this.get(option));
+                }, this);
+            }
+        }
+        return oldId;
+    },
 
-	/**
-	 * Changes all the changed values to be the default values
-	 * @param {String} id
-	 */
-	commit: function() {
-		this.stored[this.currentId] = Ext.apply(this.stored[this.currentId], this.changed[this.currentId]);
-		this.reset();
-	},
-	
-	/**
-	 * Get the value for an option
-	 * @param {String/Array} option A single option or an array of options to return.
-	 * @returns {Object} the options value.
-	 */
-	get: function() {
-		if (arguments.length == 1) {
-			var option = arguments[0];
-			return (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
-		} else if (arguments.length == 0) {
-			var options = {};
-			for (var option in this.options) {
-			    options[option] = (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
-			}
-			return options;
-		} else {
-			var options = {};
-			Ext.each(arguments, function(option) {
-				options[option] = (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
-			}, this);
-			return options;
-		}
-	},
+    /**
+     * Changes all the changed values to be the default values
+     * @param {String} id
+     */
+    commit: function() {
+        this.stored[this.currentId] = Ext.apply(this.stored[this.currentId], this.changed[this.currentId]);
+        this.reset();
+    },
+    
+    /**
+     * Get the value for an option
+     * @param {String/Array} option A single option or an array of options to return.
+     * @returns {Object} the options value.
+     */
+    get: function() {
+        if (arguments.length == 1) {
+            var option = arguments[0];
+            return (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
+        } else if (arguments.length == 0) {
+            var options = {};
+            for (var option in this.options) {
+                options[option] = (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
+            }
+            return options;
+        } else {
+            var options = {};
+            Ext.each(arguments, function(option) {
+                options[option] = (this.isDirty(option)) ? this.changed[this.currentId][option] : this.getDefault(option);
+            }, this);
+            return options;
+        }
+    },
 
-	/**
-	 * Get the default value for an option.
-	 * @param {String} option A single option.
-	 * @returns {Object} the value of the option
-	 */
-	getDefault: function(option) {
-		return (this.has(option)) ? this.stored[this.currentId][option] : this.options[option];
-	},
+    /**
+     * Get the default value for an option.
+     * @param {String} option A single option.
+     * @returns {Object} the value of the option
+     */
+    getDefault: function(option) {
+        return (this.has(option)) ? this.stored[this.currentId][option] : this.options[option];
+    },
 
-	/**
-	 * Returns the dirty (changed) values.
-	 * @returns {Object} the changed options
-	 */
-	getDirty: function() {
-		return (this.changed[this.currentId]) ? this.changed[this.currentId] : {};
-	},
+    /**
+     * Returns the dirty (changed) values.
+     * @returns {Object} the changed options
+     */
+    getDirty: function() {
+        return (this.changed[this.currentId]) ? this.changed[this.currentId] : {};
+    },
 
-	/**
-	 * Check to see if the option has been changed.
-	 * @param {String} option
-	 * @returns {Boolean} true if the option has been changed, else false.
-	 */
-	isDirty: function(option) {
-		return (this.changed[this.currentId] && !Ext.isEmpty(this.changed[this.currentId][option]));
-	},
+    /**
+     * Check to see if the option has been changed.
+     * @param {String} option
+     * @returns {Boolean} true if the option has been changed, else false.
+     */
+    isDirty: function(option) {
+        return (this.changed[this.currentId] && !Ext.isEmpty(this.changed[this.currentId][option]));
+    },
 
-	/**
-	 * Check to see if an id has had an option set to something other than the
-	 * default value.
-	 * @param {String} option
-	 * @returns {Boolean} true if the id has an option, else false.
-	 */
-	has: function(option) {
-		return (this.stored[this.currentId] && !Ext.isEmpty(this.stored[this.currentId][option]));
-	},
+    /**
+     * Check to see if an id has had an option set to something other than the
+     * default value.
+     * @param {String} option
+     * @returns {Boolean} true if the id has an option, else false.
+     */
+    has: function(option) {
+        return (this.stored[this.currentId] && !Ext.isEmpty(this.stored[this.currentId][option]));
+    },
 
-	/**
-	 * Reset the options back to the default values for the specified id.
-	 */
-	reset: function() {
-		if (this.changed[this.currentId]) delete this.changed[this.currentId];
-		if (this.stored[this.currentId]) delete this.stored[this.currentId];
-	},
+    /**
+     * Reset the options back to the default values for the specified id.
+     */
+    reset: function() {
+        if (this.changed[this.currentId]) delete this.changed[this.currentId];
+        if (this.stored[this.currentId]) delete this.stored[this.currentId];
+    },
 
-	/**
-	 * Reset the options back to their defaults for all ids.
-	 */
-	resetAll: function() {
-		this.changed = {};
-		this.stored = {};
-		this.changeId(null);
-	},
+    /**
+     * Reset the options back to their defaults for all ids.
+     */
+    resetAll: function() {
+        this.changed = {};
+        this.stored = {};
+        this.changeId(null);
+    },
 
-	/**
-	 * Sets the value of specified option for the passed in id.
-	 * @param {String} id
-	 * @param {String} option
-	 * @param {Object} value The value for the option
-	 */
-	setDefault: function(option, value) {
-		if (option === undefined) {
-			return;
-		} else if (value === undefined) {
-			for (var key in option) {
-				this.setDefault(key, option[key]);
-			}
-		} else {
-			var oldValue = this.getDefault(option);
-			value = this.convertValueType(oldValue, value);
-			
-			// If the value is the same as the old value there is 
-			// no point in setting it again.
-			if (oldValue == value) return;
-			
-			// Store the new default
-			if (!this.stored[this.currentId]) this.stored[this.currentId] = {};
-			this.stored[this.currentId][option] = value;
-			
-			if (!this.isDirty(option)) {
-				this.fireEvent('changed', option, value, oldValue);
-			}
-		}
-	},
+    /**
+     * Sets the value of specified option for the passed in id.
+     * @param {String} id
+     * @param {String} option
+     * @param {Object} value The value for the option
+     */
+    setDefault: function(option, value) {
+        if (option === undefined) {
+            return;
+        } else if (value === undefined) {
+            for (var key in option) {
+                this.setDefault(key, option[key]);
+            }
+        } else {
+            var oldValue = this.getDefault(option);
+            value = this.convertValueType(oldValue, value);
+            
+            // If the value is the same as the old value there is 
+            // no point in setting it again.
+            if (oldValue == value) return;
+            
+            // Store the new default
+            if (!this.stored[this.currentId]) this.stored[this.currentId] = {};
+            this.stored[this.currentId][option] = value;
+            
+            if (!this.isDirty(option)) {
+                this.fireEvent('changed', option, value, oldValue);
+            }
+        }
+    },
 
-	/**
-	 * Update the value for the specified option and id.
-	 * @param {String} id
-	 * @param {String/Object} option or options to update
-	 * @param {Object} [value];
-	 */
-	update: function(option, value) {
-		if (option === undefined) {
-			return;
-		} else if (value === undefined) {
-			for (var key in option) {
-				this.update(key, option[key]);
-			}
-		} else {
-			if (!this.changed[this.currentId]) this.changed[this.currentId] = {};
+    /**
+     * Update the value for the specified option and id.
+     * @param {String} id
+     * @param {String/Object} option or options to update
+     * @param {Object} [value];
+     */
+    update: function(option, value) {
+        if (option === undefined) {
+            return;
+        } else if (value === undefined) {
+            for (var key in option) {
+                this.update(key, option[key]);
+            }
+        } else {
+            if (!this.changed[this.currentId]) this.changed[this.currentId] = {};
 
-			var defaultValue = this.getDefault(option);
-			value = this.convertValueType(defaultValue, value);
-			
-			var oldValue = this.get(option);
-			if (oldValue == value) return;
+            var defaultValue = this.getDefault(option);
+            value = this.convertValueType(defaultValue, value);
+            
+            var oldValue = this.get(option);
+            if (oldValue == value) return;
 
-			if (defaultValue == value) {
-				if (this.isDirty(option)) delete this.changed[this.currentId][option];
-				this.fireEvent('changed', option, value, oldValue);
-				return;
-			} else {
-				this.changed[this.currentId][option] = value;
-				this.fireEvent('changed', option, value, oldValue);
-			}
-		}
-	}
+            if (defaultValue == value) {
+                if (this.isDirty(option)) delete this.changed[this.currentId][option];
+                this.fireEvent('changed', option, value, oldValue);
+                return;
+            } else {
+                this.changed[this.currentId][option] = value;
+                this.fireEvent('changed', option, value, oldValue);
+            }
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/OptionsManager.js b/deluge/ui/web/js/deluge-all/OptionsManager.js
index abbcbb54d..fedd439ef 100644
--- a/deluge/ui/web/js/deluge-all/OptionsManager.js
+++ b/deluge/ui/web/js/deluge-all/OptionsManager.js
@@ -40,250 +40,250 @@ Ext.namespace('Deluge');
  * @param {Object} config Configuration options
  */
 Deluge.OptionsManager = Ext.extend(Ext.util.Observable, {
-	
-	constructor: function(config) {
-		config = config || {};
-		this.binds = {};
-		this.changed = {};
-		this.options = (config && config['options']) || {};
-		this.focused = null;
+    
+    constructor: function(config) {
+        config = config || {};
+        this.binds = {};
+        this.changed = {};
+        this.options = (config && config['options']) || {};
+        this.focused = null;
 
-		this.addEvents({
-			/**
-			 * @event add
-			 * Fires when an option is added
-			 */
-			'add': true,
+        this.addEvents({
+            /**
+             * @event add
+             * Fires when an option is added
+             */
+            'add': true,
 
-			/**
-			 * @event changed
-			 * Fires when an option is changed
-			 * @param {String} option The changed option
-			 * @param {Mixed} value The options new value
-			 * @param {Mixed} oldValue The options old value
-			 */
-			'changed': true,
+            /**
+             * @event changed
+             * Fires when an option is changed
+             * @param {String} option The changed option
+             * @param {Mixed} value The options new value
+             * @param {Mixed} oldValue The options old value
+             */
+            'changed': true,
 
-			/**
-			 * @event reset
-			 * Fires when the options are reset
-			 */
-			'reset': true
-		});
-		this.on('changed', this.onChange, this);
+            /**
+             * @event reset
+             * Fires when the options are reset
+             */
+            'reset': true
+        });
+        this.on('changed', this.onChange, this);
 
-		Deluge.OptionsManager.superclass.constructor.call(this);
-	},
+        Deluge.OptionsManager.superclass.constructor.call(this);
+    },
 
-	/**
-	 * Add a set of default options and values to the options manager
-	 * @param {Object} options The default options.
-	 */
-	addOptions: function(options) {
-		this.options = Ext.applyIf(this.options, options);
-	},
-	
-	/**
-	 * Binds a form field to the specified option.
-	 * @param {String} option
-	 * @param {Ext.form.Field} field
-	 */
-	bind: function(option, field) {
-		this.binds[option] = this.binds[option] || [];
-		this.binds[option].push(field);
-		field._doption = option;
+    /**
+     * Add a set of default options and values to the options manager
+     * @param {Object} options The default options.
+     */
+    addOptions: function(options) {
+        this.options = Ext.applyIf(this.options, options);
+    },
+    
+    /**
+     * Binds a form field to the specified option.
+     * @param {String} option
+     * @param {Ext.form.Field} field
+     */
+    bind: function(option, field) {
+        this.binds[option] = this.binds[option] || [];
+        this.binds[option].push(field);
+        field._doption = option;
 
-		field.on('focus', this.onFieldFocus, this);
-		field.on('blur', this.onFieldBlur, this);
-		field.on('change', this.onFieldChange, this);
-		field.on('check', this.onFieldChange, this);
-		field.on('spin', this.onFieldChange, this);
-		return field;
-	},
+        field.on('focus', this.onFieldFocus, this);
+        field.on('blur', this.onFieldBlur, this);
+        field.on('change', this.onFieldChange, this);
+        field.on('check', this.onFieldChange, this);
+        field.on('spin', this.onFieldChange, this);
+        return field;
+    },
 
-	/**
-	 * Changes all the changed values to be the default values
-	 */
-	commit: function() {
-		this.options = Ext.apply(this.options, this.changed);
-		this.reset();
-	},
+    /**
+     * Changes all the changed values to be the default values
+     */
+    commit: function() {
+        this.options = Ext.apply(this.options, this.changed);
+        this.reset();
+    },
 
-	/**
-	 * Converts the value so it matches the originals type
-	 * @param {Mixed} oldValue The original value
-	 * @param {Mixed} value The new value to convert
-	 */
-	convertValueType: function(oldValue, value) {
-		if (Ext.type(oldValue) != Ext.type(value)) {
-			switch (Ext.type(oldValue)) {
-				case 'string':
-					value = String(value);
-					break;
-				case 'number':
-					value = Number(value);
-					break;
-				case 'boolean':
-					if (Ext.type(value) == 'string') {
-						value = value.toLowerCase();
-						value = (value == 'true' || value == '1' || value == 'on') ? true : false;
-					} else {
-						value = Boolean(value);
-					}
-					break;
-			}
-		}
-		return value;
-	},
+    /**
+     * Converts the value so it matches the originals type
+     * @param {Mixed} oldValue The original value
+     * @param {Mixed} value The new value to convert
+     */
+    convertValueType: function(oldValue, value) {
+        if (Ext.type(oldValue) != Ext.type(value)) {
+            switch (Ext.type(oldValue)) {
+                case 'string':
+                    value = String(value);
+                    break;
+                case 'number':
+                    value = Number(value);
+                    break;
+                case 'boolean':
+                    if (Ext.type(value) == 'string') {
+                        value = value.toLowerCase();
+                        value = (value == 'true' || value == '1' || value == 'on') ? true : false;
+                    } else {
+                        value = Boolean(value);
+                    }
+                    break;
+            }
+        }
+        return value;
+    },
 
-	/**
-	 * Get the value for an option or options.
-	 * @param {String} [option] A single option or an array of options to return.
-	 * @returns {Object} the options value.
-	 */
-	get: function() {
-		if (arguments.length == 1) {
-			var option = arguments[0];
-			return (this.isDirty(option)) ? this.changed[option] : this.options[option];
-		} else {
-			var options = {};
-			Ext.each(arguments, function(option) {
-				if (!this.has(option)) return;
-				options[option] = (this.isDirty(option)) ? this.changed[option] : this.options[option];
-			}, this);
-			return options;
-		}
-	},
+    /**
+     * Get the value for an option or options.
+     * @param {String} [option] A single option or an array of options to return.
+     * @returns {Object} the options value.
+     */
+    get: function() {
+        if (arguments.length == 1) {
+            var option = arguments[0];
+            return (this.isDirty(option)) ? this.changed[option] : this.options[option];
+        } else {
+            var options = {};
+            Ext.each(arguments, function(option) {
+                if (!this.has(option)) return;
+                options[option] = (this.isDirty(option)) ? this.changed[option] : this.options[option];
+            }, this);
+            return options;
+        }
+    },
 
-	/**
-	 * Get the default value for an option or options.
-	 * @param {String|Array} [option] A single option or an array of options to return.
-	 * @returns {Object} the value of the option
-	 */
-	getDefault: function(option) {
-		return this.options[option];
-	},
+    /**
+     * Get the default value for an option or options.
+     * @param {String|Array} [option] A single option or an array of options to return.
+     * @returns {Object} the value of the option
+     */
+    getDefault: function(option) {
+        return this.options[option];
+    },
 
-	/**
-	 * Returns the dirty (changed) values.
-	 * @returns {Object} the changed options
-	 */
-	getDirty: function() {
-		return this.changed;
-	},
+    /**
+     * Returns the dirty (changed) values.
+     * @returns {Object} the changed options
+     */
+    getDirty: function() {
+        return this.changed;
+    },
 
-	/**
-	 * @param {String} [option] The option to check
-	 * @returns {Boolean} true if the option has been changed from the default.
-	 */
-	isDirty: function(option) {
-		return !Ext.isEmpty(this.changed[option]);
-	},
+    /**
+     * @param {String} [option] The option to check
+     * @returns {Boolean} true if the option has been changed from the default.
+     */
+    isDirty: function(option) {
+        return !Ext.isEmpty(this.changed[option]);
+    },
 
-	/**
-	 * Check to see if an option exists in the options manager
-	 * @param {String} option
-	 * @returns {Boolean} true if the option exists, else false.
-	 */
-	has: function(option) {
-		return (this.options[option]);
-	},
+    /**
+     * Check to see if an option exists in the options manager
+     * @param {String} option
+     * @returns {Boolean} true if the option exists, else false.
+     */
+    has: function(option) {
+        return (this.options[option]);
+    },
 
-	/**
-	 * Reset the options back to the default values.
-	 */
-	reset: function() {
-		this.changed = {};
-	},
+    /**
+     * Reset the options back to the default values.
+     */
+    reset: function() {
+        this.changed = {};
+    },
 
-	/**
-	 * Sets the value of specified option(s) for the passed in id.
-	 * @param {String} option
-	 * @param {Object} value The value for the option
-	 */
-	set: function(option, value) {
-		if (option === undefined) {
-			return;
-		} else if (typeof option == 'object') {
-			var options = option;
-			this.options = Ext.apply(this.options, options);
-			for (var option in options) {
-				this.onChange(option, options[option]);
-			}
-		} else {
-			this.options[option] = value;
-			this.onChange(option, value)
-		}
-	},
+    /**
+     * Sets the value of specified option(s) for the passed in id.
+     * @param {String} option
+     * @param {Object} value The value for the option
+     */
+    set: function(option, value) {
+        if (option === undefined) {
+            return;
+        } else if (typeof option == 'object') {
+            var options = option;
+            this.options = Ext.apply(this.options, options);
+            for (var option in options) {
+                this.onChange(option, options[option]);
+            }
+        } else {
+            this.options[option] = value;
+            this.onChange(option, value)
+        }
+    },
 
-	/**
-	 * Update the value for the specified option and id.
-	 * @param {String/Object} option or options to update
-	 * @param {Object} [value];
-	 */
-	update: function(option, value) {
-		if (option === undefined) {
-			return;
-		} else if (value === undefined) {
-			for (var key in option) {
-				this.update(key, option[key]);
-			}
-		} else {
-			var defaultValue = this.getDefault(option);
-			value = this.convertValueType(defaultValue, value);
+    /**
+     * Update the value for the specified option and id.
+     * @param {String/Object} option or options to update
+     * @param {Object} [value];
+     */
+    update: function(option, value) {
+        if (option === undefined) {
+            return;
+        } else if (value === undefined) {
+            for (var key in option) {
+                this.update(key, option[key]);
+            }
+        } else {
+            var defaultValue = this.getDefault(option);
+            value = this.convertValueType(defaultValue, value);
 
-			var oldValue = this.get(option);
-			if (oldValue == value) return;
+            var oldValue = this.get(option);
+            if (oldValue == value) return;
 
-			if (defaultValue == value) {
-				if (this.isDirty(option)) delete this.changed[option];
-				this.fireEvent('changed', option, value, oldValue);
-				return;
-			}
+            if (defaultValue == value) {
+                if (this.isDirty(option)) delete this.changed[option];
+                this.fireEvent('changed', option, value, oldValue);
+                return;
+            }
 
-			this.changed[option] = value;
-			this.fireEvent('changed', option, value, oldValue);
-		}
-	},
+            this.changed[option] = value;
+            this.fireEvent('changed', option, value, oldValue);
+        }
+    },
 
-	/**
-	 * Lets the option manager know when a field is blurred so if a value
-	 * so value changing operations can continue on that field.
-	 */
-	onFieldBlur: function(field, event) {
-		if (this.focused == field) {
-			this.focused = null;
-		}
-	},
+    /**
+     * Lets the option manager know when a field is blurred so if a value
+     * so value changing operations can continue on that field.
+     */
+    onFieldBlur: function(field, event) {
+        if (this.focused == field) {
+            this.focused = null;
+        }
+    },
 
-	/**
-	 * Stops a form fields value from being blocked by the change functions
-	 * @param {Ext.form.Field} field
-	 * @private
-	 */
-	onFieldChange: function(field, event) {
-		if (field.field) field = field.field // fix for spinners
-		this.update(field._doption, field.getValue());
-	},
+    /**
+     * Stops a form fields value from being blocked by the change functions
+     * @param {Ext.form.Field} field
+     * @private
+     */
+    onFieldChange: function(field, event) {
+        if (field.field) field = field.field // fix for spinners
+        this.update(field._doption, field.getValue());
+    },
 
-	/**
-	 * Lets the option manager know when a field is focused so if a value
-	 * changing operation is performed it won't change the value of the
-	 * field.
-	 */
-	onFieldFocus: function(field, event) {
-		this.focused = field;
-	},
+    /**
+     * Lets the option manager know when a field is focused so if a value
+     * changing operation is performed it won't change the value of the
+     * field.
+     */
+    onFieldFocus: function(field, event) {
+        this.focused = field;
+    },
 
-	onChange: function(option, newValue, oldValue) {
-		// If we don't have a bind there's nothing to do.
-		if (Ext.isEmpty(this.binds[option])) return;
-		Ext.each(this.binds[option], function(bind) {
-			// The field is currently focused so we don't want to 
-			// change it.
-			if (bind == this.focused) return;
-			// Set the form field to the new value.
-			bind.setValue(newValue);
-		}, this);
-	}
+    onChange: function(option, newValue, oldValue) {
+        // If we don't have a bind there's nothing to do.
+        if (Ext.isEmpty(this.binds[option])) return;
+        Ext.each(this.binds[option], function(bind) {
+            // The field is currently focused so we don't want to 
+            // change it.
+            if (bind == this.focused) return;
+            // Set the form field to the new value.
+            bind.setValue(newValue);
+        }, this);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/OtherLimitWindow.js b/deluge/ui/web/js/deluge-all/OtherLimitWindow.js
index aee1b4246..28c647d9a 100644
--- a/deluge/ui/web/js/deluge-all/OtherLimitWindow.js
+++ b/deluge/ui/web/js/deluge-all/OtherLimitWindow.js
@@ -36,65 +36,65 @@ Ext.ns('Deluge');
  * @extends Ext.Window
  */
 Deluge.OtherLimitWindow = Ext.extend(Ext.Window, {
-	
-	layout: 'fit',
-	width: 210,
-	height: 100,
+    
+    layout: 'fit',
+    width: 210,
+    height: 100,
 
-	closeAction: 'hide',
+    closeAction: 'hide',
 
-	initComponent: function() {
-		Deluge.OtherLimitWindow.superclass.initComponent.call(this);
-		this.form = this.add({
-			xtype: 'form',
-			baseCls: 'x-plain',
-			bodyStyle: 'padding: 5px',
-			layout: 'hbox',
-			layoutConfig: {
-				pack: 'start'
-			},
-			items: [{
-				xtype: 'spinnerfield',
-				name: 'limit'
-			}]
-		});
-		if (this.initialConfig.unit) {
-			this.form.add({
-				border: false,
-				baseCls: 'x-plain',
-				bodyStyle: 'padding: 5px',
-				html: this.initialConfig.unit
-			});
-		} else {
-			this.setSize(180, 100);
-		}
+    initComponent: function() {
+        Deluge.OtherLimitWindow.superclass.initComponent.call(this);
+        this.form = this.add({
+            xtype: 'form',
+            baseCls: 'x-plain',
+            bodyStyle: 'padding: 5px',
+            layout: 'hbox',
+            layoutConfig: {
+                pack: 'start'
+            },
+            items: [{
+                xtype: 'spinnerfield',
+                name: 'limit'
+            }]
+        });
+        if (this.initialConfig.unit) {
+            this.form.add({
+                border: false,
+                baseCls: 'x-plain',
+                bodyStyle: 'padding: 5px',
+                html: this.initialConfig.unit
+            });
+        } else {
+            this.setSize(180, 100);
+        }
 
-		this.addButton(_('Cancel'), this.onCancelClick, this);
-		this.addButton(_('Ok'), this.onOkClick, this);
-		this.afterMethod('show', this.doFocusField, this);
-	},
+        this.addButton(_('Cancel'), this.onCancelClick, this);
+        this.addButton(_('Ok'), this.onOkClick, this);
+        this.afterMethod('show', this.doFocusField, this);
+    },
 
-	setValue: function(value) {
-		this.form.getForm().setValues({limit: value});
-	},
+    setValue: function(value) {
+        this.form.getForm().setValues({limit: value});
+    },
 
-	onCancelClick: function() {
-		this.form.getForm().reset();
-		this.hide();
-	},
+    onCancelClick: function() {
+        this.form.getForm().reset();
+        this.hide();
+    },
 
-	onOkClick: function() {
-		var config = {};
-		config[this.group] = this.form.getForm().getValues().limit;
-		deluge.client.core.set_config(config, {
-			success: function() {
-				deluge.ui.update();
-			}
-		});
-		this.hide();
-	},
+    onOkClick: function() {
+        var config = {};
+        config[this.group] = this.form.getForm().getValues().limit;
+        deluge.client.core.set_config(config, {
+            success: function() {
+                deluge.ui.update();
+            }
+        });
+        this.hide();
+    },
 
-	doFocusField: function() {
-		this.form.getForm().findField('limit').focus(true, 10);
-	}
+    doFocusField: function() {
+        this.form.getForm().findField('limit').focus(true, 10);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Plugin.js b/deluge/ui/web/js/deluge-all/Plugin.js
index 40468e35c..2453abe05 100644
--- a/deluge/ui/web/js/deluge-all/Plugin.js
+++ b/deluge/ui/web/js/deluge-all/Plugin.js
@@ -37,91 +37,91 @@ Ext.ns('Deluge');
  */
 Deluge.Plugin = Ext.extend(Ext.util.Observable, {
 
-	/**
-	 * The plugins name
-	 * @property name
-	 * @type {String}
-	 */
-	name: null,
+    /**
+     * The plugins name
+     * @property name
+     * @type {String}
+     */
+    name: null,
 
-	constructor: function(config) {
-		this.isDelugePlugin = true;
-		this.addEvents({
-			/**
-			 * @event enabled
-			 * @param {Plugin} plugin the plugin instance
-			 */
-			"enabled": true,
+    constructor: function(config) {
+        this.isDelugePlugin = true;
+        this.addEvents({
+            /**
+             * @event enabled
+             * @param {Plugin} plugin the plugin instance
+             */
+            "enabled": true,
 
-			/**
-			 * @event disabled
-			 * @param {Plugin} plugin the plugin instance
-			 */
-			"disabled": true
-		});
-		Deluge.Plugin.superclass.constructor.call(this, config);
-	},
-	
-	/**
-	 * Disables the plugin, firing the "{@link #disabled}" event and
-	 * then executing the plugins clean up method onDisabled.
-	 */
-	disable: function() {
-		this.fireEvent("disabled", this);
-		if (this.onDisable) this.onDisable();
-	},
-	
-	/**
-	 * Enables the plugin, firing the "{@link #enabled}" event and
-	 * then executes the plugins setup method, onEnabled.
-	 */
-	enable: function() {
-		this.fireEvent("enable", this);
-		if (this.onEnable) this.onEnable();
-	},
+            /**
+             * @event disabled
+             * @param {Plugin} plugin the plugin instance
+             */
+            "disabled": true
+        });
+        Deluge.Plugin.superclass.constructor.call(this, config);
+    },
+    
+    /**
+     * Disables the plugin, firing the "{@link #disabled}" event and
+     * then executing the plugins clean up method onDisabled.
+     */
+    disable: function() {
+        this.fireEvent("disabled", this);
+        if (this.onDisable) this.onDisable();
+    },
+    
+    /**
+     * Enables the plugin, firing the "{@link #enabled}" event and
+     * then executes the plugins setup method, onEnabled.
+     */
+    enable: function() {
+        this.fireEvent("enable", this);
+        if (this.onEnable) this.onEnable();
+    },
 
-	registerTorrentStatus: function(key, header, options) {
-		options = options || {};
-		var cc = options.colCfg || {}, sc = options.storeCfg || {};
-		sc = Ext.apply(sc, {name: key});
-		deluge.torrents.meta.fields.push(sc);
-		deluge.torrents.getStore().reader.onMetaChange(deluge.torrents.meta);
+    registerTorrentStatus: function(key, header, options) {
+        options = options || {};
+        var cc = options.colCfg || {}, sc = options.storeCfg || {};
+        sc = Ext.apply(sc, {name: key});
+        deluge.torrents.meta.fields.push(sc);
+        deluge.torrents.getStore().reader.onMetaChange(deluge.torrents.meta);
 
-		cc = Ext.apply(cc, {
-			header: header,
-			dataIndex: key
-		});
-		var cols = deluge.torrents.columns.slice(0);
-		cols.push(cc);
-		deluge.torrents.colModel.setConfig(cols);
-		deluge.torrents.columns = cols;
+        cc = Ext.apply(cc, {
+            header: header,
+            dataIndex: key
+        });
+        var cols = deluge.torrents.columns.slice(0);
+        cols.push(cc);
+        deluge.torrents.colModel.setConfig(cols);
+        deluge.torrents.columns = cols;
 
-		Deluge.Keys.Grid.push(key);
-		deluge.torrents.getView().refresh(true);
-	},
+        Deluge.Keys.Grid.push(key);
+        deluge.torrents.getView().refresh(true);
+    },
 
-	deregisterTorrentStatus: function(key) {
-		var fields = [];
-		Ext.each(deluge.torrents.meta.fields, function(field) {
-			if (field.name != key) fields.push(field);
-		});
-		deluge.torrents.meta.fields = fields;
-		deluge.torrents.getStore().reader.onMetaChange(deluge.torrents.meta);
+    deregisterTorrentStatus: function(key) {
+        var fields = [];
+        Ext.each(deluge.torrents.meta.fields, function(field) {
+            if (field.name != key) fields.push(field);
+        });
+        deluge.torrents.meta.fields = fields;
+        deluge.torrents.getStore().reader.onMetaChange(deluge.torrents.meta);
 
-		var cols = [];
-		Ext.each(deluge.torrents.columns, function(col) {
-			if (col.dataIndex != key) cols.push(col);
-		});
-		deluge.torrents.colModel.setConfig(cols);
-		deluge.torrents.columns = cols;
+        var cols = [];
+        Ext.each(deluge.torrents.columns, function(col) {
+            if (col.dataIndex != key) cols.push(col);
+        });
+        deluge.torrents.colModel.setConfig(cols);
+        deluge.torrents.columns = cols;
 
-		var keys = [];
-		Ext.each(Deluge.Keys.Grid, function(k) {
-			if (k == key) keys.push(k);
-		});
-		Deluge.Keys.Grid = keys;
-		deluge.torrents.getView().refresh(true);
-	}
+        var keys = [];
+        Ext.each(Deluge.Keys.Grid, function(k) {
+            if (k == key) keys.push(k);
+        });
+        Deluge.Keys.Grid = keys;
+        deluge.torrents.getView().refresh(true);
+    }
 });
 
 Ext.ns('Deluge.plugins');
diff --git a/deluge/ui/web/js/deluge-all/RemoveWindow.js b/deluge/ui/web/js/deluge-all/RemoveWindow.js
index 237ef0bf3..43e872dd3 100644
--- a/deluge/ui/web/js/deluge-all/RemoveWindow.js
+++ b/deluge/ui/web/js/deluge-all/RemoveWindow.js
@@ -39,7 +39,7 @@ Deluge.RemoveWindow = Ext.extend(Ext.Window, {
     title:  _('Remove Torrent'),
     layout: 'fit',
     width:  350,
-	height: 100,
+    height: 100,
     
     buttonAlign: 'right',
     closeAction: 'hide',
@@ -49,50 +49,50 @@ Deluge.RemoveWindow = Ext.extend(Ext.Window, {
     
     bodyStyle: 'padding: 5px; padding-left: 10px;',
     html: 'Are you sure you wish to remove the torrent (s)?',
-	
-	initComponent: function() {
-		Deluge.RemoveWindow.superclass.initComponent.call(this);
-		this.addButton(_('Cancel'), this.onCancel, this);
-		this.addButton(_('Remove With Data'), this.onRemoveData, this);
-		this.addButton(_('Remove Torrent'), this.onRemove, this);
-	},
-	
-	remove: function(removeData) {
-		Ext.each(this.torrentIds, function(torrentId) {
-			deluge.client.core.remove_torrent(torrentId, removeData, {
-				success: function() {
-					this.onRemoved(torrentId);
-				},
-				scope: this,
-				torrentId: torrentId
-			});
-		}, this);
-		
-	},
-	
-	show: function(ids) {
-		Deluge.RemoveWindow.superclass.show.call(this);
-		this.torrentIds = ids;
-	},
-	
-	onCancel: function() {
-		this.hide();
-		this.torrentIds = null;
-	},
-	
-	onRemove: function() {
-		this.remove(false);
-	},
-	
-	onRemoveData: function() {
-		this.remove(true);
-	},
-	
-	onRemoved: function(torrentId) {
-		deluge.events.fire('torrentRemoved', torrentId);
-		this.hide();
-		deluge.ui.update();
-	}
+    
+    initComponent: function() {
+        Deluge.RemoveWindow.superclass.initComponent.call(this);
+        this.addButton(_('Cancel'), this.onCancel, this);
+        this.addButton(_('Remove With Data'), this.onRemoveData, this);
+        this.addButton(_('Remove Torrent'), this.onRemove, this);
+    },
+    
+    remove: function(removeData) {
+        Ext.each(this.torrentIds, function(torrentId) {
+            deluge.client.core.remove_torrent(torrentId, removeData, {
+                success: function() {
+                    this.onRemoved(torrentId);
+                },
+                scope: this,
+                torrentId: torrentId
+            });
+        }, this);
+        
+    },
+    
+    show: function(ids) {
+        Deluge.RemoveWindow.superclass.show.call(this);
+        this.torrentIds = ids;
+    },
+    
+    onCancel: function() {
+        this.hide();
+        this.torrentIds = null;
+    },
+    
+    onRemove: function() {
+        this.remove(false);
+    },
+    
+    onRemoveData: function() {
+        this.remove(true);
+    },
+    
+    onRemoved: function(torrentId) {
+        deluge.events.fire('torrentRemoved', torrentId);
+        this.hide();
+        deluge.ui.update();
+    }
 });
 
 deluge.removeWindow = new Deluge.RemoveWindow();
diff --git a/deluge/ui/web/js/deluge-all/Sidebar.js b/deluge/ui/web/js/deluge-all/Sidebar.js
index b8e8cbda6..aa9713860 100644
--- a/deluge/ui/web/js/deluge-all/Sidebar.js
+++ b/deluge/ui/web/js/deluge-all/Sidebar.js
@@ -41,122 +41,122 @@
  */
 Deluge.Sidebar = Ext.extend(Ext.Panel, {
 
-	// private
-	panels: {},
+    // private
+    panels: {},
 
-	// private
-	selected: null,
+    // private
+    selected: null,
 
-	constructor: function(config) {
-		config = Ext.apply({
-			id: 'sidebar',
-			region: 'west',
-			cls: 'deluge-sidebar',
-			title: _('Filters'),
-			layout: 'accordion',
-			split: true,
-			width: 200,
-			minSize: 175,
-			collapsible: true,
-			margins: '5 0 0 5',
-			cmargins: '5 0 0 5'
-		}, config);
-		Deluge.Sidebar.superclass.constructor.call(this, config);
-	},
+    constructor: function(config) {
+        config = Ext.apply({
+            id: 'sidebar',
+            region: 'west',
+            cls: 'deluge-sidebar',
+            title: _('Filters'),
+            layout: 'accordion',
+            split: true,
+            width: 200,
+            minSize: 175,
+            collapsible: true,
+            margins: '5 0 0 5',
+            cmargins: '5 0 0 5'
+        }, config);
+        Deluge.Sidebar.superclass.constructor.call(this, config);
+    },
 
-	// private
-	initComponent: function() {
-		Deluge.Sidebar.superclass.initComponent.call(this);
-		deluge.events.on("disconnect", this.onDisconnect, this);
-	},
+    // private
+    initComponent: function() {
+        Deluge.Sidebar.superclass.initComponent.call(this);
+        deluge.events.on("disconnect", this.onDisconnect, this);
+    },
 
-	createFilter: function(filter, states) {
-		var panel = new Deluge.FilterPanel({
-			filter: filter
-		});
-		panel.on('selectionchange', function(view, nodes) {
-			deluge.ui.update();
-		});
-		this.add(panel);
-	
-		this.doLayout();
-		this.panels[filter] = panel;
+    createFilter: function(filter, states) {
+        var panel = new Deluge.FilterPanel({
+            filter: filter
+        });
+        panel.on('selectionchange', function(view, nodes) {
+            deluge.ui.update();
+        });
+        this.add(panel);
+    
+        this.doLayout();
+        this.panels[filter] = panel;
 
-		panel.header.on('click', function(header) {
-			if (!deluge.config.sidebar_multiple_filters) {
-				deluge.ui.update();
-			}
-			if (!panel.list.getSelectionCount()) {
-				panel.list.select(0);	
-			}
-		});
-		this.fireEvent('filtercreate', this, panel);
+        panel.header.on('click', function(header) {
+            if (!deluge.config.sidebar_multiple_filters) {
+                deluge.ui.update();
+            }
+            if (!panel.list.getSelectionCount()) {
+                panel.list.select(0);    
+            }
+        });
+        this.fireEvent('filtercreate', this, panel);
 
-		panel.updateStates(states);
-		this.fireEvent('afterfiltercreate', this, panel);
-	},
+        panel.updateStates(states);
+        this.fireEvent('afterfiltercreate', this, panel);
+    },
 
-	getFilter: function(filter) {
-		return this.panels[filter];
-	},
+    getFilter: function(filter) {
+        return this.panels[filter];
+    },
 
-	getFilterStates: function() {
-		var states = {}
+    getFilterStates: function() {
+        var states = {}
 
-		if (deluge.config.sidebar_multiple_filters) {
-			// Grab the filters from each of the filter panels
-			this.items.each(function(panel) {
-				var state = panel.getState();
-				if (state == null) return;
-				states[panel.filterType] = state;
-			}, this);
-		} else {
-			var panel = this.getLayout().activeItem;
-			if (panel) {
-				var state = panel.getState();
-				if (!state == null) return;
-				states[panel.filterType] = state;
-			}
-		}
+        if (deluge.config.sidebar_multiple_filters) {
+            // Grab the filters from each of the filter panels
+            this.items.each(function(panel) {
+                var state = panel.getState();
+                if (state == null) return;
+                states[panel.filterType] = state;
+            }, this);
+        } else {
+            var panel = this.getLayout().activeItem;
+            if (panel) {
+                var state = panel.getState();
+                if (!state == null) return;
+                states[panel.filterType] = state;
+            }
+        }
 
-		return states;
-	},
+        return states;
+    },
 
-	hasFilter: function(filter) {
-		return (this.panels[filter]) ? true : false;
-	},
+    hasFilter: function(filter) {
+        return (this.panels[filter]) ? true : false;
+    },
 
-	// private
-	onDisconnect: function() {
-		for (var filter in this.panels) {
-			this.remove(this.panels[filter]);
-		}
-		this.panels = {};
-		this.selected = null;
-	},
+    // private
+    onDisconnect: function() {
+        for (var filter in this.panels) {
+            this.remove(this.panels[filter]);
+        }
+        this.panels = {};
+        this.selected = null;
+    },
 
-	onFilterSelect: function(selModel, rowIndex, record) {
-		deluge.ui.update();
-	},
+    onFilterSelect: function(selModel, rowIndex, record) {
+        deluge.ui.update();
+    },
 
-	update: function(filters) {
-		for (var filter in filters) {
-			var states = filters[filter];
-			if (Ext.getKeys(this.panels).indexOf(filter) > -1) {
-				this.panels[filter].updateStates(states);
-			} else {
-				this.createFilter(filter, states);
-			}
-		}
+    update: function(filters) {
+        for (var filter in filters) {
+            var states = filters[filter];
+            if (Ext.getKeys(this.panels).indexOf(filter) > -1) {
+                this.panels[filter].updateStates(states);
+            } else {
+                this.createFilter(filter, states);
+            }
+        }
 
-		// Perform a cleanup of fitlers that aren't enabled any more
-		Ext.each(Ext.keys(this.panels), function(filter) {
-			if (Ext.keys(filters).indexOf(filter) == -1) {
-				// We need to remove the panel
-				this.remove(this.panels[filter]);
-				this.doLayout();
-				delete this.panels[filter];
-			}
-		}, this);
-	}
+        // Perform a cleanup of fitlers that aren't enabled any more
+        Ext.each(Ext.keys(this.panels), function(filter) {
+            if (Ext.keys(filters).indexOf(filter) == -1) {
+                // We need to remove the panel
+                this.remove(this.panels[filter]);
+                this.doLayout();
+                delete this.panels[filter];
+            }
+        }, this);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Statusbar.js b/deluge/ui/web/js/deluge-all/Statusbar.js
index ed122a61e..4f1c48f86 100644
--- a/deluge/ui/web/js/deluge-all/Statusbar.js
+++ b/deluge/ui/web/js/deluge-all/Statusbar.js
@@ -32,284 +32,284 @@
 Ext.namespace('Deluge');
 
 Deluge.Statusbar = Ext.extend(Ext.ux.StatusBar, {
-	constructor: function(config) {
-		config = Ext.apply({
-			id: 'deluge-statusbar',
-			defaultIconCls: 'x-deluge-statusbar x-not-connected',
-			defaultText: _('Not Connected')
-		}, config);
-		Deluge.Statusbar.superclass.constructor.call(this, config);
-	},
-	
-	initComponent: function() {
-		Deluge.Statusbar.superclass.initComponent.call(this);
-		
-		deluge.events.on('connect', this.onConnect, this);
-		deluge.events.on('disconnect', this.onDisconnect, this);
-	},
-	
-	createButtons: function() {
-		this.buttons = this.add({
-			id: 'statusbar-connections',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-connections',
-			tooltip: _('Connections'),
-			menu: new Deluge.StatusbarMenu({
-				items: [{
-					text: '50',
-					value: '50',
-					group: 'max_connections_global',
-					checked: false
-				},{
-					text: '100',
-					value: '100',
-					group: 'max_connections_global',
-					checked: false
-				},{
-					text: '200',
-					value: '200',
-					group: 'max_connections_global',
-					checked: false
-				},{
-					text: '300',
-					value: '300',
-					group: 'max_connections_global',
-					checked: false
-				},{
-					text: '500',
-					value: '500',
-					group: 'max_connections_global',
-					checked: false
-				},{
-					text: _('Unlimited'),
-					value: '-1',
-					group: 'max_connections_global',
-					checked: false
-				},'-',{
-					text: _('Other'),
-					value: 'other',
-					group: 'max_connections_global',
-					checked: false
-				}],
-				otherWin: {
-					title: _('Set Maximum Connections')
-				}
-			})
-		}, '-', {
-			id: 'statusbar-downspeed',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-downloading',
-			tooltip: _('Download Speed'),
-			menu: new Deluge.StatusbarMenu({
-				items: [{
-					value: '5',
-					text: '5 KiB/s',
-					group: 'max_download_speed',
-					checked: false
-				},{
-					value: '10',
-					text: '10 KiB/s',
-					group: 'max_download_speed',
-					checked: false
-				},{
-					value: '30',
-					text: '30 KiB/s',
-					group: 'max_download_speed',
-					checked: false
-				},{
-					value: '80',
-					text: '80 KiB/s',
-					group: 'max_download_speed',
-					checked: false
-				},{
-					value: '300',
-					text: '300 KiB/s',
-					group: 'max_download_speed',
-					checked: false
-				},{
-					value: '-1',
-					text: _('Unlimited'),
-					group: 'max_download_speed',
-					checked: false
-				},'-',{
-					value: 'other',
-					text: _('Other'),
-					group: 'max_download_speed',
-					checked: false
-				}],
-				otherWin: {
-					title: _('Set Maximum Download Speed'),
-					unit: _('Kib/s')
-				}
-			})
-		}, '-', {
-			id: 'statusbar-upspeed',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-seeding',
-			tooltip: _('Upload Speed'),
-			menu: new Deluge.StatusbarMenu({
-				items: [{
-					value: '5',
-					text: '5 KiB/s',
-					group: 'max_upload_speed',
-					checked: false
-				},{
-					value: '10',
-					text: '10 KiB/s',
-					group: 'max_upload_speed',
-					checked: false
-				},{
-					value: '30',
-					text: '30 KiB/s',
-					group: 'max_upload_speed',
-					checked: false
-				},{
-					value: '80',
-					text: '80 KiB/s',
-					group: 'max_upload_speed',
-					checked: false
-				},{
-					value: '300',
-					text: '300 KiB/s',
-					group: 'max_upload_speed',
-					checked: false
-				},{
-					value: '-1',
-					text: _('Unlimited'),
-					group: 'max_upload_speed',
-					checked: false
-				},'-',{
-					value: 'other',
-					text: _('Other'),
-					group: 'max_upload_speed',
-					checked: false
-				}],
-				otherWin: {
-					title: _('Set Maximum Upload Speed'),
-					unit: _('Kib/s')
-				}
-			})
-		}, '-', {
-			id: 'statusbar-traffic',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-traffic',
-			tooltip: _('Protocol Traffic Download/Upload'),
-			handler: function() {
-				deluge.preferences.show();
-				deluge.preferences.selectPage('Network');
-			}
-		}, '-', {
-			id: 'statusbar-dht',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-dht',
-			tooltip: _('DHT Nodes')
-		}, '-', {
-			id: 'statusbar-freespace',
-			text: ' ',
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-freespace',
-			tooltip: _('Freespace in download location'),
-			handler: function() {
-				deluge.preferences.show();
-				deluge.preferences.selectPage('Downloads');
-			}
-		});
-		this.created = true;
-	},
-	
-	onConnect: function() {
-		this.setStatus({
-			iconCls: 'x-connected',
-			text: ''
-		});
-		if (!this.created) {
-			this.createButtons();
-		} else {
-			Ext.each(this.buttons, function(item) {
-				item.show();
-				item.enable();
-			});
-		}
-		this.doLayout();
-	},
+    constructor: function(config) {
+        config = Ext.apply({
+            id: 'deluge-statusbar',
+            defaultIconCls: 'x-deluge-statusbar x-not-connected',
+            defaultText: _('Not Connected')
+        }, config);
+        Deluge.Statusbar.superclass.constructor.call(this, config);
+    },
+    
+    initComponent: function() {
+        Deluge.Statusbar.superclass.initComponent.call(this);
+        
+        deluge.events.on('connect', this.onConnect, this);
+        deluge.events.on('disconnect', this.onDisconnect, this);
+    },
+    
+    createButtons: function() {
+        this.buttons = this.add({
+            id: 'statusbar-connections',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-connections',
+            tooltip: _('Connections'),
+            menu: new Deluge.StatusbarMenu({
+                items: [{
+                    text: '50',
+                    value: '50',
+                    group: 'max_connections_global',
+                    checked: false
+                },{
+                    text: '100',
+                    value: '100',
+                    group: 'max_connections_global',
+                    checked: false
+                },{
+                    text: '200',
+                    value: '200',
+                    group: 'max_connections_global',
+                    checked: false
+                },{
+                    text: '300',
+                    value: '300',
+                    group: 'max_connections_global',
+                    checked: false
+                },{
+                    text: '500',
+                    value: '500',
+                    group: 'max_connections_global',
+                    checked: false
+                },{
+                    text: _('Unlimited'),
+                    value: '-1',
+                    group: 'max_connections_global',
+                    checked: false
+                },'-',{
+                    text: _('Other'),
+                    value: 'other',
+                    group: 'max_connections_global',
+                    checked: false
+                }],
+                otherWin: {
+                    title: _('Set Maximum Connections')
+                }
+            })
+        }, '-', {
+            id: 'statusbar-downspeed',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-downloading',
+            tooltip: _('Download Speed'),
+            menu: new Deluge.StatusbarMenu({
+                items: [{
+                    value: '5',
+                    text: '5 KiB/s',
+                    group: 'max_download_speed',
+                    checked: false
+                },{
+                    value: '10',
+                    text: '10 KiB/s',
+                    group: 'max_download_speed',
+                    checked: false
+                },{
+                    value: '30',
+                    text: '30 KiB/s',
+                    group: 'max_download_speed',
+                    checked: false
+                },{
+                    value: '80',
+                    text: '80 KiB/s',
+                    group: 'max_download_speed',
+                    checked: false
+                },{
+                    value: '300',
+                    text: '300 KiB/s',
+                    group: 'max_download_speed',
+                    checked: false
+                },{
+                    value: '-1',
+                    text: _('Unlimited'),
+                    group: 'max_download_speed',
+                    checked: false
+                },'-',{
+                    value: 'other',
+                    text: _('Other'),
+                    group: 'max_download_speed',
+                    checked: false
+                }],
+                otherWin: {
+                    title: _('Set Maximum Download Speed'),
+                    unit: _('Kib/s')
+                }
+            })
+        }, '-', {
+            id: 'statusbar-upspeed',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-seeding',
+            tooltip: _('Upload Speed'),
+            menu: new Deluge.StatusbarMenu({
+                items: [{
+                    value: '5',
+                    text: '5 KiB/s',
+                    group: 'max_upload_speed',
+                    checked: false
+                },{
+                    value: '10',
+                    text: '10 KiB/s',
+                    group: 'max_upload_speed',
+                    checked: false
+                },{
+                    value: '30',
+                    text: '30 KiB/s',
+                    group: 'max_upload_speed',
+                    checked: false
+                },{
+                    value: '80',
+                    text: '80 KiB/s',
+                    group: 'max_upload_speed',
+                    checked: false
+                },{
+                    value: '300',
+                    text: '300 KiB/s',
+                    group: 'max_upload_speed',
+                    checked: false
+                },{
+                    value: '-1',
+                    text: _('Unlimited'),
+                    group: 'max_upload_speed',
+                    checked: false
+                },'-',{
+                    value: 'other',
+                    text: _('Other'),
+                    group: 'max_upload_speed',
+                    checked: false
+                }],
+                otherWin: {
+                    title: _('Set Maximum Upload Speed'),
+                    unit: _('Kib/s')
+                }
+            })
+        }, '-', {
+            id: 'statusbar-traffic',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-traffic',
+            tooltip: _('Protocol Traffic Download/Upload'),
+            handler: function() {
+                deluge.preferences.show();
+                deluge.preferences.selectPage('Network');
+            }
+        }, '-', {
+            id: 'statusbar-dht',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-dht',
+            tooltip: _('DHT Nodes')
+        }, '-', {
+            id: 'statusbar-freespace',
+            text: ' ',
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-freespace',
+            tooltip: _('Freespace in download location'),
+            handler: function() {
+                deluge.preferences.show();
+                deluge.preferences.selectPage('Downloads');
+            }
+        });
+        this.created = true;
+    },
+    
+    onConnect: function() {
+        this.setStatus({
+            iconCls: 'x-connected',
+            text: ''
+        });
+        if (!this.created) {
+            this.createButtons();
+        } else {
+            Ext.each(this.buttons, function(item) {
+                item.show();
+                item.enable();
+            });
+        }
+        this.doLayout();
+    },
 
-	onDisconnect: function() {
-		this.clearStatus({useDefaults:true});
-		Ext.each(this.buttons, function(item) {
-			item.hide();
-			item.disable();
-		});
-		this.doLayout();
-	},
-	
-	update: function(stats) {
-		if (!stats) return;
-		
-		function addSpeed(val) {return val + ' KiB/s'}
-		
-		var updateStat = function(name, config) {
-			var item = this.items.get('statusbar-' + name);
-			if (config.limit.value > 0) {
-				var value = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;
-				var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value, true) : config.limit.value;
-				var str = String.format(config.format, value, limit);
-			} else {
-				var str = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;
-			}
-			item.setText(str);
+    onDisconnect: function() {
+        this.clearStatus({useDefaults:true});
+        Ext.each(this.buttons, function(item) {
+            item.hide();
+            item.disable();
+        });
+        this.doLayout();
+    },
+    
+    update: function(stats) {
+        if (!stats) return;
+        
+        function addSpeed(val) {return val + ' KiB/s'}
+        
+        var updateStat = function(name, config) {
+            var item = this.items.get('statusbar-' + name);
+            if (config.limit.value > 0) {
+                var value = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;
+                var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value, true) : config.limit.value;
+                var str = String.format(config.format, value, limit);
+            } else {
+                var str = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;
+            }
+            item.setText(str);
 
-			if (!item.menu) return;
-			item.menu.setValue(config.limit.value);
-		}.createDelegate(this);
-		
-		updateStat('connections', {
-			value: {value: stats.num_connections},
-			limit: {value: stats.max_num_connections},
-			format: '{0} ({1})'
-		});
+            if (!item.menu) return;
+            item.menu.setValue(config.limit.value);
+        }.createDelegate(this);
+        
+        updateStat('connections', {
+            value: {value: stats.num_connections},
+            limit: {value: stats.max_num_connections},
+            format: '{0} ({1})'
+        });
 
-		updateStat('downspeed', {
-			value: {
-				value: stats.download_rate,
-				formatter: Deluge.Formatters.speed
-			},
-			limit: {
-				value: stats.max_download,
-				formatter: addSpeed
-			},
-			format: '{0} ({1})'
-		});
+        updateStat('downspeed', {
+            value: {
+                value: stats.download_rate,
+                formatter: Deluge.Formatters.speed
+            },
+            limit: {
+                value: stats.max_download,
+                formatter: addSpeed
+            },
+            format: '{0} ({1})'
+        });
 
-		updateStat('upspeed', {
-			value: {
-				value: stats.upload_rate,
-				formatter: Deluge.Formatters.speed
-			},
-			limit: {
-				value: stats.max_upload,
-				formatter: addSpeed
-			},
-			format: '{0} ({1})'
-		});
+        updateStat('upspeed', {
+            value: {
+                value: stats.upload_rate,
+                formatter: Deluge.Formatters.speed
+            },
+            limit: {
+                value: stats.max_upload,
+                formatter: addSpeed
+            },
+            format: '{0} ({1})'
+        });
 
-		updateStat('traffic', {
-			value: {
-				value: stats.download_protocol_rate,
-				formatter: Deluge.Formatters.speed
-			},
-			limit: {
-				value: stats.upload_protocol_rate,
-				formatter: Deluge.Formatters.speed
-			},
-			format: '{0}/{1}'
-		});
+        updateStat('traffic', {
+            value: {
+                value: stats.download_protocol_rate,
+                formatter: Deluge.Formatters.speed
+            },
+            limit: {
+                value: stats.upload_protocol_rate,
+                formatter: Deluge.Formatters.speed
+            },
+            format: '{0}/{1}'
+        });
 
-		this.items.get('statusbar-dht').setText(stats.dht_nodes);
-		this.items.get('statusbar-freespace').setText(fsize(stats.free_space));
-	}
+        this.items.get('statusbar-dht').setText(stats.dht_nodes);
+        this.items.get('statusbar-freespace').setText(fsize(stats.free_space));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/StatusbarMenu.js b/deluge/ui/web/js/deluge-all/StatusbarMenu.js
index 78adf9bd1..939318ade 100644
--- a/deluge/ui/web/js/deluge-all/StatusbarMenu.js
+++ b/deluge/ui/web/js/deluge-all/StatusbarMenu.js
@@ -37,20 +37,20 @@ Ext.ns('Deluge');
  * @extends Ext.menu.Menu
  */
 Deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, {
-	
-	initComponent: function() {
-		Deluge.StatusbarMenu.superclass.initComponent.call(this);
-		this.otherWin = new Deluge.OtherLimitWindow(this.initialConfig.otherWin || {});
+    
+    initComponent: function() {
+        Deluge.StatusbarMenu.superclass.initComponent.call(this);
+        this.otherWin = new Deluge.OtherLimitWindow(this.initialConfig.otherWin || {});
 
-		this.items.each(function(item) {
-			if (item.getXType() != 'menucheckitem') return;
-			if (item.value == 'other') {
-				item.on('click', this.onOtherClicked, this);
-			} else {
-				item.on('checkchange', this.onLimitChanged, this);
-			}
-		}, this);
-	},
+        this.items.each(function(item) {
+            if (item.getXType() != 'menucheckitem') return;
+            if (item.value == 'other') {
+                item.on('click', this.onOtherClicked, this);
+            } else {
+                item.on('checkchange', this.onLimitChanged, this);
+            }
+        }, this);
+    },
     
     setValue: function(value) {
         var beenSet = false;
@@ -81,20 +81,20 @@ Deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, {
         other.resumeEvents();
     },
 
-	onLimitChanged: function(item, checked) {
-		if (!checked || item.value == 'other') return; // we don't care about unchecks or other
-		var config = {}
-		config[item.group] = item.value
-		deluge.client.core.set_config(config, {
-			success: function() {
-				deluge.ui.update();
-			}
-		});
-	},
+    onLimitChanged: function(item, checked) {
+        if (!checked || item.value == 'other') return; // we don't care about unchecks or other
+        var config = {}
+        config[item.group] = item.value
+        deluge.client.core.set_config(config, {
+            success: function() {
+                deluge.ui.update();
+            }
+        });
+    },
 
-	onOtherClicked: function(item, e) {
-		this.otherWin.group = item.group;
-		this.otherWin.setValue(this.value);
-		this.otherWin.show();
-	}
+    onOtherClicked: function(item, e) {
+        this.otherWin.group = item.group;
+        this.otherWin.setValue(this.value);
+        this.otherWin.show();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/Toolbar.js b/deluge/ui/web/js/deluge-all/Toolbar.js
index 3558f28d2..a95f2a381 100644
--- a/deluge/ui/web/js/deluge-all/Toolbar.js
+++ b/deluge/ui/web/js/deluge-all/Toolbar.js
@@ -36,157 +36,157 @@
  * @extends Ext.Toolbar
  */
 Deluge.Toolbar = Ext.extend(Ext.Toolbar, {
-	constructor: function(config) {
-		config = Ext.apply({
-			items: [
-				{
-					id: 'create',
-					disabled: true,
-					text: _('Create'),
-					iconCls: 'icon-create',
-					handler: this.onTorrentAction
-				},{
-					id: 'add',
-					disabled: true,
-					text: _('Add'),
-					iconCls: 'icon-add',
-					handler: this.onTorrentAdd
-				},{
-					id: 'remove',
-					disabled: true,
-					text: _('Remove'),
-					iconCls: 'icon-remove',
-					handler: this.onTorrentAction
-				},'|',{
-					id: 'pause',
-					disabled: true,
-					text: _('Pause'),
-					iconCls: 'icon-pause',
-					handler: this.onTorrentAction
-				},{
-					id: 'resume',
-					disabled: true,
-					text: _('Resume'),
-					iconCls: 'icon-resume',
-					handler: this.onTorrentAction
-				},'|',{
-					id: 'up',
-					cls: 'x-btn-text-icon',
-					disabled: true,
-					text: _('Up'),
-					iconCls: 'icon-up',
-					handler: this.onTorrentAction
-				},{
-					id: 'down',
-					disabled: true,
-					text: _('Down'),
-					iconCls: 'icon-down',
-					handler: this.onTorrentAction
-				},'|',{
-					id: 'preferences',
-					text: _('Preferences'),
-					iconCls: 'x-deluge-preferences',
-					handler: this.onPreferencesClick,
-					scope: this
-				},{
-					id: 'connectionman',
-					text: _('Connection Manager'),
-					iconCls: 'x-deluge-connection-manager',
-					handler: this.onConnectionManagerClick,
-					scope: this
-				},'->',{
-					id: 'help',
-					iconCls: 'icon-help',
-					text: _('Help'),
-					handler: this.onHelpClick,
-					scope: this
-				},{
-					id: 'logout',
-					iconCls: 'icon-logout',
-					disabled: true,
-					text: _('Logout'),
-					handler: this.onLogout,
-					scope: this
-				}
-			]
-		}, config);
-		Deluge.Toolbar.superclass.constructor.call(this, config);
-	},
+    constructor: function(config) {
+        config = Ext.apply({
+            items: [
+                {
+                    id: 'create',
+                    disabled: true,
+                    text: _('Create'),
+                    iconCls: 'icon-create',
+                    handler: this.onTorrentAction
+                },{
+                    id: 'add',
+                    disabled: true,
+                    text: _('Add'),
+                    iconCls: 'icon-add',
+                    handler: this.onTorrentAdd
+                },{
+                    id: 'remove',
+                    disabled: true,
+                    text: _('Remove'),
+                    iconCls: 'icon-remove',
+                    handler: this.onTorrentAction
+                },'|',{
+                    id: 'pause',
+                    disabled: true,
+                    text: _('Pause'),
+                    iconCls: 'icon-pause',
+                    handler: this.onTorrentAction
+                },{
+                    id: 'resume',
+                    disabled: true,
+                    text: _('Resume'),
+                    iconCls: 'icon-resume',
+                    handler: this.onTorrentAction
+                },'|',{
+                    id: 'up',
+                    cls: 'x-btn-text-icon',
+                    disabled: true,
+                    text: _('Up'),
+                    iconCls: 'icon-up',
+                    handler: this.onTorrentAction
+                },{
+                    id: 'down',
+                    disabled: true,
+                    text: _('Down'),
+                    iconCls: 'icon-down',
+                    handler: this.onTorrentAction
+                },'|',{
+                    id: 'preferences',
+                    text: _('Preferences'),
+                    iconCls: 'x-deluge-preferences',
+                    handler: this.onPreferencesClick,
+                    scope: this
+                },{
+                    id: 'connectionman',
+                    text: _('Connection Manager'),
+                    iconCls: 'x-deluge-connection-manager',
+                    handler: this.onConnectionManagerClick,
+                    scope: this
+                },'->',{
+                    id: 'help',
+                    iconCls: 'icon-help',
+                    text: _('Help'),
+                    handler: this.onHelpClick,
+                    scope: this
+                },{
+                    id: 'logout',
+                    iconCls: 'icon-logout',
+                    disabled: true,
+                    text: _('Logout'),
+                    handler: this.onLogout,
+                    scope: this
+                }
+            ]
+        }, config);
+        Deluge.Toolbar.superclass.constructor.call(this, config);
+    },
 
-	connectedButtons: [
-		'add', 'remove', 'pause', 'resume', 'up', 'down'
-	],
-	
-	initComponent: function() {
-		Deluge.Toolbar.superclass.initComponent.call(this);
-		deluge.events.on('connect', this.onConnect, this);
-		deluge.events.on('login', this.onLogin, this);
-	},
-	
-	onConnect: function() {
-		Ext.each(this.connectedButtons, function(buttonId) {
-			this.items.get(buttonId).enable();
-		}, this);
-	},
-	
-	onDisconnect: function() {
-		Ext.each(this.connectedButtons, function(buttonId) {
-			this.items.get(buttonId).disable();
-		}, this);
-	},
-	
-	onLogin: function() {
-		this.items.get('logout').enable();
-	},
-	
-	onLogout: function() {
-		this.items.get('logout').disable();
-		deluge.login.logout();
-	},
-	
-	onConnectionManagerClick: function() {
-		deluge.connectionManager.show();
-	},
-	
-	onHelpClick: function() {
-		window.open('http://dev.deluge-torrent.org/wiki/UserGuide');
-	},
-	
-	onPreferencesClick: function() {
-		deluge.preferences.show();
-	},
-	
-	onTorrentAction: function(item) {
-		var selection = deluge.torrents.getSelections();
-		var ids = [];
-		Ext.each(selection, function(record) {
-			ids.push(record.id);
-		});
-		
-		switch (item.id) {
-			case 'remove':
-				deluge.removeWindow.show(ids);
-				break;
-			case 'pause':
-			case 'resume':
-				deluge.client.core[item.id + '_torrent'](ids, {
-					success: function() {
-						deluge.ui.update();
-					}
-				});
-				break;
-			case 'up':
-			case 'down':
-				deluge.client.core['queue_' + item.id](ids, {
-					success: function() {
-						deluge.ui.update();
-					}
-				});
-				break;
-		}
-	},
-	
-	onTorrentAdd: function() {
-		deluge.add.show();
-	}
+    connectedButtons: [
+        'add', 'remove', 'pause', 'resume', 'up', 'down'
+    ],
+    
+    initComponent: function() {
+        Deluge.Toolbar.superclass.initComponent.call(this);
+        deluge.events.on('connect', this.onConnect, this);
+        deluge.events.on('login', this.onLogin, this);
+    },
+    
+    onConnect: function() {
+        Ext.each(this.connectedButtons, function(buttonId) {
+            this.items.get(buttonId).enable();
+        }, this);
+    },
+    
+    onDisconnect: function() {
+        Ext.each(this.connectedButtons, function(buttonId) {
+            this.items.get(buttonId).disable();
+        }, this);
+    },
+    
+    onLogin: function() {
+        this.items.get('logout').enable();
+    },
+    
+    onLogout: function() {
+        this.items.get('logout').disable();
+        deluge.login.logout();
+    },
+    
+    onConnectionManagerClick: function() {
+        deluge.connectionManager.show();
+    },
+    
+    onHelpClick: function() {
+        window.open('http://dev.deluge-torrent.org/wiki/UserGuide');
+    },
+    
+    onPreferencesClick: function() {
+        deluge.preferences.show();
+    },
+    
+    onTorrentAction: function(item) {
+        var selection = deluge.torrents.getSelections();
+        var ids = [];
+        Ext.each(selection, function(record) {
+            ids.push(record.id);
+        });
+        
+        switch (item.id) {
+            case 'remove':
+                deluge.removeWindow.show(ids);
+                break;
+            case 'pause':
+            case 'resume':
+                deluge.client.core[item.id + '_torrent'](ids, {
+                    success: function() {
+                        deluge.ui.update();
+                    }
+                });
+                break;
+            case 'up':
+            case 'down':
+                deluge.client.core['queue_' + item.id](ids, {
+                    success: function() {
+                        deluge.ui.update();
+                    }
+                });
+                break;
+        }
+    },
+    
+    onTorrentAdd: function() {
+        deluge.add.show();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/TorrentGrid.js b/deluge/ui/web/js/deluge-all/TorrentGrid.js
index 0455113c5..022aac7a3 100644
--- a/deluge/ui/web/js/deluge-all/TorrentGrid.js
+++ b/deluge/ui/web/js/deluge-all/TorrentGrid.js
@@ -1,6 +1,6 @@
 /*!
  * Deluge.TorrentGrid.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,323 +32,347 @@
 
 (function() {
 
-	/* Renderers for the Torrent Grid */
-	function queueRenderer(value) {
-		return (value == -1) ? '' : value + 1;
-	}
-	function torrentNameRenderer(value, p, r) {
-		return String.format('
{1}
', r.data['state'].toLowerCase(), value);
-	}
-	function torrentSpeedRenderer(value) {
-		if (!value) return;
-		return fspeed(value);
-	}
-	function torrentProgressRenderer(value, p, r) {
-		value = new Number(value);
-		var progress = value;
-		var text = r.data['state'] + ' ' + value.toFixed(2) + '%';
-		var width = new Number(this.style.match(/\w+:\s*(\d+)\w+/)[1]);
-		return Deluge.progressBar(value, width - 8, text);
-	}
-	function seedsRenderer(value, p, r) {
-		if (r.data['total_seeds'] > -1) {
-			return String.format('{0} ({1})', value, r.data['total_seeds']);
-		} else {
-			return value;
-		}
-	}
-	function peersRenderer(value, p, r) {
-		if (r.data['total_peers'] > -1) {
-			return String.format('{0} ({1})', value, r.data['total_peers']);
-		} else {
-			return value;
-		}
-	}
-	function availRenderer(value, p, r)	{
-		return (value < 0) ? '∞' : new Number(value).toFixed(3);
-	}
-	function trackerRenderer(value, p, r) {
-		return String.format('
{0}
', value);
-	}
-	
-	function etaSorter(eta) {
-		return eta * -1;
-	}
+    /* Renderers for the Torrent Grid */
+    function queueRenderer(value) {
+        return (value == -1) ? '' : value + 1;
+    }
+    function torrentNameRenderer(value, p, r) {
+        return String.format('
{1}
', r.data['state'].toLowerCase(), value);
+    }
+    function torrentSpeedRenderer(value) {
+        if (!value) return;
+        return fspeed(value);
+    }
+    function torrentProgressRenderer(value, p, r) {
+        value = new Number(value);
+        var progress = value;
+        var text = r.data['state'] + ' ' + value.toFixed(2) + '%';
+        var width = new Number(this.style.match(/\w+:\s*(\d+)\w+/)[1]);
+        return Deluge.progressBar(value, width - 8, text);
+    }
+    function seedsRenderer(value, p, r) {
+        if (r.data['total_seeds'] > -1) {
+            return String.format('{0} ({1})', value, r.data['total_seeds']);
+        } else {
+            return value;
+        }
+    }
+    function peersRenderer(value, p, r) {
+        if (r.data['total_peers'] > -1) {
+            return String.format('{0} ({1})', value, r.data['total_peers']);
+        } else {
+            return value;
+        }
+    }
+    function availRenderer(value, p, r)    {
+        return (value < 0) ? '∞' : new Number(value).toFixed(3);
+    }
+    function trackerRenderer(value, p, r) {
+        return String.format('
{0}
', value);
+    }
 
-	/**
-	 * Deluge.TorrentGrid Class
-	 *
-	 * @author Damien Churchill 
-	 * @version 1.3
-	 *
-	 * @class Deluge.TorrentGrid
-	 * @extends Ext.grid.GridPanel
-	 * @constructor
-	 * @param {Object} config Configuration options
-	 */
-	Deluge.TorrentGrid = Ext.extend(Ext.grid.GridPanel, {
+    function etaSorter(eta) {
+        return eta * -1;
+    }
 
-		// object to store contained torrent ids
-		torrents: {},
+    /**
+     * Deluge.TorrentGrid Class
+     *
+     * @author Damien Churchill 
+     * @version 1.3
+     *
+     * @class Deluge.TorrentGrid
+     * @extends Ext.grid.GridPanel
+     * @constructor
+     * @param {Object} config Configuration options
+     */
+    Deluge.TorrentGrid = Ext.extend(Ext.grid.GridPanel, {
 
-		columns: [{
-			id:'queue',
-			header: _('#'), 
-			width: 30, 
-			sortable: true, 
-			renderer: queueRenderer,
-			dataIndex: 'queue'
-		}, {
-			id:'name',
-			header: _('Name'),
-			width: 150,
-			sortable: true,
-			renderer: torrentNameRenderer,
-			dataIndex: 'name'
-		}, {
-			header: _('Size'),
-			width: 75,
-			sortable: true,
-			renderer: fsize,
-			dataIndex: 'total_size'
-		}, {
-			header: _('Progress'),
-			width: 150, 
-			sortable: true, 
-			renderer: torrentProgressRenderer,
-			dataIndex: 'progress'
-		}, {
-			header: _('Seeders'),
-			width: 60,
-			sortable: true,
-			renderer: seedsRenderer,
-			dataIndex: 'num_seeds'
-		}, {
-			header: _('Peers'),
-			width: 60,
-			sortable: true,
-			renderer: peersRenderer,
-			dataIndex: 'num_peers'
-		}, {
-			header: _('Down Speed'),
-			width: 80,
-			sortable: true,
-			renderer: torrentSpeedRenderer,
-			dataIndex: 'download_payload_rate'
-		}, {
-			header: _('Up Speed'),
-			width: 80,
-			sortable: true,
-			renderer: torrentSpeedRenderer,
-			dataIndex: 'upload_payload_rate'
-		}, {
-			header: _('ETA'),
-			width: 60,
-			sortable: true,
-			renderer: ftime,
-			dataIndex: 'eta'
-		}, {
-			header: _('Ratio'),
-			width: 60,
-			sortable: true,
-			renderer: availRenderer,
-			dataIndex: 'ratio'
-		}, {
-			header: _('Avail'),
-			width: 60,
-			sortable: true,
-			renderer: availRenderer,
-			dataIndex: 'distributed_copies'
-		}, {
-			header: _('Added'),
-			width: 80,
-			sortable: true,
-			renderer: fdate,
-			dataIndex: 'time_added'
-		}, {
-			header: _('Tracker'),
-			width: 120,
-			sortable: true,
-			renderer: trackerRenderer,
-			dataIndex: 'tracker_host'
-		}, {
-			header: _('Save Path'),
-			width: 120,
-			sortable: true,
-			renderer: fplain,
-			dataIndex: 'save_path'
-		}],
+        // object to store contained torrent ids
+        torrents: {},
 
-		meta: {
-			root: 'torrents',
-			idProperty: 'id',
-			fields: [
-				{name: 'queue', sortType: Deluge.data.SortTypes.asQueuePosition},
-				{name: 'name'},
-				{name: 'total_size', type: 'int'},
-				{name: 'state'},
-				{name: 'progress', type: 'float'},
-				{name: 'num_seeds', type: 'int'},
-				{name: 'total_seeds', type: 'int'},
-				{name: 'num_peers', type: 'int'},
-				{name: 'total_peers', type: 'int'},
-				{name: 'download_payload_rate', type: 'int'},
-				{name: 'upload_payload_speed', type: 'int'},
-				{name: 'eta', type: 'int', sortType: etaSorter},
-				{name: 'ratio', type: 'float'},
-				{name: 'distributed_copies', type: 'float'},
-				{name: 'time_added', type: 'int'},
-				{name: 'tracker_host'},
-				{name: 'save_path'}
-			]
-		},
+        columns: [{
+            id:'queue',
+            header: _('#'),
+            width: 30,
+            sortable: true,
+            renderer: queueRenderer,
+            dataIndex: 'queue'
+        }, {
+            id:'name',
+            header: _('Name'),
+            width: 150,
+            sortable: true,
+            renderer: torrentNameRenderer,
+            dataIndex: 'name'
+        }, {
+            header: _('Size'),
+            width: 75,
+            sortable: true,
+            renderer: fsize,
+            dataIndex: 'total_size'
+        }, {
+            header: _('Progress'),
+            width: 150,
+            sortable: true,
+            renderer: torrentProgressRenderer,
+            dataIndex: 'progress'
+        }, {
+            header: _('Seeders'),
+            width: 60,
+            sortable: true,
+            renderer: seedsRenderer,
+            dataIndex: 'num_seeds'
+        }, {
+            header: _('Peers'),
+            width: 60,
+            sortable: true,
+            renderer: peersRenderer,
+            dataIndex: 'num_peers'
+        }, {
+            header: _('Down Speed'),
+            width: 80,
+            sortable: true,
+            renderer: torrentSpeedRenderer,
+            dataIndex: 'download_payload_rate'
+        }, {
+            header: _('Up Speed'),
+            width: 80,
+            sortable: true,
+            renderer: torrentSpeedRenderer,
+            dataIndex: 'upload_payload_rate'
+        }, {
+            header: _('ETA'),
+            width: 60,
+            sortable: true,
+            renderer: ftime,
+            dataIndex: 'eta'
+        }, {
+            header: _('Ratio'),
+            width: 60,
+            sortable: true,
+            renderer: availRenderer,
+            dataIndex: 'ratio'
+        }, {
+            header: _('Avail'),
+            width: 60,
+            sortable: true,
+            renderer: availRenderer,
+            dataIndex: 'distributed_copies'
+        }, {
+            header: _('Added'),
+            width: 80,
+            sortable: true,
+            renderer: fdate,
+            dataIndex: 'time_added'
+        }, {
+            header: _('Last Seen Complete'),
+            width: 80,
+            sortable: true,
+            renderer: fdate,
+            dataIndex: 'last_seen_complete'
+        }, {
+            header: _('Tracker'),
+            width: 120,
+            sortable: true,
+            renderer: trackerRenderer,
+            dataIndex: 'tracker_host'
+        }, {
+            header: _('Save Path'),
+            width: 120,
+            sortable: true,
+            renderer: fplain,
+            dataIndex: 'save_path'
+        }, {
+            header: _('Owner'),
+            width: 80,
+            sortable: true,
+            renderer: fplain,
+            dataIndex: 'owner'
+        }, {
+            header: _('Public'),
+            width: 80,
+            sortable: true,
+            renderer: fplain,
+            dataIndex: 'public'
+        }, {
+            header: _('Shared'),
+            width: 80,
+            sortable: true,
+            renderer: fplain,
+            dataIndex: 'shared'
+        }],
 
-		constructor: function(config) {
-			config = Ext.apply({
-				id: 'torrentGrid',
-				store: new Ext.data.JsonStore(this.meta),
-				columns: this.columns,
-				region: 'center',
-				cls: 'deluge-torrents',
-				stripeRows: true,
-				autoExpandColumn: 'name',
-				deferredRender:false,
-				autoScroll:true,
-				margins: '5 5 0 0',
-				stateful: true,
-				view: new Ext.ux.grid.BufferView({
-					rowHeight: 26,
-					scrollDelay: false
-				})
-			}, config);
-			Deluge.TorrentGrid.superclass.constructor.call(this, config);
-		},
+        meta: {
+            root: 'torrents',
+            idProperty: 'id',
+            fields: [
+                {name: 'queue', sortType: Deluge.data.SortTypes.asQueuePosition},
+                {name: 'name'},
+                {name: 'total_size', type: 'int'},
+                {name: 'state'},
+                {name: 'progress', type: 'float'},
+                {name: 'num_seeds', type: 'int'},
+                {name: 'total_seeds', type: 'int'},
+                {name: 'num_peers', type: 'int'},
+                {name: 'total_peers', type: 'int'},
+                {name: 'download_payload_rate', type: 'int'},
+                {name: 'upload_payload_speed', type: 'int'},
+                {name: 'eta', type: 'int', sortType: etaSorter},
+                {name: 'ratio', type: 'float'},
+                {name: 'distributed_copies', type: 'float'},
+                {name: 'time_added', type: 'int'},
+                {name: 'tracker_host'},
+                {name: 'save_path'}
+            ]
+        },
 
-	initComponent: function() {
-		Deluge.TorrentGrid.superclass.initComponent.call(this);
-		deluge.events.on('torrentRemoved', this.onTorrentRemoved, this);
-		deluge.events.on('disconnect', this.onDisconnect, this);
+        constructor: function(config) {
+            config = Ext.apply({
+                id: 'torrentGrid',
+                store: new Ext.data.JsonStore(this.meta),
+                columns: this.columns,
+                region: 'center',
+                cls: 'deluge-torrents',
+                stripeRows: true,
+                autoExpandColumn: 'name',
+                deferredRender:false,
+                autoScroll:true,
+                margins: '5 5 0 0',
+                stateful: true,
+                view: new Ext.ux.grid.BufferView({
+                    rowHeight: 26,
+                    scrollDelay: false
+                })
+            }, config);
+            Deluge.TorrentGrid.superclass.constructor.call(this, config);
+        },
 
-		this.on('rowcontextmenu', function(grid, rowIndex, e) {
-			e.stopEvent();
-			var selection = grid.getSelectionModel();
-			if (!selection.hasSelection()) {
-				selection.selectRow(rowIndex);
-			}
-			deluge.menus.torrent.showAt(e.getPoint());
-		});
-	},
+    initComponent: function() {
+        Deluge.TorrentGrid.superclass.initComponent.call(this);
+        deluge.events.on('torrentRemoved', this.onTorrentRemoved, this);
+        deluge.events.on('disconnect', this.onDisconnect, this);
 
-	/**
-	 * Returns the record representing the torrent at the specified index.
-	 *
-	 * @param index {int} The row index of the torrent you wish to retrieve.
-	 * @return {Ext.data.Record} The record representing the torrent.
-	 */
-	getTorrent: function(index) {
-		return this.getStore().getAt(index);
-	},
+        this.on('rowcontextmenu', function(grid, rowIndex, e) {
+            e.stopEvent();
+            var selection = grid.getSelectionModel();
+            if (!selection.hasSelection()) {
+                selection.selectRow(rowIndex);
+            }
+            deluge.menus.torrent.showAt(e.getPoint());
+        });
+    },
 
-	/**
-	 * Returns the currently selected record.
-	 * @ return {Array/Ext.data.Record} The record(s) representing the rows
-	 */
-	getSelected: function() {
-		return this.getSelectionModel().getSelected();
-	},
+    /**
+     * Returns the record representing the torrent at the specified index.
+     *
+     * @param index {int} The row index of the torrent you wish to retrieve.
+     * @return {Ext.data.Record} The record representing the torrent.
+     */
+    getTorrent: function(index) {
+        return this.getStore().getAt(index);
+    },
 
-	/**
-	 * Returns the currently selected records.
-	 */
-	getSelections: function() {
-		return this.getSelectionModel().getSelections();
-	},
+    /**
+     * Returns the currently selected record.
+     * @ return {Array/Ext.data.Record} The record(s) representing the rows
+     */
+    getSelected: function() {
+        return this.getSelectionModel().getSelected();
+    },
 
-	/**
-	 * Return the currently selected torrent id.
-	 * @return {String} The currently selected id.
-	 */
-	getSelectedId: function() {
-		return this.getSelectionModel().getSelected().id
-	},
+    /**
+     * Returns the currently selected records.
+     */
+    getSelections: function() {
+        return this.getSelectionModel().getSelections();
+    },
 
-	/**
-	 * Return the currently selected torrent ids.
-	 * @return {Array} The currently selected ids.
-	 */
-	getSelectedIds: function() {
-		var ids = [];
-		Ext.each(this.getSelectionModel().getSelections(), function(r) {
-			ids.push(r.id);
-		});
-		return ids;
-	},
+    /**
+     * Return the currently selected torrent id.
+     * @return {String} The currently selected id.
+     */
+    getSelectedId: function() {
+        return this.getSelectionModel().getSelected().id
+    },
 
-	update: function(torrents, wipe) {
-		var store = this.getStore();
+    /**
+     * Return the currently selected torrent ids.
+     * @return {Array} The currently selected ids.
+     */
+    getSelectedIds: function() {
+        var ids = [];
+        Ext.each(this.getSelectionModel().getSelections(), function(r) {
+            ids.push(r.id);
+        });
+        return ids;
+    },
 
-		// Need to perform a complete reload of the torrent grid.
-		if (wipe) {
-			store.removeAll();
-			this.torrents = {};
-		}
+    update: function(torrents, wipe) {
+        var store = this.getStore();
 
-		var newTorrents = [];
+        // Need to perform a complete reload of the torrent grid.
+        if (wipe) {
+            store.removeAll();
+            this.torrents = {};
+        }
 
-		// Update and add any new torrents.
-		for (var t in torrents) {
-			var torrent = torrents[t];
+        var newTorrents = [];
 
-			if (this.torrents[t]) {
-				var record = store.getById(t);
-				record.beginEdit();
-				for (var k in torrent) {
-					if (record.get(k) != torrent[k]) {
-						record.set(k, torrent[k]);
-					}
-				}
-				record.endEdit();
-			} else {
-				var record = new Deluge.data.Torrent(torrent);
-				record.id = t;
-				this.torrents[t] = 1;
-				newTorrents.push(record);
-			}
-		}
-		store.add(newTorrents);
+        // Update and add any new torrents.
+        for (var t in torrents) {
+            var torrent = torrents[t];
 
-		// Remove any torrents that should not be in the store.
-		store.each(function(record) {
-			if (!torrents[record.id]) {
-				store.remove(record);
-				delete this.torrents[record.id];
-			}
-		}, this);
-		store.commitChanges();
+            if (this.torrents[t]) {
+                var record = store.getById(t);
+                record.beginEdit();
+                for (var k in torrent) {
+                    if (record.get(k) != torrent[k]) {
+                        record.set(k, torrent[k]);
+                    }
+                }
+                record.endEdit();
+            } else {
+                var record = new Deluge.data.Torrent(torrent);
+                record.id = t;
+                this.torrents[t] = 1;
+                newTorrents.push(record);
+            }
+        }
+        store.add(newTorrents);
 
-		var sortState = store.getSortState()
-		if (!sortState) return;
-		store.sort(sortState.field, sortState.direction);
-	},
+        // Remove any torrents that should not be in the store.
+        store.each(function(record) {
+            if (!torrents[record.id]) {
+                store.remove(record);
+                delete this.torrents[record.id];
+            }
+        }, this);
+        store.commitChanges();
 
-	// private
-	onDisconnect: function() {
-		this.getStore().removeAll();
-		this.torrents = {};
-	},
+        var sortState = store.getSortState()
+        if (!sortState) return;
+        store.sort(sortState.field, sortState.direction);
+    },
 
-	// private
-	onTorrentRemoved: function(torrentIds) {
-		var selModel = this.getSelectionModel();
-		Ext.each(torrentIds, function(torrentId) {
-			var record = this.getStore().getById(torrentId);
-			if (selModel.isSelected(record)) {
-				selModel.deselectRow(this.getStore().indexOf(record));
-			}
-			this.getStore().remove(record);
-			delete this.torrents[torrentId];
-		}, this);
-	}
+    // private
+    onDisconnect: function() {
+        this.getStore().removeAll();
+        this.torrents = {};
+    },
+
+    // private
+    onTorrentRemoved: function(torrentIds) {
+        var selModel = this.getSelectionModel();
+        Ext.each(torrentIds, function(torrentId) {
+            var record = this.getStore().getById(torrentId);
+            if (selModel.isSelected(record)) {
+                selModel.deselectRow(this.getStore().indexOf(record));
+            }
+            this.getStore().remove(record);
+            delete this.torrents[torrentId];
+        }, this);
+    }
 });
 deluge.torrents = new Deluge.TorrentGrid();
 })();
diff --git a/deluge/ui/web/js/deluge-all/UI.js b/deluge/ui/web/js/deluge-all/UI.js
index 2492caf9e..c8e721fdd 100644
--- a/deluge/ui/web/js/deluge-all/UI.js
+++ b/deluge/ui/web/js/deluge-all/UI.js
@@ -38,234 +38,234 @@
  */
 deluge.ui = {
 
-	errorCount: 0,
+    errorCount: 0,
 
-	filters: null,
+    filters: null,
 
-	/**
-	 * @description Create all the interface components, the json-rpc client
-	 * and set up various events that the UI will utilise.
-	 */
-	initialize: function() {
-		deluge.add = new Deluge.add.AddWindow();
-		deluge.details = new Deluge.details.DetailsPanel();
-		deluge.connectionManager = new Deluge.ConnectionManager();
-		deluge.editTrackers = new Deluge.EditTrackersWindow();
-		deluge.login = new Deluge.LoginWindow();
-		deluge.preferences = new Deluge.preferences.PreferencesWindow();
-		deluge.sidebar = new Deluge.Sidebar();
-		deluge.statusbar = new Deluge.Statusbar();
-		deluge.toolbar = new Deluge.Toolbar();
+    /**
+     * @description Create all the interface components, the json-rpc client
+     * and set up various events that the UI will utilise.
+     */
+    initialize: function() {
+        deluge.add = new Deluge.add.AddWindow();
+        deluge.details = new Deluge.details.DetailsPanel();
+        deluge.connectionManager = new Deluge.ConnectionManager();
+        deluge.editTrackers = new Deluge.EditTrackersWindow();
+        deluge.login = new Deluge.LoginWindow();
+        deluge.preferences = new Deluge.preferences.PreferencesWindow();
+        deluge.sidebar = new Deluge.Sidebar();
+        deluge.statusbar = new Deluge.Statusbar();
+        deluge.toolbar = new Deluge.Toolbar();
 
-		this.MainPanel = new Ext.Panel({
-			id: 'mainPanel',
-			iconCls: 'x-deluge-main-panel',
-			title: 'Deluge',
-			layout: 'border',
-			tbar: deluge.toolbar,
-			items: [
-				deluge.sidebar,
-				deluge.details,
-				deluge.torrents
-			],
-			bbar: deluge.statusbar
-		});
+        this.MainPanel = new Ext.Panel({
+            id: 'mainPanel',
+            iconCls: 'x-deluge-main-panel',
+            title: 'Deluge',
+            layout: 'border',
+            tbar: deluge.toolbar,
+            items: [
+                deluge.sidebar,
+                deluge.details,
+                deluge.torrents
+            ],
+            bbar: deluge.statusbar
+        });
 
-		this.Viewport = new Ext.Viewport({
-			layout: 'fit',
-			items: [this.MainPanel]
-		});
+        this.Viewport = new Ext.Viewport({
+            layout: 'fit',
+            items: [this.MainPanel]
+        });
 
-		deluge.events.on("connect", this.onConnect, this);
-		deluge.events.on("disconnect", this.onDisconnect, this);
-		deluge.events.on('PluginDisabledEvent', this.onPluginDisabled, this);
-		deluge.events.on('PluginEnabledEvent', this.onPluginEnabled, this);
-		deluge.client = new Ext.ux.util.RpcClient({
-			url: deluge.config.base + 'json'
-		});
+        deluge.events.on("connect", this.onConnect, this);
+        deluge.events.on("disconnect", this.onDisconnect, this);
+        deluge.events.on('PluginDisabledEvent', this.onPluginDisabled, this);
+        deluge.events.on('PluginEnabledEvent', this.onPluginEnabled, this);
+        deluge.client = new Ext.ux.util.RpcClient({
+            url: deluge.config.base + 'json'
+        });
 
-		// enable all the already active plugins
-		for (var plugin in Deluge.pluginStore) {
-			plugin = Deluge.createPlugin(plugin);
-			plugin.enable();
-			deluge.plugins[plugin.name] = plugin;
-		}
+        // enable all the already active plugins
+        for (var plugin in Deluge.pluginStore) {
+            plugin = Deluge.createPlugin(plugin);
+            plugin.enable();
+            deluge.plugins[plugin.name] = plugin;
+        }
 
-		// Initialize quicktips so all the tooltip configs start working.
-		Ext.QuickTips.init();
+        // Initialize quicktips so all the tooltip configs start working.
+        Ext.QuickTips.init();
 
-		deluge.client.on('connected', function(e) {
-			deluge.login.show();
-		}, this, {single: true});
+        deluge.client.on('connected', function(e) {
+            deluge.login.show();
+        }, this, {single: true});
 
-		this.update = this.update.createDelegate(this);
-		this.checkConnection = this.checkConnection.createDelegate(this);
+        this.update = this.update.createDelegate(this);
+        this.checkConnection = this.checkConnection.createDelegate(this);
 
-		this.originalTitle = document.title;
-	},
+        this.originalTitle = document.title;
+    },
 
-	checkConnection: function() {
-		deluge.client.web.connected({
-			success: this.onConnectionSuccess,
-			failure: this.onConnectionError,
-			scope: this
-		});
-	},
+    checkConnection: function() {
+        deluge.client.web.connected({
+            success: this.onConnectionSuccess,
+            failure: this.onConnectionError,
+            scope: this
+        });
+    },
 
-	update: function() {
-		var filters = deluge.sidebar.getFilterStates();
-		this.oldFilters = this.filters;
-		this.filters = filters;
+    update: function() {
+        var filters = deluge.sidebar.getFilterStates();
+        this.oldFilters = this.filters;
+        this.filters = filters;
 
-		deluge.client.web.update_ui(Deluge.Keys.Grid, filters, {
-			success: this.onUpdate,
-			failure: this.onUpdateError,
-			scope: this
-		});
-		deluge.details.update();
-	},
+        deluge.client.web.update_ui(Deluge.Keys.Grid, filters, {
+            success: this.onUpdate,
+            failure: this.onUpdateError,
+            scope: this
+        });
+        deluge.details.update();
+    },
 
-	onConnectionError: function(error) {
+    onConnectionError: function(error) {
 
-	},
+    },
 
-	onConnectionSuccess: function(result) {
-		deluge.statusbar.setStatus({
-			iconCls: 'x-deluge-statusbar icon-ok',
-			text: _('Connection restored')
-		});
-		clearInterval(this.checking);
-		if (!result) {
-			deluge.connectionManager.show();
-		}
-	},
+    onConnectionSuccess: function(result) {
+        deluge.statusbar.setStatus({
+            iconCls: 'x-deluge-statusbar icon-ok',
+            text: _('Connection restored')
+        });
+        clearInterval(this.checking);
+        if (!result) {
+            deluge.connectionManager.show();
+        }
+    },
 
-	onUpdateError: function(error) {
-		if (this.errorCount == 2) {
-			Ext.MessageBox.show({
-				title: 'Lost Connection',
-				msg: 'The connection to the webserver has been lost!',
-				buttons: Ext.MessageBox.OK,
-				icon: Ext.MessageBox.ERROR
-			});
-			deluge.events.fire('disconnect');
-			deluge.statusbar.setStatus({
-				text: 'Lost connection to webserver'}
-			);
-			this.checking = setInterval(this.checkConnection, 2000);
-		}
-		this.errorCount++;
-	},
+    onUpdateError: function(error) {
+        if (this.errorCount == 2) {
+            Ext.MessageBox.show({
+                title: 'Lost Connection',
+                msg: 'The connection to the webserver has been lost!',
+                buttons: Ext.MessageBox.OK,
+                icon: Ext.MessageBox.ERROR
+            });
+            deluge.events.fire('disconnect');
+            deluge.statusbar.setStatus({
+                text: 'Lost connection to webserver'}
+            );
+            this.checking = setInterval(this.checkConnection, 2000);
+        }
+        this.errorCount++;
+    },
 
-	/**
-	 * @static
-	 * @private
-	 * Updates the various components in the interface.
-	 */
-	onUpdate: function(data) {
-		if (!data['connected']) {
-			deluge.connectionManager.disconnect(true);
-			return;
-		}
+    /**
+     * @static
+     * @private
+     * Updates the various components in the interface.
+     */
+    onUpdate: function(data) {
+        if (!data['connected']) {
+            deluge.connectionManager.disconnect(true);
+            return;
+        }
 
-		if (deluge.config.show_session_speed) {
-			document.title = this.originalTitle +
-				' (Down: ' + fspeed(data['stats'].download_rate, true) +
-				' Up: ' + fspeed(data['stats'].upload_rate, true) + ')';
-		}
-		if (Ext.areObjectsEqual(this.filters, this.oldFilters)) {
-			deluge.torrents.update(data['torrents']);
-		} else {
-			deluge.torrents.update(data['torrents'], true);
-		}
-		deluge.statusbar.update(data['stats']);
-		deluge.sidebar.update(data['filters']);
-		this.errorCount = 0;
-	},
+        if (deluge.config.show_session_speed) {
+            document.title = this.originalTitle +
+                ' (Down: ' + fspeed(data['stats'].download_rate, true) +
+                ' Up: ' + fspeed(data['stats'].upload_rate, true) + ')';
+        }
+        if (Ext.areObjectsEqual(this.filters, this.oldFilters)) {
+            deluge.torrents.update(data['torrents']);
+        } else {
+            deluge.torrents.update(data['torrents'], true);
+        }
+        deluge.statusbar.update(data['stats']);
+        deluge.sidebar.update(data['filters']);
+        this.errorCount = 0;
+    },
 
-	/**
-	 * @static
-	 * @private
-	 * Start the Deluge UI polling the server and update the interface.
-	 */
-	onConnect: function() {
-		if (!this.running) {
-			this.running = setInterval(this.update, 2000);
-			this.update();
-		}
-		deluge.client.web.get_plugins({
-			success: this.onGotPlugins,
-			scope: this
-		});
-	},
+    /**
+     * @static
+     * @private
+     * Start the Deluge UI polling the server and update the interface.
+     */
+    onConnect: function() {
+        if (!this.running) {
+            this.running = setInterval(this.update, 2000);
+            this.update();
+        }
+        deluge.client.web.get_plugins({
+            success: this.onGotPlugins,
+            scope: this
+        });
+    },
 
-	/**
-	 * @static
-	 * @private
-	 */
-	onDisconnect: function() {
-		this.stop();
-	},
+    /**
+     * @static
+     * @private
+     */
+    onDisconnect: function() {
+        this.stop();
+    },
 
-	onGotPlugins: function(plugins) {
-		Ext.each(plugins.enabled_plugins, function(plugin) {
-			if (deluge.plugins[plugin]) return;
-			deluge.client.web.get_plugin_resources(plugin, {
-				success: this.onGotPluginResources,
-				scope: this
-			});
-		}, this);
-	},
+    onGotPlugins: function(plugins) {
+        Ext.each(plugins.enabled_plugins, function(plugin) {
+            if (deluge.plugins[plugin]) return;
+            deluge.client.web.get_plugin_resources(plugin, {
+                success: this.onGotPluginResources,
+                scope: this
+            });
+        }, this);
+    },
 
-	onPluginEnabled: function(pluginName) {
-		if (deluge.plugins[pluginName]) {
-			deluge.plugins[pluginName].enable();
-		} else {
-			deluge.client.web.get_plugin_resources(pluginName, {
-				success: this.onGotPluginResources,
-				scope: this
-			});
-		}
-	},
+    onPluginEnabled: function(pluginName) {
+        if (deluge.plugins[pluginName]) {
+            deluge.plugins[pluginName].enable();
+        } else {
+            deluge.client.web.get_plugin_resources(pluginName, {
+                success: this.onGotPluginResources,
+                scope: this
+            });
+        }
+    },
 
-	onGotPluginResources: function(resources) {
-		var scripts = (Deluge.debug) ? resources.debug_scripts : resources.scripts;
-		Ext.each(scripts, function(script) {
-			Ext.ux.JSLoader({
-				url: deluge.config.base + script,
-				onLoad: this.onPluginLoaded,
-				pluginName: resources.name
-			});
-		}, this);
-	},
+    onGotPluginResources: function(resources) {
+        var scripts = (Deluge.debug) ? resources.debug_scripts : resources.scripts;
+        Ext.each(scripts, function(script) {
+            Ext.ux.JSLoader({
+                url: deluge.config.base + script,
+                onLoad: this.onPluginLoaded,
+                pluginName: resources.name
+            });
+        }, this);
+    },
 
-	onPluginDisabled: function(pluginName) {
-		deluge.plugins[pluginName].disable();
-	},
+    onPluginDisabled: function(pluginName) {
+        deluge.plugins[pluginName].disable();
+    },
 
-	onPluginLoaded: function(options) {
-		// This could happen if the plugin has multiple scripts
-		if (!Deluge.hasPlugin(options.pluginName)) return;
+    onPluginLoaded: function(options) {
+        // This could happen if the plugin has multiple scripts
+        if (!Deluge.hasPlugin(options.pluginName)) return;
 
-		// Enable the plugin
-		plugin = Deluge.createPlugin(options.pluginName);
-		plugin.enable();
-		deluge.plugins[plugin.name] = plugin;
-	},
+        // Enable the plugin
+        plugin = Deluge.createPlugin(options.pluginName);
+        plugin.enable();
+        deluge.plugins[plugin.name] = plugin;
+    },
 
-	/**
-	 * @static
-	 * Stop the Deluge UI polling the server and clear the interface.
-	 */
-	stop: function() {
-		if (this.running) {
-			clearInterval(this.running);
-			this.running = false;
-			deluge.torrents.getStore().removeAll();
-		}
-	}
+    /**
+     * @static
+     * Stop the Deluge UI polling the server and clear the interface.
+     */
+    stop: function() {
+        if (this.running) {
+            clearInterval(this.running);
+            this.running = false;
+            deluge.torrents.getStore().removeAll();
+        }
+    }
 }
 
 Ext.onReady(function(e) {
-	deluge.ui.initialize();
+    deluge.ui.initialize();
 });
diff --git a/deluge/ui/web/js/deluge-all/add/AddWindow.js b/deluge/ui/web/js/deluge-all/add/AddWindow.js
index 4dc4edeb5..85c0da162 100644
--- a/deluge/ui/web/js/deluge-all/add/AddWindow.js
+++ b/deluge/ui/web/js/deluge-all/add/AddWindow.js
@@ -34,195 +34,195 @@ Ext.namespace('Deluge.add');
 
 Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
 
-	title: _('Add Torrents'),
-	layout: 'border',
-	width: 470,
-	height: 450,
-	bodyStyle: 'padding: 10px 5px;',
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	closable: true,
-	plain: true,
-	iconCls: 'x-deluge-add-window-icon',
+    title: _('Add Torrents'),
+    layout: 'border',
+    width: 470,
+    height: 450,
+    bodyStyle: 'padding: 10px 5px;',
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    closable: true,
+    plain: true,
+    iconCls: 'x-deluge-add-window-icon',
 
-	initComponent: function() {
-		Deluge.add.AddWindow.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.add.AddWindow.superclass.initComponent.call(this);
 
-		this.addButton(_('Cancel'), this.onCancelClick, this);
-		this.addButton(_('Add'), this.onAddClick, this);
-	
-		function torrentRenderer(value, p, r) {
-			if (r.data['info_hash']) {
-				return String.format('
{0}
', value);
-			} else {
-				return String.format('
{0}
', value);
-			}
-		}
+        this.addButton(_('Cancel'), this.onCancelClick, this);
+        this.addButton(_('Add'), this.onAddClick, this);
+    
+        function torrentRenderer(value, p, r) {
+            if (r.data['info_hash']) {
+                return String.format('
{0}
', value);
+            } else {
+                return String.format('
{0}
', value);
+            }
+        }
 
-		this.list = new Ext.list.ListView({
-			store: new Ext.data.SimpleStore({
-				fields: [
-					{name: 'info_hash', mapping: 1},
-					{name: 'text', mapping: 2}
-				],
-				id: 0
-			}),
-			columns: [{
-				id: 'torrent',
-				width: 150,
-				sortable: true,
-				renderer: torrentRenderer,
-				dataIndex: 'text'
-			}],	
-			stripeRows: true,
-			singleSelect: true,
-			listeners: {
-				'selectionchange': {
-					fn: this.onSelect,
-					scope: this
-				}
-			},
-			hideHeaders: true,
-			autoExpandColumn: 'torrent',
-			autoScroll: true
-		});
+        this.list = new Ext.list.ListView({
+            store: new Ext.data.SimpleStore({
+                fields: [
+                    {name: 'info_hash', mapping: 1},
+                    {name: 'text', mapping: 2}
+                ],
+                id: 0
+            }),
+            columns: [{
+                id: 'torrent',
+                width: 150,
+                sortable: true,
+                renderer: torrentRenderer,
+                dataIndex: 'text'
+            }],    
+            stripeRows: true,
+            singleSelect: true,
+            listeners: {
+                'selectionchange': {
+                    fn: this.onSelect,
+                    scope: this
+                }
+            },
+            hideHeaders: true,
+            autoExpandColumn: 'torrent',
+            autoScroll: true
+        });
 
-		this.add({
-			region: 'center',
-			items: [this.list],
-			margins: '5 5 5 5',
-			bbar: new Ext.Toolbar({
-				items: [{
-					iconCls: 'x-deluge-add-file',
-					text: _('File'),
-					handler: this.onFile,
-					scope: this
-				}, {
-					text: _('Url'),
-					iconCls: 'icon-add-url',
-					handler: this.onUrl,
-					scope: this
-				}, {
-					text: _('Infohash'),
-					iconCls: 'icon-add-magnet',
-					disabled: true
-				}, '->', {
-					text: _('Remove'),
-					iconCls: 'icon-remove',
-					handler: this.onRemove,
-					scope: this
-				}]
-			})
-		});
-	
-		this.optionsPanel = this.add(new Deluge.add.OptionsPanel());
-		this.on('hide', this.onHide, this);
-		this.on('show', this.onShow, this);
-	},
+        this.add({
+            region: 'center',
+            items: [this.list],
+            margins: '5 5 5 5',
+            bbar: new Ext.Toolbar({
+                items: [{
+                    iconCls: 'x-deluge-add-file',
+                    text: _('File'),
+                    handler: this.onFile,
+                    scope: this
+                }, {
+                    text: _('Url'),
+                    iconCls: 'icon-add-url',
+                    handler: this.onUrl,
+                    scope: this
+                }, {
+                    text: _('Infohash'),
+                    iconCls: 'icon-add-magnet',
+                    disabled: true
+                }, '->', {
+                    text: _('Remove'),
+                    iconCls: 'icon-remove',
+                    handler: this.onRemove,
+                    scope: this
+                }]
+            })
+        });
+    
+        this.optionsPanel = this.add(new Deluge.add.OptionsPanel());
+        this.on('hide', this.onHide, this);
+        this.on('show', this.onShow, this);
+    },
 
-	clear: function() {
-		this.list.getStore().removeAll();
-		this.optionsPanel.clear();
-	},
+    clear: function() {
+        this.list.getStore().removeAll();
+        this.optionsPanel.clear();
+    },
 
-	onAddClick: function() {
-		var torrents = [];
-		if (!this.list) return;
-		this.list.getStore().each(function(r) {
-			var id = r.get('info_hash');
-			torrents.push({
-				path: this.optionsPanel.getFilename(id),
-				options: this.optionsPanel.getOptions(id)
-			});
-		}, this);
+    onAddClick: function() {
+        var torrents = [];
+        if (!this.list) return;
+        this.list.getStore().each(function(r) {
+            var id = r.get('info_hash');
+            torrents.push({
+                path: this.optionsPanel.getFilename(id),
+                options: this.optionsPanel.getOptions(id)
+            });
+        }, this);
 
-		deluge.client.web.add_torrents(torrents, {
-			success: function(result) {
-			}
-		})
-		this.clear();
-		this.hide();
-	},
+        deluge.client.web.add_torrents(torrents, {
+            success: function(result) {
+            }
+        })
+        this.clear();
+        this.hide();
+    },
 
-	onCancelClick: function() {
-		this.clear();
-		this.hide();
-	},
+    onCancelClick: function() {
+        this.clear();
+        this.hide();
+    },
 
-	onFile: function() {
-		if (!this.file) this.file = new Deluge.add.FileWindow();
-		this.file.show();
-	},
+    onFile: function() {
+        if (!this.file) this.file = new Deluge.add.FileWindow();
+        this.file.show();
+    },
 
-	onHide: function() {
-		this.optionsPanel.setActiveTab(0);
-		this.optionsPanel.files.setDisabled(true);
-		this.optionsPanel.form.setDisabled(true);
-	},
+    onHide: function() {
+        this.optionsPanel.setActiveTab(0);
+        this.optionsPanel.files.setDisabled(true);
+        this.optionsPanel.form.setDisabled(true);
+    },
 
-	onRemove: function() {
-		if (!this.list.getSelectionCount()) return;
-		var torrent = this.list.getSelectedRecords()[0];
-		this.list.getStore().remove(torrent);
-		this.optionsPanel.clear();
-		
-		if (this.torrents && this.torrents[torrent.id]) delete this.torrents[torrent.id];
-	},
+    onRemove: function() {
+        if (!this.list.getSelectionCount()) return;
+        var torrent = this.list.getSelectedRecords()[0];
+        this.list.getStore().remove(torrent);
+        this.optionsPanel.clear();
+        
+        if (this.torrents && this.torrents[torrent.id]) delete this.torrents[torrent.id];
+    },
 
-	onSelect: function(list, selections) {
-		if (selections.length) {	
-			var record = this.list.getRecord(selections[0]);
-			this.optionsPanel.setTorrent(record.get('info_hash'));
-			this.optionsPanel.files.setDisabled(false);
-			this.optionsPanel.form.setDisabled(false);
-		} else {
-			this.optionsPanel.files.setDisabled(true);
-			this.optionsPanel.form.setDisabled(true);
-		}
-	},
+    onSelect: function(list, selections) {
+        if (selections.length) {    
+            var record = this.list.getRecord(selections[0]);
+            this.optionsPanel.setTorrent(record.get('info_hash'));
+            this.optionsPanel.files.setDisabled(false);
+            this.optionsPanel.form.setDisabled(false);
+        } else {
+            this.optionsPanel.files.setDisabled(true);
+            this.optionsPanel.form.setDisabled(true);
+        }
+    },
 
-	onShow: function() {
-		if (!this.url) {
-			this.url = new Deluge.add.UrlWindow();
-			this.url.on('beforeadd', this.onTorrentBeforeAdd, this);
-			this.url.on('add', this.onTorrentAdd, this);
-		}
+    onShow: function() {
+        if (!this.url) {
+            this.url = new Deluge.add.UrlWindow();
+            this.url.on('beforeadd', this.onTorrentBeforeAdd, this);
+            this.url.on('add', this.onTorrentAdd, this);
+        }
 
-		if (!this.file) {
-			this.file = new Deluge.add.FileWindow();
-			this.file.on('beforeadd', this.onTorrentBeforeAdd, this);
-			this.file.on('add', this.onTorrentAdd, this);
-		}
-	
-		this.optionsPanel.form.getDefaults();
-	},
+        if (!this.file) {
+            this.file = new Deluge.add.FileWindow();
+            this.file.on('beforeadd', this.onTorrentBeforeAdd, this);
+            this.file.on('add', this.onTorrentAdd, this);
+        }
+    
+        this.optionsPanel.form.getDefaults();
+    },
 
-	onTorrentBeforeAdd: function(torrentId, text) {
-		var store = this.list.getStore();
-		store.loadData([[torrentId, null, text]], true);
-	},
+    onTorrentBeforeAdd: function(torrentId, text) {
+        var store = this.list.getStore();
+        store.loadData([[torrentId, null, text]], true);
+    },
 
-	onTorrentAdd: function(torrentId, info) {
-		var r = this.list.getStore().getById(torrentId);
-		if (!info) {
-			Ext.MessageBox.show({
-				title: _('Error'),
-				msg: _('Not a valid torrent'),
-				buttons: Ext.MessageBox.OK,
-				modal: false,
-				icon: Ext.MessageBox.ERROR,
-				iconCls: 'x-deluge-icon-error'
-			});
-			this.list.getStore().remove(r);
-		} else {
-			r.set('info_hash', info['info_hash']);
-			r.set('text', info['name']);
-			this.list.getStore().commitChanges();
-			this.optionsPanel.addTorrent(info);
-		}
-	},
+    onTorrentAdd: function(torrentId, info) {
+        var r = this.list.getStore().getById(torrentId);
+        if (!info) {
+            Ext.MessageBox.show({
+                title: _('Error'),
+                msg: _('Not a valid torrent'),
+                buttons: Ext.MessageBox.OK,
+                modal: false,
+                icon: Ext.MessageBox.ERROR,
+                iconCls: 'x-deluge-icon-error'
+            });
+            this.list.getStore().remove(r);
+        } else {
+            r.set('info_hash', info['info_hash']);
+            r.set('text', info['name']);
+            this.list.getStore().commitChanges();
+            this.optionsPanel.addTorrent(info);
+        }
+    },
 
-	onUrl: function(button, event) {
-		this.url.show();
-	}
+    onUrl: function(button, event) {
+        this.url.show();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/add/FileWindow.js b/deluge/ui/web/js/deluge-all/add/FileWindow.js
index 632e7a306..65f9a6073 100644
--- a/deluge/ui/web/js/deluge-all/add/FileWindow.js
+++ b/deluge/ui/web/js/deluge-all/add/FileWindow.js
@@ -37,80 +37,80 @@ Ext.ns('Deluge.add');
  */
 Deluge.add.FileWindow = Ext.extend(Deluge.add.Window, {
 
-	title: _('Add from File'),
-	layout: 'fit',
-	width: 350,
-	height: 115,
-	modal: true,
-	plain: true,
-	buttonAlign: 'center',
-	closeAction: 'hide',
-	bodyStyle: 'padding: 10px 5px;',
-	iconCls: 'x-deluge-add-file',
+    title: _('Add from File'),
+    layout: 'fit',
+    width: 350,
+    height: 115,
+    modal: true,
+    plain: true,
+    buttonAlign: 'center',
+    closeAction: 'hide',
+    bodyStyle: 'padding: 10px 5px;',
+    iconCls: 'x-deluge-add-file',
 
-	initComponent: function() {
-		Deluge.add.FileWindow.superclass.initComponent.call(this);
-		this.addButton(_('Add'), this.onAddClick, this);
-		
-		this.form = this.add({
-			xtype: 'form',
-			baseCls: 'x-plain',
-			labelWidth: 35,
-			autoHeight: true,
-			fileUpload: true,
-			items: [{
-				xtype: 'fileuploadfield',
-				id: 'torrentFile',
-				width: 280,
-				emptyText: _('Select a torrent'),
-				fieldLabel: _('File'),
-				name: 'file',
-				buttonCfg: {
-					text: _('Browse') + '...'
-				}
-			}]
-		});
-	},
-	
-	// private
-	onAddClick: function(field, e) {
-		if (this.form.getForm().isValid()) {
-			this.torrentId = this.createTorrentId();
-			this.form.getForm().submit({
-				url: '/upload',
-				waitMsg: _('Uploading your torrent...'),
-				failure: this.onUploadFailure,
-				success: this.onUploadSuccess,
-				scope: this
-			});
-			var name = this.form.getForm().findField('torrentFile').value;
-			name = name.split('\\').slice(-1)[0];
-			this.fireEvent('beforeadd', this.torrentId, name);
-		}
-	},
-	
-	// private
-	onGotInfo: function(info, obj, response, request) {
-		info['filename'] = request.options.filename;
-		this.fireEvent('add', this.torrentId, info);
-	},
+    initComponent: function() {
+        Deluge.add.FileWindow.superclass.initComponent.call(this);
+        this.addButton(_('Add'), this.onAddClick, this);
+        
+        this.form = this.add({
+            xtype: 'form',
+            baseCls: 'x-plain',
+            labelWidth: 35,
+            autoHeight: true,
+            fileUpload: true,
+            items: [{
+                xtype: 'fileuploadfield',
+                id: 'torrentFile',
+                width: 280,
+                emptyText: _('Select a torrent'),
+                fieldLabel: _('File'),
+                name: 'file',
+                buttonCfg: {
+                    text: _('Browse') + '...'
+                }
+            }]
+        });
+    },
+    
+    // private
+    onAddClick: function(field, e) {
+        if (this.form.getForm().isValid()) {
+            this.torrentId = this.createTorrentId();
+            this.form.getForm().submit({
+                url: '/upload',
+                waitMsg: _('Uploading your torrent...'),
+                failure: this.onUploadFailure,
+                success: this.onUploadSuccess,
+                scope: this
+            });
+            var name = this.form.getForm().findField('torrentFile').value;
+            name = name.split('\\').slice(-1)[0];
+            this.fireEvent('beforeadd', this.torrentId, name);
+        }
+    },
+    
+    // private
+    onGotInfo: function(info, obj, response, request) {
+        info['filename'] = request.options.filename;
+        this.fireEvent('add', this.torrentId, info);
+    },
 
-	// private
-	onUploadFailure: function(form, action) {
-		this.hide();
-	},
-	
-	// private
-	onUploadSuccess: function(fp, upload) {
-		this.hide();
-		if (upload.result.success) {
-			var filename = upload.result.files[0];
-			this.form.getForm().findField('torrentFile').setValue('');
-			deluge.client.web.get_torrent_info(filename, {
-				success: this.onGotInfo,
-				scope: this,
-				filename: filename
-			});
-		}
-	}
+    // private
+    onUploadFailure: function(form, action) {
+        this.hide();
+    },
+    
+    // private
+    onUploadSuccess: function(fp, upload) {
+        this.hide();
+        if (upload.result.success) {
+            var filename = upload.result.files[0];
+            this.form.getForm().findField('torrentFile').setValue('');
+            deluge.client.web.get_torrent_info(filename, {
+                success: this.onGotInfo,
+                scope: this,
+                filename: filename
+            });
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/add/FilesTab.js b/deluge/ui/web/js/deluge-all/add/FilesTab.js
index e1eccc063..3e624823d 100644
--- a/deluge/ui/web/js/deluge-all/add/FilesTab.js
+++ b/deluge/ui/web/js/deluge-all/add/FilesTab.js
@@ -37,78 +37,78 @@ Ext.ns('Deluge.add');
  */
 Deluge.add.FilesTab = Ext.extend(Ext.ux.tree.TreeGrid, {
 
-	layout: 'fit',
-	title:  _('Files'),
+    layout: 'fit',
+    title:  _('Files'),
 
-	autoScroll:  true,
-	animate:     false,
-	border:      false,
-	disabled:    true,
-	rootVisible: false,
+    autoScroll:  true,
+    animate:     false,
+    border:      false,
+    disabled:    true,
+    rootVisible: false,
 
-	columns: [{
-		header: _('Filename'),
-		width: 295,
-		dataIndex: 'filename'
-	},{
-		header: _('Size'),
-		width: 60,
-		dataIndex: 'size',
-		tpl: new Ext.XTemplate('{size:this.fsize}', {
-			fsize: function(v) {
-				return fsize(v);
-			}
-		})
-	},{
-		header: _('Download'),
-		width: 65,
-		dataIndex: 'download',
-		tpl: new Ext.XTemplate('{download:this.format}', {
-			format: function(v) {
-				return '
 
';
-			}
-		})
-	}],
+    columns: [{
+        header: _('Filename'),
+        width: 295,
+        dataIndex: 'filename'
+    },{
+        header: _('Size'),
+        width: 60,
+        dataIndex: 'size',
+        tpl: new Ext.XTemplate('{size:this.fsize}', {
+            fsize: function(v) {
+                return fsize(v);
+            }
+        })
+    },{
+        header: _('Download'),
+        width: 65,
+        dataIndex: 'download',
+        tpl: new Ext.XTemplate('{download:this.format}', {
+            format: function(v) {
+                return '
 
';
+            }
+        })
+    }],
 
-	initComponent: function() {
-		Deluge.add.FilesTab.superclass.initComponent.call(this);
-		this.on('click', this.onNodeClick, this);
-	},
+    initComponent: function() {
+        Deluge.add.FilesTab.superclass.initComponent.call(this);
+        this.on('click', this.onNodeClick, this);
+    },
 
-	clearFiles: function() {
-		var root = this.getRootNode();
-		if (!root.hasChildNodes()) return;
-		root.cascade(function(node) {
-			if (!node.parentNode || !node.getOwnerTree()) return;
-			node.remove();
-		});
-	},
+    clearFiles: function() {
+        var root = this.getRootNode();
+        if (!root.hasChildNodes()) return;
+        root.cascade(function(node) {
+            if (!node.parentNode || !node.getOwnerTree()) return;
+            node.remove();
+        });
+    },
 
-	setDownload: function(node, value, suppress) {
-		node.attributes.download = value;
-		node.ui.updateColumns();
+    setDownload: function(node, value, suppress) {
+        node.attributes.download = value;
+        node.ui.updateColumns();
 
-		if (node.isLeaf()) {
-			if (!suppress) {
-				return this.fireEvent('fileschecked', [node], value, !value);
-			}
-		} else {
-			var nodes = [node];
-			node.cascade(function(n) {
-				n.attributes.download = value;
-				n.ui.updateColumns();
-				nodes.push(n);
-			}, this);
-			if (!suppress) {
-				return this.fireEvent('fileschecked', nodes, value, !value);
-			}
-		}
-	},
+        if (node.isLeaf()) {
+            if (!suppress) {
+                return this.fireEvent('fileschecked', [node], value, !value);
+            }
+        } else {
+            var nodes = [node];
+            node.cascade(function(n) {
+                n.attributes.download = value;
+                n.ui.updateColumns();
+                nodes.push(n);
+            }, this);
+            if (!suppress) {
+                return this.fireEvent('fileschecked', nodes, value, !value);
+            }
+        }
+    },
 
-	onNodeClick: function(node, e) {
-		var el = new Ext.Element(e.target);
-		if (el.getAttribute('rel') == 'chkbox') {
-			this.setDownload(node, !node.attributes.download);
-		}
-	}
+    onNodeClick: function(node, e) {
+        var el = new Ext.Element(e.target);
+        if (el.getAttribute('rel') == 'chkbox') {
+            this.setDownload(node, !node.attributes.download);
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/add/OptionsPanel.js b/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
index 2d37bde91..5578a4520 100644
--- a/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
+++ b/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
@@ -33,127 +33,127 @@ Ext.ns('Deluge.add');
 
 Deluge.add.OptionsPanel = Ext.extend(Ext.TabPanel, {
 
-	torrents: {},
+    torrents: {},
 
-	// layout options
-	region: 'south',
-	margins: '5 5 5 5',
-	activeTab: 0,
-	height: 220,
+    // layout options
+    region: 'south',
+    margins: '5 5 5 5',
+    activeTab: 0,
+    height: 220,
 
-	initComponent: function() {
-		Deluge.add.OptionsPanel.superclass.initComponent.call(this);
-		this.files = this.add(new Deluge.add.FilesTab());
-		this.form = this.add(new Deluge.add.OptionsTab());
+    initComponent: function() {
+        Deluge.add.OptionsPanel.superclass.initComponent.call(this);
+        this.files = this.add(new Deluge.add.FilesTab());
+        this.form = this.add(new Deluge.add.OptionsTab());
 
-		this.files.on('fileschecked', this.onFilesChecked, this);
-	},
+        this.files.on('fileschecked', this.onFilesChecked, this);
+    },
 
-	addTorrent: function(torrent) {
-		this.torrents[torrent['info_hash']] = torrent;
-		var fileIndexes = {};
-		this.walkFileTree(torrent['files_tree'], function(filename, type, entry, parent) {
-			if (type != 'file') return;
-			fileIndexes[entry.index] = entry.download;
-		}, this);
+    addTorrent: function(torrent) {
+        this.torrents[torrent['info_hash']] = torrent;
+        var fileIndexes = {};
+        this.walkFileTree(torrent['files_tree'], function(filename, type, entry, parent) {
+            if (type != 'file') return;
+            fileIndexes[entry.index] = entry.download;
+        }, this);
 
-		var priorities = [];
-		Ext.each(Ext.keys(fileIndexes), function(index) {
-			priorities[index] = fileIndexes[index];
-		});
-		
-		var oldId = this.form.optionsManager.changeId(torrent['info_hash'], true);
-		this.form.optionsManager.setDefault('file_priorities', priorities);
-		this.form.optionsManager.changeId(oldId, true);
-	},
+        var priorities = [];
+        Ext.each(Ext.keys(fileIndexes), function(index) {
+            priorities[index] = fileIndexes[index];
+        });
+        
+        var oldId = this.form.optionsManager.changeId(torrent['info_hash'], true);
+        this.form.optionsManager.setDefault('file_priorities', priorities);
+        this.form.optionsManager.changeId(oldId, true);
+    },
 
-	clear: function() {
-		this.files.clearFiles();
-		this.form.optionsManager.resetAll();
-	},
+    clear: function() {
+        this.files.clearFiles();
+        this.form.optionsManager.resetAll();
+    },
 
-	getFilename: function(torrentId) {
-		return this.torrents[torrentId]['filename'];
-	},
+    getFilename: function(torrentId) {
+        return this.torrents[torrentId]['filename'];
+    },
 
-	getOptions: function(torrentId) {
-		var oldId = this.form.optionsManager.changeId(torrentId, true);
-		var options = this.form.optionsManager.get();
-		this.form.optionsManager.changeId(oldId, true);
-		Ext.each(options['file_priorities'], function(priority, index) {
-			options['file_priorities'][index] = (priority) ? 1 : 0;
-		});
-		return options;
-	},
+    getOptions: function(torrentId) {
+        var oldId = this.form.optionsManager.changeId(torrentId, true);
+        var options = this.form.optionsManager.get();
+        this.form.optionsManager.changeId(oldId, true);
+        Ext.each(options['file_priorities'], function(priority, index) {
+            options['file_priorities'][index] = (priority) ? 1 : 0;
+        });
+        return options;
+    },
 
-	setTorrent: function(torrentId) {
-		if (!torrentId) return;
+    setTorrent: function(torrentId) {
+        if (!torrentId) return;
 
-		this.torrentId = torrentId;
-		this.form.optionsManager.changeId(torrentId);
-	
-		this.files.clearFiles();
-		var root = this.files.getRootNode();
-		var priorities = this.form.optionsManager.get('file_priorities');
+        this.torrentId = torrentId;
+        this.form.optionsManager.changeId(torrentId);
+    
+        this.files.clearFiles();
+        var root = this.files.getRootNode();
+        var priorities = this.form.optionsManager.get('file_priorities');
 
-		this.walkFileTree(this.torrents[torrentId]['files_tree'], function(filename, type, entry, parentNode) {
-			var node = new Ext.tree.TreeNode({
-				download:  (entry.index) ? priorities[entry.index] : true,
-				filename:  filename,
-				fileindex: entry.index,
-				leaf:      type != 'dir',
-				size:      entry.length
-			});
-			parentNode.appendChild(node);
-			if (type == 'dir') return node;
-		}, this, root);
-		root.firstChild.expand();
-	},
+        this.walkFileTree(this.torrents[torrentId]['files_tree'], function(filename, type, entry, parentNode) {
+            var node = new Ext.tree.TreeNode({
+                download:  (entry.index) ? priorities[entry.index] : true,
+                filename:  filename,
+                fileindex: entry.index,
+                leaf:      type != 'dir',
+                size:      entry.length
+            });
+            parentNode.appendChild(node);
+            if (type == 'dir') return node;
+        }, this, root);
+        root.firstChild.expand();
+    },
 
-	walkFileTree: function(files, callback, scope, parentNode) {
-		for (var filename in files.contents) {
-			var entry = files.contents[filename];
-			var type = entry.type;
+    walkFileTree: function(files, callback, scope, parentNode) {
+        for (var filename in files.contents) {
+            var entry = files.contents[filename];
+            var type = entry.type;
 
-			if (scope) {
-				var ret = callback.apply(scope, [filename, type, entry, parentNode]);
-			} else {
-				var ret = callback(filename, type, entry, parentNode);
-			}
-		
-			if (type == 'dir') this.walkFileTree(entry, callback, scope, ret);
-		}
-	},
+            if (scope) {
+                var ret = callback.apply(scope, [filename, type, entry, parentNode]);
+            } else {
+                var ret = callback(filename, type, entry, parentNode);
+            }
+        
+            if (type == 'dir') this.walkFileTree(entry, callback, scope, ret);
+        }
+    },
 
-	onFilesChecked: function(nodes, newValue, oldValue) {
-		if (this.form.optionsManager.get('compact_allocation')) {
-			Ext.Msg.show({
-				title: _('Unable to set file priority!'),
-				msg:   _('File prioritization is unavailable when using Compact allocation. Would you like to switch to Full allocation?'),
-				buttons: Ext.Msg.YESNO,
-				fn: function(result) {
-					if (result == 'yes') {
-						this.form.optionsManager.update('compact_allocation', false);
-						Ext.each(nodes, function(node) {
-							if (node.attributes.fileindex < 0) return;
-							var priorities = this.form.optionsManager.get('file_priorities');
-							priorities[node.attributes.fileindex] = newValue;
-							this.form.optionsManager.update('file_priorities', priorities);
-						}, this);
-					} else {
-						this.files.setDownload(nodes[0], oldValue, true);
-					}	
-				},
-				scope: this,
-				icon: Ext.MessageBox.QUESTION
-			});
-		} else {
-			Ext.each(nodes, function(node) {
-				if (node.attributes.fileindex < 0) return;
-				var priorities = this.form.optionsManager.get('file_priorities');
-				priorities[node.attributes.fileindex] = newValue;
-				this.form.optionsManager.update('file_priorities', priorities);
-			}, this);
-		}
-	}
+    onFilesChecked: function(nodes, newValue, oldValue) {
+        if (this.form.optionsManager.get('compact_allocation')) {
+            Ext.Msg.show({
+                title: _('Unable to set file priority!'),
+                msg:   _('File prioritization is unavailable when using Compact allocation. Would you like to switch to Full allocation?'),
+                buttons: Ext.Msg.YESNO,
+                fn: function(result) {
+                    if (result == 'yes') {
+                        this.form.optionsManager.update('compact_allocation', false);
+                        Ext.each(nodes, function(node) {
+                            if (node.attributes.fileindex < 0) return;
+                            var priorities = this.form.optionsManager.get('file_priorities');
+                            priorities[node.attributes.fileindex] = newValue;
+                            this.form.optionsManager.update('file_priorities', priorities);
+                        }, this);
+                    } else {
+                        this.files.setDownload(nodes[0], oldValue, true);
+                    }    
+                },
+                scope: this,
+                icon: Ext.MessageBox.QUESTION
+            });
+        } else {
+            Ext.each(nodes, function(node) {
+                if (node.attributes.fileindex < 0) return;
+                var priorities = this.form.optionsManager.get('file_priorities');
+                priorities[node.attributes.fileindex] = newValue;
+                this.form.optionsManager.update('file_priorities', priorities);
+            }, this);
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/add/OptionsTab.js b/deluge/ui/web/js/deluge-all/add/OptionsTab.js
index c1ff5bca8..c65dc6f40 100644
--- a/deluge/ui/web/js/deluge-all/add/OptionsTab.js
+++ b/deluge/ui/web/js/deluge-all/add/OptionsTab.js
@@ -37,148 +37,148 @@ Ext.ns('Deluge.add');
  */
 Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 
-	title:  _('Options'),
-	height: 170,
+    title:  _('Options'),
+    height: 170,
 
-	border:     false,
-	bodyStyle:  'padding: 5px',
-	disabled:   true,
-	labelWidth: 1,
+    border:     false,
+    bodyStyle:  'padding: 5px',
+    disabled:   true,
+    labelWidth: 1,
 
-	initComponent: function() {
-		Deluge.add.OptionsTab.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.add.OptionsTab.superclass.initComponent.call(this);
 
-		this.optionsManager = new Deluge.MultiOptionsManager();
+        this.optionsManager = new Deluge.MultiOptionsManager();
 
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			title: _('Download Location'),
-			border: false,
-			autoHeight: true,
-			defaultType: 'textfield',
-			labelWidth: 1,
-			fieldLabel: '',
-			style: 'padding-bottom: 5px; margin-bottom: 0px;'
-		});
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            title: _('Download Location'),
+            border: false,
+            autoHeight: true,
+            defaultType: 'textfield',
+            labelWidth: 1,
+            fieldLabel: '',
+            style: 'padding-bottom: 5px; margin-bottom: 0px;'
+        });
 
-		this.optionsManager.bind('download_location', fieldset.add({
-			fieldLabel: '',
-			name: 'download_location',
-			width: 400,
-			labelSeparator: ''
-		}));
-	
-		var panel = this.add({
-			border: false,
-			layout: 'column',
-			defaultType: 'fieldset'
-		});
-		fieldset = panel.add({
-			title: _('Allocation'),
-			border: false,
-			autoHeight: true,
-			defaultType: 'radio',
-			width: 100
-		});
+        this.optionsManager.bind('download_location', fieldset.add({
+            fieldLabel: '',
+            name: 'download_location',
+            width: 400,
+            labelSeparator: ''
+        }));
+    
+        var panel = this.add({
+            border: false,
+            layout: 'column',
+            defaultType: 'fieldset'
+        });
+        fieldset = panel.add({
+            title: _('Allocation'),
+            border: false,
+            autoHeight: true,
+            defaultType: 'radio',
+            width: 100
+        });
 
-		this.optionsManager.bind('compact_allocation', fieldset.add({
-			xtype: 'radiogroup',
-			columns: 1,
-			vertical: true,
-			labelSeparator: '',
-			items: [{
-				name: 'compact_allocation',
-				value: false,
-				inputValue: false,
-				boxLabel: _('Full'),
-				fieldLabel: '',
-				labelSeparator: ''
-			}, {
-				name: 'compact_allocation',
-				value: true,
-				inputValue: true,
-				boxLabel: _('Compact'),
-				fieldLabel: '',
-				labelSeparator: ''
-			}]
-		}));
+        this.optionsManager.bind('compact_allocation', fieldset.add({
+            xtype: 'radiogroup',
+            columns: 1,
+            vertical: true,
+            labelSeparator: '',
+            items: [{
+                name: 'compact_allocation',
+                value: false,
+                inputValue: false,
+                boxLabel: _('Full'),
+                fieldLabel: '',
+                labelSeparator: ''
+            }, {
+                name: 'compact_allocation',
+                value: true,
+                inputValue: true,
+                boxLabel: _('Compact'),
+                fieldLabel: '',
+                labelSeparator: ''
+            }]
+        }));
 
-		fieldset = panel.add({
-			title: _('Bandwidth'),
-			border: false,
-			autoHeight: true,
-			labelWidth: 100,
-			width: 200,
-			defaultType: 'spinnerfield'
-		});
-		this.optionsManager.bind('max_download_speed', fieldset.add({
-			fieldLabel: _('Max Down Speed'),
-			labelStyle: 'margin-left: 10px',
-			name: 'max_download_speed',
-			width: 60
-		}));
-		this.optionsManager.bind('max_upload_speed', fieldset.add({
-			fieldLabel: _('Max Up Speed'),
-			labelStyle: 'margin-left: 10px',
-			name: 'max_upload_speed',
-			width: 60
-		}));
-		this.optionsManager.bind('max_connections', fieldset.add({
-			fieldLabel: _('Max Connections'),
-			labelStyle: 'margin-left: 10px',
-			name: 'max_connections',
-			width: 60
-		}));
-		this.optionsManager.bind('max_upload_slots', fieldset.add({
-			fieldLabel: _('Max Upload Slots'),
-			labelStyle: 'margin-left: 10px',
-			name: 'max_upload_slots',
-			width: 60
-		}));
-	
-		fieldset = panel.add({
-			title: _('General'),
-			border: false,
-			autoHeight: true,
-			defaultType: 'checkbox'
-		});
-		this.optionsManager.bind('add_paused', fieldset.add({
-			name: 'add_paused',
-			boxLabel: _('Add In Paused State'),
-			fieldLabel: '',
-			labelSeparator: ''
-		}));
-		this.optionsManager.bind('prioritize_first_last_pieces', fieldset.add({
-			name: 'prioritize_first_last_pieces',
-			boxLabel: _('Prioritize First/Last Pieces'),
-			fieldLabel: '',
-			labelSeparator: ''
-		}));
-	},
+        fieldset = panel.add({
+            title: _('Bandwidth'),
+            border: false,
+            autoHeight: true,
+            labelWidth: 100,
+            width: 200,
+            defaultType: 'spinnerfield'
+        });
+        this.optionsManager.bind('max_download_speed', fieldset.add({
+            fieldLabel: _('Max Down Speed'),
+            labelStyle: 'margin-left: 10px',
+            name: 'max_download_speed',
+            width: 60
+        }));
+        this.optionsManager.bind('max_upload_speed', fieldset.add({
+            fieldLabel: _('Max Up Speed'),
+            labelStyle: 'margin-left: 10px',
+            name: 'max_upload_speed',
+            width: 60
+        }));
+        this.optionsManager.bind('max_connections', fieldset.add({
+            fieldLabel: _('Max Connections'),
+            labelStyle: 'margin-left: 10px',
+            name: 'max_connections',
+            width: 60
+        }));
+        this.optionsManager.bind('max_upload_slots', fieldset.add({
+            fieldLabel: _('Max Upload Slots'),
+            labelStyle: 'margin-left: 10px',
+            name: 'max_upload_slots',
+            width: 60
+        }));
+    
+        fieldset = panel.add({
+            title: _('General'),
+            border: false,
+            autoHeight: true,
+            defaultType: 'checkbox'
+        });
+        this.optionsManager.bind('add_paused', fieldset.add({
+            name: 'add_paused',
+            boxLabel: _('Add In Paused State'),
+            fieldLabel: '',
+            labelSeparator: ''
+        }));
+        this.optionsManager.bind('prioritize_first_last_pieces', fieldset.add({
+            name: 'prioritize_first_last_pieces',
+            boxLabel: _('Prioritize First/Last Pieces'),
+            fieldLabel: '',
+            labelSeparator: ''
+        }));
+    },
 
-	getDefaults: function() {
-		var keys = ['add_paused','compact_allocation','download_location',
-		'max_connections_per_torrent','max_download_speed_per_torrent',
-		'max_upload_slots_per_torrent','max_upload_speed_per_torrent',
-		'prioritize_first_last_pieces'];
+    getDefaults: function() {
+        var keys = ['add_paused','compact_allocation','download_location',
+        'max_connections_per_torrent','max_download_speed_per_torrent',
+        'max_upload_slots_per_torrent','max_upload_speed_per_torrent',
+        'prioritize_first_last_pieces'];
 
-		deluge.client.core.get_config_values(keys, {
-			success: function(config) {
-				var options = {
-					'file_priorities': [],
-					'add_paused': config.add_paused,
-					'compact_allocation': config.compact_allocation,
-					'download_location': config.download_location,
-					'max_connections': config.max_connections_per_torrent,
-					'max_download_speed': config.max_download_speed_per_torrent,
-					'max_upload_slots': config.max_upload_slots_per_torrent,
-					'max_upload_speed': config.max_upload_speed_per_torrent,
-					'prioritize_first_last_pieces': config.prioritize_first_last_pieces
-				}
-				this.optionsManager.options = options;
-				this.optionsManager.resetAll();
-			},
-			scope: this
-		});
-	}
+        deluge.client.core.get_config_values(keys, {
+            success: function(config) {
+                var options = {
+                    'file_priorities': [],
+                    'add_paused': config.add_paused,
+                    'compact_allocation': config.compact_allocation,
+                    'download_location': config.download_location,
+                    'max_connections': config.max_connections_per_torrent,
+                    'max_download_speed': config.max_download_speed_per_torrent,
+                    'max_upload_slots': config.max_upload_slots_per_torrent,
+                    'max_upload_speed': config.max_upload_speed_per_torrent,
+                    'prioritize_first_last_pieces': config.prioritize_first_last_pieces
+                }
+                this.optionsManager.options = options;
+                this.optionsManager.resetAll();
+            },
+            scope: this
+        });
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/add/Window.js b/deluge/ui/web/js/deluge-all/add/Window.js
index 39b7843f1..b47c5d658 100644
--- a/deluge/ui/web/js/deluge-all/add/Window.js
+++ b/deluge/ui/web/js/deluge-all/add/Window.js
@@ -45,9 +45,9 @@ Deluge.add.Window = Ext.extend(Ext.Window, {
         );
     },
 
-	/**
-	 * Create an id for the torrent before we have any info about it.
-	 */
+    /**
+     * Create an id for the torrent before we have any info about it.
+     */
     createTorrentId: function() {
         return new Date().getTime();
     }
diff --git a/deluge/ui/web/js/deluge-all/data/PeerRecord.js b/deluge/ui/web/js/deluge-all/data/PeerRecord.js
index 79da154ba..0fdd58e9b 100644
--- a/deluge/ui/web/js/deluge-all/data/PeerRecord.js
+++ b/deluge/ui/web/js/deluge-all/data/PeerRecord.js
@@ -43,27 +43,27 @@ Ext.namespace('Deluge.data');
  * @param {Object} data The peer data
  */
 Deluge.data.Peer = Ext.data.Record.create([
-	{
-		name: 'country',
-		type: 'string'
-	}, {
-		name: 'ip',
-		type: 'string',
-		sortType: Deluge.data.SortTypes.asIPAddress
-	}, {
-		name: 'client',
-		type: 'string'
-	}, {
-		name: 'progress',
-		type: 'float'
-	}, {
-		name: 'down_speed',
-		type: 'int'
-	}, {
-		name: 'up_speed',
-		type: 'int'
-	}, {
-		name: 'seed',
-		type: 'int'
-	}
+    {
+        name: 'country',
+        type: 'string'
+    }, {
+        name: 'ip',
+        type: 'string',
+        sortType: Deluge.data.SortTypes.asIPAddress
+    }, {
+        name: 'client',
+        type: 'string'
+    }, {
+        name: 'progress',
+        type: 'float'
+    }, {
+        name: 'down_speed',
+        type: 'int'
+    }, {
+        name: 'up_speed',
+        type: 'int'
+    }, {
+        name: 'seed',
+        type: 'int'
+    }
 ]);
diff --git a/deluge/ui/web/js/deluge-all/data/SortTypes.js b/deluge/ui/web/js/deluge-all/data/SortTypes.js
index 2acaf8b4a..e404ba348 100644
--- a/deluge/ui/web/js/deluge-all/data/SortTypes.js
+++ b/deluge/ui/web/js/deluge-all/data/SortTypes.js
@@ -41,12 +41,12 @@ Ext.namespace('Deluge.data');
  * @singleton
  */ 
 Deluge.data.SortTypes = {
-	asIPAddress: function(value) {
-		var d = value.match(/(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\:(\d+)/);
-		return ((((((+d[1])*256)+(+d[2]))*256)+(+d[3]))*256)+(+d[4]);
-	},
+    asIPAddress: function(value) {
+        var d = value.match(/(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\:(\d+)/);
+        return ((((((+d[1])*256)+(+d[2]))*256)+(+d[3]))*256)+(+d[4]);
+    },
 
-	asQueuePosition: function(value) {
-		return (value > -1) ? value : Number.MAX_VALUE;
-	}
+    asQueuePosition: function(value) {
+        return (value > -1) ? value : Number.MAX_VALUE;
+    }
 }
diff --git a/deluge/ui/web/js/deluge-all/data/TorrentRecord.js b/deluge/ui/web/js/deluge-all/data/TorrentRecord.js
index 2b89f3d7a..d13806c14 100644
--- a/deluge/ui/web/js/deluge-all/data/TorrentRecord.js
+++ b/deluge/ui/web/js/deluge-all/data/TorrentRecord.js
@@ -43,52 +43,52 @@ Ext.namespace('Deluge.data');
  * @param {Object} data The torrents data
  */
 Deluge.data.Torrent = Ext.data.Record.create([{
-		name: 'queue',
-		type: 'int'
-	}, {
-		name: 'name',
-		type: 'string'
-	}, {
-		name: 'total_size',
-		type: 'int'
-	}, {
-		name: 'state',
-		type: 'string'
-	}, {
-		name: 'progress',
-		type: 'int'
-	}, {
-		name: 'num_seeds',
-		type: 'int'
-	}, {
-		name: 'total_seeds',
-		type: 'int'
-	}, {
-		name: 'num_peers',
-		type: 'int'
-	}, {
-		name: 'total_peers',
-		type: 'int'
-	}, {
-		name: 'download_payload_rate',
-		type: 'int'
-	}, {
-		name: 'upload_payload_rate',
-		type: 'int'
-	}, {
-		name: 'eta',
-		type: 'int'
-	}, {
-		name: 'ratio',
-		type: 'float'
-	}, {
-		name: 'distributed_copies',
-		type: 'float'
-	}, {
-		name: 'time_added',
-		type: 'int'
-	}, {
-		name: 'tracker_host',
-		type: 'string'
-	}
+        name: 'queue',
+        type: 'int'
+    }, {
+        name: 'name',
+        type: 'string'
+    }, {
+        name: 'total_size',
+        type: 'int'
+    }, {
+        name: 'state',
+        type: 'string'
+    }, {
+        name: 'progress',
+        type: 'int'
+    }, {
+        name: 'num_seeds',
+        type: 'int'
+    }, {
+        name: 'total_seeds',
+        type: 'int'
+    }, {
+        name: 'num_peers',
+        type: 'int'
+    }, {
+        name: 'total_peers',
+        type: 'int'
+    }, {
+        name: 'download_payload_rate',
+        type: 'int'
+    }, {
+        name: 'upload_payload_rate',
+        type: 'int'
+    }, {
+        name: 'eta',
+        type: 'int'
+    }, {
+        name: 'ratio',
+        type: 'float'
+    }, {
+        name: 'distributed_copies',
+        type: 'float'
+    }, {
+        name: 'time_added',
+        type: 'int'
+    }, {
+        name: 'tracker_host',
+        type: 'string'
+    }
 ]);
diff --git a/deluge/ui/web/js/deluge-all/details/DetailsPanel.js b/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
index 0ac556e4a..382ae6815 100644
--- a/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
+++ b/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
@@ -36,69 +36,69 @@ Ext.namespace('Deluge.details');
  */
 Deluge.details.DetailsPanel = Ext.extend(Ext.TabPanel, {
 
-	region: 'south',
-	id: 'torrentDetails',
-	split: true,
-	height: 210,
-	minSize: 100,
-	collapsible: true,
-	margins: '0 5 5 5',
-	activeTab: 0,
-	
-	initComponent: function() {
-		Deluge.details.DetailsPanel.superclass.initComponent.call(this);
-		this.add(new Deluge.details.StatusTab());
-		this.add(new Deluge.details.DetailsTab());
-		this.add(new Deluge.details.FilesTab());
-		this.add(new Deluge.details.PeersTab());
-		this.add(new Deluge.details.OptionsTab());
-	},
-	
-	clear: function() {
-		this.items.each(function(panel) {
-			if (panel.clear) {
-				panel.clear.defer(100, panel);
-				panel.disable();
-			}
-		});
-	},
-	
-	
-	update: function(tab) {
-		var torrent = deluge.torrents.getSelected();
-		if (!torrent) {
-			this.clear();
-			return;
-		}
-		
-		this.items.each(function(tab) {
-			if (tab.disabled) tab.enable();
-		});
-		
-		tab = tab || this.getActiveTab();
-		if (tab.update) tab.update(torrent.id);
-	},
-	
-	/* Event Handlers */
-	
-	// We need to add the events in onRender since Deluge.Torrents hasn't
-	// been created yet.
-	onRender: function(ct, position) {
-		Deluge.details.DetailsPanel.superclass.onRender.call(this, ct, position);
-		deluge.events.on('disconnect', this.clear, this);
-		deluge.torrents.on('rowclick', this.onTorrentsClick, this);
-		this.on('tabchange', this.onTabChange, this);
-		
-		deluge.torrents.getSelectionModel().on('selectionchange', function(selModel) {
-			if (!selModel.hasSelection()) this.clear();
-		}, this);
-	},
-	
-	onTabChange: function(panel, tab) {
-		this.update(tab);
-	},
-	
-	onTorrentsClick: function(grid, rowIndex, e) {
-		this.update();
-	}
+    region: 'south',
+    id: 'torrentDetails',
+    split: true,
+    height: 210,
+    minSize: 100,
+    collapsible: true,
+    margins: '0 5 5 5',
+    activeTab: 0,
+    
+    initComponent: function() {
+        Deluge.details.DetailsPanel.superclass.initComponent.call(this);
+        this.add(new Deluge.details.StatusTab());
+        this.add(new Deluge.details.DetailsTab());
+        this.add(new Deluge.details.FilesTab());
+        this.add(new Deluge.details.PeersTab());
+        this.add(new Deluge.details.OptionsTab());
+    },
+    
+    clear: function() {
+        this.items.each(function(panel) {
+            if (panel.clear) {
+                panel.clear.defer(100, panel);
+                panel.disable();
+            }
+        });
+    },
+    
+    
+    update: function(tab) {
+        var torrent = deluge.torrents.getSelected();
+        if (!torrent) {
+            this.clear();
+            return;
+        }
+        
+        this.items.each(function(tab) {
+            if (tab.disabled) tab.enable();
+        });
+        
+        tab = tab || this.getActiveTab();
+        if (tab.update) tab.update(torrent.id);
+    },
+    
+    /* Event Handlers */
+    
+    // We need to add the events in onRender since Deluge.Torrents hasn't
+    // been created yet.
+    onRender: function(ct, position) {
+        Deluge.details.DetailsPanel.superclass.onRender.call(this, ct, position);
+        deluge.events.on('disconnect', this.clear, this);
+        deluge.torrents.on('rowclick', this.onTorrentsClick, this);
+        this.on('tabchange', this.onTabChange, this);
+        
+        deluge.torrents.getSelectionModel().on('selectionchange', function(selModel) {
+            if (!selModel.hasSelection()) this.clear();
+        }, this);
+    },
+    
+    onTabChange: function(panel, tab) {
+        this.update(tab);
+    },
+    
+    onTorrentsClick: function(grid, rowIndex, e) {
+        this.update();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/details/DetailsTab.js b/deluge/ui/web/js/deluge-all/details/DetailsTab.js
index 0c04421e2..ca41478d4 100644
--- a/deluge/ui/web/js/deluge-all/details/DetailsTab.js
+++ b/deluge/ui/web/js/deluge-all/details/DetailsTab.js
@@ -1,115 +1,115 @@
 /*
 Script: Deluge.Details.Details.js
-	The details tab displayed in the details panel.
+    The details tab displayed in the details panel.
 
 Copyright:
-	(C) Damien Churchill 2009-2010 
-	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.
+    (C) Damien Churchill 2009-2010 
+    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.
+    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.
+    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.
 
-	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
-	statement from all source files in the program, then also delete it here.
+    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
+    statement from all source files in the program, then also delete it here.
 
 */
 
 Deluge.details.DetailsTab = Ext.extend(Ext.Panel, {
-	title: _('Details'),
+    title: _('Details'),
 
-	fields: {},
+    fields: {},
 
-	queuedItems: {},
+    queuedItems: {},
 
-	oldData: {},
+    oldData: {},
 
-	initComponent: function() {
-		Deluge.details.DetailsTab.superclass.initComponent.call(this);
-		this.addItem('torrent_name', _('Name'));
-		this.addItem('hash', _('Hash'));
-		this.addItem('path', _('Path'));
-		this.addItem('size', _('Total Size'));
-		this.addItem('files', _('# of files'));
-		this.addItem('comment', _('Comment'));
-		this.addItem('status', _('Status'));
-		this.addItem('tracker', _('Tracker'));
-	},
+    initComponent: function() {
+        Deluge.details.DetailsTab.superclass.initComponent.call(this);
+        this.addItem('torrent_name', _('Name'));
+        this.addItem('hash', _('Hash'));
+        this.addItem('path', _('Path'));
+        this.addItem('size', _('Total Size'));
+        this.addItem('files', _('# of files'));
+        this.addItem('comment', _('Comment'));
+        this.addItem('status', _('Status'));
+        this.addItem('tracker', _('Tracker'));
+    },
 
-	onRender: function(ct, position) {
-		Deluge.details.DetailsTab.superclass.onRender.call(this, ct, position);
-		this.body.setStyle('padding', '10px');
-		this.dl = Ext.DomHelper.append(this.body, {tag: 'dl'}, true);
+    onRender: function(ct, position) {
+        Deluge.details.DetailsTab.superclass.onRender.call(this, ct, position);
+        this.body.setStyle('padding', '10px');
+        this.dl = Ext.DomHelper.append(this.body, {tag: 'dl'}, true);
 
-		for (var id in this.queuedItems) {
-			this.doAddItem(id, this.queuedItems[id]);
-		}
-	},
+        for (var id in this.queuedItems) {
+            this.doAddItem(id, this.queuedItems[id]);
+        }
+    },
 
-	addItem: function(id, label) {
-		if (!this.rendered) {
-			this.queuedItems[id] = label;
-		} else {
-			this.doAddItem(id, label);
-		}
-	},
+    addItem: function(id, label) {
+        if (!this.rendered) {
+            this.queuedItems[id] = label;
+        } else {
+            this.doAddItem(id, label);
+        }
+    },
 
-	// private
-	doAddItem: function(id, label) {
-		Ext.DomHelper.append(this.dl, {tag: 'dt', cls: id, html: label + ':'});
-		this.fields[id] = Ext.DomHelper.append(this.dl, {tag: 'dd', cls: id, html: ''}, true);
-	},
+    // private
+    doAddItem: function(id, label) {
+        Ext.DomHelper.append(this.dl, {tag: 'dt', cls: id, html: label + ':'});
+        this.fields[id] = Ext.DomHelper.append(this.dl, {tag: 'dd', cls: id, html: ''}, true);
+    },
 
-	clear: function() {
-		if (!this.fields) return;
-		for (var k in this.fields) {
-			this.fields[k].dom.innerHTML = '';
-		}
-		this.oldData = {}
-	},
+    clear: function() {
+        if (!this.fields) return;
+        for (var k in this.fields) {
+            this.fields[k].dom.innerHTML = '';
+        }
+        this.oldData = {}
+    },
 
-	update: function(torrentId) {
-		deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Details, {
-			success: this.onRequestComplete,
-			scope: this,
-			torrentId: torrentId
-		});
-	},
+    update: function(torrentId) {
+        deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Details, {
+            success: this.onRequestComplete,
+            scope: this,
+            torrentId: torrentId
+        });
+    },
 
-	onRequestComplete: function(torrent, request, response, options) {
-		var data = {
-			torrent_name: torrent.name,
-			hash: options.options.torrentId,
-			path: torrent.save_path,
-			size: fsize(torrent.total_size),
-			files: torrent.num_files,
-			status: torrent.message,
-			tracker: torrent.tracker,
-			comment: torrent.comment
-		};
+    onRequestComplete: function(torrent, request, response, options) {
+        var data = {
+            torrent_name: torrent.name,
+            hash: options.options.torrentId,
+            path: torrent.save_path,
+            size: fsize(torrent.total_size),
+            files: torrent.num_files,
+            status: torrent.message,
+            tracker: torrent.tracker,
+            comment: torrent.comment
+        };
 
-		for (var field in this.fields) {
-			if (!Ext.isDefined(data[field])) continue; // this is a field we aren't responsible for.
-			if (data[field] == this.oldData[field]) continue;
-			this.fields[field].dom.innerHTML = Ext.escapeHTML(data[field]);
-		}
-		this.oldData = data;
-	}
+        for (var field in this.fields) {
+            if (!Ext.isDefined(data[field])) continue; // this is a field we aren't responsible for.
+            if (data[field] == this.oldData[field]) continue;
+            this.fields[field].dom.innerHTML = Ext.escapeHTML(data[field]);
+        }
+        this.oldData = data;
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/details/FilesTab.js b/deluge/ui/web/js/deluge-all/details/FilesTab.js
index a57168d47..061ed7950 100644
--- a/deluge/ui/web/js/deluge-all/details/FilesTab.js
+++ b/deluge/ui/web/js/deluge-all/details/FilesTab.js
@@ -29,200 +29,200 @@
  * this exception statement from your version. If you delete this exception
  * statement from all source files in the program, then also delete it here.
  */
-	
+    
 Deluge.details.FilesTab = Ext.extend(Ext.ux.tree.TreeGrid, {
 
-	title: _('Files'),
+    title: _('Files'),
 
-	autoScroll: true,
-	rootVisible: false,
+    autoScroll: true,
+    rootVisible: false,
 
-	columns: [{
-		header: _('Filename'),
-		width: 330,
-		dataIndex: 'filename'
-	}, {
-		header: _('Size'),
-		width: 150,
-		dataIndex: 'size',
-		tpl: new Ext.XTemplate('{size:this.fsize}', {
-			fsize: function(v) { return fsize(v); }
-		})
-	}, {
-		xtype: 'tgrendercolumn',
-		header: _('Progress'),
-		width: 150,
-		dataIndex: 'progress',
-		renderer: function(v) {
-			var progress = v * 100;
-			return Deluge.progressBar(progress, this.col.width, progress.toFixed(2) + '%', 0);
-		}
-	}, {
-		header: _('Priority'),
-		width: 150,
-		dataIndex: 'priority',
-		tpl: new Ext.XTemplate('' +
-			'
' +
-				'{priority:this.getName}' +
-			'
', {
-			getClass: function(v) {
-				return FILE_PRIORITY_CSS[v];
-			},
+    columns: [{
+        header: _('Filename'),
+        width: 330,
+        dataIndex: 'filename'
+    }, {
+        header: _('Size'),
+        width: 150,
+        dataIndex: 'size',
+        tpl: new Ext.XTemplate('{size:this.fsize}', {
+            fsize: function(v) { return fsize(v); }
+        })
+    }, {
+        xtype: 'tgrendercolumn',
+        header: _('Progress'),
+        width: 150,
+        dataIndex: 'progress',
+        renderer: function(v) {
+            var progress = v * 100;
+            return Deluge.progressBar(progress, this.col.width, progress.toFixed(2) + '%', 0);
+        }
+    }, {
+        header: _('Priority'),
+        width: 150,
+        dataIndex: 'priority',
+        tpl: new Ext.XTemplate('' +
+            '
' +
+                '{priority:this.getName}' +
+            '
', {
+            getClass: function(v) {
+                return FILE_PRIORITY_CSS[v];
+            },
 
-			getName: function(v) {
-				return _(FILE_PRIORITY[v]);
-			}
-		})
-	}],
-	
-	selModel: new Ext.tree.MultiSelectionModel(),
+            getName: function(v) {
+                return _(FILE_PRIORITY[v]);
+            }
+        })
+    }],
+    
+    selModel: new Ext.tree.MultiSelectionModel(),
 
-	initComponent: function() {
-		Deluge.details.FilesTab.superclass.initComponent.call(this);
-		this.setRootNode(new Ext.tree.TreeNode({text: 'Files'}));
-	},
+    initComponent: function() {
+        Deluge.details.FilesTab.superclass.initComponent.call(this);
+        this.setRootNode(new Ext.tree.TreeNode({text: 'Files'}));
+    },
 
-	clear: function() {
-		var root = this.getRootNode();
-		if (!root.hasChildNodes()) return;
-		root.cascade(function(node) {
-			var parentNode = node.parentNode;
-			if (!parentNode) return;
-			if (!parentNode.ownerTree) return;
-			parentNode.removeChild(node);
-		});
-	},
+    clear: function() {
+        var root = this.getRootNode();
+        if (!root.hasChildNodes()) return;
+        root.cascade(function(node) {
+            var parentNode = node.parentNode;
+            if (!parentNode) return;
+            if (!parentNode.ownerTree) return;
+            parentNode.removeChild(node);
+        });
+    },
 
-	createFileTree: function(files) {
-		function walk(files, parentNode) {
-			for (var file in files.contents) {
-				var item = files.contents[file];
-				if (item.type == 'dir') {
-					walk(item, parentNode.appendChild(new Ext.tree.TreeNode({
-						text: file,
-						filename: file,
-						size: item.size,
-						progress: item.progress,
-						priority: item.priority
-					})));
-				} else {
-					parentNode.appendChild(new Ext.tree.TreeNode({
-						text: file,
-						filename: file,
-						fileIndex: item.index,
-						size: item.size,
-						progress: item.progress,
-						priority: item.priority,
-						leaf: true,
-						iconCls: 'x-deluge-file',
-						uiProvider: Ext.ux.tree.TreeGridNodeUI
-					}));
-				}
-			}
-		}
-		var root = this.getRootNode();
-		walk(files, root);
-		root.firstChild.expand();
-	},
+    createFileTree: function(files) {
+        function walk(files, parentNode) {
+            for (var file in files.contents) {
+                var item = files.contents[file];
+                if (item.type == 'dir') {
+                    walk(item, parentNode.appendChild(new Ext.tree.TreeNode({
+                        text: file,
+                        filename: file,
+                        size: item.size,
+                        progress: item.progress,
+                        priority: item.priority
+                    })));
+                } else {
+                    parentNode.appendChild(new Ext.tree.TreeNode({
+                        text: file,
+                        filename: file,
+                        fileIndex: item.index,
+                        size: item.size,
+                        progress: item.progress,
+                        priority: item.priority,
+                        leaf: true,
+                        iconCls: 'x-deluge-file',
+                        uiProvider: Ext.ux.tree.TreeGridNodeUI
+                    }));
+                }
+            }
+        }
+        var root = this.getRootNode();
+        walk(files, root);
+        root.firstChild.expand();
+    },
 
-	update: function(torrentId) {
-		if (this.torrentId != torrentId) {
-			this.clear();
-			this.torrentId = torrentId;
-		}
-		
-		deluge.client.web.get_torrent_files(torrentId, {
-			success: this.onRequestComplete,
-			scope: this,
-			torrentId: torrentId
-		});
-	},
+    update: function(torrentId) {
+        if (this.torrentId != torrentId) {
+            this.clear();
+            this.torrentId = torrentId;
+        }
+        
+        deluge.client.web.get_torrent_files(torrentId, {
+            success: this.onRequestComplete,
+            scope: this,
+            torrentId: torrentId
+        });
+    },
 
-	updateFileTree: function(files) {
-		function walk(files, parentNode) {
-			for (var file in files.contents) {
-				var item = files.contents[file];
-				var node = parentNode.findChild('filename', file);
-				node.attributes.size     = item.size;
-				node.attributes.progress = item.progress;
-				node.attributes.priority = item.priority;
-				node.ui.updateColumns();
-				if (item.type == 'dir') {
-					walk(item, node);
-				}
-			}
-		}
-		walk(files, this.getRootNode());
-	},
+    updateFileTree: function(files) {
+        function walk(files, parentNode) {
+            for (var file in files.contents) {
+                var item = files.contents[file];
+                var node = parentNode.findChild('filename', file);
+                node.attributes.size     = item.size;
+                node.attributes.progress = item.progress;
+                node.attributes.priority = item.priority;
+                node.ui.updateColumns();
+                if (item.type == 'dir') {
+                    walk(item, node);
+                }
+            }
+        }
+        walk(files, this.getRootNode());
+    },
 
-	onRender: function(ct, position) {
-		Deluge.details.FilesTab.superclass.onRender.call(this, ct, position);
-		deluge.menus.filePriorities.on('itemclick', this.onItemClick, this);
-		this.on('contextmenu', this.onContextMenu, this);
-		this.sorter = new Ext.tree.TreeSorter(this, {
-			folderSort: true
-		});
-	},
-	
-	onContextMenu: function(node, e) {
-		e.stopEvent();
-		var selModel = this.getSelectionModel();
-		if (selModel.getSelectedNodes().length < 2) {
-			selModel.clearSelections();
-			node.select();
-		}
-		deluge.menus.filePriorities.showAt(e.getPoint());
-	},
-	
-	onItemClick: function(baseItem, e) {
-		switch (baseItem.id) {
-			case 'expandAll':
-				this.expandAll();
-				break;
-			default:
-				var indexes = {};
-				function walk(node) {
-					if (Ext.isEmpty(node.attributes.fileIndex)) return;
-					indexes[node.attributes.fileIndex] = node.attributes.priority;
-				}
-				this.getRootNode().cascade(walk);
+    onRender: function(ct, position) {
+        Deluge.details.FilesTab.superclass.onRender.call(this, ct, position);
+        deluge.menus.filePriorities.on('itemclick', this.onItemClick, this);
+        this.on('contextmenu', this.onContextMenu, this);
+        this.sorter = new Ext.tree.TreeSorter(this, {
+            folderSort: true
+        });
+    },
+    
+    onContextMenu: function(node, e) {
+        e.stopEvent();
+        var selModel = this.getSelectionModel();
+        if (selModel.getSelectedNodes().length < 2) {
+            selModel.clearSelections();
+            node.select();
+        }
+        deluge.menus.filePriorities.showAt(e.getPoint());
+    },
+    
+    onItemClick: function(baseItem, e) {
+        switch (baseItem.id) {
+            case 'expandAll':
+                this.expandAll();
+                break;
+            default:
+                var indexes = {};
+                function walk(node) {
+                    if (Ext.isEmpty(node.attributes.fileIndex)) return;
+                    indexes[node.attributes.fileIndex] = node.attributes.priority;
+                }
+                this.getRootNode().cascade(walk);
 
-				var nodes = this.getSelectionModel().getSelectedNodes();
-				Ext.each(nodes, function(node) {
-					if (!node.isLeaf()) {
-						function setPriorities(node) {
-							if (Ext.isEmpty(node.attributes.fileIndex)) return;
-							indexes[node.attributes.fileIndex] = baseItem.filePriority;
-						}
-						node.cascade(setPriorities);
-					} else if (!Ext.isEmpty(node.attributes.fileIndex)) {
-						indexes[node.attributes.fileIndex] = baseItem.filePriority;
-						return;
-					}
-				});
-				
-				var priorities = new Array(Ext.keys(indexes).length);
-				for (var index in indexes) {
-					priorities[index] = indexes[index];
-				}
+                var nodes = this.getSelectionModel().getSelectedNodes();
+                Ext.each(nodes, function(node) {
+                    if (!node.isLeaf()) {
+                        function setPriorities(node) {
+                            if (Ext.isEmpty(node.attributes.fileIndex)) return;
+                            indexes[node.attributes.fileIndex] = baseItem.filePriority;
+                        }
+                        node.cascade(setPriorities);
+                    } else if (!Ext.isEmpty(node.attributes.fileIndex)) {
+                        indexes[node.attributes.fileIndex] = baseItem.filePriority;
+                        return;
+                    }
+                });
+                
+                var priorities = new Array(Ext.keys(indexes).length);
+                for (var index in indexes) {
+                    priorities[index] = indexes[index];
+                }
 
-				deluge.client.core.set_torrent_file_priorities(this.torrentId, priorities, {
-					success: function() {
-						Ext.each(nodes, function(node) {
-							node.setColumnValue(3, baseItem.filePriority);
-						});
-					},
-					scope: this
-				});
-				break;
-		}
-	},
-	
-	onRequestComplete: function(files, options) {
-		if (!this.getRootNode().hasChildNodes()) {
-			this.createFileTree(files);
-		} else {
-			this.updateFileTree(files);
-		}
-	}
+                deluge.client.core.set_torrent_file_priorities(this.torrentId, priorities, {
+                    success: function() {
+                        Ext.each(nodes, function(node) {
+                            node.setColumnValue(3, baseItem.filePriority);
+                        });
+                    },
+                    scope: this
+                });
+                break;
+        }
+    },
+    
+    onRequestComplete: function(files, options) {
+        if (!this.getRootNode().hasChildNodes()) {
+            this.createFileTree(files);
+        } else {
+            this.updateFileTree(files);
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/details/OptionsTab.js b/deluge/ui/web/js/deluge-all/details/OptionsTab.js
index 34256988c..4a6294f80 100644
--- a/deluge/ui/web/js/deluge-all/details/OptionsTab.js
+++ b/deluge/ui/web/js/deluge-all/details/OptionsTab.js
@@ -33,382 +33,382 @@
 
 Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 
-	constructor: function(config) {
-		config = Ext.apply({
-			autoScroll: true,
-			bodyStyle: 'padding: 5px;',
-			border: false,
-			cls: 'x-deluge-options',
-			defaults: {
-				autoHeight: true,
-				labelWidth: 1,
-				defaultType: 'checkbox'
-			},
-			deferredRender: false,
-			layout: 'column',
-			title: _('Options')
-		}, config);
-		Deluge.details.OptionsTab.superclass.constructor.call(this, config);
-	},
+    constructor: function(config) {
+        config = Ext.apply({
+            autoScroll: true,
+            bodyStyle: 'padding: 5px;',
+            border: false,
+            cls: 'x-deluge-options',
+            defaults: {
+                autoHeight: true,
+                labelWidth: 1,
+                defaultType: 'checkbox'
+            },
+            deferredRender: false,
+            layout: 'column',
+            title: _('Options')
+        }, config);
+        Deluge.details.OptionsTab.superclass.constructor.call(this, config);
+    },
 
-	initComponent: function() {
-		Deluge.details.OptionsTab.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.details.OptionsTab.superclass.initComponent.call(this);
 
-		this.fieldsets = {}, this.fields = {};
-		this.optionsManager = new Deluge.MultiOptionsManager({
-			options: {
-				'max_download_speed': -1,
-				'max_upload_speed': -1,
-				'max_connections': -1,
-				'max_upload_slots': -1,
-				'auto_managed': false,
-				'stop_at_ratio': false,
-				'stop_ratio': 2.0,
-				'remove_at_ratio': false,
-				'move_completed': false,
+        this.fieldsets = {}, this.fields = {};
+        this.optionsManager = new Deluge.MultiOptionsManager({
+            options: {
+                'max_download_speed': -1,
+                'max_upload_speed': -1,
+                'max_connections': -1,
+                'max_upload_slots': -1,
+                'auto_managed': false,
+                'stop_at_ratio': false,
+                'stop_ratio': 2.0,
+                'remove_at_ratio': false,
+                'move_completed': false,
                 'move_completed_path': '',
-				'private': false,
-				'prioritize_first_last': false
-			}
-		});
+                'private': false,
+                'prioritize_first_last': false
+            }
+        });
 
-		/*
-		 * Bandwidth Options
-		 */
-		this.fieldsets.bandwidth = this.add({
-			xtype: 'fieldset',
-			defaultType: 'spinnerfield',
-			bodyStyle: 'padding: 5px',
+        /*
+         * Bandwidth Options
+         */
+        this.fieldsets.bandwidth = this.add({
+            xtype: 'fieldset',
+            defaultType: 'spinnerfield',
+            bodyStyle: 'padding: 5px',
 
-			layout: 'table',
-			layoutConfig: {columns: 3},
-			labelWidth: 150,
+            layout: 'table',
+            layoutConfig: {columns: 3},
+            labelWidth: 150,
 
-			style: 'margin-left: 10px; margin-right: 5px; padding: 5px',
-			title: _('Bandwidth'),
-			width: 250
-		});
+            style: 'margin-left: 10px; margin-right: 5px; padding: 5px',
+            title: _('Bandwidth'),
+            width: 250
+        });
 
-		/*
-		 * Max Download Speed
-		 */
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('Max Download Speed'),
-			forId: 'max_download_speed',
-			cls: 'x-deluge-options-label'
-		});
-		this.fields.max_download_speed = this.fieldsets.bandwidth.add({
-			id: 'max_download_speed',
-			name: 'max_download_speed',
-			width: 70,
-			strategy: {
-				xtype: 'number',
-				decimalPrecision: 1,
-				minValue: -1,
-				maxValue: 99999
-			}
-		});
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('KiB/s'),
-			style: 'margin-left: 10px'
-		});
+        /*
+         * Max Download Speed
+         */
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('Max Download Speed'),
+            forId: 'max_download_speed',
+            cls: 'x-deluge-options-label'
+        });
+        this.fields.max_download_speed = this.fieldsets.bandwidth.add({
+            id: 'max_download_speed',
+            name: 'max_download_speed',
+            width: 70,
+            strategy: {
+                xtype: 'number',
+                decimalPrecision: 1,
+                minValue: -1,
+                maxValue: 99999
+            }
+        });
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('KiB/s'),
+            style: 'margin-left: 10px'
+        });
 
-		/*
-		 * Max Upload Speed
-		 */
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('Max Upload Speed'),
-			forId: 'max_upload_speed',
-			cls: 'x-deluge-options-label'
-		});
-		this.fields.max_upload_speed = this.fieldsets.bandwidth.add({
-			id: 'max_upload_speed',
-			name: 'max_upload_speed',
-			width: 70,
-			value: -1,
-			strategy: {
-				xtype: 'number',
-				decimalPrecision: 1,
-				minValue: -1,
-				maxValue: 99999
-			}
-		});
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('KiB/s'),
-			style: 'margin-left: 10px'
-		});
+        /*
+         * Max Upload Speed
+         */
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('Max Upload Speed'),
+            forId: 'max_upload_speed',
+            cls: 'x-deluge-options-label'
+        });
+        this.fields.max_upload_speed = this.fieldsets.bandwidth.add({
+            id: 'max_upload_speed',
+            name: 'max_upload_speed',
+            width: 70,
+            value: -1,
+            strategy: {
+                xtype: 'number',
+                decimalPrecision: 1,
+                minValue: -1,
+                maxValue: 99999
+            }
+        });
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('KiB/s'),
+            style: 'margin-left: 10px'
+        });
 
-		/*
-		 * Max Connections
-		 */
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('Max Connections'),
-			forId: 'max_connections',
-			cls: 'x-deluge-options-label'
-		});
-		this.fields.max_connections = this.fieldsets.bandwidth.add({
-			id: 'max_connections',
-			name: 'max_connections',
-			width: 70,
-			value: -1,
-			strategy: {
-				xtype: 'number',
-				decimalPrecision: 0,
-				minValue: -1,
-				maxValue: 99999
-			},
-			colspan: 2
-		});
+        /*
+         * Max Connections
+         */
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('Max Connections'),
+            forId: 'max_connections',
+            cls: 'x-deluge-options-label'
+        });
+        this.fields.max_connections = this.fieldsets.bandwidth.add({
+            id: 'max_connections',
+            name: 'max_connections',
+            width: 70,
+            value: -1,
+            strategy: {
+                xtype: 'number',
+                decimalPrecision: 0,
+                minValue: -1,
+                maxValue: 99999
+            },
+            colspan: 2
+        });
 
-		/*
-		 * Max Upload Slots
-		 */
-		this.fieldsets.bandwidth.add({
-			xtype: 'label',
-			text: _('Max Upload Slots'),
-			forId: 'max_upload_slots',
-			cls: 'x-deluge-options-label'
-		});
-		this.fields.max_upload_slots = this.fieldsets.bandwidth.add({
-			id: 'max_upload_slots',
-			name: 'max_upload_slots',
-			width: 70,
-			value: -1,
-			strategy: {
-				xtype: 'number',
-				decimalPrecision: 0,
-				minValue: -1,
-				maxValue: 99999
-			},
-			colspan: 2
-		});
+        /*
+         * Max Upload Slots
+         */
+        this.fieldsets.bandwidth.add({
+            xtype: 'label',
+            text: _('Max Upload Slots'),
+            forId: 'max_upload_slots',
+            cls: 'x-deluge-options-label'
+        });
+        this.fields.max_upload_slots = this.fieldsets.bandwidth.add({
+            id: 'max_upload_slots',
+            name: 'max_upload_slots',
+            width: 70,
+            value: -1,
+            strategy: {
+                xtype: 'number',
+                decimalPrecision: 0,
+                minValue: -1,
+                maxValue: 99999
+            },
+            colspan: 2
+        });
 
-		/*
-		 * Queue Options
-		 */
-		this.fieldsets.queue = this.add({
-			xtype: 'fieldset',
-			title: _('Queue'),
-			style: 'margin-left: 5px; margin-right: 5px; padding: 5px',
-			width: 210,
+        /*
+         * Queue Options
+         */
+        this.fieldsets.queue = this.add({
+            xtype: 'fieldset',
+            title: _('Queue'),
+            style: 'margin-left: 5px; margin-right: 5px; padding: 5px',
+            width: 210,
 
-			layout: 'table',
-			layoutConfig: {columns: 2},
-			labelWidth: 0,
+            layout: 'table',
+            layoutConfig: {columns: 2},
+            labelWidth: 0,
 
-			defaults: {
-				fieldLabel: '',
-				labelSeparator: ''
-			}
-		});
+            defaults: {
+                fieldLabel: '',
+                labelSeparator: ''
+            }
+        });
 
-		this.fields.auto_managed = this.fieldsets.queue.add({
-			xtype: 'checkbox',
-			fieldLabel: '',
-			labelSeparator: '',
-			name: 'is_auto_managed',
-			boxLabel: _('Auto Managed'),
-			width: 200,
-			colspan: 2
-		});
+        this.fields.auto_managed = this.fieldsets.queue.add({
+            xtype: 'checkbox',
+            fieldLabel: '',
+            labelSeparator: '',
+            name: 'is_auto_managed',
+            boxLabel: _('Auto Managed'),
+            width: 200,
+            colspan: 2
+        });
 
-		this.fields.stop_at_ratio = this.fieldsets.queue.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			id: 'stop_at_ratio',
-			width: 120,
-			boxLabel: _('Stop seed at ratio'),
-			handler: this.onStopRatioChecked,
-			scope: this
-		});
+        this.fields.stop_at_ratio = this.fieldsets.queue.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            id: 'stop_at_ratio',
+            width: 120,
+            boxLabel: _('Stop seed at ratio'),
+            handler: this.onStopRatioChecked,
+            scope: this
+        });
 
-		this.fields.stop_ratio = this.fieldsets.queue.add({
-			xtype: 'spinnerfield',
-			id: 'stop_ratio',
-			name: 'stop_ratio',
-			disabled: true,
-			width: 50,
-			value: 2.0,
-			strategy: {
-				xtype: 'number',
-				minValue: -1,
-				maxValue: 99999,
-				incrementValue: 0.1,
-				alternateIncrementValue: 1,
-				decimalPrecision: 1
-			}
-		});
+        this.fields.stop_ratio = this.fieldsets.queue.add({
+            xtype: 'spinnerfield',
+            id: 'stop_ratio',
+            name: 'stop_ratio',
+            disabled: true,
+            width: 50,
+            value: 2.0,
+            strategy: {
+                xtype: 'number',
+                minValue: -1,
+                maxValue: 99999,
+                incrementValue: 0.1,
+                alternateIncrementValue: 1,
+                decimalPrecision: 1
+            }
+        });
 
-		this.fields.remove_at_ratio = this.fieldsets.queue.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			id: 'remove_at_ratio',
-			ctCls: 'x-deluge-indent-checkbox',
-			bodyStyle: 'padding-left: 10px',
-			boxLabel: _('Remove at ratio'),
-			disabled: true,
-			colspan: 2
-		});
+        this.fields.remove_at_ratio = this.fieldsets.queue.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            id: 'remove_at_ratio',
+            ctCls: 'x-deluge-indent-checkbox',
+            bodyStyle: 'padding-left: 10px',
+            boxLabel: _('Remove at ratio'),
+            disabled: true,
+            colspan: 2
+        });
 
-		this.fields.move_completed = this.fieldsets.queue.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			id: 'move_completed',
-			boxLabel: _('Move Completed'),
-			colspan: 2,
+        this.fields.move_completed = this.fieldsets.queue.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            id: 'move_completed',
+            boxLabel: _('Move Completed'),
+            colspan: 2,
             handler: this.onMoveCompletedChecked,
             scope: this
-		});
+        });
 
         this.fields.move_completed_path = this.fieldsets.queue.add({
             xtype: 'textfield',
             fieldLabel: '',
             id: 'move_completed_path',
             colspan: 3,
-			bodyStyle: 'margin-left: 20px',
+            bodyStyle: 'margin-left: 20px',
             width: 180,
             disabled: true
         });
 
 
-		/*
-		 * General Options
-		 */
-		this.rightColumn =  this.add({
-			border: false,
-			autoHeight: true,
-			style: 'margin-left: 5px',
-			width: 210
-		});
+        /*
+         * General Options
+         */
+        this.rightColumn =  this.add({
+            border: false,
+            autoHeight: true,
+            style: 'margin-left: 5px',
+            width: 210
+        });
 
-		this.fieldsets.general = this.rightColumn.add({
-			xtype: 'fieldset',
-			autoHeight: true,
-			defaultType: 'checkbox',
-			title: _('General'),
-			layout: 'form'
-		});
+        this.fieldsets.general = this.rightColumn.add({
+            xtype: 'fieldset',
+            autoHeight: true,
+            defaultType: 'checkbox',
+            title: _('General'),
+            layout: 'form'
+        });
 
-		this.fields['private'] = this.fieldsets.general.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Private'),
-			id: 'private',
-			disabled: true
-		});
+        this.fields['private'] = this.fieldsets.general.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Private'),
+            id: 'private',
+            disabled: true
+        });
 
-		this.fields.prioritize_first_last = this.fieldsets.general.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Prioritize First/Last'),
-			id: 'prioritize_first_last'
-		});
+        this.fields.prioritize_first_last = this.fieldsets.general.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Prioritize First/Last'),
+            id: 'prioritize_first_last'
+        });
 
-		// Bind the fields so the options manager can manage them.
-		for (var id in this.fields) {
-			this.optionsManager.bind(id, this.fields[id]);
-		}
+        // Bind the fields so the options manager can manage them.
+        for (var id in this.fields) {
+            this.optionsManager.bind(id, this.fields[id]);
+        }
 
-		/*
-		 * Buttons
-		 */
-		this.buttonPanel = this.rightColumn.add({
-			layout: 'hbox',
-			xtype: 'panel',
-			border: false
-		});
+        /*
+         * Buttons
+         */
+        this.buttonPanel = this.rightColumn.add({
+            layout: 'hbox',
+            xtype: 'panel',
+            border: false
+        });
 
-		/*
-		 * Edit Trackers button
-		 */
-		this.buttonPanel.add({
-			id: 'edit_trackers',
-			xtype: 'button',
-			text: _('Edit Trackers'),
-			cls: 'x-btn-text-icon',
-			iconCls: 'x-deluge-edit-trackers',
-			border: false,
-			width: 100,
-			handler: this.onEditTrackers,
-			scope: this
-		});
+        /*
+         * Edit Trackers button
+         */
+        this.buttonPanel.add({
+            id: 'edit_trackers',
+            xtype: 'button',
+            text: _('Edit Trackers'),
+            cls: 'x-btn-text-icon',
+            iconCls: 'x-deluge-edit-trackers',
+            border: false,
+            width: 100,
+            handler: this.onEditTrackers,
+            scope: this
+        });
 
-		/*
-		 * Apply button
-		 */
-		this.buttonPanel.add({
-			id: 'apply',
-			xtype: 'button',
-			text: _('Apply'),
-			style: 'margin-left: 10px;',
-			border: false,
-			width: 100,
-			handler: this.onApply,
-			scope: this
-		});
-	},
+        /*
+         * Apply button
+         */
+        this.buttonPanel.add({
+            id: 'apply',
+            xtype: 'button',
+            text: _('Apply'),
+            style: 'margin-left: 10px;',
+            border: false,
+            width: 100,
+            handler: this.onApply,
+            scope: this
+        });
+    },
 
-	onRender: function(ct, position) {
-		Deluge.details.OptionsTab.superclass.onRender.call(this, ct, position);
+    onRender: function(ct, position) {
+        Deluge.details.OptionsTab.superclass.onRender.call(this, ct, position);
 
-		// This is another hack I think, so keep an eye out here when upgrading.
-		this.layout = new Ext.layout.ColumnLayout();
-		this.layout.setContainer(this);
-		this.doLayout();
-	},
+        // This is another hack I think, so keep an eye out here when upgrading.
+        this.layout = new Ext.layout.ColumnLayout();
+        this.layout.setContainer(this);
+        this.doLayout();
+    },
 
-	clear: function() {
-		if (this.torrentId == null) return;
-		this.torrentId = null;
-		this.optionsManager.changeId(null);
-	},
+    clear: function() {
+        if (this.torrentId == null) return;
+        this.torrentId = null;
+        this.optionsManager.changeId(null);
+    },
 
-	reset: function() {
-		if (this.torrentId) this.optionsManager.reset();
-	},
+    reset: function() {
+        if (this.torrentId) this.optionsManager.reset();
+    },
 
-	update: function(torrentId) {
-		if (this.torrentId && !torrentId) this.clear(); // we want to clear the pane if we get a null torrent torrentIds
+    update: function(torrentId) {
+        if (this.torrentId && !torrentId) this.clear(); // we want to clear the pane if we get a null torrent torrentIds
 
-		if (!torrentId) return; // we don't care about null torrentIds
+        if (!torrentId) return; // we don't care about null torrentIds
 
-		if (this.torrentId != torrentId) {
-			this.torrentId = torrentId;
-			this.optionsManager.changeId(torrentId);
-		}
-		deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Options, {
-			success: this.onRequestComplete,
-			scope: this
-		});
-	},
+        if (this.torrentId != torrentId) {
+            this.torrentId = torrentId;
+            this.optionsManager.changeId(torrentId);
+        }
+        deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Options, {
+            success: this.onRequestComplete,
+            scope: this
+        });
+    },
 
-	onApply: function() {
-		var changed = this.optionsManager.getDirty();
-		if (!Ext.isEmpty(changed['prioritize_first_last'])) {
-			var value = changed['prioritize_first_last'];
-			deluge.client.core.set_torrent_prioritize_first_last(this.torrentId, value, {
-				success: function() {
-					this.optionsManager.set('prioritize_first_last', value);
-				},
-				scope: this
-			});
-		}
-		deluge.client.core.set_torrent_options([this.torrentId], changed, {
-			success: function() {
-				this.optionsManager.commit();
-			},
-			scope: this
-		});
-	},
+    onApply: function() {
+        var changed = this.optionsManager.getDirty();
+        if (!Ext.isEmpty(changed['prioritize_first_last'])) {
+            var value = changed['prioritize_first_last'];
+            deluge.client.core.set_torrent_prioritize_first_last(this.torrentId, value, {
+                success: function() {
+                    this.optionsManager.set('prioritize_first_last', value);
+                },
+                scope: this
+            });
+        }
+        deluge.client.core.set_torrent_options([this.torrentId], changed, {
+            success: function() {
+                this.optionsManager.commit();
+            },
+            scope: this
+        });
+    },
 
-	onEditTrackers: function() {
-		deluge.editTrackers.show();
-	},
+    onEditTrackers: function() {
+        deluge.editTrackers.show();
+    },
 
     onMoveCompletedChecked: function(checkbox, checked) {
         this.fields.move_completed_path.setDisabled(!checked);
@@ -417,20 +417,20 @@ Deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
         this.fields.move_completed_path.focus();
     },
 
-	onStopRatioChecked: function(checkbox, checked) {
-		this.fields.remove_at_ratio.setDisabled(!checked);
-		this.fields.stop_ratio.setDisabled(!checked);
-	},
+    onStopRatioChecked: function(checkbox, checked) {
+        this.fields.remove_at_ratio.setDisabled(!checked);
+        this.fields.stop_ratio.setDisabled(!checked);
+    },
 
-	onRequestComplete: function(torrent, options) {
-		this.fields['private'].setValue(torrent['private']);
-		this.fields['private'].setDisabled(true);
-		delete torrent['private'];
-		torrent['auto_managed'] = torrent['is_auto_managed'];
-		this.optionsManager.setDefault(torrent);
-		var stop_at_ratio = this.optionsManager.get('stop_at_ratio');
-		this.fields.remove_at_ratio.setDisabled(!stop_at_ratio);
-		this.fields.stop_ratio.setDisabled(!stop_at_ratio);
+    onRequestComplete: function(torrent, options) {
+        this.fields['private'].setValue(torrent['private']);
+        this.fields['private'].setDisabled(true);
+        delete torrent['private'];
+        torrent['auto_managed'] = torrent['is_auto_managed'];
+        this.optionsManager.setDefault(torrent);
+        var stop_at_ratio = this.optionsManager.get('stop_at_ratio');
+        this.fields.remove_at_ratio.setDisabled(!stop_at_ratio);
+        this.fields.stop_ratio.setDisabled(!stop_at_ratio);
         this.fields.move_completed_path.setDisabled(!this.optionsManager.get('move_completed'));
-	}
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/details/PeersTab.js b/deluge/ui/web/js/deluge-all/details/PeersTab.js
index f9728936b..44a4daa35 100644
--- a/deluge/ui/web/js/deluge-all/details/PeersTab.js
+++ b/deluge/ui/web/js/deluge-all/details/PeersTab.js
@@ -31,102 +31,102 @@
  */
 
 (function() {
-	function flagRenderer(value) {
-		if (!value.replace(' ', '').replace(' ', '')){
+    function flagRenderer(value) {
+        if (!value.replace(' ', '').replace(' ', '')){
             return '';
         }
-		return String.format('', value);
-	}
-	function peerAddressRenderer(value, p, record) {
-		var seed = (record.data['seed'] == 1024) ? 'x-deluge-seed' : 'x-deluge-peer'
-		return String.format('
{1}
', seed, value);
-	}
-	function peerProgressRenderer(value) {
-		var progress = (value * 100).toFixed(0);
-		return Deluge.progressBar(progress, this.width - 8, progress + '%');
-	}
+        return String.format('', value);
+    }
+    function peerAddressRenderer(value, p, record) {
+        var seed = (record.data['seed'] == 1024) ? 'x-deluge-seed' : 'x-deluge-peer'
+        return String.format('
{1}
', seed, value);
+    }
+    function peerProgressRenderer(value) {
+        var progress = (value * 100).toFixed(0);
+        return Deluge.progressBar(progress, this.width - 8, progress + '%');
+    }
 
-	Deluge.details.PeersTab = Ext.extend(Ext.grid.GridPanel, {
+    Deluge.details.PeersTab = Ext.extend(Ext.grid.GridPanel, {
 
-		// fast way to figure out if we have a peer already.
-		peers: {},
+        // fast way to figure out if we have a peer already.
+        peers: {},
 
-		constructor: function(config) {
-			config = Ext.apply({
-				title: _('Peers'),
-				cls: 'x-deluge-peers',
-				store: new Ext.data.Store({
-					reader: new Ext.data.JsonReader({
-						idProperty: 'ip',
-						root: 'peers'
-					}, Deluge.data.Peer)
-				}),
-				columns: [{
-					header: ' ',
-					width: 30,
-					sortable: true,
-					renderer: flagRenderer,
-					dataIndex: 'country'
-				}, {
-					header: 'Address',
-					width: 125,
-					sortable: true,
-					renderer: peerAddressRenderer,
-					dataIndex: 'ip'
-				}, {
-					header: 'Client',
-					width: 125,
-					sortable: true,
-					renderer: fplain,
-					dataIndex: 'client'
-				}, {
-					header: 'Progress',
-					width: 150,
-					sortable: true,
-					renderer: peerProgressRenderer,
-					dataIndex: 'progress'
-				}, {
-					header: 'Down Speed',
-					width: 100,
-					sortable: true,
-					renderer: fspeed,
-					dataIndex: 'down_speed'
-				}, {
-					header: 'Up Speed',
-					width: 100,
-					sortable: true,
-					renderer: fspeed,
-					dataIndex: 'up_speed'
-				}],
-				stripeRows: true,
-				deferredRender:false,
-				autoScroll:true
-			}, config);
-			Deluge.details.PeersTab.superclass.constructor.call(this, config);
-		},
+        constructor: function(config) {
+            config = Ext.apply({
+                title: _('Peers'),
+                cls: 'x-deluge-peers',
+                store: new Ext.data.Store({
+                    reader: new Ext.data.JsonReader({
+                        idProperty: 'ip',
+                        root: 'peers'
+                    }, Deluge.data.Peer)
+                }),
+                columns: [{
+                    header: ' ',
+                    width: 30,
+                    sortable: true,
+                    renderer: flagRenderer,
+                    dataIndex: 'country'
+                }, {
+                    header: 'Address',
+                    width: 125,
+                    sortable: true,
+                    renderer: peerAddressRenderer,
+                    dataIndex: 'ip'
+                }, {
+                    header: 'Client',
+                    width: 125,
+                    sortable: true,
+                    renderer: fplain,
+                    dataIndex: 'client'
+                }, {
+                    header: 'Progress',
+                    width: 150,
+                    sortable: true,
+                    renderer: peerProgressRenderer,
+                    dataIndex: 'progress'
+                }, {
+                    header: 'Down Speed',
+                    width: 100,
+                    sortable: true,
+                    renderer: fspeed,
+                    dataIndex: 'down_speed'
+                }, {
+                    header: 'Up Speed',
+                    width: 100,
+                    sortable: true,
+                    renderer: fspeed,
+                    dataIndex: 'up_speed'
+                }],
+                stripeRows: true,
+                deferredRender:false,
+                autoScroll:true
+            }, config);
+            Deluge.details.PeersTab.superclass.constructor.call(this, config);
+        },
 
-		clear: function() {
-			this.getStore().removeAll();
-			this.peers = {};
-		},
+        clear: function() {
+            this.getStore().removeAll();
+            this.peers = {};
+        },
 
-		update: function(torrentId) {
-			deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Peers, {
-				success: this.onRequestComplete,
-				scope: this
-			});
-		},
+        update: function(torrentId) {
+            deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Peers, {
+                success: this.onRequestComplete,
+                scope: this
+            });
+        },
 
-		onRequestComplete: function(torrent, options) {
-			if (!torrent) return;
+        onRequestComplete: function(torrent, options) {
+            if (!torrent) return;
 
-			var store = this.getStore();
-			var newPeers = [];
-			var addresses = {};
+            var store = this.getStore();
+            var newPeers = [];
+            var addresses = {};
 
-			// Go through the peers updating and creating peer records
-			Ext.each(torrent.peers, function(peer) {
-				if (this.peers[peer.ip]) {
+            // Go through the peers updating and creating peer records
+            Ext.each(torrent.peers, function(peer) {
+                if (this.peers[peer.ip]) {
                     var record = store.getById(peer.ip);
                     record.beginEdit();
                     for (var k in peer) {
@@ -135,26 +135,26 @@
                         }
                     }
                     record.endEdit();
-				} else {
-					this.peers[peer.ip] = 1;
-					newPeers.push(new Deluge.data.Peer(peer, peer.ip));
-				}
-				addresses[peer.ip] = 1;
-			}, this);
-			store.add(newPeers);
+                } else {
+                    this.peers[peer.ip] = 1;
+                    newPeers.push(new Deluge.data.Peer(peer, peer.ip));
+                }
+                addresses[peer.ip] = 1;
+            }, this);
+            store.add(newPeers);
 
-			// Remove any peers that shouldn't be left in the store
-			store.each(function(record) {
-				if (!addresses[record.id]) {
-					store.remove(record);
-					delete this.peers[record.id];
-				}
-			}, this);
-			store.commitChanges();
+            // Remove any peers that shouldn't be left in the store
+            store.each(function(record) {
+                if (!addresses[record.id]) {
+                    store.remove(record);
+                    delete this.peers[record.id];
+                }
+            }, this);
+            store.commitChanges();
 
-			var sortState = store.getSortState();
-			if (!sortState) return;
-			store.sort(sortState.field, sortState.direction);
-		}
-	});
+            var sortState = store.getSortState();
+            if (!sortState) return;
+            store.sort(sortState.field, sortState.direction);
+        }
+    });
 })();
diff --git a/deluge/ui/web/js/deluge-all/details/StatusTab.js b/deluge/ui/web/js/deluge-all/details/StatusTab.js
index ba99a2a5d..e3671bd0e 100644
--- a/deluge/ui/web/js/deluge-all/details/StatusTab.js
+++ b/deluge/ui/web/js/deluge-all/details/StatusTab.js
@@ -36,90 +36,90 @@ Ext.ns('Deluge.details');
  * @extends Ext.Panel
  */
 Deluge.details.StatusTab = Ext.extend(Ext.Panel, {
-	title: _('Status'),
-	autoScroll: true,
-	
-	onRender: function(ct, position) {
-		Deluge.details.StatusTab.superclass.onRender.call(this, ct, position);
-		
-		this.progressBar = this.add({
-			xtype: 'progress',
-			cls: 'x-deluge-status-progressbar'
-		});
-		
-		this.status = this.add({
-			cls: 'x-deluge-status',
-			id: 'deluge-details-status',
-			
-			border: false,
-			width: 1000,
-			listeners: {
-				'render': {
-					fn: function(panel) {
-						panel.load({
-							url: deluge.config.base + 'render/tab_status.html',
-							text: _('Loading') + '...'
-						});
-						panel.getUpdater().on('update', this.onPanelUpdate, this);
-					},
-					scope: this
-				}
-			}
-		});
-	},
-	
-	clear: function() {
-		this.progressBar.updateProgress(0, ' ');
-		for (var k in this.fields) {
-			this.fields[k].innerHTML = '';
-		}
-	},
-	
-	update: function(torrentId) {
-		if (!this.fields) this.getFields();
-		deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Status, {
-			success: this.onRequestComplete,
-			scope: this
-		});
-	},
-	
-	onPanelUpdate: function(el, response) {
-		this.fields = {};
-		Ext.each(Ext.query('dd', this.status.body.dom), function(field) {
-			this.fields[field.className] = field;
-		}, this);
-	},
-	
-	onRequestComplete: function(status) {
-		seeders = status.total_seeds > -1 ? status.num_seeds + ' (' + status.total_seeds + ')' : status.num_seeds
-		peers = status.total_peers > -1 ? status.num_peers + ' (' + status.total_peers + ')' : status.num_peers
-		var data = {
-			downloaded: fsize(status.total_done, true),
-			uploaded: fsize(status.total_uploaded, true),
-			share: (status.ratio == -1) ? '∞' : status.ratio.toFixed(3),
-			announce: ftime(status.next_announce),
-			tracker_status: status.tracker_status,
-			downspeed: (status.download_payload_rate) ? fspeed(status.download_payload_rate) : '0.0 KiB/s',
-			upspeed: (status.upload_payload_rate) ? fspeed(status.upload_payload_rate) : '0.0 KiB/s',
-			eta: ftime(status.eta),
-			pieces: status.num_pieces + ' (' + fsize(status.piece_length) + ')',
-			seeders: seeders,
-			peers: peers,
-			avail: status.distributed_copies.toFixed(3),
-			active_time: ftime(status.active_time),
-			seeding_time: ftime(status.seeding_time),
-			seed_rank: status.seed_rank,
-			time_added: fdate(status.time_added)
-		}
-		data.auto_managed = _((status.is_auto_managed) ? 'True' : 'False');
+    title: _('Status'),
+    autoScroll: true,
+    
+    onRender: function(ct, position) {
+        Deluge.details.StatusTab.superclass.onRender.call(this, ct, position);
+        
+        this.progressBar = this.add({
+            xtype: 'progress',
+            cls: 'x-deluge-status-progressbar'
+        });
+        
+        this.status = this.add({
+            cls: 'x-deluge-status',
+            id: 'deluge-details-status',
+            
+            border: false,
+            width: 1000,
+            listeners: {
+                'render': {
+                    fn: function(panel) {
+                        panel.load({
+                            url: deluge.config.base + 'render/tab_status.html',
+                            text: _('Loading') + '...'
+                        });
+                        panel.getUpdater().on('update', this.onPanelUpdate, this);
+                    },
+                    scope: this
+                }
+            }
+        });
+    },
+    
+    clear: function() {
+        this.progressBar.updateProgress(0, ' ');
+        for (var k in this.fields) {
+            this.fields[k].innerHTML = '';
+        }
+    },
+    
+    update: function(torrentId) {
+        if (!this.fields) this.getFields();
+        deluge.client.web.get_torrent_status(torrentId, Deluge.Keys.Status, {
+            success: this.onRequestComplete,
+            scope: this
+        });
+    },
+    
+    onPanelUpdate: function(el, response) {
+        this.fields = {};
+        Ext.each(Ext.query('dd', this.status.body.dom), function(field) {
+            this.fields[field.className] = field;
+        }, this);
+    },
+    
+    onRequestComplete: function(status) {
+        seeders = status.total_seeds > -1 ? status.num_seeds + ' (' + status.total_seeds + ')' : status.num_seeds
+        peers = status.total_peers > -1 ? status.num_peers + ' (' + status.total_peers + ')' : status.num_peers
+        var data = {
+            downloaded: fsize(status.total_done, true),
+            uploaded: fsize(status.total_uploaded, true),
+            share: (status.ratio == -1) ? '∞' : status.ratio.toFixed(3),
+            announce: ftime(status.next_announce),
+            tracker_status: status.tracker_status,
+            downspeed: (status.download_payload_rate) ? fspeed(status.download_payload_rate) : '0.0 KiB/s',
+            upspeed: (status.upload_payload_rate) ? fspeed(status.upload_payload_rate) : '0.0 KiB/s',
+            eta: ftime(status.eta),
+            pieces: status.num_pieces + ' (' + fsize(status.piece_length) + ')',
+            seeders: seeders,
+            peers: peers,
+            avail: status.distributed_copies.toFixed(3),
+            active_time: ftime(status.active_time),
+            seeding_time: ftime(status.seeding_time),
+            seed_rank: status.seed_rank,
+            time_added: fdate(status.time_added)
+        }
+        data.auto_managed = _((status.is_auto_managed) ? 'True' : 'False');
 
-		data.downloaded += ' (' + ((status.total_payload_download) ? fsize(status.total_payload_download) : '0.0 KiB') + ')';
-		data.uploaded += ' (' + ((status.total_payload_download) ? fsize(status.total_payload_download): '0.0 KiB') + ')';
-		
-		for (var field in this.fields) {
-			this.fields[field].innerHTML = data[field];
-		}
-		var text = status.state + ' ' + status.progress.toFixed(2) + '%';
-		this.progressBar.updateProgress(status.progress / 100.0, text);
-	}
+        data.downloaded += ' (' + ((status.total_payload_download) ? fsize(status.total_payload_download) : '0.0 KiB') + ')';
+        data.uploaded += ' (' + ((status.total_payload_download) ? fsize(status.total_payload_download): '0.0 KiB') + ')';
+        
+        for (var field in this.fields) {
+            this.fields[field].innerHTML = data[field];
+        }
+        var text = status.state + ' ' + status.progress.toFixed(2) + '%';
+        this.progressBar.updateProgress(status.progress / 100.0, text);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/BandwidthPage.js b/deluge/ui/web/js/deluge-all/preferences/BandwidthPage.js
index 5b5c1b0f9..78d02dffc 100644
--- a/deluge/ui/web/js/deluge-all/preferences/BandwidthPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/BandwidthPage.js
@@ -36,139 +36,139 @@ Ext.namespace('Deluge.preferences');
  * @extends Ext.form.FormPanel
  */
 Deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
-	constructor: function(config) {
-		config = Ext.apply({
-			border: false,
-			title: _('Bandwidth'),
-			layout: 'form',
-			labelWidth: 10
-		}, config);
-		Deluge.preferences.Bandwidth.superclass.constructor.call(this, config);
-	},
-	
-	initComponent: function() {
-		Deluge.preferences.Bandwidth.superclass.initComponent.call(this);
-		
-		var om = deluge.preferences.getOptionsManager();
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Global Bandwidth Usage'),
-			labelWidth: 200,
-			defaultType: 'spinnerfield',
-			defaults: {
-				minValue: -1,
-				maxValue: 99999
-			},
-			style: 'margin-bottom: 0px; padding-bottom: 0px;',
-			autoHeight: true
-		});
-		om.bind('max_connections_global', fieldset.add({
-			name: 'max_connections_global',
-			fieldLabel: _('Maximum Connections'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_upload_slots_global', fieldset.add({
-			name: 'max_upload_slots_global',
-			fieldLabel: _('Maximum Upload Slots'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_download_speed', fieldset.add({
-			name: 'max_download_speed',
-			fieldLabel: _('Maximum Download Speed (KiB/s)'),
-			width: 80,
-			value: -1.0,
-			decimalPrecision: 1
-		}));
-		om.bind('max_upload_speed', fieldset.add({
-			name: 'max_upload_speed',
-			fieldLabel: _('Maximum Upload Speed (KiB/s)'),
-			width: 80,
-			value: -1.0,
-			decimalPrecision: 1
-		}));
-		om.bind('max_half_open_connections', fieldset.add({
-			name: 'max_half_open_connections',
-			fieldLabel: _('Maximum Half-Open Connections'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_connections_per_second', fieldset.add({
-			name: 'max_connections_per_second',
-			fieldLabel: _('Maximum Connection Attempts per Second'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: '',
-			defaultType: 'checkbox',
-			style: 'padding-top: 0px; padding-bottom: 5px; margin-top: 0px; margin-bottom: 0px;',
-			autoHeight: true
-		});
-		om.bind('ignore_limits_on_local_network', fieldset.add({
-			name: 'ignore_limits_on_local_network',
-			height: 22,
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Ignore limits on local network')
-		}));
-		om.bind('rate_limit_ip_overhead', fieldset.add({
-			name: 'rate_limit_ip_overhead',
-			height: 22,
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Rate limit IP overhead')
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Per Torrent Bandwidth Usage'),
-			style: 'margin-bottom: 0px; padding-bottom: 0px;',
-			defaultType: 'spinnerfield',
-			labelWidth: 200,
-			defaults: {
-				minValue: -1,
-				maxValue: 99999
-			},
-			autoHeight: true
-		});
-		om.bind('max_connections_per_torrent', fieldset.add({
-			name: 'max_connections_per_torrent',
-			fieldLabel: _('Maximum Connections'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_upload_slots_per_torrent', fieldset.add({
-			name: 'max_upload_slots_per_torrent',
-			fieldLabel: _('Maximum Upload Slots'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_download_speed_per_torrent', fieldset.add({
-			name: 'max_download_speed_per_torrent',
-			fieldLabel: _('Maximum Download Speed (KiB/s)'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-		om.bind('max_upload_speed_per_torrent', fieldset.add({
-			name: 'max_upload_speed_per_torrent',
-			fieldLabel: _('Maximum Upload Speed (KiB/s)'),
-			width: 80,
-			value: -1,
-			decimalPrecision: 0
-		}));
-	}
+    constructor: function(config) {
+        config = Ext.apply({
+            border: false,
+            title: _('Bandwidth'),
+            layout: 'form',
+            labelWidth: 10
+        }, config);
+        Deluge.preferences.Bandwidth.superclass.constructor.call(this, config);
+    },
+    
+    initComponent: function() {
+        Deluge.preferences.Bandwidth.superclass.initComponent.call(this);
+        
+        var om = deluge.preferences.getOptionsManager();
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Global Bandwidth Usage'),
+            labelWidth: 200,
+            defaultType: 'spinnerfield',
+            defaults: {
+                minValue: -1,
+                maxValue: 99999
+            },
+            style: 'margin-bottom: 0px; padding-bottom: 0px;',
+            autoHeight: true
+        });
+        om.bind('max_connections_global', fieldset.add({
+            name: 'max_connections_global',
+            fieldLabel: _('Maximum Connections'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_upload_slots_global', fieldset.add({
+            name: 'max_upload_slots_global',
+            fieldLabel: _('Maximum Upload Slots'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_download_speed', fieldset.add({
+            name: 'max_download_speed',
+            fieldLabel: _('Maximum Download Speed (KiB/s)'),
+            width: 80,
+            value: -1.0,
+            decimalPrecision: 1
+        }));
+        om.bind('max_upload_speed', fieldset.add({
+            name: 'max_upload_speed',
+            fieldLabel: _('Maximum Upload Speed (KiB/s)'),
+            width: 80,
+            value: -1.0,
+            decimalPrecision: 1
+        }));
+        om.bind('max_half_open_connections', fieldset.add({
+            name: 'max_half_open_connections',
+            fieldLabel: _('Maximum Half-Open Connections'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_connections_per_second', fieldset.add({
+            name: 'max_connections_per_second',
+            fieldLabel: _('Maximum Connection Attempts per Second'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: '',
+            defaultType: 'checkbox',
+            style: 'padding-top: 0px; padding-bottom: 5px; margin-top: 0px; margin-bottom: 0px;',
+            autoHeight: true
+        });
+        om.bind('ignore_limits_on_local_network', fieldset.add({
+            name: 'ignore_limits_on_local_network',
+            height: 22,
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Ignore limits on local network')
+        }));
+        om.bind('rate_limit_ip_overhead', fieldset.add({
+            name: 'rate_limit_ip_overhead',
+            height: 22,
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Rate limit IP overhead')
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Per Torrent Bandwidth Usage'),
+            style: 'margin-bottom: 0px; padding-bottom: 0px;',
+            defaultType: 'spinnerfield',
+            labelWidth: 200,
+            defaults: {
+                minValue: -1,
+                maxValue: 99999
+            },
+            autoHeight: true
+        });
+        om.bind('max_connections_per_torrent', fieldset.add({
+            name: 'max_connections_per_torrent',
+            fieldLabel: _('Maximum Connections'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_upload_slots_per_torrent', fieldset.add({
+            name: 'max_upload_slots_per_torrent',
+            fieldLabel: _('Maximum Upload Slots'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_download_speed_per_torrent', fieldset.add({
+            name: 'max_download_speed_per_torrent',
+            fieldLabel: _('Maximum Download Speed (KiB/s)'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+        om.bind('max_upload_speed_per_torrent', fieldset.add({
+            name: 'max_upload_speed_per_torrent',
+            fieldLabel: _('Maximum Upload Speed (KiB/s)'),
+            width: 80,
+            value: -1,
+            decimalPrecision: 0
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/CachePage.js b/deluge/ui/web/js/deluge-all/preferences/CachePage.js
index c673ed7ff..4afec2e6a 100644
--- a/deluge/ui/web/js/deluge-all/preferences/CachePage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/CachePage.js
@@ -37,39 +37,39 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Cache = Ext.extend(Ext.form.FormPanel, {
 
-	border: false,
-	title: _('Cache'),
-	layout: 'form',
-	
-	initComponent: function() {
-		Deluge.preferences.Cache.superclass.initComponent.call(this);
+    border: false,
+    title: _('Cache'),
+    layout: 'form',
+    
+    initComponent: function() {
+        Deluge.preferences.Cache.superclass.initComponent.call(this);
 
-		var om = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Settings'),
-			autoHeight: true,
-			labelWidth: 180,
-			defaultType: 'spinnerfield',
-			defaults: {
-				decimalPrecision: 0,
-				minValue: -1,
-				maxValue: 99999
-			}
-		});
-		om.bind('cache_size', fieldset.add({
-			fieldLabel: _('Cache Size (16 KiB Blocks)'),
-			name: 'cache_size',
-			width: 60,
-			value: 512
-		}));
-		om.bind('cache_expiry', fieldset.add({
-			fieldLabel: _('Cache Expiry (seconds)'),
-			name: 'cache_expiry',
-			width: 60,
-			value: 60
-		}));
-	}
+        var om = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Settings'),
+            autoHeight: true,
+            labelWidth: 180,
+            defaultType: 'spinnerfield',
+            defaults: {
+                decimalPrecision: 0,
+                minValue: -1,
+                maxValue: 99999
+            }
+        });
+        om.bind('cache_size', fieldset.add({
+            fieldLabel: _('Cache Size (16 KiB Blocks)'),
+            name: 'cache_size',
+            width: 60,
+            value: 512
+        }));
+        om.bind('cache_expiry', fieldset.add({
+            fieldLabel: _('Cache Expiry (seconds)'),
+            name: 'cache_expiry',
+            width: 60,
+            value: 60
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/DaemonPage.js b/deluge/ui/web/js/deluge-all/preferences/DaemonPage.js
index 621c28a0f..2a344d9c0 100644
--- a/deluge/ui/web/js/deluge-all/preferences/DaemonPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/DaemonPage.js
@@ -37,61 +37,61 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Daemon = Ext.extend(Ext.form.FormPanel, {
 
-	border: false,
-	title: _('Daemon'),
-	layout: 'form',
-	
-	initComponent: function() {
-		Deluge.preferences.Daemon.superclass.initComponent.call(this);
+    border: false,
+    title: _('Daemon'),
+    layout: 'form',
+    
+    initComponent: function() {
+        Deluge.preferences.Daemon.superclass.initComponent.call(this);
 
-		var om = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Port'),
-			autoHeight: true,
-			defaultType: 'spinnerfield'
-		});
-		om.bind('daemon_port', fieldset.add({
-			fieldLabel: _('Daemon port'),
-			name: 'daemon_port',
-			value: 58846,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Connections'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		om.bind('allow_remote', fieldset.add({
-			fieldLabel: '',
-			height: 22,
-			labelSeparator: '',
-			boxLabel: _('Allow Remote Connections'),
-			name: 'allow_remote'
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Other'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		om.bind('new_release_check', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			height: 40,
-			boxLabel: _('Periodically check the website for new releases'),
-			id: 'new_release_check'
-		}));
-	}
+        var om = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Port'),
+            autoHeight: true,
+            defaultType: 'spinnerfield'
+        });
+        om.bind('daemon_port', fieldset.add({
+            fieldLabel: _('Daemon port'),
+            name: 'daemon_port',
+            value: 58846,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Connections'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        om.bind('allow_remote', fieldset.add({
+            fieldLabel: '',
+            height: 22,
+            labelSeparator: '',
+            boxLabel: _('Allow Remote Connections'),
+            name: 'allow_remote'
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Other'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        om.bind('new_release_check', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            height: 40,
+            boxLabel: _('Periodically check the website for new releases'),
+            id: 'new_release_check'
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/DownloadsPage.js b/deluge/ui/web/js/deluge-all/preferences/DownloadsPage.js
index 603b58d29..6984db040 100644
--- a/deluge/ui/web/js/deluge-all/preferences/DownloadsPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/DownloadsPage.js
@@ -36,114 +36,114 @@ Ext.namespace('Deluge.preferences');
  * @extends Ext.form.FormPanel
  */
 Deluge.preferences.Downloads = Ext.extend(Ext.FormPanel, {
-	constructor: function(config) {
-		config = Ext.apply({
-			border: false,
-			title: _('Downloads'),
-			layout: 'form',
-			autoHeight: true,
-			width: 320
-		}, config);
-		Deluge.preferences.Downloads.superclass.constructor.call(this, config);
-	},
+    constructor: function(config) {
+        config = Ext.apply({
+            border: false,
+            title: _('Downloads'),
+            layout: 'form',
+            autoHeight: true,
+            width: 320
+        }, config);
+        Deluge.preferences.Downloads.superclass.constructor.call(this, config);
+    },
 
-	initComponent: function() {
-		Deluge.preferences.Downloads.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.preferences.Downloads.superclass.initComponent.call(this);
 
-		var optMan = deluge.preferences.getOptionsManager();
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Folders'),
-			labelWidth: 150,
-			defaultType: 'togglefield',
-			autoHeight: true,
-			labelAlign: 'top',
-			width: 300,
-			style: 'margin-bottom: 5px; padding-bottom: 5px;'
-		});
+        var optMan = deluge.preferences.getOptionsManager();
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Folders'),
+            labelWidth: 150,
+            defaultType: 'togglefield',
+            autoHeight: true,
+            labelAlign: 'top',
+            width: 300,
+            style: 'margin-bottom: 5px; padding-bottom: 5px;'
+        });
 
-		optMan.bind('download_location', fieldset.add({
-			xtype: 'textfield',
-			name: 'download_location',
-			fieldLabel: _('Download to'),
-			width: 280
-		}));
+        optMan.bind('download_location', fieldset.add({
+            xtype: 'textfield',
+            name: 'download_location',
+            fieldLabel: _('Download to'),
+            width: 280
+        }));
 
-		var field = fieldset.add({
-			name: 'move_completed_path',
-			fieldLabel: _('Move completed to'),
-			width: 280
-		});
-		optMan.bind('move_completed', field.toggle);
-		optMan.bind('move_completed_path', field.input);
+        var field = fieldset.add({
+            name: 'move_completed_path',
+            fieldLabel: _('Move completed to'),
+            width: 280
+        });
+        optMan.bind('move_completed', field.toggle);
+        optMan.bind('move_completed_path', field.input);
 
-		field = fieldset.add({
-			name: 'torrentfiles_location',
-			fieldLabel: _('Copy of .torrent files to'),
-			width: 280
-		});
-		optMan.bind('copy_torrent_file', field.toggle);
-		optMan.bind('torrentfiles_location', field.input);
+        field = fieldset.add({
+            name: 'torrentfiles_location',
+            fieldLabel: _('Copy of .torrent files to'),
+            width: 280
+        });
+        optMan.bind('copy_torrent_file', field.toggle);
+        optMan.bind('torrentfiles_location', field.input);
 
-		field = fieldset.add({
-			name: 'autoadd_location',
-			fieldLabel: _('Autoadd .torrent files from'),
-			width: 280
-		});
-		optMan.bind('autoadd_enable', field.toggle);
-		optMan.bind('autoadd_location', field.input);
-	
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Allocation'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'radiogroup',
-			style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
-			width: 240
-		});
-		optMan.bind('compact_allocation', fieldset.add({
-			name: 'compact_allocation',
-			width: 200,
-			labelSeparator: '',
-			//disabled: true,
-			defaults: {
-				width: 80,
-				height: 22,
-				name: 'compact_allocation'
-			},
-			items: [{
-				boxLabel: _('Use Full'),
-				inputValue: false
-			}, {
-				boxLabel: _('Use Compact'),
-				inputValue: true
-			}]
-		}));
-	
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Options'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox',
-			style: 'margin-bottom: 0; padding-bottom: 0;',
-			width: 280
-		});
-		optMan.bind('prioritize_first_last_pieces', fieldset.add({
-			name: 'prioritize_first_last_pieces',
-			labelSeparator: '',
-			height: 22,
-			boxLabel: _('Prioritize first and last pieces of torrent')
-		}));
-		optMan.bind('add_paused', fieldset.add({
-			name: 'add_paused',
-			labelSeparator: '',
-			height: 22,
-			boxLabel: _('Add torrents in Paused state')
-		}));
-	}
+        field = fieldset.add({
+            name: 'autoadd_location',
+            fieldLabel: _('Autoadd .torrent files from'),
+            width: 280
+        });
+        optMan.bind('autoadd_enable', field.toggle);
+        optMan.bind('autoadd_location', field.input);
+    
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Allocation'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'radiogroup',
+            style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
+            width: 240
+        });
+        optMan.bind('compact_allocation', fieldset.add({
+            name: 'compact_allocation',
+            width: 200,
+            labelSeparator: '',
+            //disabled: true,
+            defaults: {
+                width: 80,
+                height: 22,
+                name: 'compact_allocation'
+            },
+            items: [{
+                boxLabel: _('Use Full'),
+                inputValue: false
+            }, {
+                boxLabel: _('Use Compact'),
+                inputValue: true
+            }]
+        }));
+    
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Options'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox',
+            style: 'margin-bottom: 0; padding-bottom: 0;',
+            width: 280
+        });
+        optMan.bind('prioritize_first_last_pieces', fieldset.add({
+            name: 'prioritize_first_last_pieces',
+            labelSeparator: '',
+            height: 22,
+            boxLabel: _('Prioritize first and last pieces of torrent')
+        }));
+        optMan.bind('add_paused', fieldset.add({
+            name: 'add_paused',
+            labelSeparator: '',
+            height: 22,
+            boxLabel: _('Add torrents in Paused state')
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/EncryptionPage.js b/deluge/ui/web/js/deluge-all/preferences/EncryptionPage.js
index af945c5c3..a259529d3 100644
--- a/deluge/ui/web/js/deluge-all/preferences/EncryptionPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/EncryptionPage.js
@@ -37,79 +37,79 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Encryption = Ext.extend(Ext.form.FormPanel, {
 
-	border: false,
-	title: _('Encryption'),
-	
-	initComponent: function() {
-		Deluge.preferences.Encryption.superclass.initComponent.call(this);
+    border: false,
+    title: _('Encryption'),
+    
+    initComponent: function() {
+        Deluge.preferences.Encryption.superclass.initComponent.call(this);
 
-		var optMan = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Settings'),
-			autoHeight: true,
-			defaultType: 'combo',
-			width: 300
-		});
-		optMan.bind('enc_in_policy', fieldset.add({
-			fieldLabel: _('Inbound'),
-			mode: 'local',
-			width: 150,
-			store: new Ext.data.ArrayStore({
-				fields: ['id', 'text'],
-				data: [
-					[0, _('Forced')],
-					[1, _('Enabled')],
-					[2, _('Disabled')]
-				]
-			}),
-			editable: false,
-			triggerAction: 'all',
-			valueField: 'id',
-			displayField: 'text'
-		}));
-		optMan.bind('enc_out_policy', fieldset.add({
-			fieldLabel: _('Outbound'),
-			mode: 'local',
-			width: 150,
-			store: new Ext.data.SimpleStore({
-				fields: ['id', 'text'],
-				data: [
-					[0, _('Forced')],
-					[1, _('Enabled')],
-					[2, _('Disabled')]
-				]
-			}),
-			editable: false,
-			triggerAction: 'all',
-			valueField: 'id',
-			displayField: 'text'
-		}));
-		optMan.bind('enc_level', fieldset.add({
-			fieldLabel: _('Level'),
-			mode: 'local',
-			width: 150,
-			store: new Ext.data.SimpleStore({
-				fields: ['id', 'text'],
-				data: [
-					[0, _('Handshake')],
-					[1, _('Full Stream')],
-					[2, _('Either')]
-				]
-			}),
-			editable: false,
-			triggerAction: 'all',
-			valueField: 'id',
-			displayField: 'text'
-		}));
-		optMan.bind('enc_prefer_rc4', fieldset.add({
-			xtype: 'checkbox',
-			name: 'enc_prefer_rc4',
-			height: 40,
-			hideLabel: true,
-			boxLabel: _('Encrypt entire stream')
-		}));
-	}
+        var optMan = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Settings'),
+            autoHeight: true,
+            defaultType: 'combo',
+            width: 300
+        });
+        optMan.bind('enc_in_policy', fieldset.add({
+            fieldLabel: _('Inbound'),
+            mode: 'local',
+            width: 150,
+            store: new Ext.data.ArrayStore({
+                fields: ['id', 'text'],
+                data: [
+                    [0, _('Forced')],
+                    [1, _('Enabled')],
+                    [2, _('Disabled')]
+                ]
+            }),
+            editable: false,
+            triggerAction: 'all',
+            valueField: 'id',
+            displayField: 'text'
+        }));
+        optMan.bind('enc_out_policy', fieldset.add({
+            fieldLabel: _('Outbound'),
+            mode: 'local',
+            width: 150,
+            store: new Ext.data.SimpleStore({
+                fields: ['id', 'text'],
+                data: [
+                    [0, _('Forced')],
+                    [1, _('Enabled')],
+                    [2, _('Disabled')]
+                ]
+            }),
+            editable: false,
+            triggerAction: 'all',
+            valueField: 'id',
+            displayField: 'text'
+        }));
+        optMan.bind('enc_level', fieldset.add({
+            fieldLabel: _('Level'),
+            mode: 'local',
+            width: 150,
+            store: new Ext.data.SimpleStore({
+                fields: ['id', 'text'],
+                data: [
+                    [0, _('Handshake')],
+                    [1, _('Full Stream')],
+                    [2, _('Either')]
+                ]
+            }),
+            editable: false,
+            triggerAction: 'all',
+            valueField: 'id',
+            displayField: 'text'
+        }));
+        optMan.bind('enc_prefer_rc4', fieldset.add({
+            xtype: 'checkbox',
+            name: 'enc_prefer_rc4',
+            height: 40,
+            hideLabel: true,
+            boxLabel: _('Encrypt entire stream')
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/InstallPluginWindow.js b/deluge/ui/web/js/deluge-all/preferences/InstallPluginWindow.js
index abc161437..c1d9e2b14 100644
--- a/deluge/ui/web/js/deluge-all/preferences/InstallPluginWindow.js
+++ b/deluge/ui/web/js/deluge-all/preferences/InstallPluginWindow.js
@@ -37,66 +37,66 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.InstallPluginWindow = Ext.extend(Ext.Window, {
 
-	title: _('Install Plugin'),
-	layout: 'fit',
-	height: 115,
-	width: 350,
-	
-	bodyStyle: 'padding: 10px 5px;',
-	buttonAlign: 'center',
-	closeAction: 'hide',
-	iconCls: 'x-deluge-install-plugin',
-	modal: true,
-	plain: true,
+    title: _('Install Plugin'),
+    layout: 'fit',
+    height: 115,
+    width: 350,
+    
+    bodyStyle: 'padding: 10px 5px;',
+    buttonAlign: 'center',
+    closeAction: 'hide',
+    iconCls: 'x-deluge-install-plugin',
+    modal: true,
+    plain: true,
 
-	initComponent: function() {
-		Deluge.add.FileWindow.superclass.initComponent.call(this);
-		this.addButton(_('Install'), this.onInstall, this);
-		
-		this.form = this.add({
-			xtype: 'form',
-			baseCls: 'x-plain',
-			labelWidth: 70,
-			autoHeight: true,
-			fileUpload: true,
-			items: [{
-				xtype: 'fileuploadfield',
-				width: 240,
-				emptyText: _('Select an egg'),
-				fieldLabel: _('Plugin Egg'),
-				name: 'file',
-				buttonCfg: {
-					text: _('Browse') + '...'
-				}
-			}]
-		});
-	},
+    initComponent: function() {
+        Deluge.add.FileWindow.superclass.initComponent.call(this);
+        this.addButton(_('Install'), this.onInstall, this);
+        
+        this.form = this.add({
+            xtype: 'form',
+            baseCls: 'x-plain',
+            labelWidth: 70,
+            autoHeight: true,
+            fileUpload: true,
+            items: [{
+                xtype: 'fileuploadfield',
+                width: 240,
+                emptyText: _('Select an egg'),
+                fieldLabel: _('Plugin Egg'),
+                name: 'file',
+                buttonCfg: {
+                    text: _('Browse') + '...'
+                }
+            }]
+        });
+    },
 
-	onInstall: function(field, e) {
-		this.form.getForm().submit({
-			url: '/upload',
-			waitMsg: _('Uploading your plugin...'),
-			success: this.onUploadSuccess,
-			scope: this
-		}); 
-	},
+    onInstall: function(field, e) {
+        this.form.getForm().submit({
+            url: '/upload',
+            waitMsg: _('Uploading your plugin...'),
+            success: this.onUploadSuccess,
+            scope: this
+        }); 
+    },
 
-	onUploadPlugin: function(info, obj, response, request) {
-		this.fireEvent('pluginadded');
-	},
+    onUploadPlugin: function(info, obj, response, request) {
+        this.fireEvent('pluginadded');
+    },
 
-	onUploadSuccess: function(fp, upload) {
-		this.hide();
-		if (upload.result.success) {
-			var filename = this.form.getForm().getFieldValues().file;
-			filename = filename.split('\\').slice(-1)[0]
-			var path = upload.result.files[0];
-			this.form.getForm().setValues({file: ''});
-			deluge.client.web.upload_plugin(filename, path, {
-				success: this.onUploadPlugin,
-				scope: this,
-				filename: filename
-			});
-		}
-	}
+    onUploadSuccess: function(fp, upload) {
+        this.hide();
+        if (upload.result.success) {
+            var filename = this.form.getForm().getFieldValues().file;
+            filename = filename.split('\\').slice(-1)[0]
+            var path = upload.result.files[0];
+            this.form.getForm().setValues({file: ''});
+            deluge.client.web.upload_plugin(filename, path, {
+                success: this.onUploadPlugin,
+                scope: this,
+                filename: filename
+            });
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js b/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
index bc8e87898..e8e6b749d 100644
--- a/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/InterfacePage.js
@@ -37,219 +37,219 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Interface = Ext.extend(Ext.form.FormPanel, {
 
-	border: false,
-	title: _('Interface'),
-	layout: 'form',
-	
-	initComponent: function() {
-		Deluge.preferences.Interface.superclass.initComponent.call(this);
-		
-		var om = this.optionsManager = new Deluge.OptionsManager();
-		this.on('show', this.onPageShow, this);
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Interface'),
-			style: 'margin-bottom: 0px; padding-bottom: 5px; padding-top: 5px',
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		om.bind('show_session_speed', fieldset.add({
-			name: 'show_session_speed',
-			height: 22,
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Show session speed in titlebar')
-		}));
-		om.bind('sidebar_show_zero', fieldset.add({
-			name: 'sidebar_show_zero',
-			height: 22,
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Show filters with zero torrents')
-		}));
-		om.bind('sidebar_multiple_filters', fieldset.add({
-			name: 'sidebar_multiple_filters',
-			height: 22,
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Allow the use of multiple filters at once')
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Password'),
-			style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
-			autoHeight: true,
-			labelWidth: 110,
-			defaultType: 'textfield',
-			defaults: {
-				width: 180,
-				inputType: 'password'
-			}
-		});
-		
-		this.oldPassword = fieldset.add({
-			name: 'old_password',
-			fieldLabel: _('Old Password')
-		});
-		this.newPassword = fieldset.add({
-			name: 'new_password',
-			fieldLabel: _('New Password')
-		});
-		this.confirmPassword = fieldset.add({
-			name: 'confirm_password',
-			fieldLabel: _('Confirm Password')
-		});
-		
-		var panel = fieldset.add({
-			xtype: 'panel',
-			autoHeight: true,
-			border: false,
-			width: 320,
-			bodyStyle: 'padding-left: 230px'
-		})
-		panel.add({
-			xtype: 'button',
-			text: _('Change'),
-			listeners: {
-				'click': {
-					fn: this.onPasswordChange,
-					scope: this
-				}
-			}
-		});
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Server'),
-			style: 'margin-top: 0px; padding-top: 0px; margin-bottom: 0px; padding-bottom: 0px',
-			autoHeight: true,
-			labelWidth: 110,
-			defaultType: 'spinnerfield',
-			defaults: {
-				width: 80
-			}
-		});
-		om.bind('session_timeout', fieldset.add({
-			name: 'session_timeout',
-			fieldLabel: _('Session Timeout'),
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		om.bind('port', fieldset.add({
-			name: 'port',
-			fieldLabel: _('Port'),
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		this.httpsField = om.bind('https', fieldset.add({
-			xtype: 'checkbox',
-			name: 'https',
-			hideLabel: true,
-			width: 280,
-			height: 22,
-			boxLabel: _('Use SSL (paths relative to Deluge config folder)')
-		}));
-		this.httpsField.on('check', this.onSSLCheck, this);
-		this.pkeyField = om.bind('pkey', fieldset.add({
-			xtype: 'textfield',
-			disabled: true,
-			name: 'pkey',
-			width: 180,
-			fieldLabel: _('Private Key')
-		}));
-		this.certField = om.bind('cert', fieldset.add({
-			xtype: 'textfield',
-			disabled: true,
-			name: 'cert',
-			width: 180,
-			fieldLabel: _('Certificate')
-		}));
-	},
-	
-	onApply: function() {
-		var changed = this.optionsManager.getDirty();
-		if (!Ext.isObjectEmpty(changed)) {
-			deluge.client.web.set_config(changed, {
-				success: this.onSetConfig,
-				scope: this
-			});
+    border: false,
+    title: _('Interface'),
+    layout: 'form',
+    
+    initComponent: function() {
+        Deluge.preferences.Interface.superclass.initComponent.call(this);
+        
+        var om = this.optionsManager = new Deluge.OptionsManager();
+        this.on('show', this.onPageShow, this);
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Interface'),
+            style: 'margin-bottom: 0px; padding-bottom: 5px; padding-top: 5px',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        om.bind('show_session_speed', fieldset.add({
+            name: 'show_session_speed',
+            height: 22,
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Show session speed in titlebar')
+        }));
+        om.bind('sidebar_show_zero', fieldset.add({
+            name: 'sidebar_show_zero',
+            height: 22,
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Show filters with zero torrents')
+        }));
+        om.bind('sidebar_multiple_filters', fieldset.add({
+            name: 'sidebar_multiple_filters',
+            height: 22,
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Allow the use of multiple filters at once')
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Password'),
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelWidth: 110,
+            defaultType: 'textfield',
+            defaults: {
+                width: 180,
+                inputType: 'password'
+            }
+        });
+        
+        this.oldPassword = fieldset.add({
+            name: 'old_password',
+            fieldLabel: _('Old Password')
+        });
+        this.newPassword = fieldset.add({
+            name: 'new_password',
+            fieldLabel: _('New Password')
+        });
+        this.confirmPassword = fieldset.add({
+            name: 'confirm_password',
+            fieldLabel: _('Confirm Password')
+        });
+        
+        var panel = fieldset.add({
+            xtype: 'panel',
+            autoHeight: true,
+            border: false,
+            width: 320,
+            bodyStyle: 'padding-left: 230px'
+        })
+        panel.add({
+            xtype: 'button',
+            text: _('Change'),
+            listeners: {
+                'click': {
+                    fn: this.onPasswordChange,
+                    scope: this
+                }
+            }
+        });
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Server'),
+            style: 'margin-top: 0px; padding-top: 0px; margin-bottom: 0px; padding-bottom: 0px',
+            autoHeight: true,
+            labelWidth: 110,
+            defaultType: 'spinnerfield',
+            defaults: {
+                width: 80
+            }
+        });
+        om.bind('session_timeout', fieldset.add({
+            name: 'session_timeout',
+            fieldLabel: _('Session Timeout'),
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        om.bind('port', fieldset.add({
+            name: 'port',
+            fieldLabel: _('Port'),
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        this.httpsField = om.bind('https', fieldset.add({
+            xtype: 'checkbox',
+            name: 'https',
+            hideLabel: true,
+            width: 280,
+            height: 22,
+            boxLabel: _('Use SSL (paths relative to Deluge config folder)')
+        }));
+        this.httpsField.on('check', this.onSSLCheck, this);
+        this.pkeyField = om.bind('pkey', fieldset.add({
+            xtype: 'textfield',
+            disabled: true,
+            name: 'pkey',
+            width: 180,
+            fieldLabel: _('Private Key')
+        }));
+        this.certField = om.bind('cert', fieldset.add({
+            xtype: 'textfield',
+            disabled: true,
+            name: 'cert',
+            width: 180,
+            fieldLabel: _('Certificate')
+        }));
+    },
+    
+    onApply: function() {
+        var changed = this.optionsManager.getDirty();
+        if (!Ext.isObjectEmpty(changed)) {
+            deluge.client.web.set_config(changed, {
+                success: this.onSetConfig,
+                scope: this
+            });
 
-			for (var key in deluge.config) {
-				deluge.config[key] = this.optionsManager.get(key);
-			}
-		}
-	},
-	
-	onGotConfig: function(config) {
-		this.optionsManager.set(config);
-	},
-	
-	onPasswordChange: function() {
-		var newPassword = this.newPassword.getValue();
-		if (newPassword != this.confirmPassword.getValue()) {
-			Ext.MessageBox.show({
-				title: _('Invalid Password'),
-				msg: _('Your passwords don\'t match!'),
-				buttons: Ext.MessageBox.OK,
-				modal: false,
-				icon: Ext.MessageBox.ERROR,
-				iconCls: 'x-deluge-icon-error'
-			});
-			return;
-		}
-		
-		var oldPassword = this.oldPassword.getValue();
-		deluge.client.auth.change_password(oldPassword, newPassword, {
-			success: function(result) {
-				if (!result) {
-					Ext.MessageBox.show({
-						title: _('Password'),
-						msg: _('Your old password was incorrect!'),
-						buttons: Ext.MessageBox.OK,
-						modal: false,
-						icon: Ext.MessageBox.ERROR,
-						iconCls: 'x-deluge-icon-error'
-					});
-					this.oldPassword.setValue('');
-				} else {
-					Ext.MessageBox.show({
-						title: _('Change Successful'),
-						msg: _('Your password was successfully changed!'),
-						buttons: Ext.MessageBox.OK,
-						modal: false,
-						icon: Ext.MessageBox.INFO,
-						iconCls: 'x-deluge-icon-info'
-					});
-					this.oldPassword.setValue('');
-					this.newPassword.setValue('');
-					this.confirmPassword.setValue('');
-				}
-			},
-			scope: this
-		});
-	},
-	
-	onSetConfig: function() {
-		this.optionsManager.commit();
-	},
-	
-	onPageShow: function() {
-		deluge.client.web.get_config({
-			success: this.onGotConfig,
-			scope: this
-		})
-	},
-	
-	onSSLCheck: function(e, checked) {
-		this.pkeyField.setDisabled(!checked);
-		this.certField.setDisabled(!checked);
-	}
+            for (var key in deluge.config) {
+                deluge.config[key] = this.optionsManager.get(key);
+            }
+        }
+    },
+    
+    onGotConfig: function(config) {
+        this.optionsManager.set(config);
+    },
+    
+    onPasswordChange: function() {
+        var newPassword = this.newPassword.getValue();
+        if (newPassword != this.confirmPassword.getValue()) {
+            Ext.MessageBox.show({
+                title: _('Invalid Password'),
+                msg: _('Your passwords don\'t match!'),
+                buttons: Ext.MessageBox.OK,
+                modal: false,
+                icon: Ext.MessageBox.ERROR,
+                iconCls: 'x-deluge-icon-error'
+            });
+            return;
+        }
+        
+        var oldPassword = this.oldPassword.getValue();
+        deluge.client.auth.change_password(oldPassword, newPassword, {
+            success: function(result) {
+                if (!result) {
+                    Ext.MessageBox.show({
+                        title: _('Password'),
+                        msg: _('Your old password was incorrect!'),
+                        buttons: Ext.MessageBox.OK,
+                        modal: false,
+                        icon: Ext.MessageBox.ERROR,
+                        iconCls: 'x-deluge-icon-error'
+                    });
+                    this.oldPassword.setValue('');
+                } else {
+                    Ext.MessageBox.show({
+                        title: _('Change Successful'),
+                        msg: _('Your password was successfully changed!'),
+                        buttons: Ext.MessageBox.OK,
+                        modal: false,
+                        icon: Ext.MessageBox.INFO,
+                        iconCls: 'x-deluge-icon-info'
+                    });
+                    this.oldPassword.setValue('');
+                    this.newPassword.setValue('');
+                    this.confirmPassword.setValue('');
+                }
+            },
+            scope: this
+        });
+    },
+    
+    onSetConfig: function() {
+        this.optionsManager.commit();
+    },
+    
+    onPageShow: function() {
+        deluge.client.web.get_config({
+            success: this.onGotConfig,
+            scope: this
+        })
+    },
+    
+    onSSLCheck: function(e, checked) {
+        this.pkeyField.setDisabled(!checked);
+        this.certField.setDisabled(!checked);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js b/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js
index 6d7d83929..13b1448fb 100644
--- a/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js
@@ -36,195 +36,195 @@ Ext.namespace('Deluge.preferences');
  * @extends Ext.form.FormPanel
  */
 Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
-	
-	border: false,
-	layout: 'form',
-	title:  _('Network'),
+    
+    border: false,
+    layout: 'form',
+    title:  _('Network'),
 
-	initComponent: function() {
-		Deluge.preferences.Network.superclass.initComponent.call(this);
-		var optMan = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Incoming Ports'),
-			style: 'margin-bottom: 5px; padding-bottom: 0px;',
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		optMan.bind('random_port', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Use Random Ports'),
-			name: 'random_port',
-			height: 22,
-			listeners: {
-				'check': {
-					fn: function(e, checked) {
-						this.listenPorts.setDisabled(checked);
-					},
-					scope: this
-				}
-			}
-		}));
-		this.listenPorts = fieldset.add({
-			xtype: 'spinnergroup',
-			name: 'listen_ports',
-			fieldLabel: '',
-			labelSeparator: '',
-			colCfg: {
-				labelWidth: 40,
-				style: 'margin-right: 10px;'
-			},
-			items: [{
-				fieldLabel: 'From',
-				strategy: {
-					xtype: 'number',
-					decimalPrecision: 0,
-					minValue: -1,
-					maxValue: 99999
-				}
-			}, {
-				fieldLabel: 'To',
-				strategy: {
-					xtype: 'number',
-					decimalPrecision: 0,
-					minValue: -1,
-					maxValue: 99999
-				}
-			}]
-		});
-		optMan.bind('listen_ports', this.listenPorts);
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Outgoing Ports'),
-			style: 'margin-bottom: 5px; padding-bottom: 0px;',
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		optMan.bind('random_outgoing_ports', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Use Random Ports'),
-			name: 'random_outgoing_ports',
-			height: 22,
-			listeners: {
-				'check': {
-					fn: function(e, checked) {
-						this.outgoingPorts.setDisabled(checked);
-					},
-					scope: this
-				}
-			}
-		}));
-		this.outgoingPorts = fieldset.add({
-			xtype: 'spinnergroup',
-			name: 'outgoing_ports',
-			fieldLabel: '',
-			labelSeparator: '',
-			colCfg: {
-				labelWidth: 40,
-				style: 'margin-right: 10px;'
-			},
-			items: [{
-				fieldLabel: 'From',
-				strategy: {
-					xtype: 'number',
-					decimalPrecision: 0,
-					minValue: -1,
-					maxValue: 99999
-				}
-			}, {
-				fieldLabel: 'To',
-				strategy: {
-					xtype: 'number',
-					decimalPrecision: 0,
-					minValue: -1,
-					maxValue: 99999
-				}
-			}]
-		});
-		optMan.bind('outgoing_ports', this.outgoingPorts);
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Network Interface'),
-			style: 'margin-bottom: 5px; padding-bottom: 0px;',
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'textfield'
-		});
-		optMan.bind('listen_interface', fieldset.add({
-			name: 'listen_interface',
-			fieldLabel: '',
-			labelSeparator: '',
-			width: 200
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('TOS'),
-			style: 'margin-bottom: 5px; padding-bottom: 0px;',
-			bodyStyle: 'margin: 0px; padding: 0px',
-			autoHeight: true,
-			defaultType: 'textfield'
-		});
-		optMan.bind('peer_tos', fieldset.add({
-			name: 'peer_tos',
-			fieldLabel: _('Peer TOS Byte'),
-			width: 80
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Network Extras'),
-			autoHeight: true,
-			layout: 'table',
-			layoutConfig: {
-				columns: 3
-			},			
-			defaultType: 'checkbox'
-		});
-		optMan.bind('upnp', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('UPnP'),
-			name: 'upnp'
-		}));
-		optMan.bind('natpmp', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('NAT-PMP'),
-			ctCls: 'x-deluge-indent-checkbox',
-			name: 'natpmp'
-		}));
-		optMan.bind('utpex', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('Peer Exchange'),
-			ctCls: 'x-deluge-indent-checkbox',
-			name: 'utpex'
-		}));
-		optMan.bind('lsd', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('LSD'),
-			name: 'lsd'
-		}));
-		optMan.bind('dht', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			boxLabel: _('DHT'),
-			ctCls: 'x-deluge-indent-checkbox',
-			name: 'dht'
-		}));
-	}
+    initComponent: function() {
+        Deluge.preferences.Network.superclass.initComponent.call(this);
+        var optMan = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Incoming Ports'),
+            style: 'margin-bottom: 5px; padding-bottom: 0px;',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        optMan.bind('random_port', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Use Random Ports'),
+            name: 'random_port',
+            height: 22,
+            listeners: {
+                'check': {
+                    fn: function(e, checked) {
+                        this.listenPorts.setDisabled(checked);
+                    },
+                    scope: this
+                }
+            }
+        }));
+        this.listenPorts = fieldset.add({
+            xtype: 'spinnergroup',
+            name: 'listen_ports',
+            fieldLabel: '',
+            labelSeparator: '',
+            colCfg: {
+                labelWidth: 40,
+                style: 'margin-right: 10px;'
+            },
+            items: [{
+                fieldLabel: 'From',
+                strategy: {
+                    xtype: 'number',
+                    decimalPrecision: 0,
+                    minValue: -1,
+                    maxValue: 99999
+                }
+            }, {
+                fieldLabel: 'To',
+                strategy: {
+                    xtype: 'number',
+                    decimalPrecision: 0,
+                    minValue: -1,
+                    maxValue: 99999
+                }
+            }]
+        });
+        optMan.bind('listen_ports', this.listenPorts);
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Outgoing Ports'),
+            style: 'margin-bottom: 5px; padding-bottom: 0px;',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        optMan.bind('random_outgoing_ports', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Use Random Ports'),
+            name: 'random_outgoing_ports',
+            height: 22,
+            listeners: {
+                'check': {
+                    fn: function(e, checked) {
+                        this.outgoingPorts.setDisabled(checked);
+                    },
+                    scope: this
+                }
+            }
+        }));
+        this.outgoingPorts = fieldset.add({
+            xtype: 'spinnergroup',
+            name: 'outgoing_ports',
+            fieldLabel: '',
+            labelSeparator: '',
+            colCfg: {
+                labelWidth: 40,
+                style: 'margin-right: 10px;'
+            },
+            items: [{
+                fieldLabel: 'From',
+                strategy: {
+                    xtype: 'number',
+                    decimalPrecision: 0,
+                    minValue: -1,
+                    maxValue: 99999
+                }
+            }, {
+                fieldLabel: 'To',
+                strategy: {
+                    xtype: 'number',
+                    decimalPrecision: 0,
+                    minValue: -1,
+                    maxValue: 99999
+                }
+            }]
+        });
+        optMan.bind('outgoing_ports', this.outgoingPorts);
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Network Interface'),
+            style: 'margin-bottom: 5px; padding-bottom: 0px;',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'textfield'
+        });
+        optMan.bind('listen_interface', fieldset.add({
+            name: 'listen_interface',
+            fieldLabel: '',
+            labelSeparator: '',
+            width: 200
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('TOS'),
+            style: 'margin-bottom: 5px; padding-bottom: 0px;',
+            bodyStyle: 'margin: 0px; padding: 0px',
+            autoHeight: true,
+            defaultType: 'textfield'
+        });
+        optMan.bind('peer_tos', fieldset.add({
+            name: 'peer_tos',
+            fieldLabel: _('Peer TOS Byte'),
+            width: 80
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Network Extras'),
+            autoHeight: true,
+            layout: 'table',
+            layoutConfig: {
+                columns: 3
+            },            
+            defaultType: 'checkbox'
+        });
+        optMan.bind('upnp', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('UPnP'),
+            name: 'upnp'
+        }));
+        optMan.bind('natpmp', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('NAT-PMP'),
+            ctCls: 'x-deluge-indent-checkbox',
+            name: 'natpmp'
+        }));
+        optMan.bind('utpex', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Peer Exchange'),
+            ctCls: 'x-deluge-indent-checkbox',
+            name: 'utpex'
+        }));
+        optMan.bind('lsd', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('LSD'),
+            name: 'lsd'
+        }));
+        optMan.bind('dht', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('DHT'),
+            ctCls: 'x-deluge-indent-checkbox',
+            name: 'dht'
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/OtherPage.js b/deluge/ui/web/js/deluge-all/preferences/OtherPage.js
index 951d8c2b4..105500eb3 100644
--- a/deluge/ui/web/js/deluge-all/preferences/OtherPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/OtherPage.js
@@ -36,73 +36,73 @@ Ext.namespace('Deluge.preferences');
  * @extends Ext.form.FormPanel
  */
 Deluge.preferences.Other = Ext.extend(Ext.form.FormPanel, {
-	constructor: function(config) {
-		config = Ext.apply({
-			border: false,
-			title: _('Other'),
-			layout: 'form'
-		}, config);
-		Deluge.preferences.Other.superclass.constructor.call(this, config);
-	},
-	
-	initComponent: function() {
-		Deluge.preferences.Other.superclass.initComponent.call(this);
-		
-		var optMan = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Updates'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		optMan.bind('new_release_check', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			height: 22,
-			name: 'new_release_check',
-			boxLabel: _('Be alerted about new releases')
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('System Information'),
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		fieldset.add({
-			xtype: 'panel',
-			border: false,
-			bodyCfg: {
-				html: _('Help us improve Deluge by sending us your '
-				    + 'Python version, PyGTK version, OS and processor '
-				    + 'types. Absolutely no other information is sent.')
-			}
-		});
-		optMan.bind('send_info', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			height: 22,
-			boxLabel: _('Yes, please send anonymous statistics'),
-			name: 'send_info'
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('GeoIP Database'),
-			autoHeight: true,
-			labelWidth: 80,
-			defaultType: 'textfield'
-		});
-		optMan.bind('geoip_db_location', fieldset.add({
-			name: 'geoip_db_location',
-			fieldLabel: _('Location'),
-			width: 200
-		}));
-	}
+    constructor: function(config) {
+        config = Ext.apply({
+            border: false,
+            title: _('Other'),
+            layout: 'form'
+        }, config);
+        Deluge.preferences.Other.superclass.constructor.call(this, config);
+    },
+    
+    initComponent: function() {
+        Deluge.preferences.Other.superclass.initComponent.call(this);
+        
+        var optMan = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Updates'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        optMan.bind('new_release_check', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            height: 22,
+            name: 'new_release_check',
+            boxLabel: _('Be alerted about new releases')
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('System Information'),
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        fieldset.add({
+            xtype: 'panel',
+            border: false,
+            bodyCfg: {
+                html: _('Help us improve Deluge by sending us your '
+                    + 'Python version, PyGTK version, OS and processor '
+                    + 'types. Absolutely no other information is sent.')
+            }
+        });
+        optMan.bind('send_info', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            height: 22,
+            boxLabel: _('Yes, please send anonymous statistics'),
+            name: 'send_info'
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('GeoIP Database'),
+            autoHeight: true,
+            labelWidth: 80,
+            defaultType: 'textfield'
+        });
+        optMan.bind('geoip_db_location', fieldset.add({
+            name: 'geoip_db_location',
+            fieldLabel: _('Location'),
+            width: 200
+        }));
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js b/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js
index 49ab9db6a..1d7499fe1 100644
--- a/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/PluginsPage.js
@@ -37,234 +37,234 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Plugins = Ext.extend(Ext.Panel, {
 
-	layout: 'border',
-	title: _('Plugins'),
-	border: false,
-	height: 400,
-	cls: 'x-deluge-plugins',
+    layout: 'border',
+    title: _('Plugins'),
+    border: false,
+    height: 400,
+    cls: 'x-deluge-plugins',
 
-	pluginTemplate: new Ext.Template(
-		'
' +
-			'
Author:
{author}
' +
-			'
Version:
{version}
' +
-			'
Author Email:
{email}
' +
-			'
Homepage:
{homepage}
' +
-			'
Details:
{details}
' +
-		'
'
-	),
+    pluginTemplate: new Ext.Template(
+        '
' +
+            '
Author:
{author}
' +
+            '
Version:
{version}
' +
+            '
Author Email:
{email}
' +
+            '
Homepage:
{homepage}
' +
+            '
Details:
{details}
' +
+        '
'
+    ),
 
-	initComponent: function() {
-		Deluge.preferences.Plugins.superclass.initComponent.call(this);
-		this.defaultValues = {
-			'version': '',
-			'email': '',
-			'homepage': '',
-			'details': ''
-		};
-		this.pluginTemplate.compile();
+    initComponent: function() {
+        Deluge.preferences.Plugins.superclass.initComponent.call(this);
+        this.defaultValues = {
+            'version': '',
+            'email': '',
+            'homepage': '',
+            'details': ''
+        };
+        this.pluginTemplate.compile();
 
-		var checkboxRenderer = function(v, p, record){
-			p.css += ' x-grid3-check-col-td';
-			return '
 
';
-		}
+        var checkboxRenderer = function(v, p, record){
+            p.css += ' x-grid3-check-col-td';
+            return '
 
';
+        }
 
-		this.list = this.add({
-			xtype: 'listview',
-			store: new Ext.data.ArrayStore({
-				fields: [
-					{name: 'enabled', mapping: 0},
-					{name: 'plugin', mapping: 1}
-				]
-			}),
-			columns: [{
-				id: 'enabled',
-				header: _('Enabled'),
-				width: .2,
-				sortable: true,
-				tpl: new Ext.XTemplate('{enabled:this.getCheckbox}', {
-					getCheckbox: function(v) {
-						return '
 
';
-					}
-				}),
-				dataIndex: 'enabled'
-			}, {
-				id: 'plugin',
-				header: _('Plugin'),
-				width: .8,
-				sortable: true,
-				dataIndex: 'plugin'
-			}],
-			singleSelect: true,
-			autoExpandColumn: 'plugin',
-			listeners: {
-				selectionchange: {fn: this.onPluginSelect, scope: this}
-			}
-		});
+        this.list = this.add({
+            xtype: 'listview',
+            store: new Ext.data.ArrayStore({
+                fields: [
+                    {name: 'enabled', mapping: 0},
+                    {name: 'plugin', mapping: 1}
+                ]
+            }),
+            columns: [{
+                id: 'enabled',
+                header: _('Enabled'),
+                width: .2,
+                sortable: true,
+                tpl: new Ext.XTemplate('{enabled:this.getCheckbox}', {
+                    getCheckbox: function(v) {
+                        return '
 
';
+                    }
+                }),
+                dataIndex: 'enabled'
+            }, {
+                id: 'plugin',
+                header: _('Plugin'),
+                width: .8,
+                sortable: true,
+                dataIndex: 'plugin'
+            }],
+            singleSelect: true,
+            autoExpandColumn: 'plugin',
+            listeners: {
+                selectionchange: {fn: this.onPluginSelect, scope: this}
+            }
+        });
 
-		this.panel = this.add({
-			region: 'center',
-			autoScroll: true,
-			margins: '5 5 5 5',
-			items: [this.list],
-			bbar: new Ext.Toolbar({
-				items: [{
-					cls: 'x-btn-text-icon',
-					iconCls: 'x-deluge-install-plugin',
-					text: _('Install'),
-					handler: this.onInstallPluginWindow,
-					scope: this
-				}, '->', {
-					cls: 'x-btn-text-icon',
-					text: _('Find More'),
-					iconCls: 'x-deluge-find-more',
-					handler: this.onFindMorePlugins,
-					scope: this
-				}]
-			})
-		});
+        this.panel = this.add({
+            region: 'center',
+            autoScroll: true,
+            margins: '5 5 5 5',
+            items: [this.list],
+            bbar: new Ext.Toolbar({
+                items: [{
+                    cls: 'x-btn-text-icon',
+                    iconCls: 'x-deluge-install-plugin',
+                    text: _('Install'),
+                    handler: this.onInstallPluginWindow,
+                    scope: this
+                }, '->', {
+                    cls: 'x-btn-text-icon',
+                    text: _('Find More'),
+                    iconCls: 'x-deluge-find-more',
+                    handler: this.onFindMorePlugins,
+                    scope: this
+                }]
+            })
+        });
 
-		var pp = this.pluginInfo = this.add({
-			xtype:     'panel',
-			border:     true,
-			height:     160,
-			region:    'south',
-			margins:   '0 5 5 5'
-		});
-		var fieldset = pp.add({
-			xtype:     'fieldset',
-			title:   _('Info'),
-			border:     false,
-			autoHeight: true,
-			labelWidth: 1,
-			style:     'margin-top: 5px;'
-		});
-		this.pluginInfo = fieldset.add({
-			xtype: 'panel',
-			border: false,
-			bodyCfg: {
-				style: 'margin-left: 10px'
-			}
-		});
+        var pp = this.pluginInfo = this.add({
+            xtype:     'panel',
+            border:     true,
+            height:     160,
+            region:    'south',
+            margins:   '0 5 5 5'
+        });
+        var fieldset = pp.add({
+            xtype:     'fieldset',
+            title:   _('Info'),
+            border:     false,
+            autoHeight: true,
+            labelWidth: 1,
+            style:     'margin-top: 5px;'
+        });
+        this.pluginInfo = fieldset.add({
+            xtype: 'panel',
+            border: false,
+            bodyCfg: {
+                style: 'margin-left: 10px'
+            }
+        });
 
-		this.pluginInfo.on('render', this.onPluginInfoRender, this);
-		this.list.on('click', this.onNodeClick, this);
-		deluge.preferences.on('show', this.onPreferencesShow, this);
-		deluge.events.on('PluginDisabledEvent', this.onPluginDisabled, this);
-		deluge.events.on('PluginEnabledEvent', this.onPluginEnabled, this);
-	},
+        this.pluginInfo.on('render', this.onPluginInfoRender, this);
+        this.list.on('click', this.onNodeClick, this);
+        deluge.preferences.on('show', this.onPreferencesShow, this);
+        deluge.events.on('PluginDisabledEvent', this.onPluginDisabled, this);
+        deluge.events.on('PluginEnabledEvent', this.onPluginEnabled, this);
+    },
 
-	disablePlugin: function(plugin) {
-		deluge.client.core.disable_plugin(plugin);
-	},
+    disablePlugin: function(plugin) {
+        deluge.client.core.disable_plugin(plugin);
+    },
 
-	enablePlugin: function(plugin) {
-		deluge.client.core.enable_plugin(plugin);
-	},
+    enablePlugin: function(plugin) {
+        deluge.client.core.enable_plugin(plugin);
+    },
 
-	setInfo: function(plugin) {
-		if (!this.pluginInfo.rendered) return;
-		var values = plugin || this.defaultValues;
-		this.pluginInfo.body.dom.innerHTML = this.pluginTemplate.apply(values);
-	},
+    setInfo: function(plugin) {
+        if (!this.pluginInfo.rendered) return;
+        var values = plugin || this.defaultValues;
+        this.pluginInfo.body.dom.innerHTML = this.pluginTemplate.apply(values);
+    },
 
-	updatePlugins: function() {
-		deluge.client.web.get_plugins({
-			success: this.onGotPlugins,
-			scope: this
-		});
-	},
+    updatePlugins: function() {
+        deluge.client.web.get_plugins({
+            success: this.onGotPlugins,
+            scope: this
+        });
+    },
 
-	updatePluginsGrid: function() {
-		var plugins = [];
-		Ext.each(this.availablePlugins, function(plugin) {
-			if (this.enabledPlugins.indexOf(plugin) > -1) {
-				plugins.push([true, plugin]);
-			} else {
-				plugins.push([false, plugin]);
-			}
-		}, this);
-		this.list.getStore().loadData(plugins);
-	},
+    updatePluginsGrid: function() {
+        var plugins = [];
+        Ext.each(this.availablePlugins, function(plugin) {
+            if (this.enabledPlugins.indexOf(plugin) > -1) {
+                plugins.push([true, plugin]);
+            } else {
+                plugins.push([false, plugin]);
+            }
+        }, this);
+        this.list.getStore().loadData(plugins);
+    },
 
-	onNodeClick: function(dv, index, node, e) {
-		var el = new Ext.Element(e.target);
-		if (el.getAttribute('rel') != 'chkbox') return;
+    onNodeClick: function(dv, index, node, e) {
+        var el = new Ext.Element(e.target);
+        if (el.getAttribute('rel') != 'chkbox') return;
 
-		var r = dv.getStore().getAt(index);
-		r.set('enabled', !r.get('enabled'));
-		r.commit();
-		if (r.get('enabled')) {
-			this.enablePlugin(r.get('plugin'));
-		} else {
-			this.disablePlugin(r.get('plugin'));
-		}
-	},
+        var r = dv.getStore().getAt(index);
+        r.set('enabled', !r.get('enabled'));
+        r.commit();
+        if (r.get('enabled')) {
+            this.enablePlugin(r.get('plugin'));
+        } else {
+            this.disablePlugin(r.get('plugin'));
+        }
+    },
 
-	onFindMorePlugins: function() {
-		window.open('http://dev.deluge-torrent.org/wiki/Plugins');
-	},
+    onFindMorePlugins: function() {
+        window.open('http://dev.deluge-torrent.org/wiki/Plugins');
+    },
 
-	onGotPlugins: function(plugins) {
-		this.enabledPlugins = plugins.enabled_plugins;
-		this.availablePlugins = plugins.available_plugins;
-		this.setInfo();
-		this.updatePluginsGrid();
-	},
+    onGotPlugins: function(plugins) {
+        this.enabledPlugins = plugins.enabled_plugins;
+        this.availablePlugins = plugins.available_plugins;
+        this.setInfo();
+        this.updatePluginsGrid();
+    },
 
-	onGotPluginInfo: function(info) {
-		var values = {
-			author: info['Author'],
-			version: info['Version'],
-			email: info['Author-email'],
-			homepage: info['Home-page'],
-			details: info['Description']
-		}
-		this.setInfo(values);
-		delete info;
-	},
+    onGotPluginInfo: function(info) {
+        var values = {
+            author: info['Author'],
+            version: info['Version'],
+            email: info['Author-email'],
+            homepage: info['Home-page'],
+            details: info['Description']
+        }
+        this.setInfo(values);
+        delete info;
+    },
 
-	onInstallPluginWindow: function() {
-		if (!this.installWindow) {
-			this.installWindow = new Deluge.preferences.InstallPluginWindow();
-			this.installWindow.on('pluginadded', this.onPluginInstall, this);
-		}
-		this.installWindow.show();
-	},
+    onInstallPluginWindow: function() {
+        if (!this.installWindow) {
+            this.installWindow = new Deluge.preferences.InstallPluginWindow();
+            this.installWindow.on('pluginadded', this.onPluginInstall, this);
+        }
+        this.installWindow.show();
+    },
 
-	onPluginEnabled: function(pluginName) {
-		var index = this.list.getStore().find('plugin', pluginName);
-		if (index == -1) return;
-		var plugin = this.list.getStore().getAt(index);
-		plugin.set('enabled', true);
-		plugin.commit();
-	},
+    onPluginEnabled: function(pluginName) {
+        var index = this.list.getStore().find('plugin', pluginName);
+        if (index == -1) return;
+        var plugin = this.list.getStore().getAt(index);
+        plugin.set('enabled', true);
+        plugin.commit();
+    },
 
-	onPluginDisabled: function(pluginName) {
-		var index = this.list.getStore().find('plugin', pluginName);
-		if (index == -1) return;
-		var plugin = this.list.getStore().getAt(index);
-		plugin.set('enabled', false);
-		plugin.commit();
-	},
+    onPluginDisabled: function(pluginName) {
+        var index = this.list.getStore().find('plugin', pluginName);
+        if (index == -1) return;
+        var plugin = this.list.getStore().getAt(index);
+        plugin.set('enabled', false);
+        plugin.commit();
+    },
 
-	onPluginInstall: function() {
-		this.updatePlugins();
-	},
+    onPluginInstall: function() {
+        this.updatePlugins();
+    },
 
-	onPluginSelect: function(dv, selections) {
+    onPluginSelect: function(dv, selections) {
         if (selections.length == 0) return;
-		var r = dv.getRecords(selections)[0];
-		deluge.client.web.get_plugin_info(r.get('plugin'), {
-			success: this.onGotPluginInfo,
-			scope: this
-		});
-	},
+        var r = dv.getRecords(selections)[0];
+        deluge.client.web.get_plugin_info(r.get('plugin'), {
+            success: this.onGotPluginInfo,
+            scope: this
+        });
+    },
 
-	onPreferencesShow: function() {
-		this.updatePlugins();
-	},
+    onPreferencesShow: function() {
+        this.updatePlugins();
+    },
 
-	onPluginInfoRender: function(ct, position) {
-		this.setInfo();
-	}
+    onPluginInfoRender: function(ct, position) {
+        this.setInfo();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js b/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
index f71c463f6..67f11fe83 100644
--- a/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
+++ b/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
@@ -39,207 +39,207 @@ PreferencesRecord = Ext.data.Record.create([{name:'name', type:'string'}]);
  */
 Deluge.preferences.PreferencesWindow = Ext.extend(Ext.Window, {
 
-	/**
-	 * @property {String} currentPage The currently selected page.
-	 */
-	currentPage: null,
+    /**
+     * @property {String} currentPage The currently selected page.
+     */
+    currentPage: null,
 
-	title: _('Preferences'),
-	layout: 'border',
-	width: 485,
-	height: 500,
+    title: _('Preferences'),
+    layout: 'border',
+    width: 485,
+    height: 500,
 
-	buttonAlign: 'right',
-	closeAction: 'hide',
-	closable: true,
-	iconCls: 'x-deluge-preferences',
-	plain: true,
-	resizable: false,
+    buttonAlign: 'right',
+    closeAction: 'hide',
+    closable: true,
+    iconCls: 'x-deluge-preferences',
+    plain: true,
+    resizable: false,
 
-	pages: {},
+    pages: {},
 
-	initComponent: function() {
-		Deluge.preferences.PreferencesWindow.superclass.initComponent.call(this);
+    initComponent: function() {
+        Deluge.preferences.PreferencesWindow.superclass.initComponent.call(this);
 
-		this.list = new Ext.list.ListView({
-			store: new Ext.data.Store(),
-			columns: [{
-				id: 'name',
-				renderer: fplain,
-				dataIndex: 'name'
-			}],
-			singleSelect: true,
-			listeners: {
-				'selectionchange': {
-					fn: this.onPageSelect, scope: this
-				}
-			},
-			hideHeaders: true,
-			autoExpandColumn: 'name',
-			deferredRender: false,
-			autoScroll: true,
-			collapsible: true
-		});
-		this.add({
-			region: 'west',
-			title: _('Categories'),
-			items: [this.list],
-			width: 120,
-			margins: '5 0 5 5',
-			cmargins: '5 0 5 5'
-		});
+        this.list = new Ext.list.ListView({
+            store: new Ext.data.Store(),
+            columns: [{
+                id: 'name',
+                renderer: fplain,
+                dataIndex: 'name'
+            }],
+            singleSelect: true,
+            listeners: {
+                'selectionchange': {
+                    fn: this.onPageSelect, scope: this
+                }
+            },
+            hideHeaders: true,
+            autoExpandColumn: 'name',
+            deferredRender: false,
+            autoScroll: true,
+            collapsible: true
+        });
+        this.add({
+            region: 'west',
+            title: _('Categories'),
+            items: [this.list],
+            width: 120,
+            margins: '5 0 5 5',
+            cmargins: '5 0 5 5'
+        });
 
-		this.configPanel = this.add({
-			type: 'container',
-			autoDestroy: false,
-			region: 'center',
-			layout: 'card',
-			layoutConfig: {
-				deferredRender: true
-			},
-			autoScroll: true,
-			width: 300,
-			margins: '5 5 5 5',
-			cmargins: '5 5 5 5'
-		});
+        this.configPanel = this.add({
+            type: 'container',
+            autoDestroy: false,
+            region: 'center',
+            layout: 'card',
+            layoutConfig: {
+                deferredRender: true
+            },
+            autoScroll: true,
+            width: 300,
+            margins: '5 5 5 5',
+            cmargins: '5 5 5 5'
+        });
 
-		this.addButton(_('Close'), this.onClose, this);
-		this.addButton(_('Apply'), this.onApply, this);
-		this.addButton(_('Ok'), this.onOk, this);
-		
-		this.optionsManager = new Deluge.OptionsManager();
-		this.on('afterrender', this.onAfterRender, this);
-		this.on('show', this.onShow, this);
+        this.addButton(_('Close'), this.onClose, this);
+        this.addButton(_('Apply'), this.onApply, this);
+        this.addButton(_('Ok'), this.onOk, this);
+        
+        this.optionsManager = new Deluge.OptionsManager();
+        this.on('afterrender', this.onAfterRender, this);
+        this.on('show', this.onShow, this);
 
-		this.initPages();
-	},
+        this.initPages();
+    },
 
-	initPages: function() {
-		deluge.preferences = this;
-		this.addPage(new Deluge.preferences.Downloads());
-		this.addPage(new Deluge.preferences.Network());
-		this.addPage(new Deluge.preferences.Encryption());
-		this.addPage(new Deluge.preferences.Bandwidth());
-		this.addPage(new Deluge.preferences.Interface());
-		this.addPage(new Deluge.preferences.Other());
-		this.addPage(new Deluge.preferences.Daemon());
-		this.addPage(new Deluge.preferences.Queue());
-		this.addPage(new Deluge.preferences.Proxy());
-		this.addPage(new Deluge.preferences.Cache());
-		this.addPage(new Deluge.preferences.Plugins());
-	},
-	
-	onApply: function(e) {
-		var changed = this.optionsManager.getDirty();
-		if (!Ext.isObjectEmpty(changed)) {
-			deluge.client.core.set_config(changed, {
-				success: this.onSetConfig,
-				scope: this
-			});
-		}
-		
-		for (var page in this.pages) {
-			if (this.pages[page].onApply) this.pages[page].onApply();
-		}
-	},
-	
-	
-	/**
-	 * Return the options manager for the preferences window.
-	 * @returns {Deluge.OptionsManager} the options manager
-	 */
-	getOptionsManager: function() {
-		return this.optionsManager;
-	},
-	
-	/**
-	 * Adds a page to the preferences window.
-	 * @param {Mixed} page
-	 */
-	addPage: function(page) {
-		var store = this.list.getStore();
-		var name = page.title;
-		store.add([new PreferencesRecord({name: name})]);
-		page['bodyStyle'] = 'padding: 5px';
-		page.preferences = this;
-		this.pages[name] = this.configPanel.add(page);
-		this.pages[name].index = -1;
-		return this.pages[name];
-	},
-	
-	/**
-	 * Removes a preferences page from the window.
-	 * @param {mixed} name
-	 */
-	removePage: function(page) {
-	    var name = page.title;
-	    var store = this.list.getStore();
-	    store.removeAt(store.find('name', name));
-	    this.configPanel.remove(page);
-	    delete this.pages[page.title];
-	},
+    initPages: function() {
+        deluge.preferences = this;
+        this.addPage(new Deluge.preferences.Downloads());
+        this.addPage(new Deluge.preferences.Network());
+        this.addPage(new Deluge.preferences.Encryption());
+        this.addPage(new Deluge.preferences.Bandwidth());
+        this.addPage(new Deluge.preferences.Interface());
+        this.addPage(new Deluge.preferences.Other());
+        this.addPage(new Deluge.preferences.Daemon());
+        this.addPage(new Deluge.preferences.Queue());
+        this.addPage(new Deluge.preferences.Proxy());
+        this.addPage(new Deluge.preferences.Cache());
+        this.addPage(new Deluge.preferences.Plugins());
+    },
+    
+    onApply: function(e) {
+        var changed = this.optionsManager.getDirty();
+        if (!Ext.isObjectEmpty(changed)) {
+            deluge.client.core.set_config(changed, {
+                success: this.onSetConfig,
+                scope: this
+            });
+        }
+        
+        for (var page in this.pages) {
+            if (this.pages[page].onApply) this.pages[page].onApply();
+        }
+    },
+    
+    
+    /**
+     * Return the options manager for the preferences window.
+     * @returns {Deluge.OptionsManager} the options manager
+     */
+    getOptionsManager: function() {
+        return this.optionsManager;
+    },
+    
+    /**
+     * Adds a page to the preferences window.
+     * @param {Mixed} page
+     */
+    addPage: function(page) {
+        var store = this.list.getStore();
+        var name = page.title;
+        store.add([new PreferencesRecord({name: name})]);
+        page['bodyStyle'] = 'padding: 5px';
+        page.preferences = this;
+        this.pages[name] = this.configPanel.add(page);
+        this.pages[name].index = -1;
+        return this.pages[name];
+    },
+    
+    /**
+     * Removes a preferences page from the window.
+     * @param {mixed} name
+     */
+    removePage: function(page) {
+        var name = page.title;
+        var store = this.list.getStore();
+        store.removeAt(store.find('name', name));
+        this.configPanel.remove(page);
+        delete this.pages[page.title];
+    },
 
-	/** 
-	 * Select which preferences page is displayed.
-	 * @param {String} page The page name to change to
-	 */
-	selectPage: function(page) {
-		if (this.pages[page].index < 0) { 
-			this.pages[page].index = this.configPanel.items.indexOf(this.pages[page]);
-		}
-		this.list.select(this.pages[page].index);
-	},
+    /** 
+     * Select which preferences page is displayed.
+     * @param {String} page The page name to change to
+     */
+    selectPage: function(page) {
+        if (this.pages[page].index < 0) { 
+            this.pages[page].index = this.configPanel.items.indexOf(this.pages[page]);
+        }
+        this.list.select(this.pages[page].index);
+    },
 
-	// private
-	doSelectPage: function(page) {
-		if (this.pages[page].index < 0) { 
-			this.pages[page].index = this.configPanel.items.indexOf(this.pages[page]);
-		}
-		this.configPanel.getLayout().setActiveItem(this.pages[page].index);
-		this.currentPage = page;
-	},
-	
-	// private
-	onGotConfig: function(config) {
-		this.getOptionsManager().set(config);
-	},
-	
-	// private
-	onPageSelect: function(list, selections) {
-		var r = list.getRecord(selections[0]);
-		this.doSelectPage(r.get('name'));
-	},
-	
-	// private
-	onSetConfig: function() {
-		this.getOptionsManager().commit();
-	},
+    // private
+    doSelectPage: function(page) {
+        if (this.pages[page].index < 0) { 
+            this.pages[page].index = this.configPanel.items.indexOf(this.pages[page]);
+        }
+        this.configPanel.getLayout().setActiveItem(this.pages[page].index);
+        this.currentPage = page;
+    },
+    
+    // private
+    onGotConfig: function(config) {
+        this.getOptionsManager().set(config);
+    },
+    
+    // private
+    onPageSelect: function(list, selections) {
+        var r = list.getRecord(selections[0]);
+        this.doSelectPage(r.get('name'));
+    },
+    
+    // private
+    onSetConfig: function() {
+        this.getOptionsManager().commit();
+    },
 
-	// private
-	onAfterRender: function() {
-		if (!this.list.getSelectionCount()) {
-			this.list.select(0);
-		}
-		this.configPanel.getLayout().setActiveItem(0);
-	},
-	
-	// private
-	onShow: function() {
-		if (!deluge.client.core) return;
-		deluge.client.core.get_config({
-			success: this.onGotConfig,
-			scope: this
-		})
-	},
+    // private
+    onAfterRender: function() {
+        if (!this.list.getSelectionCount()) {
+            this.list.select(0);
+        }
+        this.configPanel.getLayout().setActiveItem(0);
+    },
+    
+    // private
+    onShow: function() {
+        if (!deluge.client.core) return;
+        deluge.client.core.get_config({
+            success: this.onGotConfig,
+            scope: this
+        })
+    },
 
-	// private
-	onClose: function() {
-		this.hide();
-	},
+    // private
+    onClose: function() {
+        this.hide();
+    },
 
-	// private
-	onOk: function() {
-		deluge.client.core.set_config(this.optionsManager.getDirty());
-		this.hide();
-	}
+    // private
+    onOk: function() {
+        deluge.client.core.set_config(this.optionsManager.getDirty());
+        this.hide();
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/ProxyField.js b/deluge/ui/web/js/deluge-all/preferences/ProxyField.js
index 228ae10d7..811372128 100644
--- a/deluge/ui/web/js/deluge-all/preferences/ProxyField.js
+++ b/deluge/ui/web/js/deluge-all/preferences/ProxyField.js
@@ -15,9 +15,9 @@
  *
  * 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.
+ *     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
@@ -37,125 +37,125 @@ Ext.ns('Deluge.preferences');
  */
 Deluge.preferences.ProxyField = Ext.extend(Ext.form.FieldSet, {
 
-	border: false,
-	autoHeight: true,
-	labelWidth: 70,
+    border: false,
+    autoHeight: true,
+    labelWidth: 70,
 
-	initComponent: function() {
-		Deluge.preferences.ProxyField.superclass.initComponent.call(this);
-		this.proxyType = this.add({
-			xtype: 'combo',
-			fieldLabel: _('Type'),
-			name: 'proxytype',
-			mode: 'local',
-			width: 150,
-			store: new Ext.data.ArrayStore({
-				fields: ['id', 'text'],
-				data: [
-					[0, _('None')],
-					[1, _('Socksv4')],
-					[2, _('Socksv5')],
-					[3, _('Socksv5 with Auth')],
-					[4, _('HTTP')],
-					[5, _('HTTP with Auth')]
-				]	   
-			}),	
-			editable: false,
-			triggerAction: 'all',
-			valueField: 'id',
-			displayField: 'text'
-		});
-		this.hostname = this.add({
-			xtype: 'textfield',
-			name: 'hostname',
-			fieldLabel: _('Host'),
-			width: 220
-		});
+    initComponent: function() {
+        Deluge.preferences.ProxyField.superclass.initComponent.call(this);
+        this.proxyType = this.add({
+            xtype: 'combo',
+            fieldLabel: _('Type'),
+            name: 'proxytype',
+            mode: 'local',
+            width: 150,
+            store: new Ext.data.ArrayStore({
+                fields: ['id', 'text'],
+                data: [
+                    [0, _('None')],
+                    [1, _('Socksv4')],
+                    [2, _('Socksv5')],
+                    [3, _('Socksv5 with Auth')],
+                    [4, _('HTTP')],
+                    [5, _('HTTP with Auth')]
+                ]       
+            }),    
+            editable: false,
+            triggerAction: 'all',
+            valueField: 'id',
+            displayField: 'text'
+        });
+        this.hostname = this.add({
+            xtype: 'textfield',
+            name: 'hostname',
+            fieldLabel: _('Host'),
+            width: 220
+        });
 
-		this.port = this.add({
-			xtype: 'spinnerfield',
-			name: 'port',
-			fieldLabel: _('Port'),
-			width: 80,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		});
+        this.port = this.add({
+            xtype: 'spinnerfield',
+            name: 'port',
+            fieldLabel: _('Port'),
+            width: 80,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        });
 
-	   this.username = this.add({
-			xtype: 'textfield',
-			name: 'username',
-			fieldLabel: _('Username'),
-			width: 220
-		});
+       this.username = this.add({
+            xtype: 'textfield',
+            name: 'username',
+            fieldLabel: _('Username'),
+            width: 220
+        });
 
-		this.password = this.add({
-			xtype: 'textfield',
-			name: 'password',
-			fieldLabel: _('Password'),
-			inputType: 'password',
-			width: 220
-		});
+        this.password = this.add({
+            xtype: 'textfield',
+            name: 'password',
+            fieldLabel: _('Password'),
+            inputType: 'password',
+            width: 220
+        });
 
-		this.proxyType.on('change', this.onFieldChange, this);
-		this.proxyType.on('select', this.onTypeSelect, this);
-		this.setting = false;
-	},
+        this.proxyType.on('change', this.onFieldChange, this);
+        this.proxyType.on('select', this.onTypeSelect, this);
+        this.setting = false;
+    },
 
-	getName: function() {
-		return this.initialConfig.name;
-	},
+    getName: function() {
+        return this.initialConfig.name;
+    },
 
-	getValue: function() {
-		return {
-			'type': this.proxyType.getValue(),
-			'hostname': this.hostname.getValue(),
-			'port': Number(this.port.getValue()),
-			'username': this.username.getValue(),
-			'password': this.password.getValue()
-		}
-	},
+    getValue: function() {
+        return {
+            'type': this.proxyType.getValue(),
+            'hostname': this.hostname.getValue(),
+            'port': Number(this.port.getValue()),
+            'username': this.username.getValue(),
+            'password': this.password.getValue()
+        }
+    },
 
-	// Set the values of the proxies
-	setValue: function(value) {
-		this.setting = true;
-		this.proxyType.setValue(value['type']);
-		var index = this.proxyType.getStore().find('id', value['type']);
-		var record = this.proxyType.getStore().getAt(index);
+    // Set the values of the proxies
+    setValue: function(value) {
+        this.setting = true;
+        this.proxyType.setValue(value['type']);
+        var index = this.proxyType.getStore().find('id', value['type']);
+        var record = this.proxyType.getStore().getAt(index);
 
-		this.hostname.setValue(value['hostname']);
-		this.port.setValue(value['port']);
-		this.username.setValue(value['username']);
-		this.password.setValue(value['password']);
-		this.onTypeSelect(this.type, record, index);
-		this.setting = false;
-	},
+        this.hostname.setValue(value['hostname']);
+        this.port.setValue(value['port']);
+        this.username.setValue(value['username']);
+        this.password.setValue(value['password']);
+        this.onTypeSelect(this.type, record, index);
+        this.setting = false;
+    },
 
-	onFieldChange: function(field, newValue, oldValue) {
-		if (this.setting) return;
-		var newValues = this.getValue();
-		var oldValues = Ext.apply({}, newValues);
-		oldValues[field.getName()] = oldValue;
+    onFieldChange: function(field, newValue, oldValue) {
+        if (this.setting) return;
+        var newValues = this.getValue();
+        var oldValues = Ext.apply({}, newValues);
+        oldValues[field.getName()] = oldValue;
 
-		this.fireEvent('change', this, newValues, oldValues);
-	},
+        this.fireEvent('change', this, newValues, oldValues);
+    },
 
-	onTypeSelect: function(combo, record, index) {
-		var typeId = record.get('id');
-		if (typeId > 0) {
-			this.hostname.show();
-			this.port.show();
-		} else {
-			this.hostname.hide();
-			this.port.hide();
-		}
+    onTypeSelect: function(combo, record, index) {
+        var typeId = record.get('id');
+        if (typeId > 0) {
+            this.hostname.show();
+            this.port.show();
+        } else {
+            this.hostname.hide();
+            this.port.hide();
+        }
 
-		if (typeId == 3 || typeId == 5) {
-			this.username.show();
-			this.password.show();
-		} else {
-			this.username.hide();
-			this.password.hide();
-		}
-	}
+        if (typeId == 3 || typeId == 5) {
+            this.username.show();
+            this.password.show();
+        } else {
+            this.username.hide();
+            this.password.hide();
+        }
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/ProxyPage.js b/deluge/ui/web/js/deluge-all/preferences/ProxyPage.js
index 24cefd9c4..db4740fb6 100644
--- a/deluge/ui/web/js/deluge-all/preferences/ProxyPage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/ProxyPage.js
@@ -36,64 +36,64 @@ Ext.namespace('Deluge.preferences');
  * @extends Ext.form.FormPanel
  */
 Deluge.preferences.Proxy = Ext.extend(Ext.form.FormPanel, {
-	constructor: function(config) {
-		config = Ext.apply({
-			border: false,
-			title: _('Proxy'),
-			layout: 'form'
-		}, config);
-		Deluge.preferences.Proxy.superclass.constructor.call(this, config);
-	},
-	
-	initComponent: function() {
-		Deluge.preferences.Proxy.superclass.initComponent.call(this);
-		this.peer = this.add(new Deluge.preferences.ProxyField({
-			title: _('Peer'),
-			name: 'peer'
-		}));
-		this.peer.on('change', this.onProxyChange, this);
-		
-		this.web_seed = this.add(new Deluge.preferences.ProxyField({
-			title: _('Web Seed'),
-			name: 'web_seed'
-		}));
-		this.web_seed.on('change', this.onProxyChange, this);
-		
-		this.tracker = this.add(new Deluge.preferences.ProxyField({
-			title: _('Tracker'),
-			name: 'tracker'
-		}));
-		this.tracker.on('change', this.onProxyChange, this);
-		
-		this.dht = this.add(new Deluge.preferences.ProxyField({
-			title: _('DHT'),
-			name: 'dht'
-		}));
-		this.dht.on('change', this.onProxyChange, this);
-		
-		deluge.preferences.getOptionsManager().bind('proxies', this);
-	},
-	
-	getValue: function() {
-		return {
-			'dht': this.dht.getValue(),
-			'peer': this.peer.getValue(),
-			'tracker': this.tracker.getValue(),
-			'web_seed': this.web_seed.getValue()
-		}
-	},
-	
-	setValue: function(value) {
-		for (var proxy in value) {
-			this[proxy].setValue(value[proxy]);
-		}
-	},
-	
-	onProxyChange: function(field, newValue, oldValue) {
-		var newValues = this.getValue();
-		var oldValues = Ext.apply({}, newValues);
-		oldValues[field.getName()] = oldValue;
-		
-		this.fireEvent('change', this, newValues, oldValues);
-	}
+    constructor: function(config) {
+        config = Ext.apply({
+            border: false,
+            title: _('Proxy'),
+            layout: 'form'
+        }, config);
+        Deluge.preferences.Proxy.superclass.constructor.call(this, config);
+    },
+    
+    initComponent: function() {
+        Deluge.preferences.Proxy.superclass.initComponent.call(this);
+        this.peer = this.add(new Deluge.preferences.ProxyField({
+            title: _('Peer'),
+            name: 'peer'
+        }));
+        this.peer.on('change', this.onProxyChange, this);
+        
+        this.web_seed = this.add(new Deluge.preferences.ProxyField({
+            title: _('Web Seed'),
+            name: 'web_seed'
+        }));
+        this.web_seed.on('change', this.onProxyChange, this);
+        
+        this.tracker = this.add(new Deluge.preferences.ProxyField({
+            title: _('Tracker'),
+            name: 'tracker'
+        }));
+        this.tracker.on('change', this.onProxyChange, this);
+        
+        this.dht = this.add(new Deluge.preferences.ProxyField({
+            title: _('DHT'),
+            name: 'dht'
+        }));
+        this.dht.on('change', this.onProxyChange, this);
+        
+        deluge.preferences.getOptionsManager().bind('proxies', this);
+    },
+    
+    getValue: function() {
+        return {
+            'dht': this.dht.getValue(),
+            'peer': this.peer.getValue(),
+            'tracker': this.tracker.getValue(),
+            'web_seed': this.web_seed.getValue()
+        }
+    },
+    
+    setValue: function(value) {
+        for (var proxy in value) {
+            this[proxy].setValue(value[proxy]);
+        }
+    },
+    
+    onProxyChange: function(field, newValue, oldValue) {
+        var newValues = this.getValue();
+        var oldValues = Ext.apply({}, newValues);
+        oldValues[field.getName()] = oldValue;
+        
+        this.fireEvent('change', this, newValues, oldValues);
+    }
 });
diff --git a/deluge/ui/web/js/deluge-all/preferences/QueuePage.js b/deluge/ui/web/js/deluge-all/preferences/QueuePage.js
index 15ca0eb60..cee5a1557 100644
--- a/deluge/ui/web/js/deluge-all/preferences/QueuePage.js
+++ b/deluge/ui/web/js/deluge-all/preferences/QueuePage.js
@@ -37,166 +37,166 @@ Ext.namespace('Deluge.preferences');
  */
 Deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
 
-	border: false,
-	title: _('Queue'),
-	layout: 'form',
-	
-	initComponent: function() {
-		Deluge.preferences.Queue.superclass.initComponent.call(this);
-		
-		var om = deluge.preferences.getOptionsManager();
-		
-		var fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('General'),
-			style: 'padding-top: 5px;',
-			autoHeight: true,
-			labelWidth: 1,
-			defaultType: 'checkbox'
-		});
-		om.bind('queue_new_to_top', fieldset.add({
-			fieldLabel: '',
-			labelSeparator: '',
-			height: 22,
-			boxLabel: _('Queue new torrents to top'),
-			name: 'queue_new_to_top'
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Active Torrents'),
-			autoHeight: true,
-			labelWidth: 150,
-			defaultType: 'spinnerfield',
-			style: 'margin-bottom: 0px; padding-bottom: 0px;'
-		});
-		om.bind('max_active_limit', fieldset.add({
-			fieldLabel: _('Total Active'),
-			name: 'max_active_limit',
-			value: 8,
-			width: 80,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		om.bind('max_active_downloading', fieldset.add({
-			fieldLabel: _('Total Active Downloading'),
-			name: 'max_active_downloading',
-			value: 3,
-			width: 80,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		om.bind('max_active_seeding', fieldset.add({
-			fieldLabel: _('Total Active Seeding'),
-			name: 'max_active_seeding',
-			value: 5,
-			width: 80,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		om.bind('dont_count_slow_torrents', fieldset.add({
-			xtype: 'checkbox',
-			name: 'dont_count_slow_torrents',
-			height: 40,
-			hideLabel: true,
-			boxLabel: _('Do not count slow torrents')
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			title: _('Seeding'),
-			autoHeight: true,
-			labelWidth: 150,
-			defaultType: 'spinnerfield',
-			style: 'margin-bottom: 0px; padding-bottom: 0px; margin-top: 0; padding-top: 0;'
-		});
-		om.bind('share_ratio_limit', fieldset.add({
-			fieldLabel: _('Share Ratio Limit'),
-			name: 'share_ratio_limit',
-			value: 8,
-			width: 80,
-			incrementValue: 0.1,
-			minValue: -1,
-			maxValue: 99999,
-			alternateIncrementValue: 1,
-			decimalPrecision: 2
-		}));
-		om.bind('seed_time_ratio_limit', fieldset.add({
-			fieldLabel: _('Share Time Ratio'),
-			name: 'seed_time_ratio_limit',
-			value: 3,
-			width: 80,
-			incrementValue: 0.1,
-			minValue: -1,
-			maxValue: 99999,
-			alternateIncrementValue: 1,
-			decimalPrecision: 2
-		}));
-		om.bind('seed_time_limit', fieldset.add({
-			fieldLabel: _('Seed Time (m)'),
-			name: 'seed_time_limit',
-			value: 5,
-			width: 80,
-			decimalPrecision: 0,
-			minValue: -1,
-			maxValue: 99999
-		}));
-		
-		fieldset = this.add({
-			xtype: 'fieldset',
-			border: false,
-			autoHeight: true,
-			
-			layout: 'table',
-			layoutConfig: {columns: 2},
-			labelWidth: 0,
-			defaultType: 'checkbox',
-			
-			defaults: {
-				fieldLabel: '',
-				labelSeparator: ''
-			}
-		});
-		this.stopAtRatio = fieldset.add({
-			name: 'stop_seed_at_ratio',
-			boxLabel: _('Stop seeding when share ratio reaches:')
-		});
-		this.stopAtRatio.on('check', this.onStopRatioCheck, this);
-		om.bind('stop_seed_at_ratio', this.stopAtRatio);
-		
-		this.stopRatio = fieldset.add({
-			xtype: 'spinnerfield',
-			name: 'stop_seed_ratio',
-			ctCls: 'x-deluge-indent-checkbox',
-			disabled: true,
-			value: '2.0',
-			width: 60,
-			incrementValue: 0.1,
-			minValue: -1,
-			maxValue: 99999,
-			alternateIncrementValue: 1,
-			decimalPrecision: 2
-		});
-		om.bind('stop_seed_ratio', this.stopRatio);
-		
-		this.removeAtRatio = fieldset.add({
-			name: 'remove_seed_at_ratio',
-			ctCls: 'x-deluge-indent-checkbox',
-			boxLabel: _('Remove torrent when share ratio is reached'),
-			disabled: true,
-			colspan: 2
-		});
-		om.bind('remove_seed_at_ratio', this.removeAtRatio);
-	},
-	
-	onStopRatioCheck: function(e, checked) {
-		this.stopRatio.setDisabled(!checked);
-		this.removeAtRatio.setDisabled(!checked);
-	}
+    border: false,
+    title: _('Queue'),
+    layout: 'form',
+    
+    initComponent: function() {
+        Deluge.preferences.Queue.superclass.initComponent.call(this);
+        
+        var om = deluge.preferences.getOptionsManager();
+        
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('General'),
+            style: 'padding-top: 5px;',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'checkbox'
+        });
+        om.bind('queue_new_to_top', fieldset.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            height: 22,
+            boxLabel: _('Queue new torrents to top'),
+            name: 'queue_new_to_top'
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Active Torrents'),
+            autoHeight: true,
+            labelWidth: 150,
+            defaultType: 'spinnerfield',
+            style: 'margin-bottom: 0px; padding-bottom: 0px;'
+        });
+        om.bind('max_active_limit', fieldset.add({
+            fieldLabel: _('Total Active'),
+            name: 'max_active_limit',
+            value: 8,
+            width: 80,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        om.bind('max_active_downloading', fieldset.add({
+            fieldLabel: _('Total Active Downloading'),
+            name: 'max_active_downloading',
+            value: 3,
+            width: 80,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        om.bind('max_active_seeding', fieldset.add({
+            fieldLabel: _('Total Active Seeding'),
+            name: 'max_active_seeding',
+            value: 5,
+            width: 80,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        om.bind('dont_count_slow_torrents', fieldset.add({
+            xtype: 'checkbox',
+            name: 'dont_count_slow_torrents',
+            height: 40,
+            hideLabel: true,
+            boxLabel: _('Do not count slow torrents')
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: _('Seeding'),
+            autoHeight: true,
+            labelWidth: 150,
+            defaultType: 'spinnerfield',
+            style: 'margin-bottom: 0px; padding-bottom: 0px; margin-top: 0; padding-top: 0;'
+        });
+        om.bind('share_ratio_limit', fieldset.add({
+            fieldLabel: _('Share Ratio Limit'),
+            name: 'share_ratio_limit',
+            value: 8,
+            width: 80,
+            incrementValue: 0.1,
+            minValue: -1,
+            maxValue: 99999,
+            alternateIncrementValue: 1,
+            decimalPrecision: 2
+        }));
+        om.bind('seed_time_ratio_limit', fieldset.add({
+            fieldLabel: _('Share Time Ratio'),
+            name: 'seed_time_ratio_limit',
+            value: 3,
+            width: 80,
+            incrementValue: 0.1,
+            minValue: -1,
+            maxValue: 99999,
+            alternateIncrementValue: 1,
+            decimalPrecision: 2
+        }));
+        om.bind('seed_time_limit', fieldset.add({
+            fieldLabel: _('Seed Time (m)'),
+            name: 'seed_time_limit',
+            value: 5,
+            width: 80,
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999
+        }));
+        
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            autoHeight: true,
+            
+            layout: 'table',
+            layoutConfig: {columns: 2},
+            labelWidth: 0,
+            defaultType: 'checkbox',
+            
+            defaults: {
+                fieldLabel: '',
+                labelSeparator: ''
+            }
+        });
+        this.stopAtRatio = fieldset.add({
+            name: 'stop_seed_at_ratio',
+            boxLabel: _('Stop seeding when share ratio reaches:')
+        });
+        this.stopAtRatio.on('check', this.onStopRatioCheck, this);
+        om.bind('stop_seed_at_ratio', this.stopAtRatio);
+        
+        this.stopRatio = fieldset.add({
+            xtype: 'spinnerfield',
+            name: 'stop_seed_ratio',
+            ctCls: 'x-deluge-indent-checkbox',
+            disabled: true,
+            value: '2.0',
+            width: 60,
+            incrementValue: 0.1,
+            minValue: -1,
+            maxValue: 99999,
+            alternateIncrementValue: 1,
+            decimalPrecision: 2
+        });
+        om.bind('stop_seed_ratio', this.stopRatio);
+        
+        this.removeAtRatio = fieldset.add({
+            name: 'remove_seed_at_ratio',
+            ctCls: 'x-deluge-indent-checkbox',
+            boxLabel: _('Remove torrent when share ratio is reached'),
+            disabled: true,
+            colspan: 2
+        });
+        om.bind('remove_seed_at_ratio', this.removeAtRatio);
+    },
+    
+    onStopRatioCheck: function(e, checked) {
+        this.stopRatio.setDisabled(!checked);
+        this.removeAtRatio.setDisabled(!checked);
+    }
 });
diff --git a/deluge/ui/web/js/ext-extensions/JSLoader.js b/deluge/ui/web/js/ext-extensions/JSLoader.js
index e3b01515b..7d397244d 100644
--- a/deluge/ui/web/js/ext-extensions/JSLoader.js
+++ b/deluge/ui/web/js/ext-extensions/JSLoader.js
@@ -1,38 +1,38 @@
 Ext.ux.JSLoader = function(options) {
-	Ext.ux.JSLoader.scripts[++Ext.ux.JSLoader.index] = {
-		url: options.url,
-		success: true,
-		jsLoadObj: null,
-		options: options,
-		onLoad: options.onLoad || Ext.emptyFn,
-		onError: options.onError || Ext.ux.JSLoader.stdError,
-		scope: options.scope || this
-   	};
+    Ext.ux.JSLoader.scripts[++Ext.ux.JSLoader.index] = {
+        url: options.url,
+        success: true,
+        jsLoadObj: null,
+        options: options,
+        onLoad: options.onLoad || Ext.emptyFn,
+        onError: options.onError || Ext.ux.JSLoader.stdError,
+        scope: options.scope || this
+       };
 
-	Ext.Ajax.request({
-		url: options.url,
-		scriptIndex: Ext.ux.JSLoader.index,
-		success: function(response, options) {
-			var script = Ext.ux.JSLoader.scripts[options.scriptIndex];
-			try {
-				eval(response.responseText);
-			} catch(e) {
-				script.success = false;
-			script.onError(script.options, e);
-			}
-			if (script.success) {
-				script.onLoad.call(script.scope, script.options);
-			}
-		},
-		failure: function(response, options) {
-			var script = Ext.ux.JSLoader.scripts[options.scriptIndex];
-			script.success = false;
-			script.onError(script.options, response.status);
-		}
-	});
+    Ext.Ajax.request({
+        url: options.url,
+        scriptIndex: Ext.ux.JSLoader.index,
+        success: function(response, options) {
+            var script = Ext.ux.JSLoader.scripts[options.scriptIndex];
+            try {
+                eval(response.responseText);
+            } catch(e) {
+                script.success = false;
+            script.onError(script.options, e);
+            }
+            if (script.success) {
+                script.onLoad.call(script.scope, script.options);
+            }
+        },
+        failure: function(response, options) {
+            var script = Ext.ux.JSLoader.scripts[options.scriptIndex];
+            script.success = false;
+            script.onError(script.options, response.status);
+        }
+    });
 }
 Ext.ux.JSLoader.index = 0;
 Ext.ux.JSLoader.scripts = [];
 Ext.ux.JSLoader.stdError = function(options, e) {
-	window.alert('Error loading script:\n\n' + options.url + '\n\nstatus: ' + e);
+    window.alert('Error loading script:\n\n' + options.url + '\n\nstatus: ' + e);
 }
diff --git a/deluge/ui/web/js/ext-extensions/Spinner.js b/deluge/ui/web/js/ext-extensions/Spinner.js
index 3ce55bf2c..292fbbb3e 100644
--- a/deluge/ui/web/js/ext-extensions/Spinner.js
+++ b/deluge/ui/web/js/ext-extensions/Spinner.js
@@ -10,428 +10,428 @@
  * Creates a Spinner control utilized by Ext.ux.form.SpinnerField
  */
 Ext.ux.Spinner = Ext.extend(Ext.util.Observable, {
-	incrementValue: 1,
-	alternateIncrementValue: 5,
-	triggerClass: 'x-form-spinner-trigger',
-	splitterClass: 'x-form-spinner-splitter',
-	alternateKey: Ext.EventObject.shiftKey,
-	defaultValue: 0,
-	accelerate: false,
+    incrementValue: 1,
+    alternateIncrementValue: 5,
+    triggerClass: 'x-form-spinner-trigger',
+    splitterClass: 'x-form-spinner-splitter',
+    alternateKey: Ext.EventObject.shiftKey,
+    defaultValue: 0,
+    accelerate: false,
 
-	constructor: function(config){
-		Ext.ux.Spinner.superclass.constructor.call(this, config);
-		Ext.apply(this, config);
-		this.mimicing = false;
-	},
+    constructor: function(config){
+        Ext.ux.Spinner.superclass.constructor.call(this, config);
+        Ext.apply(this, config);
+        this.mimicing = false;
+    },
 
-	init: function(field){
-		this.field = field;
+    init: function(field){
+        this.field = field;
 
-		field.afterMethod('onRender', this.doRender, this);
-		field.afterMethod('onEnable', this.doEnable, this);
-		field.afterMethod('onDisable', this.doDisable, this);
-		field.afterMethod('afterRender', this.doAfterRender, this);
-		field.afterMethod('onResize', this.doResize, this);
-		field.afterMethod('onFocus', this.doFocus, this);
-		field.beforeMethod('onDestroy', this.doDestroy, this);
-	},
+        field.afterMethod('onRender', this.doRender, this);
+        field.afterMethod('onEnable', this.doEnable, this);
+        field.afterMethod('onDisable', this.doDisable, this);
+        field.afterMethod('afterRender', this.doAfterRender, this);
+        field.afterMethod('onResize', this.doResize, this);
+        field.afterMethod('onFocus', this.doFocus, this);
+        field.beforeMethod('onDestroy', this.doDestroy, this);
+    },
 
-	doRender: function(ct, position){
-		var el = this.el = this.field.getEl();
-		var f = this.field;
+    doRender: function(ct, position){
+        var el = this.el = this.field.getEl();
+        var f = this.field;
 
-		if (!f.wrap) {
-			f.wrap = this.wrap = el.wrap({
-				cls: "x-form-field-wrap"
-			});
-		}
-		else {
-			this.wrap = f.wrap.addClass('x-form-field-wrap');
-		}
+        if (!f.wrap) {
+            f.wrap = this.wrap = el.wrap({
+                cls: "x-form-field-wrap"
+            });
+        }
+        else {
+            this.wrap = f.wrap.addClass('x-form-field-wrap');
+        }
 
-		this.trigger = this.wrap.createChild({
-			tag: "img",
-			src: Ext.BLANK_IMAGE_URL,
-			cls: "x-form-trigger " + this.triggerClass
-		});
+        this.trigger = this.wrap.createChild({
+            tag: "img",
+            src: Ext.BLANK_IMAGE_URL,
+            cls: "x-form-trigger " + this.triggerClass
+        });
 
-		if (!f.width) {
-			this.wrap.setWidth(el.getWidth() + this.trigger.getWidth());
-		}
+        if (!f.width) {
+            this.wrap.setWidth(el.getWidth() + this.trigger.getWidth());
+        }
 
-		this.splitter = this.wrap.createChild({
-			tag: 'div',
-			cls: this.splitterClass,
-			style: 'width:13px; height:2px;'
-		});
-		this.splitter.setRight((Ext.isIE) ? 1 : 2).setTop(10).show();
+        this.splitter = this.wrap.createChild({
+            tag: 'div',
+            cls: this.splitterClass,
+            style: 'width:13px; height:2px;'
+        });
+        this.splitter.setRight((Ext.isIE) ? 1 : 2).setTop(10).show();
 
-		this.proxy = this.trigger.createProxy('', this.splitter, true);
-		this.proxy.addClass("x-form-spinner-proxy");
-		this.proxy.setStyle('left', '0px');
-		this.proxy.setSize(14, 1);
-		this.proxy.hide();
-		this.dd = new Ext.dd.DDProxy(this.splitter.dom.id, "SpinnerDrag", {
-			dragElId: this.proxy.id
-		});
+        this.proxy = this.trigger.createProxy('', this.splitter, true);
+        this.proxy.addClass("x-form-spinner-proxy");
+        this.proxy.setStyle('left', '0px');
+        this.proxy.setSize(14, 1);
+        this.proxy.hide();
+        this.dd = new Ext.dd.DDProxy(this.splitter.dom.id, "SpinnerDrag", {
+            dragElId: this.proxy.id
+        });
 
-		this.initTrigger();
-		this.initSpinner();
-	},
+        this.initTrigger();
+        this.initSpinner();
+    },
 
-	doAfterRender: function(){
-		var y;
-		if (Ext.isIE && this.el.getY() != (y = this.trigger.getY())) {
-			this.el.position();
-			this.el.setY(y);
-		}
-	},
+    doAfterRender: function(){
+        var y;
+        if (Ext.isIE && this.el.getY() != (y = this.trigger.getY())) {
+            this.el.position();
+            this.el.setY(y);
+        }
+    },
 
-	doEnable: function(){
-		if (this.wrap) {
-			this.wrap.removeClass(this.field.disabledClass);
-		}
-	},
+    doEnable: function(){
+        if (this.wrap) {
+            this.wrap.removeClass(this.field.disabledClass);
+        }
+    },
 
-	doDisable: function(){
-		if (this.wrap) {
-			this.wrap.addClass(this.field.disabledClass);
-			this.el.removeClass(this.field.disabledClass);
-		}
-	},
+    doDisable: function(){
+        if (this.wrap) {
+            this.wrap.addClass(this.field.disabledClass);
+            this.el.removeClass(this.field.disabledClass);
+        }
+    },
 
-	doResize: function(w, h){
-		if (typeof w == 'number') {
-			this.el.setWidth(w - this.trigger.getWidth());
-		}
-		this.wrap.setWidth(this.el.getWidth() + this.trigger.getWidth());
-	},
+    doResize: function(w, h){
+        if (typeof w == 'number') {
+            this.el.setWidth(w - this.trigger.getWidth());
+        }
+        this.wrap.setWidth(this.el.getWidth() + this.trigger.getWidth());
+    },
 
-	doFocus: function(){
-		if (!this.mimicing) {
-			this.wrap.addClass('x-trigger-wrap-focus');
-			this.mimicing = true;
-			Ext.get(Ext.isIE ? document.body : document).on("mousedown", this.mimicBlur, this, {
-				delay: 10
-			});
-			this.el.on('keydown', this.checkTab, this);
-		}
-	},
+    doFocus: function(){
+        if (!this.mimicing) {
+            this.wrap.addClass('x-trigger-wrap-focus');
+            this.mimicing = true;
+            Ext.get(Ext.isIE ? document.body : document).on("mousedown", this.mimicBlur, this, {
+                delay: 10
+            });
+            this.el.on('keydown', this.checkTab, this);
+        }
+    },
 
-	// private
-	checkTab: function(e){
-		if (e.getKey() == e.TAB) {
-			this.triggerBlur();
-		}
-	},
+    // private
+    checkTab: function(e){
+        if (e.getKey() == e.TAB) {
+            this.triggerBlur();
+        }
+    },
 
-	// private
-	mimicBlur: function(e){
-		if (!this.wrap.contains(e.target) && this.field.validateBlur(e)) {
-			this.triggerBlur();
-		}
-	},
+    // private
+    mimicBlur: function(e){
+        if (!this.wrap.contains(e.target) && this.field.validateBlur(e)) {
+            this.triggerBlur();
+        }
+    },
 
-	// private
-	triggerBlur: function(){
-		this.mimicing = false;
-		Ext.get(Ext.isIE ? document.body : document).un("mousedown", this.mimicBlur, this);
-		this.el.un("keydown", this.checkTab, this);
-		this.field.beforeBlur();
-		this.wrap.removeClass('x-trigger-wrap-focus');
-		this.field.onBlur.call(this.field);
-	},
+    // private
+    triggerBlur: function(){
+        this.mimicing = false;
+        Ext.get(Ext.isIE ? document.body : document).un("mousedown", this.mimicBlur, this);
+        this.el.un("keydown", this.checkTab, this);
+        this.field.beforeBlur();
+        this.wrap.removeClass('x-trigger-wrap-focus');
+        this.field.onBlur.call(this.field);
+    },
 
-	initTrigger: function(){
-		this.trigger.addClassOnOver('x-form-trigger-over');
-		this.trigger.addClassOnClick('x-form-trigger-click');
-	},
+    initTrigger: function(){
+        this.trigger.addClassOnOver('x-form-trigger-over');
+        this.trigger.addClassOnClick('x-form-trigger-click');
+    },
 
-	initSpinner: function(){
-		this.field.addEvents({
-			'spin': true,
-			'spinup': true,
-			'spindown': true
-		});
+    initSpinner: function(){
+        this.field.addEvents({
+            'spin': true,
+            'spinup': true,
+            'spindown': true
+        });
 
-		this.keyNav = new Ext.KeyNav(this.el, {
-			"up": function(e){
-				e.preventDefault();
-				this.onSpinUp();
-			},
+        this.keyNav = new Ext.KeyNav(this.el, {
+            "up": function(e){
+                e.preventDefault();
+                this.onSpinUp();
+            },
 
-			"down": function(e){
-				e.preventDefault();
-				this.onSpinDown();
-			},
+            "down": function(e){
+                e.preventDefault();
+                this.onSpinDown();
+            },
 
-			"pageUp": function(e){
-				e.preventDefault();
-				this.onSpinUpAlternate();
-			},
+            "pageUp": function(e){
+                e.preventDefault();
+                this.onSpinUpAlternate();
+            },
 
-			"pageDown": function(e){
-				e.preventDefault();
-				this.onSpinDownAlternate();
-			},
+            "pageDown": function(e){
+                e.preventDefault();
+                this.onSpinDownAlternate();
+            },
 
-			scope: this
-		});
+            scope: this
+        });
 
-		this.repeater = new Ext.util.ClickRepeater(this.trigger, {
-			accelerate: this.accelerate
-		});
-		this.field.mon(this.repeater, "click", this.onTriggerClick, this, {
-			preventDefault: true
-		});
+        this.repeater = new Ext.util.ClickRepeater(this.trigger, {
+            accelerate: this.accelerate
+        });
+        this.field.mon(this.repeater, "click", this.onTriggerClick, this, {
+            preventDefault: true
+        });
 
-		this.field.mon(this.trigger, {
-			mouseover: this.onMouseOver,
-			mouseout: this.onMouseOut,
-			mousemove: this.onMouseMove,
-			mousedown: this.onMouseDown,
-			mouseup: this.onMouseUp,
-			scope: this,
-			preventDefault: true
-		});
+        this.field.mon(this.trigger, {
+            mouseover: this.onMouseOver,
+            mouseout: this.onMouseOut,
+            mousemove: this.onMouseMove,
+            mousedown: this.onMouseDown,
+            mouseup: this.onMouseUp,
+            scope: this,
+            preventDefault: true
+        });
 
-		this.field.mon(this.wrap, "mousewheel", this.handleMouseWheel, this);
+        this.field.mon(this.wrap, "mousewheel", this.handleMouseWheel, this);
 
-		this.dd.setXConstraint(0, 0, 10)
-		this.dd.setYConstraint(1500, 1500, 10);
-		this.dd.endDrag = this.endDrag.createDelegate(this);
-		this.dd.startDrag = this.startDrag.createDelegate(this);
-		this.dd.onDrag = this.onDrag.createDelegate(this);
-	},
+        this.dd.setXConstraint(0, 0, 10)
+        this.dd.setYConstraint(1500, 1500, 10);
+        this.dd.endDrag = this.endDrag.createDelegate(this);
+        this.dd.startDrag = this.startDrag.createDelegate(this);
+        this.dd.onDrag = this.onDrag.createDelegate(this);
+    },
 
-	onMouseOver: function(){
-		if (this.disabled) {
-			return;
-		}
-		var middle = this.getMiddle();
-		this.tmpHoverClass = (Ext.EventObject.getPageY() < middle) ? 'x-form-spinner-overup' : 'x-form-spinner-overdown';
-		this.trigger.addClass(this.tmpHoverClass);
-	},
+    onMouseOver: function(){
+        if (this.disabled) {
+            return;
+        }
+        var middle = this.getMiddle();
+        this.tmpHoverClass = (Ext.EventObject.getPageY() < middle) ? 'x-form-spinner-overup' : 'x-form-spinner-overdown';
+        this.trigger.addClass(this.tmpHoverClass);
+    },
 
-	//private
-	onMouseOut: function(){
-		this.trigger.removeClass(this.tmpHoverClass);
-	},
+    //private
+    onMouseOut: function(){
+        this.trigger.removeClass(this.tmpHoverClass);
+    },
 
-	//private
-	onMouseMove: function(){
-		if (this.disabled) {
-			return;
-		}
-		var middle = this.getMiddle();
-		if (((Ext.EventObject.getPageY() > middle) && this.tmpHoverClass == "x-form-spinner-overup") ||
-		((Ext.EventObject.getPageY() < middle) && this.tmpHoverClass == "x-form-spinner-overdown")) {
-		}
-	},
+    //private
+    onMouseMove: function(){
+        if (this.disabled) {
+            return;
+        }
+        var middle = this.getMiddle();
+        if (((Ext.EventObject.getPageY() > middle) && this.tmpHoverClass == "x-form-spinner-overup") ||
+        ((Ext.EventObject.getPageY() < middle) && this.tmpHoverClass == "x-form-spinner-overdown")) {
+        }
+    },
 
-	//private
-	onMouseDown: function(){
-		if (this.disabled) {
-			return;
-		}
-		var middle = this.getMiddle();
-		this.tmpClickClass = (Ext.EventObject.getPageY() < middle) ? 'x-form-spinner-clickup' : 'x-form-spinner-clickdown';
-		this.trigger.addClass(this.tmpClickClass);
-	},
+    //private
+    onMouseDown: function(){
+        if (this.disabled) {
+            return;
+        }
+        var middle = this.getMiddle();
+        this.tmpClickClass = (Ext.EventObject.getPageY() < middle) ? 'x-form-spinner-clickup' : 'x-form-spinner-clickdown';
+        this.trigger.addClass(this.tmpClickClass);
+    },
 
-	//private
-	onMouseUp: function(){
-		this.trigger.removeClass(this.tmpClickClass);
-	},
+    //private
+    onMouseUp: function(){
+        this.trigger.removeClass(this.tmpClickClass);
+    },
 
-	//private
-	onTriggerClick: function(){
-		if (this.disabled || this.el.dom.readOnly) {
-			return;
-		}
-		var middle = this.getMiddle();
-		var ud = (Ext.EventObject.getPageY() < middle) ? 'Up' : 'Down';
-		this['onSpin' + ud]();
-	},
+    //private
+    onTriggerClick: function(){
+        if (this.disabled || this.el.dom.readOnly) {
+            return;
+        }
+        var middle = this.getMiddle();
+        var ud = (Ext.EventObject.getPageY() < middle) ? 'Up' : 'Down';
+        this['onSpin' + ud]();
+    },
 
-	//private
-	getMiddle: function(){
-		var t = this.trigger.getTop();
-		var h = this.trigger.getHeight();
-		var middle = t + (h / 2);
-		return middle;
-	},
+    //private
+    getMiddle: function(){
+        var t = this.trigger.getTop();
+        var h = this.trigger.getHeight();
+        var middle = t + (h / 2);
+        return middle;
+    },
 
-	//private
-	//checks if control is allowed to spin
-	isSpinnable: function(){
-		if (this.disabled || this.el.dom.readOnly) {
-			Ext.EventObject.preventDefault(); //prevent scrolling when disabled/readonly
-			return false;
-		}
-		return true;
-	},
+    //private
+    //checks if control is allowed to spin
+    isSpinnable: function(){
+        if (this.disabled || this.el.dom.readOnly) {
+            Ext.EventObject.preventDefault(); //prevent scrolling when disabled/readonly
+            return false;
+        }
+        return true;
+    },
 
-	handleMouseWheel: function(e){
-		//disable scrolling when not focused
-		if (this.wrap.hasClass('x-trigger-wrap-focus') == false) {
-			return;
-		}
+    handleMouseWheel: function(e){
+        //disable scrolling when not focused
+        if (this.wrap.hasClass('x-trigger-wrap-focus') == false) {
+            return;
+        }
 
-		var delta = e.getWheelDelta();
-		if (delta > 0) {
-			this.onSpinUp();
-			e.stopEvent();
-		}
-		else
-			if (delta < 0) {
-				this.onSpinDown();
-				e.stopEvent();
-			}
-	},
+        var delta = e.getWheelDelta();
+        if (delta > 0) {
+            this.onSpinUp();
+            e.stopEvent();
+        }
+        else
+            if (delta < 0) {
+                this.onSpinDown();
+                e.stopEvent();
+            }
+    },
 
-	//private
-	startDrag: function(){
-		this.proxy.show();
-		this._previousY = Ext.fly(this.dd.getDragEl()).getTop();
-	},
+    //private
+    startDrag: function(){
+        this.proxy.show();
+        this._previousY = Ext.fly(this.dd.getDragEl()).getTop();
+    },
 
-	//private
-	endDrag: function(){
-		this.proxy.hide();
-	},
+    //private
+    endDrag: function(){
+        this.proxy.hide();
+    },
 
-	//private
-	onDrag: function(){
-		if (this.disabled) {
-			return;
-		}
-		var y = Ext.fly(this.dd.getDragEl()).getTop();
-		var ud = '';
+    //private
+    onDrag: function(){
+        if (this.disabled) {
+            return;
+        }
+        var y = Ext.fly(this.dd.getDragEl()).getTop();
+        var ud = '';
 
-		if (this._previousY > y) {
-			ud = 'Up';
-		} //up
-		if (this._previousY < y) {
-			ud = 'Down';
-		} //down
-		if (ud != '') {
-			this['onSpin' + ud]();
-		}
+        if (this._previousY > y) {
+            ud = 'Up';
+        } //up
+        if (this._previousY < y) {
+            ud = 'Down';
+        } //down
+        if (ud != '') {
+            this['onSpin' + ud]();
+        }
 
-		this._previousY = y;
-	},
+        this._previousY = y;
+    },
 
-	//private
-	onSpinUp: function(){
-		if (this.isSpinnable() == false) {
-			return;
-		}
-		if (Ext.EventObject.shiftKey == true) {
-			this.onSpinUpAlternate();
-			return;
-		}
-		else {
-			this.spin(false, false);
-		}
-		this.field.fireEvent("spin", this);
-		this.field.fireEvent("spinup", this);
-	},
+    //private
+    onSpinUp: function(){
+        if (this.isSpinnable() == false) {
+            return;
+        }
+        if (Ext.EventObject.shiftKey == true) {
+            this.onSpinUpAlternate();
+            return;
+        }
+        else {
+            this.spin(false, false);
+        }
+        this.field.fireEvent("spin", this);
+        this.field.fireEvent("spinup", this);
+    },
 
-	//private
-	onSpinDown: function(){
-		if (this.isSpinnable() == false) {
-			return;
-		}
-		if (Ext.EventObject.shiftKey == true) {
-			this.onSpinDownAlternate();
-			return;
-		}
-		else {
-			this.spin(true, false);
-		}
-		this.field.fireEvent("spin", this);
-		this.field.fireEvent("spindown", this);
-	},
+    //private
+    onSpinDown: function(){
+        if (this.isSpinnable() == false) {
+            return;
+        }
+        if (Ext.EventObject.shiftKey == true) {
+            this.onSpinDownAlternate();
+            return;
+        }
+        else {
+            this.spin(true, false);
+        }
+        this.field.fireEvent("spin", this);
+        this.field.fireEvent("spindown", this);
+    },
 
-	//private
-	onSpinUpAlternate: function(){
-		if (this.isSpinnable() == false) {
-			return;
-		}
-		this.spin(false, true);
-		this.field.fireEvent("spin", this);
-		this.field.fireEvent("spinup", this);
-	},
+    //private
+    onSpinUpAlternate: function(){
+        if (this.isSpinnable() == false) {
+            return;
+        }
+        this.spin(false, true);
+        this.field.fireEvent("spin", this);
+        this.field.fireEvent("spinup", this);
+    },
 
-	//private
-	onSpinDownAlternate: function(){
-		if (this.isSpinnable() == false) {
-			return;
-		}
-		this.spin(true, true);
-		this.field.fireEvent("spin", this);
-		this.field.fireEvent("spindown", this);
-	},
+    //private
+    onSpinDownAlternate: function(){
+        if (this.isSpinnable() == false) {
+            return;
+        }
+        this.spin(true, true);
+        this.field.fireEvent("spin", this);
+        this.field.fireEvent("spindown", this);
+    },
 
-	spin: function(down, alternate){
-		var v = parseFloat(this.field.getValue());
-		var incr = (alternate == true) ? this.alternateIncrementValue : this.incrementValue;
-		(down == true) ? v -= incr : v += incr;
+    spin: function(down, alternate){
+        var v = parseFloat(this.field.getValue());
+        var incr = (alternate == true) ? this.alternateIncrementValue : this.incrementValue;
+        (down == true) ? v -= incr : v += incr;
 
-		v = (isNaN(v)) ? this.defaultValue : v;
-		v = this.fixBoundries(v);
-		this.field.setRawValue(v);
-	},
+        v = (isNaN(v)) ? this.defaultValue : v;
+        v = this.fixBoundries(v);
+        this.field.setRawValue(v);
+    },
 
-	fixBoundries: function(value){
-		var v = value;
+    fixBoundries: function(value){
+        var v = value;
 
-		if (this.field.minValue != undefined && v < this.field.minValue) {
-			v = this.field.minValue;
-		}
-		if (this.field.maxValue != undefined && v > this.field.maxValue) {
-			v = this.field.maxValue;
-		}
+        if (this.field.minValue != undefined && v < this.field.minValue) {
+            v = this.field.minValue;
+        }
+        if (this.field.maxValue != undefined && v > this.field.maxValue) {
+            v = this.field.maxValue;
+        }
 
-		return this.fixPrecision(v);
-	},
+        return this.fixPrecision(v);
+    },
 
-	// private
-	fixPrecision: function(value){
-		var nan = isNaN(value);
-		if (!this.field.allowDecimals || this.field.decimalPrecision == -1 || nan || !value) {
-			return nan ? '' : value;
-		}
-		return parseFloat(parseFloat(value).toFixed(this.field.decimalPrecision));
-	},
+    // private
+    fixPrecision: function(value){
+        var nan = isNaN(value);
+        if (!this.field.allowDecimals || this.field.decimalPrecision == -1 || nan || !value) {
+            return nan ? '' : value;
+        }
+        return parseFloat(parseFloat(value).toFixed(this.field.decimalPrecision));
+    },
 
-	doDestroy: function(){
-		if (this.trigger) {
-			this.trigger.remove();
-		}
-		if (this.wrap) {
-			this.wrap.remove();
-			delete this.field.wrap;
-		}
+    doDestroy: function(){
+        if (this.trigger) {
+            this.trigger.remove();
+        }
+        if (this.wrap) {
+            this.wrap.remove();
+            delete this.field.wrap;
+        }
 
-		if (this.splitter) {
-			this.splitter.remove();
-		}
+        if (this.splitter) {
+            this.splitter.remove();
+        }
 
-		if (this.dd) {
-			this.dd.unreg();
-			this.dd = null;
-		}
+        if (this.dd) {
+            this.dd.unreg();
+            this.dd = null;
+        }
 
-		if (this.proxy) {
-			this.proxy.remove();
-		}
+        if (this.proxy) {
+            this.proxy.remove();
+        }
 
-		if (this.repeater) {
-			this.repeater.purgeListeners();
-		}
-	}
+        if (this.repeater) {
+            this.repeater.purgeListeners();
+        }
+    }
 });
 
 //backwards compat
diff --git a/deluge/ui/web/js/ext-extensions/StatusBar.js b/deluge/ui/web/js/ext-extensions/StatusBar.js
index 8d4eb18b9..07b85c6c5 100644
--- a/deluge/ui/web/js/ext-extensions/StatusBar.js
+++ b/deluge/ui/web/js/ext-extensions/StatusBar.js
@@ -339,9 +339,9 @@ statusBar.setStatus({
                 scope: this,
                 callback: function(){
                     this.setStatus({
-	                    text: text,
-	                    iconCls: iconCls
-	                });
+                        text: text,
+                        iconCls: iconCls
+                    });
 
                     this.statusEl.el.show();
                 }
@@ -349,10 +349,10 @@ statusBar.setStatus({
         }else{
             // hide/show the el to avoid jumpy text or icon
             this.statusEl.hide();
-	        this.setStatus({
-	            text: text,
-	            iconCls: iconCls
-	        });
+            this.setStatus({
+                text: text,
+                iconCls: iconCls
+            });
             this.statusEl.show();
         }
         return this;
@@ -391,14 +391,14 @@ statusBar.setStatus({
         cls = cls || '';
 
         if(this.rendered){
-	        if(this.currIconCls){
-	            this.statusEl.removeClass(this.currIconCls);
-	            this.currIconCls = null;
-	        }
-	        if(cls.length > 0){
-	            this.statusEl.addClass(cls);
-	            this.currIconCls = cls;
-	        }
+            if(this.currIconCls){
+                this.statusEl.removeClass(this.currIconCls);
+                this.currIconCls = null;
+            }
+            if(cls.length > 0){
+                this.statusEl.addClass(cls);
+                this.currIconCls = cls;
+            }
         }else{
             this.currIconCls = cls;
         }
diff --git a/deluge/ui/web/js/ext-extensions/form/RadioGroupFix.js b/deluge/ui/web/js/ext-extensions/form/RadioGroupFix.js
index 058cc012f..f5a325829 100644
--- a/deluge/ui/web/js/ext-extensions/form/RadioGroupFix.js
+++ b/deluge/ui/web/js/ext-extensions/form/RadioGroupFix.js
@@ -34,38 +34,38 @@
 Ext.override(Ext.form.RadioGroup, {
 
     afterRender: function() {
-		this.items.each(function(i) {
-	    	this.relayEvents(i, ['check']);
-		}, this);
-		if (this.lazyValue) {
-			this.setValue(this.value);
-			delete this.value;
-			delete this.lazyValue;
-		}
-		Ext.form.RadioGroup.superclass.afterRender.call(this)
+        this.items.each(function(i) {
+            this.relayEvents(i, ['check']);
+        }, this);
+        if (this.lazyValue) {
+            this.setValue(this.value);
+            delete this.value;
+            delete this.lazyValue;
+        }
+        Ext.form.RadioGroup.superclass.afterRender.call(this)
     },
 
     getName: function() {
-		return this.items.first().getName();
+        return this.items.first().getName();
     },
 
     getValue: function() {
-		return this.items.first().getGroupValue();
+        return this.items.first().getGroupValue();
     },
 
     setValue: function(v) {
-		if (!this.items.each) {
-			this.value = v;
-			this.lazyValue = true;
-			return;
-		}
-		this.items.each(function(item) {
-			if (item.rendered) {
-				var checked = (item.el.getValue() == String(v));
-				item.el.dom.checked = checked;
-				item.el.dom.defaultChecked = checked;
-				item.wrap[checked ? 'addClass' : 'removeClass'](item.checkedCls);
-			}
-		});
+        if (!this.items.each) {
+            this.value = v;
+            this.lazyValue = true;
+            return;
+        }
+        this.items.each(function(item) {
+            if (item.rendered) {
+                var checked = (item.el.getValue() == String(v));
+                item.el.dom.checked = checked;
+                item.el.dom.defaultChecked = checked;
+                item.wrap[checked ? 'addClass' : 'removeClass'](item.checkedCls);
+            }
+        });
     }
 });
diff --git a/deluge/ui/web/js/ext-extensions/form/SpinnerField.js b/deluge/ui/web/js/ext-extensions/form/SpinnerField.js
index 96b2a16ca..951c36985 100644
--- a/deluge/ui/web/js/ext-extensions/form/SpinnerField.js
+++ b/deluge/ui/web/js/ext-extensions/form/SpinnerField.js
@@ -13,46 +13,46 @@ Ext.ns('Ext.ux.form');
  * @xtype spinnerfield
  */
 Ext.ux.form.SpinnerField = Ext.extend(Ext.form.NumberField, {
-	actionMode: 'wrap',
-	deferHeight: true,
-	autoSize: Ext.emptyFn,
-	onBlur: Ext.emptyFn,
-	adjustSize: Ext.BoxComponent.prototype.adjustSize,
+    actionMode: 'wrap',
+    deferHeight: true,
+    autoSize: Ext.emptyFn,
+    onBlur: Ext.emptyFn,
+    adjustSize: Ext.BoxComponent.prototype.adjustSize,
 
-	constructor: function(config) {
-		var spinnerConfig = Ext.copyTo({}, config, 'incrementValue,alternateIncrementValue,accelerate,defaultValue,triggerClass,splitterClass');
+    constructor: function(config) {
+        var spinnerConfig = Ext.copyTo({}, config, 'incrementValue,alternateIncrementValue,accelerate,defaultValue,triggerClass,splitterClass');
 
-		var spl = this.spinner = new Ext.ux.Spinner(spinnerConfig);
+        var spl = this.spinner = new Ext.ux.Spinner(spinnerConfig);
 
-		var plugins = config.plugins
-			? (Ext.isArray(config.plugins)
-				? config.plugins.push(spl)
-				: [config.plugins, spl])
-			: spl;
+        var plugins = config.plugins
+            ? (Ext.isArray(config.plugins)
+                ? config.plugins.push(spl)
+                : [config.plugins, spl])
+            : spl;
 
-		Ext.ux.form.SpinnerField.superclass.constructor.call(this, Ext.apply(config, {plugins: plugins}));
-	},
+        Ext.ux.form.SpinnerField.superclass.constructor.call(this, Ext.apply(config, {plugins: plugins}));
+    },
 
-	// private
-	getResizeEl: function(){
-		return this.wrap;
-	},
+    // private
+    getResizeEl: function(){
+        return this.wrap;
+    },
 
-	// private
-	getPositionEl: function(){
-		return this.wrap;
-	},
+    // private
+    getPositionEl: function(){
+        return this.wrap;
+    },
 
-	// private
-	alignErrorIcon: function(){
-		if (this.wrap) {
-			this.errorIcon.alignTo(this.wrap, 'tl-tr', [2, 0]);
-		}
-	},
+    // private
+    alignErrorIcon: function(){
+        if (this.wrap) {
+            this.errorIcon.alignTo(this.wrap, 'tl-tr', [2, 0]);
+        }
+    },
 
-	validateBlur: function(){
-		return true;
-	}
+    validateBlur: function(){
+        return true;
+    }
 });
 
 Ext.reg('spinnerfield', Ext.ux.form.SpinnerField);
diff --git a/deluge/ui/web/js/ext-extensions/form/SpinnerFieldFix.js b/deluge/ui/web/js/ext-extensions/form/SpinnerFieldFix.js
index b12d2039d..f34462975 100644
--- a/deluge/ui/web/js/ext-extensions/form/SpinnerFieldFix.js
+++ b/deluge/ui/web/js/ext-extensions/form/SpinnerFieldFix.js
@@ -31,5 +31,5 @@
  */
 
 Ext.override(Ext.ux.form.SpinnerField, {
-	onBlur: Ext.form.Field.prototype.onBlur
+    onBlur: Ext.form.Field.prototype.onBlur
 });
diff --git a/deluge/ui/web/js/ext-extensions/form/SpinnerGroup.js b/deluge/ui/web/js/ext-extensions/form/SpinnerGroup.js
index 207ef695c..7e042fb5a 100644
--- a/deluge/ui/web/js/ext-extensions/form/SpinnerGroup.js
+++ b/deluge/ui/web/js/ext-extensions/form/SpinnerGroup.js
@@ -99,7 +99,7 @@ Ext.ux.form.SpinnerGroup = Ext.extend(Ext.form.CheckboxGroup, {
 
                 // Generate the column configs with the correct width setting
                 for(var i=0; i'
-		);
-		ts.rowHolder.disableFormats = true;
-		ts.rowHolder.compile();
+    initTemplates : function(){
+        Ext.ux.grid.BufferView.superclass.initTemplates.call(this);
+        var ts = this.templates;
+        // empty div to act as a place holder for a row
+            ts.rowHolder = new Ext.Template(
+                '
'
+        );
+        ts.rowHolder.disableFormats = true;
+        ts.rowHolder.compile();
 
-		ts.rowBody = new Ext.Template(
-				'',
-			'{cells}',
-			(this.enableRowBody ? '' : ''),
-			'
{body}
'
-		);
-		ts.rowBody.disableFormats = true;
-		ts.rowBody.compile();
-	},
+        ts.rowBody = new Ext.Template(
+                '',
+            '{cells}',
+            (this.enableRowBody ? '' : ''),
+            '
{body}
'
+        );
+        ts.rowBody.disableFormats = true;
+        ts.rowBody.compile();
+    },
 
-	getStyleRowHeight : function(){
-		return Ext.isBorderBox ? (this.rowHeight + this.borderHeight) : this.rowHeight;
-	},
+    getStyleRowHeight : function(){
+        return Ext.isBorderBox ? (this.rowHeight + this.borderHeight) : this.rowHeight;
+    },
 
-	getCalculatedRowHeight : function(){
-		return this.rowHeight + this.borderHeight;
-	},
+    getCalculatedRowHeight : function(){
+        return this.rowHeight + this.borderHeight;
+    },
 
-	getVisibleRowCount : function(){
-		var rh = this.getCalculatedRowHeight();
-		var visibleHeight = this.scroller.dom.clientHeight;
-		return (visibleHeight < 1) ? 0 : Math.ceil(visibleHeight / rh);
-	},
+    getVisibleRowCount : function(){
+        var rh = this.getCalculatedRowHeight();
+        var visibleHeight = this.scroller.dom.clientHeight;
+        return (visibleHeight < 1) ? 0 : Math.ceil(visibleHeight / rh);
+    },
 
-	getVisibleRows: function(){
-		var count = this.getVisibleRowCount();
-		var sc = this.scroller.dom.scrollTop;
-		var start = (sc == 0 ? 0 : Math.floor(sc/this.getCalculatedRowHeight())-1);
-		return {
-			first: Math.max(start, 0),
-			last: Math.min(start + count + 2, this.ds.getCount()-1)
-		};
-	},
+    getVisibleRows: function(){
+        var count = this.getVisibleRowCount();
+        var sc = this.scroller.dom.scrollTop;
+        var start = (sc == 0 ? 0 : Math.floor(sc/this.getCalculatedRowHeight())-1);
+        return {
+            first: Math.max(start, 0),
+            last: Math.min(start + count + 2, this.ds.getCount()-1)
+        };
+    },
 
-	doRender : function(cs, rs, ds, startRow, colCount, stripe, onlyBody){
-		var ts = this.templates, ct = ts.cell, rt = ts.row, rb = ts.rowBody, last = colCount-1;
-		var rh = this.getStyleRowHeight();
-		var vr = this.getVisibleRows();
-		var tstyle = 'width:'+this.getTotalWidth()+';height:'+rh+'px;';
-		// buffers
-		var buf = [], cb, c, p = {}, rp = {tstyle: tstyle}, r;
-		for (var j = 0, len = rs.length; j < len; j++) {
-			r = rs[j]; cb = [];
-			var rowIndex = (j+startRow);
-			var visible = rowIndex >= vr.first && rowIndex <= vr.last;
-			if (visible) {
-				for (var i = 0; i < colCount; i++) {
-					c = cs[i];
-					p.id = c.id;
-					p.css = i == 0 ? 'x-grid3-cell-first ' : (i == last ? 'x-grid3-cell-last ' : '');
-					p.attr = p.cellAttr = "";
-					p.value = c.renderer(r.data[c.name], p, r, rowIndex, i, ds);
-					p.style = c.style;
-					if (p.value == undefined || p.value === "") {
-						p.value = " ";
-					}
-					if (r.dirty && typeof r.modified[c.name] !== 'undefined') {
-						p.css += ' x-grid3-dirty-cell';
-					}
-					cb[cb.length] = ct.apply(p);
-				}
-			}
-			var alt = [];
-			if(stripe && ((rowIndex+1) % 2 == 0)){
-				alt[0] = "x-grid3-row-alt";
-			}
-			if(r.dirty){
-				alt[1] = " x-grid3-dirty-row";
-			}
-			rp.cols = colCount;
-			if(this.getRowClass){
-				alt[2] = this.getRowClass(r, rowIndex, rp, ds);
-			}
-			rp.alt = alt.join(" ");
-			rp.cells = cb.join("");
-			buf[buf.length] =  !visible ? ts.rowHolder.apply(rp) : (onlyBody ? rb.apply(rp) : rt.apply(rp));
-		}
-		return buf.join("");
-	},
+    doRender : function(cs, rs, ds, startRow, colCount, stripe, onlyBody){
+        var ts = this.templates, ct = ts.cell, rt = ts.row, rb = ts.rowBody, last = colCount-1;
+        var rh = this.getStyleRowHeight();
+        var vr = this.getVisibleRows();
+        var tstyle = 'width:'+this.getTotalWidth()+';height:'+rh+'px;';
+        // buffers
+        var buf = [], cb, c, p = {}, rp = {tstyle: tstyle}, r;
+        for (var j = 0, len = rs.length; j < len; j++) {
+            r = rs[j]; cb = [];
+            var rowIndex = (j+startRow);
+            var visible = rowIndex >= vr.first && rowIndex <= vr.last;
+            if (visible) {
+                for (var i = 0; i < colCount; i++) {
+                    c = cs[i];
+                    p.id = c.id;
+                    p.css = i == 0 ? 'x-grid3-cell-first ' : (i == last ? 'x-grid3-cell-last ' : '');
+                    p.attr = p.cellAttr = "";
+                    p.value = c.renderer(r.data[c.name], p, r, rowIndex, i, ds);
+                    p.style = c.style;
+                    if (p.value == undefined || p.value === "") {
+                        p.value = " ";
+                    }
+                    if (r.dirty && typeof r.modified[c.name] !== 'undefined') {
+                        p.css += ' x-grid3-dirty-cell';
+                    }
+                    cb[cb.length] = ct.apply(p);
+                }
+            }
+            var alt = [];
+            if(stripe && ((rowIndex+1) % 2 == 0)){
+                alt[0] = "x-grid3-row-alt";
+            }
+            if(r.dirty){
+                alt[1] = " x-grid3-dirty-row";
+            }
+            rp.cols = colCount;
+            if(this.getRowClass){
+                alt[2] = this.getRowClass(r, rowIndex, rp, ds);
+            }
+            rp.alt = alt.join(" ");
+            rp.cells = cb.join("");
+            buf[buf.length] =  !visible ? ts.rowHolder.apply(rp) : (onlyBody ? rb.apply(rp) : rt.apply(rp));
+        }
+        return buf.join("");
+    },
 
-	isRowRendered: function(index){
-		var row = this.getRow(index);
-		return row && row.childNodes.length > 0;
-	},
+    isRowRendered: function(index){
+        var row = this.getRow(index);
+        return row && row.childNodes.length > 0;
+    },
 
-	syncScroll: function(){
-		Ext.ux.grid.BufferView.superclass.syncScroll.apply(this, arguments);
-		this.update();
-	},
+    syncScroll: function(){
+        Ext.ux.grid.BufferView.superclass.syncScroll.apply(this, arguments);
+        this.update();
+    },
 
-	// a (optionally) buffered method to update contents of gridview
-	update: function(){
-		if (this.scrollDelay) {
-			if (!this.renderTask) {
-				this.renderTask = new Ext.util.DelayedTask(this.doUpdate, this);
-			}
-			this.renderTask.delay(this.scrollDelay);
-		}else{
-			this.doUpdate();
-		}
-	},
-	
-	onRemove : function(ds, record, index, isUpdate){
-		Ext.ux.grid.BufferView.superclass.onRemove.apply(this, arguments);
-		if(isUpdate !== true){
-			this.update();
-		}
-	},
+    // a (optionally) buffered method to update contents of gridview
+    update: function(){
+        if (this.scrollDelay) {
+            if (!this.renderTask) {
+                this.renderTask = new Ext.util.DelayedTask(this.doUpdate, this);
+            }
+            this.renderTask.delay(this.scrollDelay);
+        }else{
+            this.doUpdate();
+        }
+    },
+    
+    onRemove : function(ds, record, index, isUpdate){
+        Ext.ux.grid.BufferView.superclass.onRemove.apply(this, arguments);
+        if(isUpdate !== true){
+            this.update();
+        }
+    },
 
-	doUpdate: function(){
-		if (this.getVisibleRowCount() > 0) {
-			var g = this.grid, cm = g.colModel, ds = g.store;
-				var cs = this.getColumnData();
+    doUpdate: function(){
+        if (this.getVisibleRowCount() > 0) {
+            var g = this.grid, cm = g.colModel, ds = g.store;
+                var cs = this.getColumnData();
 
-				var vr = this.getVisibleRows();
-			for (var i = vr.first; i <= vr.last; i++) {
-				// if row is NOT rendered and is visible, render it
-				if(!this.isRowRendered(i)){
-					var html = this.doRender(cs, [ds.getAt(i)], ds, i, cm.getColumnCount(), g.stripeRows, true);
-					this.getRow(i).innerHTML = html;
-				}
-			}
-			this.clean();
-		}
-	},
+                var vr = this.getVisibleRows();
+            for (var i = vr.first; i <= vr.last; i++) {
+                // if row is NOT rendered and is visible, render it
+                if(!this.isRowRendered(i)){
+                    var html = this.doRender(cs, [ds.getAt(i)], ds, i, cm.getColumnCount(), g.stripeRows, true);
+                    this.getRow(i).innerHTML = html;
+                }
+            }
+            this.clean();
+        }
+    },
 
-	// a buffered method to clean rows
-	clean : function(){
-		if(!this.cleanTask){
-			this.cleanTask = new Ext.util.DelayedTask(this.doClean, this);
-		}
-		this.cleanTask.delay(this.cleanDelay);
-	},
+    // a buffered method to clean rows
+    clean : function(){
+        if(!this.cleanTask){
+            this.cleanTask = new Ext.util.DelayedTask(this.doClean, this);
+        }
+        this.cleanTask.delay(this.cleanDelay);
+    },
 
-	doClean: function(){
-		if (this.getVisibleRowCount() > 0) {
-			var vr = this.getVisibleRows();
-			vr.first -= this.cacheSize;
-			vr.last += this.cacheSize;
+    doClean: function(){
+        if (this.getVisibleRowCount() > 0) {
+            var vr = this.getVisibleRows();
+            vr.first -= this.cacheSize;
+            vr.last += this.cacheSize;
 
-			var i = 0, rows = this.getRows();
-			// if first is less than 0, all rows have been rendered
-			// so lets clean the end...
-			if(vr.first <= 0){
-				i = vr.last + 1;
-			}
-			for(var len = this.ds.getCount(); i < len; i++){
-				// if current row is outside of first and last and
-				// has content, update the innerHTML to nothing
-				if ((i < vr.first || i > vr.last) && rows[i].innerHTML) {
-					rows[i].innerHTML = '';
-				}
-			}
-		}
-	},
+            var i = 0, rows = this.getRows();
+            // if first is less than 0, all rows have been rendered
+            // so lets clean the end...
+            if(vr.first <= 0){
+                i = vr.last + 1;
+            }
+            for(var len = this.ds.getCount(); i < len; i++){
+                // if current row is outside of first and last and
+                // has content, update the innerHTML to nothing
+                if ((i < vr.first || i > vr.last) && rows[i].innerHTML) {
+                    rows[i].innerHTML = '';
+                }
+            }
+        }
+    },
 
-	layout: function(){
-		Ext.ux.grid.BufferView.superclass.layout.call(this);
-		this.update();
-	}
+    layout: function(){
+        Ext.ux.grid.BufferView.superclass.layout.call(this);
+        this.update();
+    }
 });
diff --git a/deluge/ui/web/js/ext-extensions/layout/FormLayoutFix.js b/deluge/ui/web/js/ext-extensions/layout/FormLayoutFix.js
index dfa27e141..5f4121574 100644
--- a/deluge/ui/web/js/ext-extensions/layout/FormLayoutFix.js
+++ b/deluge/ui/web/js/ext-extensions/layout/FormLayoutFix.js
@@ -34,23 +34,23 @@
 // remove spaces for hidden elements and make show(), hide(), enable() and disable() act on
 // the label. don't use hideLabel with this.
 Ext.override(Ext.layout.FormLayout, {
-	renderItem : function(c, position, target){
-		if(c && !c.rendered && (c.isFormField || c.fieldLabel) && c.inputType != 'hidden'){
-			var args = this.getTemplateArgs(c);
-			if(typeof position == 'number'){
-				position = target.dom.childNodes[position] || null;
-			}
-			if(position){
-				c.formItem = this.fieldTpl.insertBefore(position, args, true);
-			}else{
-				c.formItem = this.fieldTpl.append(target, args, true);
-			}
-			c.actionMode = 'formItem';
-			c.render('x-form-el-'+c.id);
-			c.container = c.formItem;
-			c.actionMode = 'container';
-		}else {
-			Ext.layout.FormLayout.superclass.renderItem.apply(this, arguments);
-		}
-	}
+    renderItem : function(c, position, target){
+        if(c && !c.rendered && (c.isFormField || c.fieldLabel) && c.inputType != 'hidden'){
+            var args = this.getTemplateArgs(c);
+            if(typeof position == 'number'){
+                position = target.dom.childNodes[position] || null;
+            }
+            if(position){
+                c.formItem = this.fieldTpl.insertBefore(position, args, true);
+            }else{
+                c.formItem = this.fieldTpl.append(target, args, true);
+            }
+            c.actionMode = 'formItem';
+            c.render('x-form-el-'+c.id);
+            c.container = c.formItem;
+            c.actionMode = 'container';
+        }else {
+            Ext.layout.FormLayout.superclass.renderItem.apply(this, arguments);
+        }
+    }
 });
diff --git a/deluge/ui/web/js/ext-extensions/tree/MultiSelectionModelFix.js b/deluge/ui/web/js/ext-extensions/tree/MultiSelectionModelFix.js
index 943cd9cec..da2513c41 100644
--- a/deluge/ui/web/js/ext-extensions/tree/MultiSelectionModelFix.js
+++ b/deluge/ui/web/js/ext-extensions/tree/MultiSelectionModelFix.js
@@ -35,58 +35,58 @@
  * @author Damien Churchill 
  */
 Ext.override(Ext.tree.MultiSelectionModel, {
-	
-	onNodeClick: function (node, e) {
-		if (e.ctrlKey && this.isSelected(node)) {
-			this.unselect(node);
-		} else if (e.shiftKey && !this.isSelected(node)) {
-			var parentNode = node.parentNode;
-			// We can only shift select files in the same node
-			if (this.lastSelNode.parentNode.id != parentNode.id) return;
+    
+    onNodeClick: function (node, e) {
+        if (e.ctrlKey && this.isSelected(node)) {
+            this.unselect(node);
+        } else if (e.shiftKey && !this.isSelected(node)) {
+            var parentNode = node.parentNode;
+            // We can only shift select files in the same node
+            if (this.lastSelNode.parentNode.id != parentNode.id) return;
 
-			// Get the node indexes
-			var fi = parentNode.indexOf(node),
-				li = parentNode.indexOf(this.lastSelNode);
+            // Get the node indexes
+            var fi = parentNode.indexOf(node),
+                li = parentNode.indexOf(this.lastSelNode);
 
-			// Select the last clicked node and wipe old selections
-			this.select(this.lastSelNode, e, false, true);
+            // Select the last clicked node and wipe old selections
+            this.select(this.lastSelNode, e, false, true);
 
-			// Swap the values if required
-			if (fi > li) {
-				fi = fi + li, li = fi - li, fi = fi - li;
-			}
+            // Swap the values if required
+            if (fi > li) {
+                fi = fi + li, li = fi - li, fi = fi - li;
+            }
 
-			// Select all the nodes
-			parentNode.eachChild(function(n) {
-				var i = parentNode.indexOf(n);
-				if (fi < i && i < li) {
-					this.select(n, e, true, true);
-				}
-			}, this);
+            // Select all the nodes
+            parentNode.eachChild(function(n) {
+                var i = parentNode.indexOf(n);
+                if (fi < i && i < li) {
+                    this.select(n, e, true, true);
+                }
+            }, this);
 
-			// Select the clicked node
-			this.select(node, e, true);
-		} else {
-			this.select(node, e, e.ctrlKey);
-		}
-	},
+            // Select the clicked node
+            this.select(node, e, true);
+        } else {
+            this.select(node, e, e.ctrlKey);
+        }
+    },
 
-	select: function(node, e, keepExisting, suppressEvent) {
-		if(keepExisting !== true){
-			this.clearSelections(true);
-		}         
-		if(this.isSelected(node)){
-			this.lastSelNode = node;
-			return node;
-		}         
-		this.selNodes.push(node);
-		this.selMap[node.id] = node;
-		this.lastSelNode = node;
-		node.ui.onSelectedChange(true);
-		if (suppressEvent !== true) {
-			this.fireEvent('selectionchange', this, this.selNodes);
-		}
+    select: function(node, e, keepExisting, suppressEvent) {
+        if(keepExisting !== true){
+            this.clearSelections(true);
+        }         
+        if(this.isSelected(node)){
+            this.lastSelNode = node;
+            return node;
+        }         
+        this.selNodes.push(node);
+        this.selMap[node.id] = node;
+        this.lastSelNode = node;
+        node.ui.onSelectedChange(true);
+        if (suppressEvent !== true) {
+            this.fireEvent('selectionchange', this, this.selNodes);
+        }
         return node;
-	}
+    }
 
 })
diff --git a/deluge/ui/web/js/ext-extensions/tree/TreeGridColumnResizer.js b/deluge/ui/web/js/ext-extensions/tree/TreeGridColumnResizer.js
index d5101c666..06c183231 100644
--- a/deluge/ui/web/js/ext-extensions/tree/TreeGridColumnResizer.js
+++ b/deluge/ui/web/js/ext-extensions/tree/TreeGridColumnResizer.js
@@ -56,7 +56,7 @@ Ext.tree.ColumnResizer = Ext.extend(Ext.util.Observable, {
                 }
                 if(ps) {                    
                     this.activeHd = Ext.get(ps);
-    				ss.cursor = Ext.isWebKit ? 'e-resize' : 'col-resize';
+                    ss.cursor = Ext.isWebKit ? 'e-resize' : 'col-resize';
                 }
             } else if(r.right - x <= hw) {
                 var ns = hd.dom;
@@ -65,7 +65,7 @@ Ext.tree.ColumnResizer = Ext.extend(Ext.util.Observable, {
                 }
                 if(ns) {
                     this.activeHd = Ext.get(ns);
-    				ss.cursor = Ext.isWebKit ? 'w-resize' : 'col-resize';                    
+                    ss.cursor = Ext.isWebKit ? 'w-resize' : 'col-resize';                    
                 }
             } else{
                 delete this.activeHd;
diff --git a/deluge/ui/web/js/ext-extensions/tree/TreeGridNodeUIFix.js b/deluge/ui/web/js/ext-extensions/tree/TreeGridNodeUIFix.js
index 55a6cd4d8..3d81c54f4 100644
--- a/deluge/ui/web/js/ext-extensions/tree/TreeGridNodeUIFix.js
+++ b/deluge/ui/web/js/ext-extensions/tree/TreeGridNodeUIFix.js
@@ -32,22 +32,22 @@
 
 Ext.override(Ext.ux.tree.TreeGridNodeUI, {
 
-	updateColumns: function() {
-		if (!this.rendered) return;
-		
-		var a = this.node.attributes,
-			t = this.node.getOwnerTree(),
-			cols = t.columns,
-			c = cols[0];
+    updateColumns: function() {
+        if (!this.rendered) return;
+        
+        var a = this.node.attributes,
+            t = this.node.getOwnerTree(),
+            cols = t.columns,
+            c = cols[0];
 
-		// Update the first column
-		this.anchor.firstChild.innerHTML = (c.tpl ? c.tpl.apply(a) : a[c.dataIndex] || c.text);
+        // Update the first column
+        this.anchor.firstChild.innerHTML = (c.tpl ? c.tpl.apply(a) : a[c.dataIndex] || c.text);
 
-		// Update the remaining columns
-		for(i = 1, len = cols.length; i < len; i++) {
-			c = cols[i];
-			this.elNode.childNodes[i].firstChild.innerHTML = (c.tpl ? c.tpl.apply(a) : a[c.dataIndex] || c.text);
-		}
-	}
+        // Update the remaining columns
+        for(i = 1, len = cols.length; i < len; i++) {
+            c = cols[i];
+            this.elNode.childNodes[i].firstChild.innerHTML = (c.tpl ? c.tpl.apply(a) : a[c.dataIndex] || c.text);
+        }
+    }
 
 });
diff --git a/deluge/ui/web/js/ext-extensions/tree/TreeGridRenderColumn.js b/deluge/ui/web/js/ext-extensions/tree/TreeGridRenderColumn.js
index d104f26c5..b50737f9f 100644
--- a/deluge/ui/web/js/ext-extensions/tree/TreeGridRenderColumn.js
+++ b/deluge/ui/web/js/ext-extensions/tree/TreeGridRenderColumn.js
@@ -1,10 +1,10 @@
 Ext.tree.RenderColumn = Ext.extend(Ext.tree.Column, {
-	
-	constructor: function(c) {
-		c.tpl = c.tpl || new Ext.XTemplate('{' + c.dataIndex + ':this.format}');
-		c.tpl.format = c.renderer;
-		c.tpl.col = this;
-		Ext.tree.RenderColumn.superclass.constructor.call(this, c);
-	}
+    
+    constructor: function(c) {
+        c.tpl = c.tpl || new Ext.XTemplate('{' + c.dataIndex + ':this.format}');
+        c.tpl.format = c.renderer;
+        c.tpl.col = this;
+        Ext.tree.RenderColumn.superclass.constructor.call(this, c);
+    }
 });
 Ext.reg('tgrendercolumn', Ext.tree.RenderColumn);
diff --git a/deluge/ui/web/js/ext-extensions/tree/TreeGridSorter.js b/deluge/ui/web/js/ext-extensions/tree/TreeGridSorter.js
index 6d2f62fe4..bbaa31898 100644
--- a/deluge/ui/web/js/ext-extensions/tree/TreeGridSorter.js
+++ b/deluge/ui/web/js/ext-extensions/tree/TreeGridSorter.js
@@ -56,14 +56,14 @@ Ext.ux.tree.TreeGridSorter = Ext.extend(Ext.tree.TreeSorter, {
                     return -1;
                 }
             }
-        	var v1 = sortType ? sortType(n1.attributes[p]) : (cs ? n1.attributes[p] : n1.attributes[p].toUpperCase());
-        	var v2 = sortType ? sortType(n2.attributes[p]) : (cs ? n2.attributes[p] : n2.attributes[p].toUpperCase());
-        	if(v1 < v2){
-    			return dsc ? +1 : -1;
-    		}else if(v1 > v2){
-    			return dsc ? -1 : +1;
+            var v1 = sortType ? sortType(n1.attributes[p]) : (cs ? n1.attributes[p] : n1.attributes[p].toUpperCase());
+            var v2 = sortType ? sortType(n2.attributes[p]) : (cs ? n2.attributes[p] : n2.attributes[p].toUpperCase());
+            if(v1 < v2){
+                return dsc ? +1 : -1;
+            }else if(v1 > v2){
+                return dsc ? -1 : +1;
             }else{
-    	    	return 0;
+                return 0;
             }
         };
 

From 9ec44894d495ef0bc8ad8d796835419a82384532 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 2 Jun 2011 10:58:45 +0100
Subject: [PATCH 323/329] Fix #1873. Re-add the files and peers tab menus.

---
 deluge/ui/gtkui/glade/main_window.glade | 146 ++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index d21dc52de..000a6babd 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -729,6 +729,152 @@ This will filter torrents for the current selection on the sidebar.
       
     
   
+  
+    True
+    False
+    
+      
+        gtk-open
+        True
+        False
+        False
+        True
+        True
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Expand All
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-zoom-fit
+            1
+          
+        
+      
+    
+    
+      
+        True
+        False
+      
+    
+    
+      
+        _Do Not Download
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-no
+            1
+          
+        
+      
+    
+    
+      
+        _Normal Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-yes
+            1
+          
+        
+      
+    
+    
+      
+        _High Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-go-up
+            1
+          
+        
+      
+    
+    
+      
+        Hi_ghest Priority
+        True
+        False
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-goto-top
+            1
+          
+        
+      
+    
+  
+  
+    True
+    False
+    
+      
+        _Add Peer
+        True
+        False
+        Add a peer by its IP
+        False
+        True
+        False
+        
+        
+          
+            True
+            False
+            gtk-add
+            1
+          
+        
+      
+    
+  
   
     False
     GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK

From 8f1730591b45308543c5bc9bdee11c6935c220ab Mon Sep 17 00:00:00 2001
From: Pedro Algarvio 
Date: Thu, 2 Jun 2011 11:16:11 +0100
Subject: [PATCH 324/329] While clearing the search filter, restore from
 pre-filter if available.

---
 deluge/ui/gtkui/torrentview.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 42e11b590..4f8217350 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -213,6 +213,17 @@ class SearchBox(object):
         if self.search_pending and self.search_pending.active():
             self.search_pending.cancel()
 
+        if self.prefiltered:
+            filter_column = self.torrentview.columns["filter"].column_indices[0]
+            torrent_id_column = self.torrentview.columns["torrent_id"].column_indices[0]
+            for row in self.torrentview.liststore:
+                torrent_id = row[torrent_id_column]
+
+                if torrent_id in self.prefiltered:
+                    # Reset to previous filter state
+                    self.prefiltered.pop(self.prefiltered.index(torrent_id))
+                    row[filter_column] = not row[filter_column]
+
         self.prefiltered = None
 
         self.search_torrents_entry.set_text("")
@@ -573,10 +584,7 @@ class TorrentView(listview.ListView, component.Component):
         # Insert a new row to the liststore
         row = self.liststore.append()
         # Store the torrent id
-        self.liststore.set_value(
-                    row,
-                    self.columns["torrent_id"].column_indices[0],
-                    torrent_id)
+        self.liststore.set_value(row, self.columns["torrent_id"].column_indices[0], torrent_id)
         if update:
             self.update()
 

From 2f785216f608ed9dfe6581daa68be518fb6c7ef1 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Thu, 2 Jun 2011 11:53:34 -0700
Subject: [PATCH 325/329] Show errors when trying failing to properly stop a
 component

---
 deluge/component.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/deluge/component.py b/deluge/component.py
index 4a6f39622..9fa4e3c67 100644
--- a/deluge/component.py
+++ b/deluge/component.py
@@ -98,6 +98,9 @@ class Component(object):
         self._component_stopping_deferred = None
         _ComponentRegistry.register(self)
 
+    def __del__(self):
+        _ComponentRegistry.deregister(self._component_name)
+        
     def _component_start_timer(self):
         if hasattr(self, "update"):
             self._component_timer = LoopingCall(self.update)
@@ -141,11 +144,18 @@ class Component(object):
                 self._component_timer.stop()
             return True
 
+        def on_stop_fail(result):
+            self._component_state = "Started"
+            self._component_stopping_deferred = None
+            log.error(result)
+            return result
+            
         if self._component_state != "Stopped" and self._component_state != "Stopping":
             if hasattr(self, "stop"):
                 self._component_state = "Stopping"
                 d = maybeDeferred(self.stop)
                 d.addCallback(on_stop)
+                d.addErrback(on_stop_fail)
                 self._component_stopping_deferred = d
             else:
                 d = maybeDeferred(on_stop, None)

From 1557d0da1ff857c3fa54a6a7f948ee5bb6bc8c85 Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Thu, 2 Jun 2011 11:53:54 -0700
Subject: [PATCH 326/329] Move the log level to the left of the module because
 this field is a fixed width and its easier to read this way

---
 deluge/log.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deluge/log.py b/deluge/log.py
index 179e03dfd..04dfd75f0 100644
--- a/deluge/log.py
+++ b/deluge/log.py
@@ -48,9 +48,9 @@ __all__ = ["setupLogger", "setLoggerLevel", "getPluginLogger", "LOG"]
 LoggingLoggerClass = logging.getLoggerClass()
 
 if 'dev' in common.get_version():
-    DEFAULT_LOGGING_FORMAT = "%%(asctime)s.%%(msecs)03.0f [%%(name)-%ds:%%(lineno)-4d][%%(levelname)-8s] %%(message)s"
+    DEFAULT_LOGGING_FORMAT = "%%(asctime)s.%%(msecs)03.0f [%%(levelname)-8s][%%(name)-%ds:%%(lineno)-4d] %%(message)s"
 else:
-    DEFAULT_LOGGING_FORMAT = "%%(asctime)s [%%(name)-%ds][%%(levelname)-8s] %%(message)s"
+    DEFAULT_LOGGING_FORMAT = "%%(asctime)s [%%(levelname)-8s][%%(name)-%ds] %%(message)s"
 MAX_LOGGER_NAME_LENGTH = 3
 
 class Logging(LoggingLoggerClass):

From 6d55c44983b179d157d6e6a59d6a5a251c66477c Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Thu, 2 Jun 2011 11:54:53 -0700
Subject: [PATCH 327/329] Fix menubar component stopping properly

---
 deluge/ui/gtkui/menubar.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/deluge/ui/gtkui/menubar.py b/deluge/ui/gtkui/menubar.py
index 14754b06a..7a0f4d904 100644
--- a/deluge/ui/gtkui/menubar.py
+++ b/deluge/ui/gtkui/menubar.py
@@ -213,9 +213,6 @@ class MenuBar(component.Component):
 
     def stop(self):
         log.debug("MenuBar stopping")
-        if client.get_auth_level() == deluge.common.AUTH_LEVEL_ADMIN:
-            # If not an admin, no submenu was added
-            self.menuitem_change_owner.remove_submenu()
 
         for widget in self.change_sensitivity:
             self.window.main_glade.get_widget(widget).set_sensitive(False)

From ac5f9a282822917fb466086f16fc2c43279196fa Mon Sep 17 00:00:00 2001
From: Andrew Resch 
Date: Thu, 2 Jun 2011 11:55:26 -0700
Subject: [PATCH 328/329] Fix up stopping classic mode

---
 deluge/ui/client.py            | 12 ++++++++++++
 deluge/ui/gtkui/preferences.py | 11 +++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/deluge/ui/client.py b/deluge/ui/client.py
index b2de0b138..31fb305a3 100644
--- a/deluge/ui/client.py
+++ b/deluge/ui/client.py
@@ -613,6 +613,11 @@ class Client(object):
         """
         Disconnects from the daemon.
         """
+        if self.is_classicmode():
+            self._daemon_proxy.disconnect()
+            self.stop_classic_mode()
+            return
+            
         if self._daemon_proxy:
             return self._daemon_proxy.disconnect()
 
@@ -623,6 +628,13 @@ class Client(object):
         self._daemon_proxy = DaemonClassicProxy(self.__event_handlers)
         self.__started_in_classic = True
 
+    def stop_classic_mode(self):
+        """
+        Stops the daemon process in the client.
+        """
+        self._daemon_proxy = None
+        self.__started_in_classic = False
+        
     def start_daemon(self, port, config):
         """
         Starts a daemon process.
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index aeadaf9cc..ee265a068 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -830,26 +830,21 @@ class Preferences(component.Component):
             # Re-show the dialog to make sure everything has been updated
             self.show()
 
-        if classic_mode_was_set==True and new_gtkui_in_classic_mode==False:
+        if classic_mode_was_set == True and new_gtkui_in_classic_mode == False:
             def on_response(response):
                 if response == gtk.RESPONSE_NO:
                     # Set each changed config value in the core
                     self.gtkui_config["classic_mode"] = True
-                    client.core.set_config({"classic_mode": True})
-                    client.force_call(True)
-                    # Update the configuration
-                    self.core_config.update({"classic_mode": True})
                     self.glade.get_widget("chk_classic_mode").set_active(True)
                 else:
                     client.disconnect()
-                    if client.is_classicmode():
-                        component.stop()
+                    component.stop()
             dialog = dialogs.YesNoDialog(
                 _("Attention"),
                 _("Your current session will be stopped. Continue?")
             )
             dialog.run().addCallback(on_response)
-        elif classic_mode_was_set==False and new_gtkui_in_classic_mode==True:
+        elif classic_mode_was_set == False and new_gtkui_in_classic_mode == True:
             dialog = dialogs.InformationDialog(
                 _("Attention"),
                 _("You must now restart the deluge UI")

From ce406674ecba03407466d7a13669bd1dcba6af7a Mon Sep 17 00:00:00 2001
From: Calum Lind 
Date: Thu, 2 Jun 2011 21:49:27 +0100
Subject: [PATCH 329/329] Update setuptools version in ez_setup

---
 ez_setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index d24e845e5..d38608de9 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``.
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c9"
+DEFAULT_VERSION = "0.6c11"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
@@ -52,6 +52,11 @@ md5_data = {
     'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
     'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
     'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
+    'setuptools-0.6c11-py2.3.egg' : '2baeac6e13d414a9d28e7ba5b5a596de',
+    'setuptools-0.6c11-py2.4.egg' : 'bd639f9b0eac4c42497034dec2ec0c2b',
+    'setuptools-0.6c11-py2.5.egg' : '64c94f3bf7a72a13ec83e0b24f2749b2',
+    'setuptools-0.6c11-py2.6.egg' : 'bfa92100bd772d5a213eedd356d64086',
+    'setuptools-0.6c11-py2.7.egg' : 'fe1f997bc722265116870bc7919059ea',
 }
 
 import sys, os