Merge branch 'develop' into tv

2013-12-07 23:40:42 +01:00
parent 0fb06a3fd3 966f8c36b1
commit 7c4185e1fa
3 changed files with 9 additions and 3 deletions
@@ -114,7 +114,7 @@ class Renamer(Plugin):
            return
        else:
            for item in no_process:
-                if from_folder in item:
+                if '%s%s' % (from_folder, os.path.sep) in item:
                    log.error('To protect your data, the movie libraries can\'t be inside of or the same as the "from" folder.')
                    return

@@ -146,7 +146,7 @@ class Renamer(Plugin):

        if movie_folder:
            for item in no_process:
-                if movie_folder in item:
+                if '%s%s' % (movie_folder, os.path.sep) in item:
                    log.error('To protect your data, the movie libraries can\'t be inside of or the same as the provided movie folder.')
                    return