From f8820c06feda37945700db6fc60ca68581bd7339 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 13 Jan 2014 21:53:38 +0100 Subject: [PATCH] Normcase in folder compare --- couchpotato/core/helpers/variable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/helpers/variable.py b/couchpotato/core/helpers/variable.py index 6ffabb9d..7146f954 100644 --- a/couchpotato/core/helpers/variable.py +++ b/couchpotato/core/helpers/variable.py @@ -221,5 +221,5 @@ def dictIsSubset(a, b): return all([k in b and b[k] == v for k, v in a.items()]) def isSubFolder(sub_folder, base_folder): - # Returns True is sub_folder is the same as or in base_folder - return base_folder.lower().rstrip(os.path.sep) + os.path.sep in sub_folder.lower().rstrip(os.path.sep) + os.path.sep + # Returns True if sub_folder is the same as or inside base_folder + return base_folder and sub_folder and os.path.normpath(base_folder).rstrip(os.path.sep) + os.path.sep in os.path.normpath(sub_folder).rstrip(os.path.sep) + os.path.sep