Ignore "Sample" folders (scene) and sample.mkv|avi|etc. files (#871)

Diaoul · Mar 27, 2018 · 585e369 · 585e369
1 parent 883a1a6
commit 585e369
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/subliminal/core.py b/subliminal/core.py
@@ -521,6 +521,10 @@ def scan_videos(path, age=None, archives=True):
             if dirname.startswith('.'):
                 logger.debug('Skipping hidden dirname %r in %r', dirname, dirpath)
                 dirnames.remove(dirname)
+            # Skip Sample folder
+            if dirname.lower() == 'sample':
+                logger.debug('Skipping sample dirname %r in %r', dirname, dirpath)
+                dirnames.remove(dirname)
 
         # scan for videos
         for filename in filenames:
@@ -532,6 +536,10 @@ def scan_videos(path, age=None, archives=True):
             if filename.startswith('.'):
                 logger.debug('Skipping hidden filename %r in %r', filename, dirpath)
                 continue
+            # skip 'sample' media files
+            if os.path.splitext(filename)[0].lower() == 'sample':
+                logger.debug('Skipping sample filename %r in %r', filename, dirpath)
+                continue
 
             # reconstruct the file path
             filepath = os.path.join(dirpath, filename)

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -345,6 +345,8 @@ def test_scan_videos(movies, tmpdir, monkeypatch):
     man_of_steel = tmpdir.ensure('movies', movies['man_of_steel'].name)
     tmpdir.ensure('movies', '.private', 'sextape.mkv')
     tmpdir.ensure('movies', '.hidden_video.mkv')
+    tmpdir.ensure('movies', 'Sample', 'video.mkv')
+    tmpdir.ensure('movies', 'sample.mkv')
     tmpdir.ensure('movies', movies['enders_game'].name)
     tmpdir.ensure('movies', movies['interstellar'].name)
     tmpdir.ensure('movies', os.path.splitext(movies['enders_game'].name)[0] + '.nfo')