Module: deluge Branch: 1.3-stable Commit: 00ad550a52560a68436bb5b51a2357dbf415afc4
Author: John Garland <[email protected]> Date: Wed Mar 23 23:38:41 2011 +1100 Improve autoadd filename matching (fixes #1614) --- ChangeLog | 1 + deluge/core/autoadd.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76707cc..d532e11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Fix a bug that can occur when upgrading 1.1 config files * #1517: Fix isohunt urls not loading * Handle redirection when adding a torrent by url + * #1614: Fix autoadd matching a directory called "torrent" ==== GtkUI ==== * #1514: Added Indicator Applet diff --git a/deluge/core/autoadd.py b/deluge/core/autoadd.py index 6d3d7a8..8d1219c 100644 --- a/deluge/core/autoadd.py +++ b/deluge/core/autoadd.py @@ -74,12 +74,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: -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
