Commit f4d34e4c authored by echel0n's avatar echel0n

Merge branch 'release/9.4.47'

parents bfd8dd2e b2668675
Pipeline #326 passed with stage
in 4 minutes and 9 seconds
# Changelog
- * 5061118 - 2018-11-28: Release v9.4.46
- * f748a5c - 2018-11-29: Release v9.4.47
- * 58c1f5e - 2018-11-29: Added code to ensure seeders, leechers, and size are always integer values before being added to cache.
- * 80b928a - 2018-11-28: Release v9.4.46
- * e444d97 - 2018-11-26: Release v9.4.45
- * 20da5e1 - 2018-11-26: Fixed Windows unicode issue with tzlocal.
- * d07ac9d - 2018-11-25: Release v9.4.44
......
......@@ -27,7 +27,7 @@ import sickrage
from sickrage.core.api.cache import ProviderCacheAPI
from sickrage.core.common import Quality
from sickrage.core.exceptions import AuthException, EpisodeNotFoundException
from sickrage.core.helpers import findCertainShow, show_names, validate_url, is_ip_private
from sickrage.core.helpers import findCertainShow, show_names, validate_url, is_ip_private, try_int
from sickrage.core.nameparser import InvalidNameException, NameParser, InvalidShowException
from sickrage.core.websession import WebSession
......@@ -225,9 +225,9 @@ class TVCache(object):
'quality': quality,
'release_group': release_group,
'version': version,
'seeders': seeders,
'leechers': leechers,
'size': size
'seeders': try_int(seeders),
'leechers': try_int(leechers),
'size': try_int(size, -1)
}
# add to internal database
......
......@@ -167,14 +167,14 @@ def pickBestResult(results, show):
continue
# check if seeders meet out minimum requirements, disgard result if it does not
if hasattr(cur_result.provider, 'minseed') and cur_result.seeders not in (-1, None):
if hasattr(cur_result.provider, 'minseed') and cur_result.seeders not in (-1, None, ''):
if int(cur_result.seeders) < int(cur_result.provider.minseed):
sickrage.app.log.info("Discarding torrent because it doesn't meet the minimum seeders: {}. Seeders: "
"{}".format(cur_result.name, cur_result.seeders))
continue
# check if leechers meet out minimum requirements, disgard result if it does not
if hasattr(cur_result.provider, 'minleech') and cur_result.leechers not in (-1, None):
if hasattr(cur_result.provider, 'minleech') and cur_result.leechers not in (-1, None, ''):
if int(cur_result.leechers) < int(cur_result.provider.minleech):
sickrage.app.log.info("Discarding torrent because it doesn't meet the minimum leechers: {}. Leechers: "
"{}".format(cur_result.name, cur_result.leechers))
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:06\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:06\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:09\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:06\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:05\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:03\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: French\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:06\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:04\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:06\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:07\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:07\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:07\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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.46\n"
"Project-Id-Version: sickrage 9.4.47\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-28 07:04-0800\n"
"POT-Creation-Date: 2018-11-29 21:03-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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:07\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:07\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:05\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:04\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:03\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:08\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:09\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:09\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\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-28 07:04-0800\n"
"PO-Revision-Date: 2018-11-28 15:09\n"
"POT-Creation-Date: 2018-11-29 21:03-0800\n"
"PO-Revision-Date: 2018-11-30 05:06\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Traditional\n"
"MIME-Version: 1.0\n"
......
......@@ -111,9 +111,13 @@ class BTNProvider(TorrentProvider):
leechers = try_int(row.get('Leechers'))
size = try_int(row.get('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
}]
sickrage.app.log.debug("Found result: {}".format(title))
......
......@@ -34,8 +34,8 @@ class DanishbitsProvider(TorrentProvider):
self.passkey = None
# Torrent Stats
self.minseed = 0
self.minleech = 0
self.minseed = None
self.minleech = None
self.freeleech = True
# URLs
......
9.4.46
\ No newline at end of file
9.4.47
\ 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