From b4b3b9c6b7a61dbe54ad3fab8628103fa81905e7 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 27 Jan 2011 18:22:09 +0000 Subject: [PATCH 2/2] Fix #1498: On folder rename ensures trailing slash and replaces any duplicates --- deluge/core/torrent.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 7651b6e..5a4d723 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -37,6 +37,7 @@ import os import time import logging +import re from urllib import unquote from urlparse import urlparse @@ -903,8 +904,9 @@ def rename_folder(self, folder, new_folder): log.error("Attempting to rename a folder with an invalid folder name: %s", new_folder) return - if new_folder[-1:] != "/": - new_folder += "/" + # Ensures trailing slash and replaces any duplicates + p = re.compile('/{2,}') + new_folder=p.sub('/',new_folder + "/") wait_on_folder = (folder, new_folder, []) for f in self.get_files(): -- 1.7.1