Merge pull request #43 from shlomiLan/develop

Develop

.gitignore

@@ -26,5 +26,6 @@ cachefile.dbm.rw.lock
 
 .mypy_cache/
 .pytest_cache/
+.mutmut-cache
 
-resources/
+resources/

tasks.py

@@ -82,3 +82,9 @@ def test(c, cov=False, file=None):
         command = "{} {}".format(command, file)
 
     run(c, command)
+
+
+@task(init_app)
+def mutmut(c):
+    command = "mutmut run"
+    run(c, command)

tvsort_sl/conf.py

@@ -2,12 +2,15 @@
 
 import yaml
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))).replace('\\', '/')
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SETTINGS_FOLDER = os.path.join(BASE_DIR, 'tvsort_sl', 'settings')
 
 
 def get_conf_file_name(is_test=False):
-    conf_files = [os.path.join(SETTINGS_FOLDER, 'conf.yml'), os.path.join(SETTINGS_FOLDER, 'local.yml')]
+    conf_files = [
+        os.path.join(SETTINGS_FOLDER, 'conf.yml'),
+        os.path.join(SETTINGS_FOLDER, 'local.yml'),
+    ]
 
     if is_test:
         conf_files.append(os.path.join(SETTINGS_FOLDER, 'test.yml'))
@@ -45,18 +48,30 @@ def build_settings(settings):
     # This folder should have any files init
     settings['FAKE_PATH'] = os.path.join(settings.get('BASE_DRIVE'), 'xxx')
 
-    settings['DUMMY_FILE_PATH'] = os.path.join(settings.get('TV_PATH'), settings.get('DUMMY_FILE_NAME'))
+    settings['DUMMY_FILE_PATH'] = os.path.join(
+        settings.get('TV_PATH'), settings.get('DUMMY_FILE_NAME')
+    )
     settings['TEST_FILE_PATH'] = os.path.join(settings.get('UNSORTED_PATH'), 'test.txt')
     settings['TEST_FILE_PATH_IN_TV'] = os.path.join(settings.get('TV_PATH'), 'test.txt')
 
     # test files
     settings['TEST_ZIP_PATH'] = os.path.join(settings['TEST_FILES'], 'zip_test.zip')
-    settings['TEST_TV_PATH'] = os.path.join(settings['TEST_FILES'],
-                                            'House.of.Cards.2013.S04E01.720p.WEBRip.X264-DEFLATE.mkv')
-    settings['TEST_TV_2_PATH'] = os.path.join(settings['TEST_FILES'], 'shameless.us.s08e01.web.h264-convoy.mkv')
-    settings['TEST_TV_3_PATH'] = os.path.join(settings['TEST_FILES'], 'This.Is.Us.S02E01.REPACK.720p.HDTV.x264-AVS.mkv')
-    settings['TEST_MOVIE'] = os.path.join(settings['TEST_FILES'], 'San Andreas 2015 720p WEB-DL x264 AAC-JYK.mkv')
+    settings['TEST_TV_PATH'] = os.path.join(
+        settings['TEST_FILES'],
+        'House.of.Cards.2013.S04E01.720p.WEBRip.X264-DEFLATE.mkv',
+    )
+    settings['TEST_TV_2_PATH'] = os.path.join(
+        settings['TEST_FILES'], 'shameless.us.s08e01.web.h264-convoy.mkv'
+    )
+    settings['TEST_TV_3_PATH'] = os.path.join(
+        settings['TEST_FILES'], 'This.Is.Us.S02E01.REPACK.720p.HDTV.x264-AVS.mkv'
+    )
+    settings['TEST_MOVIE'] = os.path.join(
+        settings['TEST_FILES'], 'San Andreas 2015 720p WEB-DL x264 AAC-JYK.mkv'
+    )
     settings['TEST_GARBAGE_PATH'] = os.path.join(settings['TEST_FILES'], 'test.nfo')
     settings['GARBAGE_FILE_DS'] = os.path.join(settings['TEST_FILES'], '.DS_Store')
     settings['TEST_FOLDER_NAME'] = 'test.nfo'
-    settings['TEST_FOLDER_IN_UNSORTED'] = os.path.join(settings.get('UNSORTED_PATH'), 'empty_folder')
+    settings['TEST_FOLDER_IN_UNSORTED'] = os.path.join(
+        settings.get('UNSORTED_PATH'), 'empty_folder'
+    )

tvsort_sl/tests/test_conf.py

@@ -2,17 +2,22 @@
 
 from tvsort_sl.conf import SETTINGS_FOLDER, get_conf_file_name
 from tvsort_sl.tests.test_base import tv_sort
-from tvsort_sl.utils import check_project_setup
+from tvsort_sl.utils import check_project_setup, is_file_exists
 
+file_path = os.path.join(SETTINGS_FOLDER, 'test.yml')
+new_file_path = os.path.join(SETTINGS_FOLDER, 'test1.yml')
 
-def test_missing_conf_file():
-    file_path = os.path.join(SETTINGS_FOLDER, 'test.yml')
-    new_file_path = os.path.join(SETTINGS_FOLDER, 'test1.yml')
+
+def setup_function():
+    assert is_file_exists(file_path) is True
     os.rename(file_path, new_file_path)
 
+
+def teardown_function():
+    os.rename(new_file_path, file_path)
+
+
+def test_missing_conf_file():
     conf_files = get_conf_file_name(is_test=True)
     response = check_project_setup(tv_sort.settings, conf_files)
     assert response[0][0] == 'error'
-
-    # clean-up
-    os.rename(new_file_path, file_path)

tvsort_sl/tests/test_core.py

@@ -31,6 +31,7 @@ def test_main(_, __):
     # Add ZIP file
     zip_file_path = tv_sort.settings.get('TEST_ZIP_PATH')
     response = utils.copy_file(zip_file_path, new_files_folder, move_file=False)
+    assert utils.is_file_exists(zip_file_path) is True
     assert response[0][0] == 'info'
 
     # Add garbage file
@@ -70,7 +71,7 @@ def test_main_process_running(_, __):
     dummy_file_path = tv_sort.settings.get('DUMMY_FILE_PATH')
     utils.create_file(dummy_file_path)
     tv_sort.run()
-    assert PROCESS_RUNNING in tv_sort.report.get('errors')
+    assert all(x == PROCESS_RUNNING for x in tv_sort.report.get('errors'))
     tv_sort.run()
     tv_sort.run()
     response = utils.delete_file(dummy_file_path)
@@ -152,6 +153,7 @@ def test_file_not_in_ext_list():
 def test_garbage_file():
     assert utils.is_garbage_file('.DS_Store', tv_sort.extensions)
     assert not utils.is_garbage_file('test.avi', tv_sort.extensions)
+    assert utils.is_garbage_file('sample_1.avi', tv_sort.extensions)
 
 
 def test_show_name():