Commit 3a86619e authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.4.35'

parents dd00ab83 c92467ed
# Changelog
- * fbe6cd3 - 2018-11-14: Release v9.4.34
- * 02fcf0a - 2018-11-16: Release v9.4.35
- * 11ac4c6 - 2018-11-16: Fixed Mako error related to no imdb_info present. Refactored `episode_string_fallback` to list.
- * 70d42c2 - 2018-11-14: Release v9.4.34
- * 4478e39 - 2018-11-14: Release v9.4.33
- * 26b7be1 - 2018-11-14: Fixed NoneType issue with delete and update database function calls.
- * aaf7acf - 2018-11-12: Refactored new version string to web socket message.
......
......@@ -186,10 +186,12 @@ class TVCache(object):
if len([x for x in sickrage.app.cache_db.get_many('providers', self.providerID) if x['url'] == url]):
return
# ignore invalid urls
if not validate_url(url) and not url.startswith('magnet') \
or is_ip_private(url.split(r'//')[-1].split(r'/')[0]):
return
# ignore invalid and private IP address urls
if not validate_url(url):
if not url.startswith('magnet'):
return
elif is_ip_private(url.split(r'//')[-1].split(r'/')[0]):
return
try:
# parse release name
......@@ -263,10 +265,12 @@ class TVCache(object):
and "|" + str(ep_obj.episode) + "|" in x['episodes']):
result = self.provider.getResult()
# ignore invalid urls
if not validate_url(curResult["url"]) and not curResult["url"].startswith('magnet') \
or is_ip_private(curResult["url"].split(r'//')[-1].split(r'/')[0]):
continue
# ignore invalid and private IP address urls
if not validate_url(curResult["url"]):
if not curResult["url"].startswith('magnet'):
continue
elif is_ip_private(curResult["url"].split(r'//')[-1].split(r'/')[0]):
continue
# ignored/required words, and non-tv junk
if not show_names.filterBadReleases(curResult["name"]):
......
......@@ -124,7 +124,7 @@ class ProperSearcher(object):
continue
name = self._genericName(x.name)
if not name in propers:
if name not in propers:
sickrage.app.log.debug("Found new proper: " + x.name)
x.provider = providerObj
propers[name] = x
......
......@@ -241,7 +241,7 @@
</a>
% endfor
% endif
% if 'Year' in show.imdb_info:
% if show.imdb_info and 'Year' in show.imdb_info:
% for imdbgenre in show.imdb_info['Genre'].replace('Sci-Fi','Science-Fiction').split(','):
<a href="${anon_url('http://trakt.tv/shows/popular/?genres=', imdbgenre.lower())}"
target="_blank"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:31\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:31\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:31\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:32\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:32\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:32\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:42\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:34\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-14 21:40-0800\n"
"PO-Revision-Date: 2018-11-15 05:41\n"
"POT-Creation-Date: 2018-11-16 22:30-0800\n"
"PO-Revision-Date: 2018-11-17 06:31\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
......
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