pymedusa · p0psicles · Oct 16, 2019 · Feb 17, 2019 · Feb 17, 2019 · Feb 17, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,17 @@
 
 #### Improvements
 - Shows without any episodes can now be added ([#6977](https://github.com/pymedusa/Medusa/pull/6977))
+- Vueified displayShow ([#6709](https://github.com/pymedusa/Medusa/pull/6709))
+  - New subtitles search UI component
+  - Direct toggle of show options on displayShow page like the checks for Subtitles, Season Folders, Paused, etc.
+  - Mark episodes as "watched"
+  - Added pagination
+  - Added search field, that searches columns like Title, File and Episode number
 
 #### Fixes
 - Fixed AnimeBytes daily search, for multi-ep results ([#7190](https://github.com/pymedusa/Medusa/pull/7190))
 - Fixed rare UnicodeDecodeError when parsing titles with Python 2.7 ([#7192](https://github.com/pymedusa/Medusa/pull/7192))
+- Fixed displayShow loading of large shows with many seasons e.g. daily shows ([#6977](https://github.com/pymedusa/Medusa/pull/6977))
 - Fixed torrent checker for client Transmission running on python 3 ([#7250](https://github.com/pymedusa/Medusa/pull/7250))
 - Fixed provider beyond-hd due to layout changes ([#7250](https://github.com/pymedusa/Medusa/pull/7250))
 - Fixed provider bj-share due to layout changes ([#7250](https://github.com/pymedusa/Medusa/pull/7250))

diff --git a/medusa/__main__.py b/medusa/__main__.py
@@ -970,7 +970,6 @@ def initialize(self, console_logging=True):
             app.TIMEZONE_DISPLAY = check_setting_str(app.CFG, 'GUI', 'timezone_display', 'local')
             app.POSTER_SORTBY = check_setting_str(app.CFG, 'GUI', 'poster_sortby', 'name')
             app.POSTER_SORTDIR = check_setting_int(app.CFG, 'GUI', 'poster_sortdir', 1)
-            app.DISPLAY_ALL_SEASONS = bool(check_setting_int(app.CFG, 'General', 'display_all_seasons', 1))
             app.RECENTLY_DELETED = set()
             app.RELEASES_IN_PP = []
             app.GIT_REMOTE_BRANCHES = []
@@ -1602,7 +1601,6 @@ def save_config():
         new_config['General']['no_restart'] = int(app.NO_RESTART)
         new_config['General']['developer'] = int(app.DEVELOPER)
         new_config['General']['python_version'] = app.PYTHON_VERSION
-        new_config['General']['display_all_seasons'] = int(app.DISPLAY_ALL_SEASONS)
         new_config['General']['news_last_read'] = app.NEWS_LAST_READ
         new_config['General']['broken_providers'] = helpers.get_broken_providers() or app.BROKEN_PROVIDERS
         new_config['General']['selected_root'] = int(app.SELECTED_ROOT)

diff --git a/medusa/app.py b/medusa/app.py
@@ -196,7 +196,6 @@ def __init__(self):
         self.SORT_ARTICLE = False
         self.DEBUG = False
         self.DBDEBUG = False
-        self.DISPLAY_ALL_SEASONS = True
         self.DEFAULT_PAGE = 'home'
         self.SEEDERS_LEECHERS_IN_NOTIFY = True
         self.SHOW_LIST_ORDER = ['Anime', 'Series']

diff --git a/medusa/common.py b/medusa/common.py
@@ -808,8 +808,8 @@ class Overview(object):
     overviewStrings = {
         SKIPPED: 'skipped',
         WANTED: 'wanted',
-        QUAL: 'qual',
-        GOOD: 'good',
+        QUAL: 'allowed',
+        GOOD: 'preferred',
         UNAIRED: 'unaired',
         SNATCHED: 'snatched',
         # we can give these a different class later, otherwise

diff --git a/medusa/search/manual.py b/medusa/search/manual.py
@@ -86,23 +86,31 @@ def get_episodes(search_thread, searchstatus):
     for ep_obj in search_thread.segment:
         ep = series_obj.get_episode(ep_obj.season, ep_obj.episode)
         results.append({
-            'indexer_id': series_obj.indexer,
-            'series_id': series_obj.series_id,
-            'episode': ep.episode,
-            'episodeindexerid': ep.indexerid,
-            'season': ep.season,
-            'searchstatus': searchstatus,
-            'status': statusStrings[ep.status],
-            # TODO: `quality_name` and `quality_style` should both be removed
-            # when converting forced/manual episode search to Vue (use QualityPill component directly)
-            'quality_name': Quality.qualityStrings[ep.quality],
-            'quality_style': Quality.quality_keys.get(ep.quality) or Quality.quality_keys[Quality.UNKNOWN],
-            'overview': Overview.overviewStrings[series_obj.get_overview(
-                ep.status, ep.quality,
-                manually_searched=ep.manually_searched
-            )],
-            'queuetime': search_thread.queue_time.isoformat(),
-            'starttime': search_thread.start_time.isoformat() if search_thread.start_time else None,
+            'show': {
+                'indexer': series_obj.indexer,
+                'series_id': series_obj.series_id,
+                'slug': series_obj.slug
+            },
+            'episode': {
+                'episode': ep.episode,
+                'season': ep.season,
+                'slug': ep.slug,
+                'indexerid': ep.indexerid,
+                'status': statusStrings[ep.status],
+                # TODO: `quality_name` and `quality_style` should both be removed
+                # when converting forced/manual episode search to Vue (use QualityPill component directly)
+                'quality_name': Quality.qualityStrings[ep.quality],
+                'quality_style': Quality.quality_keys.get(ep.quality) or Quality.quality_keys[Quality.UNKNOWN],
+                'overview': Overview.overviewStrings[series_obj.get_overview(
+                    ep.status, ep.quality,
+                    manually_searched=ep.manually_searched
+                )]
+            },
+            'search': {
+                'status': searchstatus,
+                'queuetime': search_thread.queue_time.isoformat(),
+                'starttime': search_thread.start_time.isoformat() if search_thread.start_time else None
+            }
         })
 
     return results
@@ -163,11 +171,11 @@ def collect_episodes_from_search_thread(series_obj):
             continue
 
         if isinstance(search_thread, ManualSearchQueueItem):
-            if not [x for x in episodes if x['episodeindexerid'] in [search.indexerid for search in search_thread.segment]]:
+            if not [x for x in episodes if x['episode']['indexerid'] in [search.indexerid for search in search_thread.segment]]:
                 episodes += get_episodes(search_thread, searchstatus)
         else:
             # These are only Failed Downloads/Retry search thread items.. lets loop through the segment/episodes
-            if not [i for i, j in zip(search_thread.segment, episodes) if i.indexerid == j['episodeindexerid']]:
+            if not [i for i, j in zip(search_thread.segment, episodes) if i.indexerid == j['episode']['indexerid']]:
                 episodes += get_episodes(search_thread, searchstatus)
 
     return episodes

diff --git a/medusa/search/queue.py b/medusa/search/queue.py
@@ -105,7 +105,7 @@ def force_daily(self):
 
 
 class ForcedSearchQueue(generic_queue.GenericQueue):
-    """Search Queueu used for Manual, Failed Search."""
+    """Search Queue used for Manual, (forced) Backlog and Failed Search."""
 
     def __init__(self):
         """Initialize ForcedSearch Queue."""
@@ -346,7 +346,7 @@ def __init__(self, show, segment, manual_search_type='episode'):
         self.manual_search_type = manual_search_type
 
     def run(self):
-        """Run forced search thread."""
+        """Run manual search thread."""
         generic_queue.QueueItem.run(self)
         self.started = True
 
@@ -551,6 +551,9 @@ def run(self):
                 self.success = False
                 log.debug(traceback.format_exc())
 
+        # Keep a list with the 100 last executed searches
+        fifo(SEARCH_HISTORY, self, SEARCH_HISTORY_SIZE)
+
         if self.success is None:
             self.success = False
 
@@ -648,7 +651,7 @@ def run(self):
             self.success = False
             log.info(traceback.format_exc())
 
-        # ## Keep a list with the 100 last executed searches
+        # Keep a list with the 100 last executed searches
         fifo(SEARCH_HISTORY, self, SEARCH_HISTORY_SIZE)
 
         if self.success is None:

diff --git a/medusa/server/api/v2/config.py b/medusa/server/api/v2/config.py
@@ -122,7 +122,6 @@ class ConfigHandler(BaseRequestHandler):
         'layout.history': EnumField(app, 'HISTORY_LAYOUT', ('compact', 'detailed'), default_value='detailed'),
         'layout.home': EnumField(app, 'HOME_LAYOUT', ('poster', 'small', 'banner', 'simple', 'coverflow'),
                                  default_value='poster'),
-        'layout.show.allSeasons': BooleanField(app, 'DISPLAY_ALL_SEASONS'),
         'layout.show.specials': BooleanField(app, 'DISPLAY_SHOW_SPECIALS'),
         'layout.show.showListOrder': ListField(app, 'SHOW_LIST_ORDER'),
         'theme.name': StringField(app, 'THEME_NAME', setter=theme_name_setter),
@@ -558,7 +557,7 @@ def data_main():
         section_data['layout']['history'] = app.HISTORY_LAYOUT
         section_data['layout']['home'] = app.HOME_LAYOUT
         section_data['layout']['show'] = {}
-        section_data['layout']['show']['allSeasons'] = bool(app.DISPLAY_ALL_SEASONS)
+
         section_data['layout']['show']['specials'] = bool(app.DISPLAY_SHOW_SPECIALS)
         section_data['layout']['show']['showListOrder'] = app.SHOW_LIST_ORDER
 

diff --git a/medusa/server/core.py b/medusa/server/core.py
@@ -77,6 +77,7 @@ def clean_url_path(*args, **kwargs):
 def get_apiv2_handlers(base):
     """Return api v2 handlers."""
     return [
+
         # Order: Most specific to most generic
 
         # /api/v2/search

diff --git a/medusa/server/web/config/general.py b/medusa/server/web/config/general.py
@@ -72,7 +72,7 @@ def saveGeneral(self, log_dir=None, log_nr=5, log_size=1, web_port=None, notify_
                     fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
                     indexer_timeout=None, download_url=None, rootDir=None, theme_name=None, default_page=None,
                     git_reset=None, git_reset_branches=None, git_auth_type=0, git_username=None, git_password=None, git_token=None,
-                    display_all_seasons=None, subliminal_log=None, privacy_level='normal', fanart_background=None, fanart_background_opacity=None,
+                    subliminal_log=None, privacy_level='normal', fanart_background=None, fanart_background_opacity=None,
                     dbdebug=None, fallback_plex_enable=1, fallback_plex_notifications=1, fallback_plex_timeout=3, web_root=None, ssl_ca_bundle=None):
 
         results = []
@@ -119,7 +119,6 @@ def saveGeneral(self, log_dir=None, log_nr=5, log_size=1, web_port=None, notify_
         app.SSL_CA_BUNDLE = ssl_ca_bundle
         # app.LOG_DIR is set in config.change_LOG_DIR()
         app.COMING_EPS_MISSED_RANGE = int(coming_eps_missed_range)
-        app.DISPLAY_ALL_SEASONS = config.checkbox_to_value(display_all_seasons)
         app.NOTIFY_ON_LOGIN = config.checkbox_to_value(notify_on_login)
         app.WEB_PORT = int(web_port)
         app.WEB_IPV6 = config.checkbox_to_value(web_ipv6)