diff --git a/gui/slick/views/IRC.mako b/gui/slick/views/IRC.mako
index 13a40727a610030670d99801395e3ecf1dda2f18..794fb3b63e5162df2cdf4c10da8b2bf55b766c86 100644
--- a/gui/slick/views/IRC.mako
+++ b/gui/slick/views/IRC.mako
@@ -1,8 +1,8 @@
<%inherit file="/layouts/main.mako"/>
<%block name="content">
<%
-from sickbeard import GIT_USERNAME
-username = ("SickRageUI|?", GIT_USERNAME)[bool(GIT_USERNAME)]
+import sickbeard
+username = ("SickRageUI|?", sickbeard.GIT_USERNAME)[bool(sickbeard.GIT_USERNAME)]
%>
<iframe id="extFrame" src="https://kiwiirc.com/client/irc.freenode.net/?nick=${username}&theme=basic#sickrage-issues" width="100%" height="500" frameBorder="0" style="border: 1px black solid;"></iframe>
</%block>
diff --git a/gui/slick/views/addShows.mako b/gui/slick/views/addShows.mako
index 3bf5e84d8d6d392cfda71d54191127f5cf8df311..a4b2a3805087caf00e992069569231b3fd84dade 100644
--- a/gui/slick/views/addShows.mako
+++ b/gui/slick/views/addShows.mako
@@ -1,9 +1,4 @@
<%inherit file="/layouts/main.mako"/>
-<%!
- import os.path
- import urllib
- import sickbeard
-%>
<%block name="content">
% if not header is UNDEFINED:
<h1 class="header">${header}</h1>
diff --git a/gui/slick/views/addShows_addExistingShow.mako b/gui/slick/views/addShows_addExistingShow.mako
index ad6d318e312d0d7b04186d0a44a570d794ebf988..b424dc1d49434d686cca941683edd7e485fdc24c 100644
--- a/gui/slick/views/addShows_addExistingShow.mako
+++ b/gui/slick/views/addShows_addExistingShow.mako
@@ -1,7 +1,4 @@
<%inherit file="/layouts/main.mako"/>
-<%!
- import sickbeard
-%>
<%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/qualityChooser.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/addShowOptions.js?${sbPID}"></script>
diff --git a/gui/slick/views/addShows_popularShows.mako b/gui/slick/views/addShows_popularShows.mako
index 471d8603dcaa1d307d021585d344c8ea27533fc2..9f8a079b8503c323e01c506a864916c50fcb1f66 100644
--- a/gui/slick/views/addShows_popularShows.mako
+++ b/gui/slick/views/addShows_popularShows.mako
@@ -30,7 +30,7 @@
</select>
</div>
-<% imdb_tt = [show.imdbid for show in sickbeard.showList if show.imdbid] %>
+<% imdb_tt = {show.imdbid for show in sickbeard.showList if show.imdbid} %>
<br>
<div id="popularShows">
diff --git a/gui/slick/views/config_backuprestore.mako b/gui/slick/views/config_backuprestore.mako
index e70a7a32f58709c01b39009ba5650703951f26b0..f0446257eb171ff15d83c7b58713bcbd4c67bea8 100644
--- a/gui/slick/views/config_backuprestore.mako
+++ b/gui/slick/views/config_backuprestore.mako
@@ -1,14 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
- import datetime
- import locale
import sickbeard
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
- from sickbeard.sbdatetime import sbdatetime, date_presets, time_presets
- from sickbeard import config
- from sickbeard import metadata
- from sickbeard.metadata.generic import GenericMetadata
%>
<%block name="content">
% if not header is UNDEFINED:
diff --git a/gui/slick/views/config_general.mako b/gui/slick/views/config_general.mako
index 3bd966e6251490708126482fed5ecd858aed8fb1..4d3fe065baa48ef58b0d9461715df3bd048f9f0a 100644
--- a/gui/slick/views/config_general.mako
+++ b/gui/slick/views/config_general.mako
@@ -1,14 +1,9 @@
<%inherit file="/layouts/main.mako"/>
<%!
import datetime
- import locale
import sickbeard
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
+ from sickbeard.common import SKIPPED, ARCHIVED, IGNORED, statusStrings, cpu_presets
from sickbeard.sbdatetime import sbdatetime, date_presets, time_presets
- from sickbeard import config
- from sickbeard import metadata
- from sickbeard.metadata.generic import GenericMetadata
from sickbeard.helpers import anon_url
%>
<%block name="scripts">
@@ -21,11 +16,6 @@
<h1 class="title">${title}</h1>
% endif
-<% indexer = 0 %>
-% if sickbeard.INDEXER_DEFAULT:
- <% indexer = sickbeard.INDEXER_DEFAULT %>
-% endif
-
<div id="config">
<div id="config-content">
@@ -142,7 +132,7 @@
<span class="component-title">Use initial indexer set to</span>
<span class="component-desc">
<select id="indexer_default" name="indexer_default" class="form-control input-sm">
- <option value="0" ${('', 'selected="selected"')[indexer == 0]}>All Indexers</option>
+ <option value="0" ${('', 'selected="selected"')[sickbeard.INDEXER_DEFAULT == 0]}>All Indexers</option>
% for indexer in sickbeard.indexerApi().indexers:
<option value="${indexer}" ${('', 'selected="selected"')[sickbeard.INDEXER_DEFAULT == indexer]}>${sickbeard.indexerApi().indexers[indexer]}</option>
% endfor
diff --git a/gui/slick/views/config_notifications.mako b/gui/slick/views/config_notifications.mako
index a8e77326bb186057cfa9ca79281bb2c3cd97271f..d3b8bcfa4249e029c1f5006d4993b49dcdd01d97 100644
--- a/gui/slick/views/config_notifications.mako
+++ b/gui/slick/views/config_notifications.mako
@@ -3,8 +3,6 @@
import sickbeard
import re
from sickbeard.helpers import anon_url
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, MULTI_EP_STRINGS
%>
<%block name="content">
% if not header is UNDEFINED:
diff --git a/gui/slick/views/config_postProcessing.mako b/gui/slick/views/config_postProcessing.mako
index 46bf5b0a3bbc894a0f4ec2a8242bcd8937cd5ce5..cb29875285feb94e579ea9be9ec0087b471222e0 100644
--- a/gui/slick/views/config_postProcessing.mako
+++ b/gui/slick/views/config_postProcessing.mako
@@ -3,11 +3,7 @@
import os.path
import datetime
import sickbeard
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets, MULTI_EP_STRINGS
- from sickbeard import config
- from sickbeard import metadata
- from sickbeard.metadata.generic import GenericMetadata
+ from sickbeard.common import MULTI_EP_STRINGS
from sickbeard import naming
from sickrage.helper.encoding import ek
%>
@@ -1080,9 +1076,8 @@
<label>
<span class="component-title">Metadata Type:</span>
<span class="component-desc">
- <% m_dict = metadata.get_metadata_generator_dict() %>
<select id="metadataType" class="form-control input-sm">
- % for (cur_name, cur_generator) in sorted(m_dict.iteritems()):
+ % for (cur_name, cur_generator) in sorted(sickbeard.metadata_provider_dict.iteritems()):
<option value="${cur_generator.get_id()}">${cur_name}</option>
% endfor
</select>
@@ -1091,9 +1086,11 @@
<span>Toggle the metadata options that you wish to be created. <b>Multiple targets may be used.</b></span>
</div>
- % for (cur_name, cur_generator) in m_dict.iteritems():
- <% cur_metadata_inst = sickbeard.metadata_provider_dict[cur_generator.name] %>
- <% cur_id = cur_generator.get_id() %>
+ % for (cur_name, cur_generator) in sickbeard.metadata_provider_dict.iteritems():
+ <%
+ cur_metadata_inst = sickbeard.metadata_provider_dict[cur_generator.name]
+ cur_id = cur_generator.get_id()
+ %>
<div class="metadataDiv" id="${cur_id}">
<div class="metadata_options_wrapper">
<h4>Create:</h4>
diff --git a/gui/slick/views/config_search.mako b/gui/slick/views/config_search.mako
index 32b9aac81e0ff1b71a8de8ca74b580c2c18a7995..bd2ac3ffe0115ae4904fb652c3d67ac1bd7ab2ab 100644
--- a/gui/slick/views/config_search.mako
+++ b/gui/slick/views/config_search.mako
@@ -1,7 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- from sickbeard import clients
%>
<%block name="content">
% if not header is UNDEFINED:
diff --git a/gui/slick/views/displayShow.mako b/gui/slick/views/displayShow.mako
index 2cc62826b37afb46c892882bab73e87c3b819573..e739609d832dde2037780d16c80ea8bbb3d03860 100644
--- a/gui/slick/views/displayShow.mako
+++ b/gui/slick/views/displayShow.mako
@@ -2,7 +2,6 @@
<%!
import datetime
import urllib
- import ntpath
import sickbeard
from sickbeard import subtitles, sbdatetime, network_timezones
import sickbeard.helpers
diff --git a/gui/slick/views/editShow.mako b/gui/slick/views/editShow.mako
index cb6d8b09ec085db3f10c07d1458cd844bb56cc90..45ad4355684b22f0734a7fc723076d54f314ed52 100644
--- a/gui/slick/views/editShow.mako
+++ b/gui/slick/views/editShow.mako
@@ -1,12 +1,9 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- import adba
from sickbeard import common
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
+ from sickbeard.common import SKIPPED, WANTED, IGNORED
from sickbeard.common import statusStrings
- from sickrage.helper import exceptions
- from sickbeard import scene_exceptions
%>
<%block name="metas">
diff --git a/gui/slick/views/errorlogs.mako b/gui/slick/views/errorlogs.mako
index b00c3ce384c8d58dbdfc257809f84a18238c1216..5baed2e03621f71672e256b46748ff2135085341 100644
--- a/gui/slick/views/errorlogs.mako
+++ b/gui/slick/views/errorlogs.mako
@@ -1,7 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- from sickbeard import classes
%>
<%block name="css">
<style>
@@ -15,10 +14,10 @@ pre {
<%block name="content">
<%
if logLevel == sickbeard.logger.WARNING:
- errors = classes.WarningViewer.errors
+ errors = sickbeard.classes.WarningViewer.errors
title = 'WARNING logs'
else:
- errors = classes.ErrorViewer.errors
+ errors = sickbeard.classes.ErrorViewer.errors
title = 'ERROR logs'
%>
<h1 class="header">${title}</h1>
diff --git a/gui/slick/views/history.mako b/gui/slick/views/history.mako
index 97e01eb52320494cb382f57072e8a88f52b5fc67..2476e5c625eb75efcb965746304effe6d6da3c6c 100644
--- a/gui/slick/views/history.mako
+++ b/gui/slick/views/history.mako
@@ -3,14 +3,11 @@
import sickbeard
import os.path
import datetime
- import re
- import time
- from sickbeard import providers
- from sickbeard import sbdatetime
+ from sickbeard import providers, sbdatetime
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED, DOWNLOADED, SUBTITLED
- from sickbeard.common import Quality, statusStrings, Overview
+ from sickbeard.common import ARCHIVED, SNATCHED, FAILED, DOWNLOADED, SUBTITLED
+ from sickbeard.common import Quality, statusStrings
from sickrage.show.History import History
from sickrage.helper.encoding import ek
diff --git a/gui/slick/views/home.mako b/gui/slick/views/home.mako
index 9c0362e19f50c0d565a59a6b4c70291637e27e46..d1a54e8fdf9dcef8258fa421b2da0bdf1a4587da 100644
--- a/gui/slick/views/home.mako
+++ b/gui/slick/views/home.mako
@@ -112,7 +112,7 @@
download_stat_tip = ''
display_status = curShow.status
- if None is not display_status:
+ if display_status:
if re.search(r'(?i)(?:new|returning)\s*series', curShow.status):
display_status = 'Continuing'
elif re.search(r'(?i)(?:nded)', curShow.status):
diff --git a/gui/slick/views/inc_addShowOptions.mako b/gui/slick/views/inc_addShowOptions.mako
index 5e82e6eaa930479ade37bfabcf186e55d61200a4..4b6f531c77e74f1d77f2caba195da93e19d6cd38 100644
--- a/gui/slick/views/inc_addShowOptions.mako
+++ b/gui/slick/views/inc_addShowOptions.mako
@@ -1,8 +1,7 @@
<%
import sickbeard
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, qualityPresetStrings, statusStrings
- from sickbeard import subtitles
+ from sickbeard.common import SKIPPED, WANTED, IGNORED
+ from sickbeard.common import Quality, statusStrings
%>
<div class="field-pair alt">
diff --git a/gui/slick/views/inc_defs.mako b/gui/slick/views/inc_defs.mako
index ddc7a38da644620a5b30017a4225a5081a4394af..1f31c748a2eac0fd49ee096c0f494d1a5f2c417b 100644
--- a/gui/slick/views/inc_defs.mako
+++ b/gui/slick/views/inc_defs.mako
@@ -1,24 +1,18 @@
<%!
- import cgi
from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
%>
-<%def name="renderQualityPill(quality, showTitle=False, overrideClass=None)"><%
+<%def name="renderQualityPill(quality, showTitle=False, overrideClass=None)">
+<%
# Build a string of quality names to use as title attribute
if showTitle:
allowed_qualities, preferred_qualities = Quality.splitQuality(quality)
title = 'Allowed Quality:\n'
- if allowed_qualities:
- for curQual in allowed_qualities:
- title += " " + Quality.qualityStrings[curQual] + "\n"
- else:
- title += " None\n"
+ for curQual in allowed_qualities or [None]:
+ title += " " + Quality.qualityStrings[curQual] + "\n"
+
title += "\nPreferred Quality:\n"
- if preferred_qualities:
- for curQual in preferred_qualities:
- title += " " + Quality.qualityStrings[curQual] + "\n"
- else:
- title += " None\n"
- title = ' title="' + cgi.escape(title.rstrip(), True) + '"'
+ for curQual in preferred_qualities or [None]:
+ title += " " + Quality.qualityStrings[curQual] + "\n"
else:
title = ""
@@ -77,9 +71,6 @@
cssClass = "Custom"
qualityString = "Custom"
- if overrideClass is None:
- cssClass = "quality " + cssClass
- else:
- cssClass = overrideClass
-
-%><span${title} class="${cssClass}">${qualityString}</span></%def>
+ cssClass = overrideClass or "quality " + cssClass
+%>
+<span title="${title | h}" class="${cssClass}">${qualityString}</span></%def>
diff --git a/gui/slick/views/inc_qualityChooser.mako b/gui/slick/views/inc_qualityChooser.mako
index 87852c51b97a41c4f99be6e36c6564db1d89b34a..5bad2e374d8e9611351611645f2012799171f4c7 100644
--- a/gui/slick/views/inc_qualityChooser.mako
+++ b/gui/slick/views/inc_qualityChooser.mako
@@ -4,7 +4,7 @@
%>
<%
-if not show is UNDEFINED:
+if show is not UNDEFINED:
__quality = int(show.quality)
else:
__quality = int(sickbeard.QUALITY_DEFAULT)
diff --git a/gui/slick/views/layouts/main.mako b/gui/slick/views/layouts/main.mako
index ddc0f5dc0235e19774c98f075da69f9d911877c1..0179ff82b5f57494505bcbe6af69c64bb6b5414d 100644
--- a/gui/slick/views/layouts/main.mako
+++ b/gui/slick/views/layouts/main.mako
@@ -1,6 +1,6 @@
<%!
- import datetime
import re
+ import datetime
import sickbeard
from sickrage.helper.common import pretty_file_size
from sickrage.show.Show import Show
diff --git a/gui/slick/views/manage.mako b/gui/slick/views/manage.mako
index 12c52542d3326c0263ccb4cf280b6086d0bfa573..d81177c40a2d002192f43e7065fd8298873aa9c9 100644
--- a/gui/slick/views/manage.mako
+++ b/gui/slick/views/manage.mako
@@ -1,7 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
from sickbeard.common import statusStrings
%>
<%block name="scripts">
diff --git a/gui/slick/views/manage_backlogOverview.mako b/gui/slick/views/manage_backlogOverview.mako
index 8959bc7b7a50c54ee59486067bd3919d74d0d5d5..1dfe9a8d3ad742c37cf0f6ca3d32e63cdfd999e0 100644
--- a/gui/slick/views/manage_backlogOverview.mako
+++ b/gui/slick/views/manage_backlogOverview.mako
@@ -1,11 +1,10 @@
<%inherit file="/layouts/main.mako"/>
<%!
- import sickbeard
import datetime
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Overview, Quality, qualityPresets, qualityPresetStrings
- from sickrage.helper.common import episode_num
+ import sickbeard
from sickbeard import sbdatetime, network_timezones
+ from sickbeard.common import WANTED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, Overview, Quality
+ from sickrage.helper.common import episode_num
%>
<%block name="scripts">
<script type="text/javascript">
diff --git a/gui/slick/views/manage_episodeStatuses.mako b/gui/slick/views/manage_episodeStatuses.mako
index 911d88e2f9376d1578704549a32f8bd0aa3f3c33..61527e3f5603e85b3110e3b0870f7bfb8cb550fd 100644
--- a/gui/slick/views/manage_episodeStatuses.mako
+++ b/gui/slick/views/manage_episodeStatuses.mako
@@ -1,7 +1,7 @@
<%inherit file="/layouts/main.mako"/>
<%!
- from sickbeard import common
import sickbeard
+ from sickbeard import common
%>
<%block name="scripts">
% if whichStatus or (whichStatus and ep_counts):
diff --git a/gui/slick/views/manage_failedDownloads.mako b/gui/slick/views/manage_failedDownloads.mako
index 243e22d6a705e7eebfef3189a600d6df2867c25a..ae8628aa3452bde60ae630305ad78145ee0bb99b 100644
--- a/gui/slick/views/manage_failedDownloads.mako
+++ b/gui/slick/views/manage_failedDownloads.mako
@@ -1,12 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
- import sickbeard
- import os.path
- import datetime
- import re
from sickbeard import providers
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, qualityPresetStrings, statusStrings, Overview
from sickrage.providers.GenericProvider import GenericProvider
%>
<%block name="content">
diff --git a/gui/slick/views/manage_manageSearches.mako b/gui/slick/views/manage_manageSearches.mako
index 9d48992de3c2f482dbd9747d4afa7757c4ceb141..bf88279245dd627164ffcfcde1669e90278c7552 100644
--- a/gui/slick/views/manage_manageSearches.mako
+++ b/gui/slick/views/manage_manageSearches.mako
@@ -1,9 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- import datetime
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, statusStrings, qualityPresetStrings, cpu_presets
%>
<%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/plotTooltip.js?${sbPID}"></script>
diff --git a/gui/slick/views/manage_massEdit.mako b/gui/slick/views/manage_massEdit.mako
index d9ec05feb990a940383490043fad77d241ee472b..6e3c6223664106f2e2f02e58e1556473c0679b48 100644
--- a/gui/slick/views/manage_massEdit.mako
+++ b/gui/slick/views/manage_massEdit.mako
@@ -2,9 +2,6 @@
<%!
import sickbeard
from sickbeard import common
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, qualityPresetStrings, statusStrings
- from sickrage.helper import exceptions
%>
<%block name="scripts">
@@ -163,8 +160,8 @@
<span class="component-desc">
<select id="edit_default_ep_status" name="default_ep_status" class="form-control form-control-inline input-sm">
<option value="keep">< Keep ></option>
- % for curStatus in [WANTED, SKIPPED, IGNORED]:
- <option value="${curStatus}" ${('', 'selected="selected"')[curStatus == default_ep_status_value]}>${statusStrings[curStatus]}</option>
+ % for curStatus in [common.WANTED, common.SKIPPED, common.IGNORED]:
+ <option value="${curStatus}" ${('', 'selected="selected"')[curStatus == default_ep_status_value]}>${common.statusStrings[curStatus]}</option>
% endfor
</select><br>
This will set the status for future episodes.
diff --git a/gui/slick/views/manage_subtitleMissed.mako b/gui/slick/views/manage_subtitleMissed.mako
index 41e8b838c69de444d242615f88c3c352e8b7a569..4cc9a5569afd96b9b4b469471c0a906c8dd63362 100644
--- a/gui/slick/views/manage_subtitleMissed.mako
+++ b/gui/slick/views/manage_subtitleMissed.mako
@@ -1,9 +1,8 @@
<%inherit file="/layouts/main.mako"/>
<%!
- from sickbeard import subtitles
import datetime
import sickbeard
- from sickbeard import common
+ from sickbeard import subtitles
%>
<%block name="content">
<div id="content960">
diff --git a/gui/slick/views/testRename.mako b/gui/slick/views/testRename.mako
index fb43c9d7739fca6e2f1b7ed003f864c79750af99..2623d7c176218c30441765a40744ffdf40a7a75c 100644
--- a/gui/slick/views/testRename.mako
+++ b/gui/slick/views/testRename.mako
@@ -1,12 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- import calendar
- from sickbeard.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, FAILED
- from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
- from sickbeard import db, sbdatetime, network_timezones
- import datetime
- import re
%>
<%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/testRename.js"></script>
@@ -22,11 +16,13 @@
<h3>Preview of the proposed name changes</h3>
<blockquote>
-% if int(show.air_by_date) == 1 and sickbeard.NAMING_CUSTOM_ABD:
+% if show.air_by_date and sickbeard.NAMING_CUSTOM_ABD:
${sickbeard.NAMING_ABD_PATTERN}
-% elif int(show.sports) == 1 and sickbeard.NAMING_CUSTOM_SPORTS:
+% elif show.is_sports and sickbeard.NAMING_CUSTOM_SPORTS:
${sickbeard.NAMING_SPORTS_PATTERN}
-% else:
+% elif show.is_anime and sickbeard.NAMING_CUSTOM_ANIME:
+ ${sickbeard.NAMING_CUSTOM_ANIME}
+%else:
${sickbeard.NAMING_PATTERN}
% endif
</blockquote>
diff --git a/gui/slick/views/viewlogs.mako b/gui/slick/views/viewlogs.mako
index e22e8c2472a66ba9deba66075b595acd8f599da9..32291aa50e06c4e01a3b38f2df96ea9c6827411c 100644
--- a/gui/slick/views/viewlogs.mako
+++ b/gui/slick/views/viewlogs.mako
@@ -1,7 +1,6 @@
<%inherit file="/layouts/main.mako"/>
<%!
import sickbeard
- from sickbeard import classes
from sickbeard.logger import LOGGING_LEVELS
%>
<%block name="css">