diff --git a/CHANGES.md b/CHANGES.md index b1f3866..da41974 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.23.0 (2020-11-11 13:30:00 UTC) +### 0.24.0 (202x-xx-xx xx:xx:00 UTC) + +* Change abbreviate long titles under menu tab + + +### 0.23.0 (2020-11-11 13:30:00 UTC) * Change improve search performance for backlog, manual, failed, and proper * Add overview of the last release age/date at each newznab provider to History/Layout "Connect fails" diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index 443d30d..44ef7d6 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -3,6 +3,7 @@ #import urllib #from sickbeard.common import Quality, SNATCHED_ANY, DOWNLOADED, ARCHIVED, FAILED #from sickbeard.helpers import anon_url +#from sickbeard.show_name_helpers import abbr_showname <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp# <% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp# #slurp @@ -196,7 +197,7 @@ #else #for item in $added_last #if $hasattr($item, 'tvid_prodid') -
  • $item.name
  • +
  • $abbr_showname($item.name)
  • #end if #end for #end if diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py index 98e19aa..7726623 100644 --- a/sickbeard/show_name_helpers.py +++ b/sickbeard/show_name_helpers.py @@ -458,3 +458,15 @@ def determineReleaseName(dir_name=None, nzb_name=None): return folder return None + + +def abbr_showname(name): + # type: (AnyStr) -> AnyStr + result = name + for cur_from, cur_to in ( + (r'^Star Trek\s*:\s*', r'ST: '), (r'^The Walking Dead\s*:\s*', r'TWD: '), + ): + result = re.sub('(?i)%s' % cur_from, cur_to, result) + if name != result: + break + return result diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 6b6abc7..b66e8d6 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -62,6 +62,7 @@ from .scene_numbering import get_scene_absolute_numbering_for_show, get_scene_nu get_xem_absolute_numbering_for_show, get_xem_numbering_for_show, set_scene_numbering_helper from .search_backlog import FORCED_BACKLOG from .sgdatetime import SGDatetime, timestamp_near +from .show_name_helpers import abbr_showname from .show_updater import clean_ignore_require_words from .trakt_helpers import build_config, trakt_collection_remove_account @@ -6163,10 +6164,10 @@ class History(MainHandler): for item in history_compact: if item.get('tvid_prodid') not in dedupe: dedupe.add(item.get('tvid_prodid')) + item['show_name'] = abbr_showname(item['show_name']) result += [item] if limit == len(result): break - return result @classmethod