codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Pedro Algarvio 2011-05-09 15:47:10 +01:00
parent d4692bef42
commit 1ac997e7d7
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deluge/core/preferencesmanager.py
View File

@ -154,6 +154,7 @@ class PreferencesManager(component.Component):
"attribute to shared.") "attribute to shared.")
self.config["shared"] = self.config["public"] self.config["shared"] = self.config["public"]
del self.config["public"] del self.config["public"]
self.config.run_converter((0, 1), 2, self.__migrate_config_1_to_2)
def start(self): def start(self):
self.core = component.get("Core") self.core = component.get("Core")
@ -196,7 +197,9 @@ class PreferencesManager(component.Component):
# Only set the listen ports if random_port is not true # Only set the listen ports if random_port is not true
if self.config["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]) 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): def _on_set_listen_interface(self, key, value):
# Call the random_port callback since it'll do what we need # Call the random_port callback since it'll do what we need
@ -218,7 +221,10 @@ class PreferencesManager(component.Component):
# Set the listen ports # Set the listen ports
log.debug("listen port range set to %s-%s", listen_ports[0], log.debug("listen port range set to %s-%s", listen_ports[0],
listen_ports[1]) 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): def _on_set_outgoing_ports(self, key, value):
if not self.config["random_outgoing_ports"]: if not self.config["random_outgoing_ports"]:
@ -445,8 +451,12 @@ class PreferencesManager(component.Component):
geoip_db = "" geoip_db = ""
if os.path.exists(value): if os.path.exists(value):
geoip_db = value geoip_db = value
elif os.path.exists(pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat"))): elif os.path.exists(
geoip_db = pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat")) 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: else:
log.warning("Unable to find GeoIP database file!") log.warning("Unable to find GeoIP database file!")
@ -464,3 +474,8 @@ class PreferencesManager(component.Component):
def _on_set_cache_expiry(self, key, value): def _on_set_cache_expiry(self, key, value):
log.debug("%s: %s", key, value) log.debug("%s: %s", key, value)
self.session_set_setting("cache_expiry", 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

3
deluge/plugins/autoadd/autoadd/gtkui.py
View File

@ -458,7 +458,8 @@ class GtkUI(GtkPluginBase):
def cb_get_config(self, watchdirs): def cb_get_config(self, watchdirs):
"""callback for on show_prefs""" """callback for on show_prefs"""
self.watchdirs = watchdirs log.debug("Got whatchdirs from core: %s", watchdirs)
self.watchdirs = watchdirs or {}
self.store.clear() self.store.clear()
for watchdir_id, watchdir in self.watchdirs.iteritems(): for watchdir_id, watchdir in self.watchdirs.iteritems():
self.store.append([ self.store.append([