Commit a7125d3e authored by echel0n's avatar echel0n

Merge branch 'release/9.4.41'

parents 102d2251 dff28fe4
......@@ -66,4 +66,5 @@ Thumbs.db
######################
/bower_components/
/node_modules/
/src/spritesmith-generated/
\ No newline at end of file
/src/spritesmith-generated/
/dist/
\ No newline at end of file
This diff is collapsed.
......@@ -28,13 +28,10 @@ from sickrage.core.common import UNAIRED, SKIPPED, statusStrings
def new_episode_finder():
curDate = datetime.date.today()
if sickrage.app.tz_updater.network_dict:
curDate += datetime.timedelta(days=1)
else:
curDate += datetime.timedelta(days=2)
curDate += datetime.timedelta(days=1)
curTime = datetime.datetime.now(sickrage.app.tz)
show = None
curTime = datetime.datetime.now(sickrage.app.tz)
for episode in sickrage.app.main_db.all('tv_episodes'):
if not all([episode['status'] == UNAIRED, episode['season'] > 0, episode['airdate'] > 1]):
......
......@@ -1030,18 +1030,15 @@ class TVEpisode(object):
def release_group(show, name):
if name:
name = remove_non_release_groups(remove_extension(name))
else:
return ""
try:
parse_result = NameParser(name, showObj=show, naming_pattern=True).parse(name)
except (InvalidNameException, InvalidShowException) as e:
sickrage.app.log.debug("Unable to get parse release_group: {}".format(e))
return ''
if not parse_result.release_group:
return ''
return parse_result.release_group
try:
parse_result = NameParser(name, showObj=show, naming_pattern=True).parse(name)
if parse_result.release_group:
return parse_result.release_group
except (InvalidNameException, InvalidShowException) as e:
sickrage.app.log.debug("Unable to get parse release_group: {}".format(e))
return ''
__, epQual = Quality.splitCompositeStatus(self.status)
......
......@@ -1441,7 +1441,7 @@ class Home(WebHandler):
if bool(showObj.flatten_folders) != bool(flatten_folders):
showObj.flatten_folders = flatten_folders
try:
sickrage.app.show_queue.refreshShow(showObj)
sickrage.app.show_queue.refreshShow(showObj, True)
except CantRefreshShowException as e:
errors.append(_("Unable to refresh this show: {}").format(e))
......@@ -1473,7 +1473,7 @@ class Home(WebHandler):
try:
showObj.location = location
try:
sickrage.app.show_queue.refreshShow(showObj)
sickrage.app.show_queue.refreshShow(showObj, True)
except CantRefreshShowException as e:
errors.append(_("Unable to refresh this show:{}").format(e))
# grab updated info from TVDB
......@@ -1582,7 +1582,7 @@ class Home(WebHandler):
return self._genericMessage(_("Error"), _("Unable to find the specified show"))
try:
sickrage.app.show_queue.refreshShow(showObj)
sickrage.app.show_queue.refreshShow(showObj, True)
except CantRefreshShowException as e:
sickrage.app.alerts.error(_('Unable to refresh this show.'), str(e))
......@@ -3415,7 +3415,7 @@ class Manage(Home, WebRoot):
# don't bother refreshing shows that were updated anyway
if curShowID in toRefresh and curShowID not in toUpdate:
try:
sickrage.app.show_queue.refreshShow(showObj)
sickrage.app.show_queue.refreshShow(showObj, True)
refreshes.append(showObj.name)
except CantRefreshShowException as e:
errors.append(_("Unable to refresh show ") + showObj.name + ": {}".format(e))
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:23\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:23\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Finnish\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:23\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
......@@ -4531,7 +4531,7 @@ msgstr "Si cela se produisait pendant une mise à jour un rafraîchissement de p
#: sickrage/core/webserver/views/errors/500.mako:13
msgid "Mako errors that happen during updates may be a one time error if there were significant UI changes."
msgstr ""
msgstr "Mako erreurs qui se produisent lors des mises à jour peut être une erreur si il y avait des changements de l'INTERFACE."
#: sickrage/core/webserver/views/errors/500.mako:16
msgid "Show/Hide Error"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Hebrew\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Hungarian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Italian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Japanese\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Korean\n"
"MIME-Version: 1.0\n"
......
......@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sickrage 9.4.40\n"
"Project-Id-Version: sickrage 9.4.41\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-18 12:46-0800\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Dutch\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Norwegian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:24\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Polish\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Portuguese\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:46\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:23\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Romanian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:47\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Russian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Swedish\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Turkish\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Ukrainian\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Vietnamese\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Simplified\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-18 12:46-0800\n"
"PO-Revision-Date: 2018-11-18 20:48\n"
"POT-Creation-Date: 2018-11-20 19:23-0800\n"
"PO-Revision-Date: 2018-11-21 03:25\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Traditional\n"
"MIME-Version: 1.0\n"
......
......@@ -63,9 +63,8 @@ class TorrentBytesProvider(TorrentProvider):
sickrage.app.log.warning("Unable to connect to provider")
return False
if re.search('Username or password incorrect', response):
sickrage.app.log.warning(
"Invalid username or password. Check your settings")
if 'username or password incorrect' in response.lower():
sickrage.app.log.warning("Invalid username or password. Check your settings")
return False
return True
......@@ -76,7 +75,13 @@ class TorrentBytesProvider(TorrentProvider):
if not self.login():
return results
search_params = {"c33": 1, "c38": 1, "c32": 1, "c37": 1, "c41": 1}
search_params = {
"c33": 1,
"c38": 1,
"c32": 1,
"c37": 1,
"c41": 1
}
for mode in search_strings:
sickrage.app.log.debug("Search Mode: %s" % mode)
......@@ -114,11 +119,13 @@ class TorrentBytesProvider(TorrentProvider):
return results
# "Type", "Name", Files", "Comm.", "Added", "TTL", "Size", "Snatched", "Seeders", "Leechers"
labels = [label.get_text(strip=True) for label in torrent_rows[0]("td")]
labels = [label.get_text(strip=True) for label in torrent_rows[0]('td')]
for result in torrent_rows[1:]:
try:
cells = result("td")
cells = result('td')
if len(cells) < len(labels):
continue
link = cells[labels.index("Name")].find("a", href=re.compile(r"download.php\?id="))["href"]
download_url = urljoin(self.urls['base_url'], link)
......@@ -136,12 +143,17 @@ class TorrentBytesProvider(TorrentProvider):
seeders = try_int(cells[labels.index("Seeders")].get_text(strip=True))
leechers = try_int(cells[labels.index("Leechers")].get_text(strip=True))
torrent_size = cells[labels.index("Size")].get_text(strip=True)
size = convert_size(torrent_size, -1)
results += [
{'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers}
]
results += [{
'title': title,
'link': download_url,
'size': size,
'seeders': seeders,
'leechers': leechers
}]
if mode != "RSS":
sickrage.app.log.debug("Found result: {}".format(title))
......
9.4.40
\ No newline at end of file
9.4.41
\ No newline at end of file
Markdown is supported
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