diff --git a/gui/slick/views/home_postprocess.mako b/gui/slick/views/home_postprocess.mako
index 67011997769ef229e0af7e37a36d1c411102dadb..795c3d3cddafa387d8b9a14801068b37554ec5cb 100644
--- a/gui/slick/views/home_postprocess.mako
+++ b/gui/slick/views/home_postprocess.mako
@@ -16,13 +16,13 @@
<div id="postProcess">
<form name="processForm" method="post" action="processEpisode" style="line-height: 40px;">
<table>
- <input type="hidden" id="type" name="proc_type" value="manual">
+ <input type="hidden" id="type" name="type" value="manual">
<tr>
<td style="padding-right:10px;">
<b>Enter the folder containing the episode:</b>
</td>
<td>
- <input type="text" name="proc_dir" id="episodeDir" class="form-control form-control-inline input-sm input350" />
+ <input type="text" name="dir" id="episodeDir" class="form-control form-control-inline input-sm input350" />
</td>
</tr>
<tr>
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index b53917465e50a892f89540eadf258ad1c232334d..1bb39034d8262dceefe0542ab0f5138a89695361 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1834,8 +1834,10 @@ class Home(WebRoot):
t = PageTemplate(rh=self, filename="testRename.mako")
submenu = [{'title': 'Edit', 'path': 'home/editShow?show=%d' % showObj.indexerid, 'icon': 'ui-icon ui-icon-pencil'}]
- return t.render(submenu=submenu, ep_obj_list=ep_obj_rename_list, show=showObj, title='Preview Rename', header='Preview Rename',
- controller="home", action="previewRename")
+ return t.render(submenu=submenu, ep_obj_list=ep_obj_rename_list,
+ show=showObj, title='Preview Rename',
+ header='Preview Rename',
+ controller="home", action="previewRename")
def doRename(self, show=None, eps=None):
if show is None or eps is None:
@@ -2179,8 +2181,10 @@ class HomePostProcess(Home):
t = PageTemplate(rh=self, filename="home_postprocess.mako")
return t.render(title='Post Processing', header='Post Processing', topmenu='home', controller="postprocess", action="index")
- def processEpisode(self, proc_dir=None, nzbName=None, jobName=None, quiet=None, process_method=None, force=None,
- is_priority=None, delete_on="0", failed="0", proc_type="auto", *args, **kwargs):
+ # TODO: PR to NZBtoMedia so that we can rename dir to proc_dir, and type to proc_type. Using names of builtins as var names is bad
+ # pylint: disable=W0622
+ def processEpisode(self, dir=None, nzbName=None, jobName=None, quiet=None, process_method=None, force=None,
+ is_priority=None, delete_on="0", failed="0", type="auto", *args, **kwargs):
def argToBool(argument):
if isinstance(argument, basestring):
@@ -2195,14 +2199,14 @@ class HomePostProcess(Home):
return argument
- if not proc_dir:
+ if not dir:
return self.redirect("/home/postprocess/")
else:
nzbName = ss(nzbName) if nzbName else nzbName
result = processTV.processDir(
- ss(proc_dir), nzbName, process_method=process_method, force=argToBool(force),
- is_priority=argToBool(is_priority), delete_on=argToBool(delete_on), failed=argToBool(failed), proc_type=proc_type
+ ss(dir), nzbName, process_method=process_method, force=argToBool(force),
+ is_priority=argToBool(is_priority), delete_on=argToBool(delete_on), failed=argToBool(failed), proc_type=type
)
if quiet is not None and int(quiet) == 1:
@@ -2332,7 +2336,7 @@ class HomeAddShows(Home):
# default to TVDB if indexer was not detected
if show_name and not (indexer or indexer_id):
- (sn, idxr, i) = helpers.searchIndexerForShowID(show_name, indexer, indexer_id)
+ (_, idxr, i) = helpers.searchIndexerForShowID(show_name, indexer, indexer_id)
# set indexer and indexer_id from found info
if not indexer and idxr:
@@ -2910,8 +2914,9 @@ class Manage(Home, WebRoot):
t = PageTemplate(rh=self, filename="manage_subtitleMissed.mako")
if not whichSubs:
- return t.render(whichSubs=whichSubs, title='Episode Overview', header='Episode Overview', topmenu='manage',
- controller="manage", action="subtitleMissed")
+ return t.render(whichSubs=whichSubs, title='Episode Overview',
+ header='Episode Overview', topmenu='manage',
+ controller="manage", action="subtitleMissed")
myDB = db.DBConnection()
status_results = myDB.select(
@@ -3599,8 +3604,9 @@ class ConfigGeneral(Config):
def index(self):
t = PageTemplate(rh=self, filename="config_general.mako")
- return t.render(title='Config - General', header='General Configuration', topmenu='config', submenu=self.ConfigMenu(),
- controller="config", action="index")
+ return t.render(title='Config - General', header='General Configuration',
+ topmenu='config', submenu=self.ConfigMenu(),
+ controller="config", action="index")
@staticmethod
def generateApiKey():
@@ -3764,8 +3770,9 @@ class ConfigBackupRestore(Config):
def index(self):
t = PageTemplate(rh=self, filename="config_backuprestore.mako")
- return t.render(submenu=self.ConfigMenu(), title='Config - Backup/Restore', header='Backup/Restore', topmenu='config',
- controller="config", action="backupRestore")
+ return t.render(submenu=self.ConfigMenu(), title='Config - Backup/Restore',
+ header='Backup/Restore', topmenu='config',
+ controller="config", action="backupRestore")
@staticmethod
def backup(backupDir=None):
@@ -3826,8 +3833,9 @@ class ConfigSearch(Config):
def index(self):
t = PageTemplate(rh=self, filename="config_search.mako")
- return t.render(submenu=self.ConfigMenu(), title='Config - Episode Search', header='Search Settings', topmenu='config',
- controller="config", action="search")
+ return t.render(submenu=self.ConfigMenu(), title='Config - Episode Search',
+ header='Search Settings', topmenu='config',
+ controller="config", action="search")
def saveSearch(self, use_nzbs=None, use_torrents=None, nzb_dir=None, sab_username=None, sab_password=None,
sab_apikey=None, sab_category=None, sab_category_anime=None, sab_category_backlog=None, sab_category_anime_backlog=None, sab_host=None, nzbget_username=None,
@@ -4125,8 +4133,9 @@ class ConfigProviders(Config):
def index(self):
t = PageTemplate(rh=self, filename="config_providers.mako")
- return t.render(submenu=self.ConfigMenu(), title='Config - Providers', header='Search Providers', topmenu='config',
- controller="config", action="providers")
+ return t.render(submenu=self.ConfigMenu(), title='Config - Providers',
+ header='Search Providers', topmenu='config',
+ controller="config", action="providers")
@staticmethod
def canAddNewznabProvider(name):
@@ -4843,8 +4852,9 @@ class ConfigSubtitles(Config):
def index(self):
t = PageTemplate(rh=self, filename="config_subtitles.mako")
- return t.render(submenu=self.ConfigMenu(), title='Config - Subtitles', header='Subtitles', topmenu='config',
- controller="config", action="subtitles")
+ return t.render(submenu=self.ConfigMenu(), title='Config - Subtitles',
+ header='Subtitles', topmenu='config',
+ controller="config", action="subtitles")
def saveSubtitles(self, use_subtitles=None, subtitles_plugins=None, subtitles_languages=None, subtitles_dir=None,
service_order=None, subtitles_history=None, subtitles_finder_frequency=None,
@@ -4905,8 +4915,9 @@ class ConfigAnime(Config):
t = PageTemplate(rh=self, filename="config_anime.mako")
- return t.render(submenu=self.ConfigMenu(), title='Config - Anime', header='Anime', topmenu='config',
- controller="config", action="anime")
+ return t.render(submenu=self.ConfigMenu(), title='Config - Anime',
+ header='Anime', topmenu='config',
+ controller="config", action="anime")
def saveAnime(self, use_anidb=None, anidb_username=None, anidb_password=None, anidb_use_mylist=None,
split_home=None):
@@ -4953,8 +4964,9 @@ class ErrorLogs(WebRoot):
level = logger.ERROR
t = PageTemplate(rh=self, filename="errorlogs.mako")
- return t.render(header="Logs & Errors", title="Logs & Errors", topmenu="system", submenu=self.ErrorLogsMenu(level), logLevel=level,
- controller="errorlogs", action="index")
+ return t.render(header="Logs & Errors", title="Logs & Errors",
+ topmenu="system", submenu=self.ErrorLogsMenu(level),
+ logLevel=level, controller="errorlogs", action="index")
@staticmethod
def haveErrors():