Commit 7e3baa8f authored by echel0n's avatar echel0n
Browse files

Disabled warning for when no nzb/torrent provider is picked if no nzb/torrent client enabled.

Disabled search column for display show view if no nzb/torrent is picked.
parent 9969a0b3
# Changelog # Changelog
- * f1b4113 - 2018-10-28: Added function to strip accents to encoding functions - * 30d75a7 - 2018-10-28: Disabled warning for when no nzb/torrent provider is picked if no nzb/torrent client enabled. Disabled search column for display show view if no nzb/torrent is picked.
- * 9969a0b - 2018-10-28: Added function to strip accents to encoding functions
- * bf93454 - 2018-10-27: Release v9.4.1 - * bf93454 - 2018-10-27: Release v9.4.1
- * 3dbd257 - 2018-10-27: Release v9.3.100 - * 3dbd257 - 2018-10-27: Release v9.3.100
- * 479d80e - 2018-10-27: Removed app_id and replaced with app_sub. App now links its self to SSO user via userid instead of appid. SSL cert and key now stored/retrieved from data folder. - * 479d80e - 2018-10-27: Removed app_id and replaced with app_sub. App now links its self to SSO user via userid instead of appid. SSL cert and key now stored/retrieved from data folder.
......
...@@ -128,6 +128,9 @@ class SearchQueue(srQueue): ...@@ -128,6 +128,9 @@ class SearchQueue(srQueue):
return length return length
def put(self, item, *args, **kwargs): def put(self, item, *args, **kwargs):
if all([not sickrage.app.config.use_nzbs, not sickrage.app.config.use_torrents]):
return
if not len(sickrage.app.search_providers.enabled()): if not len(sickrage.app.search_providers.enabled()):
sickrage.app.log.warning("Search Failed, No NZB/Torrent providers enabled") sickrage.app.log.warning("Search Failed, No NZB/Torrent providers enabled")
return return
......
...@@ -317,10 +317,6 @@ def searchProviders(show, episodes, manualSearch=False, downCurQuality=False, up ...@@ -317,10 +317,6 @@ def searchProviders(show, episodes, manualSearch=False, downCurQuality=False, up
:return: results for search :return: results for search
""" """
if not len(sickrage.app.search_providers.enabled()):
sickrage.app.log.warning("No NZB/Torrent providers enabled. Please check your settings.")
return
# build name cache for show # build name cache for show
sickrage.app.name_cache.build(show) sickrage.app.name_cache.build(show)
......
...@@ -552,7 +552,9 @@ ...@@ -552,7 +552,9 @@
<th data-sorter="false" ${("class=\"col-ep columnSelector-false\"", "class=\"col-ep\"")[bool(sickrage.app.config.download_url)]}>${_('Download')}</th> <th data-sorter="false" ${("class=\"col-ep columnSelector-false\"", "class=\"col-ep\"")[bool(sickrage.app.config.download_url)]}>${_('Download')}</th>
<th data-sorter="false" ${("class=\"col-ep columnSelector-false\"", "class=\"col-ep\"")[bool(sickrage.app.config.use_subtitles)]}>${_('Subtitles')}</th> <th data-sorter="false" ${("class=\"col-ep columnSelector-false\"", "class=\"col-ep\"")[bool(sickrage.app.config.use_subtitles)]}>${_('Subtitles')}</th>
<th data-sorter="false" class="col-status">${_('Status')}</th> <th data-sorter="false" class="col-status">${_('Status')}</th>
<th data-sorter="false" class="col-search">${_('Search')}</th> % if len(sickrage.app.search_providers.enabled()):
<th data-sorter="false" class="col-search">${_('Search')}</th>
% endif
</tr> </tr>
</thead> </thead>
...@@ -686,31 +688,33 @@ ...@@ -686,31 +688,33 @@
<td class="table-fit text-nowrap col-status">${statusStrings[curStatus]}</td> <td class="table-fit text-nowrap col-status">${statusStrings[curStatus]}</td>
% endif % endif
<td class="table-fit col-search"> % if len(sickrage.app.search_providers.enabled()):
% if int(epResult["season"]) != 0: <td class="table-fit col-search">
% if ( int(epResult["status"]) in Quality.SNATCHED + Quality.DOWNLOADED ): % if int(epResult["season"]) != 0:
<a class="epRetry" % if ( int(epResult["status"]) in Quality.SNATCHED + Quality.DOWNLOADED ):
id="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}" <a class="epRetry"
name="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}" id="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}"
href="retryEpisode?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}"> name="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}"
<i class="fas fa-sync" title="${_('Retry Download')}"></i> href="retryEpisode?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}">
</a> <i class="fas fa-sync" title="${_('Retry Download')}"></i>
% else: </a>
<a class="epSearch" % else:
id="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}" <a class="epSearch"
name="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}" id="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}"
href="searchEpisode?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}"> name="${str(show.indexerid)}x${str(epResult["season"])}x${str(epResult["episode"])}"
<i class="fas fa-search" title="${_('Manual Search')}"></i> href="searchEpisode?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}">
<i class="fas fa-search" title="${_('Manual Search')}"></i>
</a>
% endif
% endif
% if sickrage.app.config.use_subtitles and show.subtitles and epResult["location"] and frozenset(sickrage.subtitles.wanted_languages()).difference(epResult["subtitles"].split(',')):
<a class="epSubtitlesSearch"
href="searchEpisodeSubtitles?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}">
<i class="fas fa-comment" title="${_('Subtitles Search')}"></i>
</a> </a>
% endif % endif
% endif </td>
% if sickrage.app.config.use_subtitles and show.subtitles and epResult["location"] and frozenset(sickrage.subtitles.wanted_languages()).difference(epResult["subtitles"].split(',')): % endif
<a class="epSubtitlesSearch"
href="searchEpisodeSubtitles?show=${show.indexerid}&amp;season=${epResult["season"]}&amp;episode=${epResult["episode"]}">
<i class="fas fa-comment" title="${_('Subtitles Search')}"></i>
</a>
% endif
</td>
</tr> </tr>
% endfor % endfor
</tbody> </tbody>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment