mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-03 06:58:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve autoadd filename matching (fixes #1614)

Browse source
This commit is contained in:
John Garland 2011-03-23 23:38:41 +11:00
commit 00ad550a52
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -6,6 +6,7 @@
* Fix a bug that can occur when upgrading 1.1 config files * Fix a bug that can occur when upgrading 1.1 config files
* #1517: Fix isohunt urls not loading * #1517: Fix isohunt urls not loading
* Handle redirection when adding a torrent by url * Handle redirection when adding a torrent by url
* #1614: Fix autoadd matching a directory called "torrent"
==== GtkUI ==== ==== GtkUI ====
* #1514: Added Indicator Applet * #1514: Added Indicator Applet

4
deluge/core/autoadd.py
View file

@ -74,12 +74,12 @@ class AutoAdd(component.Component):
return return
for filename in os.listdir(self.config["autoadd_location"]): for filename in os.listdir(self.config["autoadd_location"]):
if filename.split(".")[-1] == "torrent":
try: try:
filepath = os.path.join(self.config["autoadd_location"], filename) filepath = os.path.join(self.config["autoadd_location"], filename)
except UnicodeDecodeError, e: 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 continue
if os.path.isfile(filepath) and filename.endswith(".torrent"):
try: try:
filedump = self.load_torrent(filepath) filedump = self.load_torrent(filepath)
except (RuntimeError, Exception), e: except (RuntimeError, Exception), e: