Vueify Root Dirs

medusa/server/api/v2/config.py

@@ -70,6 +70,7 @@ class ConfigHandler(BaseRequestHandler):
         'theme.name': StringField(app, 'THEME_NAME'),
         'backlogOverview.period': StringField(app, 'BACKLOG_PERIOD'),
         'backlogOverview.status': StringField(app, 'BACKLOG_STATUS'),
+        'rootDirs': ListField(app, 'ROOT_DIRS'),
     }
 
     def get(self, identifier, path_param=None):

medusa/server/api/v2/internal.py

@@ -14,8 +14,6 @@
 
 from six import itervalues
 
-from tornado.escape import json_decode
-
 log = BraceAdapter(logging.getLogger(__name__))
 
 
@@ -53,24 +51,27 @@ def get(self, resource, path_param=None):
         data = resource_function()
         return self._ok(data=data)
 
+    # existingSeries
     def resource_existing_series(self):
         """Generate existing series folders data for adding existing shows."""
-        root_dirs = json_decode(self.get_argument('root-dir', '[]'))
-
-        if not root_dirs:
-            if app.ROOT_DIRS:
-                root_dirs = app.ROOT_DIRS[1:]
-            else:
-                self._not_found('No configured root dirs')
-
-        # Put the default root-dir first
-        try:
-            default_index = int(app.ROOT_DIRS[0])
-            default_root_dir = root_dirs[default_index]
-            root_dirs.remove(default_root_dir)
-            root_dirs.insert(0, default_root_dir)
-        except (IndexError, ValueError):
-            pass
+        root_dirs_indices = self.get_argument('root-dirs', '')
+
+        if root_dirs_indices:
+            root_dirs_indices = set(root_dirs_indices.split(','))
+
+        if not app.ROOT_DIRS:
+            return self._not_found('No configured root dirs')
+
+        root_dirs = app.ROOT_DIRS[1:]
+        if root_dirs_indices:
+            try:
+                root_dirs_indices = sorted(map(int, root_dirs_indices))
+            except ValueError as error:
+                log.warning('Unable to parse root dirs indices: {indices}. Error: {error}',
+                            {'indices': root_dirs_indices, 'error': error})
+                return self._bad_request('Invalid root dirs indices')
+
+            root_dirs = [root_dirs[idx] for idx in root_dirs_indices]
 
         dir_list = []
 
@@ -107,7 +108,7 @@ def resource_existing_series(self):
                 cur_dir = {
                     'path': cur_path,
                     'alreadyAdded': False,
-                    'existingInfo': {
+                    'metadata': {
                         'seriesId': None,
                         'seriesName': None,
                         'indexer': None
@@ -123,7 +124,7 @@ def resource_existing_series(self):
                     for cur_provider in itervalues(app.metadata_provider_dict):
                         (series_id, series_name, indexer) = cur_provider.retrieveShowMetadata(cur_path)
                         if all((series_id, series_name, indexer)):
-                            cur_dir['existingInfo'] = {
+                            cur_dir['metadata'] = {
                                 'seriesId': try_int(series_id),
                                 'seriesName': series_name,
                                 'indexer': try_int(indexer)

medusa/server/web/config/general.py

@@ -40,10 +40,6 @@ def index(self):
     def generate_api_key():
         return helpers.generate_api_key()
 
-    @staticmethod
-    def saveRootDirs(rootDirString=None):
-        app.ROOT_DIRS = rootDirString.split('|')
-
     @staticmethod
     def saveAddShowDefaults(default_status, allowed_qualities, preferred_qualities, default_season_folders,
                             subtitles=False, anime=False, scene=False, default_status_after=WANTED):

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

@@ -406,24 +406,6 @@ inc_bottom.mako
     display: inline;
 }
 
-/* =======================================================================
-inc_rootDirs.mako
-========================================================================== */
-.rootdir-selectbox,
-.rootdir-selectbox #rootDirs,
-.rootdir-controls {
-    width: 100%;
-    max-width: 430px;
-}
-
-.rootdir-selectbox {
-    padding: 0 0 5px;
-}
-
-.rootdir-controls {
-    text-align: center;
-}
-
 /* =======================================================================
 history.mako
 ========================================================================== */
@@ -3398,7 +3380,8 @@ pre {
 input sizing (for config pages)
 ========================================================================== */
 
-#config select {
+/* Don't style root-dirs select */
+#config select:not([size]) {
     width: auto;
     display: inline;
 }

themes-default/slim/static/js/add-shows/init.js

@@ -44,7 +44,7 @@ MEDUSA.addShows.init = function() {
             });
         });
 
-        $('#rootDirs').on('change', () => {
+        $(document.body).on('change', '#rootDirs', () => {
             $.rootDirCheck();
         });
 

themes-default/slim/static/js/add-shows/new-show.js

@@ -194,7 +194,7 @@ MEDUSA.addShows.newShow = function() {
         }
     });
 
-    $('#rootDirText').change(updateSampleText);
+    $(document.body).on('change', '#rootDirText', updateSampleText);
     $('#searchResults').on('change', '#whichSeries', updateSampleText);
 
     $('#nameToSearch').keyup(event => {