Vueify add show options

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Updated `guessit` to version 3.0.0 ([#4244](https://github.com/pymedusa/Medusa/pull/4244))
 - Updated the API v2 endpoint to handle concurrent requests ([#4970](https://github.com/pymedusa/Medusa/pull/4970))
 - Converted some of the show header to Vue ([#5087](https://github.com/pymedusa/Medusa/pull/5087))
+- Converted "Add Show" options into a Vue SFC ([#4848](https://github.com/pymedusa/Medusa/pull/4848))
 
 #### Fixes
 - Fixed many release name parsing issues as a result of updating `guessit` ([#4244](https://github.com/pymedusa/Medusa/pull/4244))

medusa/common.py

@@ -260,6 +260,22 @@ def split_quality(quality):
 
         return sorted(allowed_qualities), sorted(preferred_qualities)
 
+    @staticmethod
+    def is_valid_combined_quality(quality):
+        """
+        Check quality value to make sure it is a valid combined quality.
+
+        :param quality: Quality to check
+        :type quality: int
+        :return: True if valid, False if not
+        """
+        for cur_qual in Quality.qualityStrings:
+            if cur_qual & quality:
+                quality -= cur_qual
+            if cur_qual << 16 & quality:
+                quality -= cur_qual << 16
+        return quality == 0
+
     @staticmethod
     def name_quality(name, anime=False, extend=True):
         """

medusa/server/api/v2/config.py

@@ -17,6 +17,7 @@
     logger,
     ws,
 )
+from medusa.common import IGNORED, Quality, SKIPPED, WANTED
 from medusa.helper.mappings import NonEmptyDict
 from medusa.indexers.indexer_config import get_indexer_config
 from medusa.logger.adapters.style import BraceAdapter
@@ -51,6 +52,11 @@ def theme_name_setter(object, name, value):
     config.change_theme(value)
 
 
+def season_folders_validator(value):
+    """Validate default season folders setting."""
+    return not (app.NAMING_FORCE_FOLDERS and value is False)
+
+
 class ConfigHandler(BaseRequestHandler):
     """Config request handler."""
 
@@ -116,6 +122,15 @@ class ConfigHandler(BaseRequestHandler):
         'backlogOverview.period': StringField(app, 'BACKLOG_PERIOD'),
         'backlogOverview.status': StringField(app, 'BACKLOG_STATUS'),
         'rootDirs': ListField(app, 'ROOT_DIRS'),
+
+        'showDefaults.status': EnumField(app, 'STATUS_DEFAULT', (SKIPPED, WANTED, IGNORED), int),
+        'showDefaults.statusAfter': EnumField(app, 'STATUS_DEFAULT_AFTER', (SKIPPED, WANTED, IGNORED), int),
+        'showDefaults.quality': IntegerField(app, 'QUALITY_DEFAULT', validator=Quality.is_valid_combined_quality),
+        'showDefaults.subtitles': BooleanField(app, 'SUBTITLES_DEFAULT', validator=lambda v: app.USE_SUBTITLES, converter=bool),
+        'showDefaults.seasonFolders': BooleanField(app, 'SEASON_FOLDERS_DEFAULT', validator=season_folders_validator, converter=bool),
+        'showDefaults.anime': BooleanField(app, 'ANIME_DEFAULT', converter=bool),
+        'showDefaults.scene': BooleanField(app, 'SCENE_DEFAULT', converter=bool),
+
         'postProcessing.showDownloadDir': StringField(app, 'TV_DOWNLOAD_DIR'),
         'postProcessing.processAutomatically': BooleanField(app, 'PROCESS_AUTOMATICALLY'),
         'postProcessing.processMethod': StringField(app, 'PROCESS_METHOD'),
@@ -297,6 +312,15 @@ def data_main():
         section_data['subtitles']['enabled'] = bool(app.USE_SUBTITLES)
         section_data['recentShows'] = app.SHOWS_RECENT
 
+        section_data['showDefaults'] = {}
+        section_data['showDefaults']['status'] = app.STATUS_DEFAULT
+        section_data['showDefaults']['statusAfter'] = app.STATUS_DEFAULT_AFTER
+        section_data['showDefaults']['quality'] = app.QUALITY_DEFAULT
+        section_data['showDefaults']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
+        section_data['showDefaults']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
+        section_data['showDefaults']['anime'] = bool(app.ANIME_DEFAULT)
+        section_data['showDefaults']['scene'] = bool(app.SCENE_DEFAULT)
+
         section_data['news'] = NonEmptyDict()
         section_data['news']['lastRead'] = app.NEWS_LAST_READ
         section_data['news']['latest'] = app.NEWS_LATEST

tests/apiv2/test_config.py

@@ -78,6 +78,15 @@ def config_main(monkeypatch, app_config):
     config_data['subtitles']['enabled'] = bool(app.USE_SUBTITLES)
     config_data['recentShows'] = app.SHOWS_RECENT
 
+    config_data['showDefaults'] = {}
+    config_data['showDefaults']['status'] = app.STATUS_DEFAULT
+    config_data['showDefaults']['statusAfter'] = app.STATUS_DEFAULT_AFTER
+    config_data['showDefaults']['quality'] = app.QUALITY_DEFAULT
+    config_data['showDefaults']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
+    config_data['showDefaults']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
+    config_data['showDefaults']['anime'] = bool(app.ANIME_DEFAULT)
+    config_data['showDefaults']['scene'] = bool(app.SCENE_DEFAULT)
+
     config_data['news'] = NonEmptyDict()
     config_data['news']['lastRead'] = app.NEWS_LAST_READ
     config_data['news']['latest'] = app.NEWS_LATEST

tests/test_common.py

@@ -461,3 +461,33 @@ def test_wanted_quality():
 
     # Then
     assert actual is True
+
+
+@pytest.mark.parametrize('p', [
+    {  # p0 - Invalid combined quality
+        'quality': -4,
+        'expected': False
+    },
+    {  # p1 - Valid 'allowed' quality
+        'quality': Quality.HDTV,
+        'expected': True
+    },
+    {  # p2 - Valid 'allowed' quality + valid 'preferred' quality
+        'quality': Quality.combine_qualities([Quality.HDTV], [Quality.HDWEBDL]),
+        'expected': True
+    },
+    {  # p3 - Valid 'allowed' quality + **invalid** 'preferred' quality
+        'quality': Quality.combine_qualities([Quality.HDTV], [-4]),
+        'expected': False
+    },
+])
+def test_is_valid_combined_quality(p):
+    # Given
+    quality = p['quality']
+    expected = p['expected']
+
+    # When
+    actual = Quality.is_valid_combined_quality(quality)
+
+    # Then
+    assert expected == actual