Vueify config-postprocessing

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+#### Fixes
+
+#### New Features
+
+#### Improvements
+- Converted /config/postProcessing to a Vue component ([#4259](https://github.com/pymedusa/Medusa/pull/4259))
+
 -----
 
 ## 0.2.8 (2018-07-28)

medusa/server/api/v2/config.py

@@ -278,6 +278,7 @@ def data_main():
         section_data['locale'] = '.'.join([text_type(loc or 'Unknown') for loc in app.LOCALE])
         section_data['localUser'] = app.OS_USER or 'Unknown'
         section_data['programDir'] = app.PROG_DIR
+        section_data['dataDir'] = app.DATA_DIR
         section_data['configFile'] = app.CONFIG_FILE
         section_data['dbPath'] = db.DBConnection().path
         section_data['cacheDir'] = app.CACHE_DIR

medusa/server/web/config/post_processing.py

@@ -39,24 +39,13 @@ def index(self):
         return t.render(submenu=self.ConfigMenu(),
                         controller='config', action='postProcessing')
 
-    def savePostProcessing(self, kodi_data=None, kodi_12plus_data=None,
-                           mediabrowser_data=None, sony_ps3_data=None,
-                           wdtv_data=None, tivo_data=None, mede8er_data=None,
-                           keep_processed_dir=None, process_method=None,
-                           del_rar_contents=None, process_automatically=None,
-                           no_delete=None, rename_episodes=None, airdate_episodes=None,
-                           file_timestamp_timezone=None, unpack=None,
-                           move_associated_files=None, sync_files=None,
-                           postpone_if_sync_files=None, postpone_if_no_subs=None,
-                           allowed_extensions=None, tv_download_dir=None,
-                           create_missing_show_dirs=None, add_shows_wo_dir=None,
-                           extra_scripts=None, nfo_rename=None,
-                           naming_pattern=None, naming_multi_ep=None,
-                           naming_custom_abd=None, naming_anime=None,
-                           naming_abd_pattern=None, naming_strip_year=None,
-                           naming_custom_sports=None, naming_sports_pattern=None,
-                           naming_custom_anime=None, naming_anime_pattern=None,
-                           naming_anime_multi_ep=None, autopostprocessor_frequency=None):
+    def savePostProcessing(self, process_automatically=None, unpack=None, allowed_extensions=None,
+                           tv_download_dir=None, naming_pattern=None, naming_multi_ep=None,
+                           naming_anime=None, naming_abd_pattern=None, naming_sports_pattern=None,
+                           naming_anime_pattern=None, naming_anime_multi_ep=None,
+                           autopostprocessor_frequency=None):
+
+        # @TODO: The following validations need to be incorporated into API v2 (PATCH /api/v2/config/main)
 
         results = []
 
@@ -75,47 +64,13 @@ def savePostProcessing(self, kodi_data=None, kodi_12plus_data=None,
                 results.append('Unpacking Not Supported, disabling unpack setting')
         else:
             app.UNPACK = config.checkbox_to_value(unpack)
-        app.NO_DELETE = config.checkbox_to_value(no_delete)
-        app.KEEP_PROCESSED_DIR = config.checkbox_to_value(keep_processed_dir)
-        app.CREATE_MISSING_SHOW_DIRS = config.checkbox_to_value(create_missing_show_dirs)
-        app.ADD_SHOWS_WO_DIR = config.checkbox_to_value(add_shows_wo_dir)
-        app.PROCESS_METHOD = process_method
-        app.DELRARCONTENTS = config.checkbox_to_value(del_rar_contents)
-        app.EXTRA_SCRIPTS = [_.strip() for _ in extra_scripts.split('|') if _.strip()]
-        app.RENAME_EPISODES = config.checkbox_to_value(rename_episodes)
-        app.AIRDATE_EPISODES = config.checkbox_to_value(airdate_episodes)
-        app.FILE_TIMESTAMP_TIMEZONE = file_timestamp_timezone
-        app.MOVE_ASSOCIATED_FILES = config.checkbox_to_value(move_associated_files)
-        app.SYNC_FILES = [_.strip() for _ in sync_files.split(',') if _.strip()]
-        app.POSTPONE_IF_SYNC_FILES = config.checkbox_to_value(postpone_if_sync_files)
-        app.POSTPONE_IF_NO_SUBS = config.checkbox_to_value(postpone_if_no_subs)
+
+        # @TODO: postprocessor for `POSTPONE_IF_NO_SUBS` and `ALLOWED_EXTENSIONS` ?
         # If 'postpone if no subs' is enabled, we must have SRT in allowed extensions list
         if app.POSTPONE_IF_NO_SUBS:
             allowed_extensions += ',srt'
             # # Auto PP must be disabled because FINDSUBTITLE thread that calls manual PP (like nzbtomedia)
             # app.PROCESS_AUTOMATICALLY = 0
-        app.ALLOWED_EXTENSIONS = {_.strip() for _ in allowed_extensions.split(',') if _.strip()}
-        app.NAMING_CUSTOM_ABD = config.checkbox_to_value(naming_custom_abd)
-        app.NAMING_CUSTOM_SPORTS = config.checkbox_to_value(naming_custom_sports)
-        app.NAMING_CUSTOM_ANIME = config.checkbox_to_value(naming_custom_anime)
-        app.NAMING_STRIP_YEAR = config.checkbox_to_value(naming_strip_year)
-        app.NFO_RENAME = config.checkbox_to_value(nfo_rename)
-
-        app.METADATA_KODI = kodi_data.split('|')
-        app.METADATA_KODI_12PLUS = kodi_12plus_data.split('|')
-        app.METADATA_MEDIABROWSER = mediabrowser_data.split('|')
-        app.METADATA_PS3 = sony_ps3_data.split('|')
-        app.METADATA_WDTV = wdtv_data.split('|')
-        app.METADATA_TIVO = tivo_data.split('|')
-        app.METADATA_MEDE8ER = mede8er_data.split('|')
-
-        app.metadata_provider_dict['KODI'].set_config(app.METADATA_KODI)
-        app.metadata_provider_dict['KODI 12+'].set_config(app.METADATA_KODI_12PLUS)
-        app.metadata_provider_dict['MediaBrowser'].set_config(app.METADATA_MEDIABROWSER)
-        app.metadata_provider_dict['Sony PS3'].set_config(app.METADATA_PS3)
-        app.metadata_provider_dict['WDTV'].set_config(app.METADATA_WDTV)
-        app.metadata_provider_dict['TIVO'].set_config(app.METADATA_TIVO)
-        app.metadata_provider_dict['Mede8er'].set_config(app.METADATA_MEDE8ER)
 
         if self.isNamingValid(naming_pattern, naming_multi_ep, anime_type=naming_anime) != 'invalid':
             app.NAMING_PATTERN = naming_pattern

setup.py

@@ -44,7 +44,7 @@ def run_tests(self):
         'flake8-quotes',
         'pep8-naming',
         'pycodestyle==2.3.1',
-        'pytest',
+        'pytest==3.6.4',
         'pytest-cov',
         'pytest-flake8',
         'pytest-tornado5',

tests/apiv2/test_config.py

@@ -60,6 +60,7 @@ def config_main(monkeypatch, app_config):
     config_data['locale'] = app_locale
     config_data['localUser'] = os_user
     config_data['programDir'] = app.PROG_DIR
+    config_data['dataDir'] = app.DATA_DIR
     config_data['configFile'] = app.CONFIG_FILE
     config_data['dbPath'] = db.DBConnection().path
     config_data['cacheDir'] = app.CACHE_DIR

themes-default/slim/package.json

@@ -119,15 +119,15 @@
       "webRoot",
       "apiRoot",
       "apiKey",
-      "Vuex"
+      "Vuex",
+      "dateFns"
     ],
     "ignores": [
       "static/js/lib/**",
       "static/js/*.min.js",
       "static/js/vender.js",
       "build/**",
-      "gulpfile.js",
-      "static/js/templates/name-pattern.vue"
+      "gulpfile.js"
     ],
     "esnext": true
   },

themes-default/slim/static/css/dark.css

@@ -464,7 +464,6 @@ config*.mako
 .component-group {
     padding: 15px 15px 25px;
     border-bottom: 1px dotted rgb(85, 85, 85);
-    min-height: 200px;
 }
 
 .component-group-desc p {

themes-default/slim/static/css/style.css

@@ -1972,20 +1972,24 @@ config*.mako
 .component-group {
     padding: 15px 15px 25px;
     border-bottom: 1px dotted rgb(204, 204, 204);
-    min-height: 200px;
+    min-height: 100px;
 }
 
 .component-item {
     border-bottom: 1px dotted rgb(102, 102, 102);
     min-height: 200px;
 }
 
-.component-group-desc {
+.component-group-desc-legacy {
     margin-top: 5px;
     float: left;
     width: 250px;
 }
 
+.component-group-desc {
+    margin-top: 5px;
+}
+
 .component-group-desc h3 {
     margin-top: 5px;
 }
@@ -2035,10 +2039,6 @@ config*.mako
     margin-right: 10px;
 }
 
-#config .metadataDiv {
-    display: none;
-}
-
 .component-group-save {
     float: right;
     padding-top: 10px;
@@ -2961,6 +2961,11 @@ fieldset[disabled] .navbar-default .btn-link:focus {
     width: auto;
 }
 
+.form-control-inline-max {
+    display: inline;
+    width: 100%;
+}
+
 .input-sm-smallfont {
     font-size: 11px;
 }
@@ -3384,6 +3389,42 @@ input sizing (for config pages)
     margin-top: -4px;
 }
 
+/* Added max-width, as setting width is really not optimal on smaller viewports */
+.max-input75 {
+    max-width: 75px;
+    margin-top: -4px;
+}
+
+.max-input100 {
+    max-width: 100px;
+    margin-top: -4px;
+}
+
+.max-input150 {
+    max-width: 150px;
+    margin-top: -4px;
+}
+
+.max-input200 {
+    max-width: 200px;
+    margin-top: -4px;
+}
+
+.max-input250 {
+    max-width: 250px;
+    margin-top: -4px;
+}
+
+.max-input300 {
+    max-width: 300px;
+    margin-top: -4px;
+}
+
+.max-input350 {
+    max-width: 350px;
+    margin-top: -4px;
+}
+
 select.input-sm {
     font-size: 0.9em;
 }
@@ -4333,3 +4374,8 @@ CSS helper classes
     display: block;
 }
 */
+
+/* These classes should be natively available in bootstrap 4 */
+.d-block {
+    display: block;
+}

themes-default/slim/static/js/store.js

@@ -93,6 +93,7 @@ const store = new Store({
                 minor: null
             },
             programDir: null,
+            dataDir: null,
             animeSplitHomeInTabs: null,
             torrents: {
                 authType: null,