Commit 1423f4a4 authored by echel0n's avatar echel0n

Merge branch 'release/9.4.32'

parents c6d7c187 d831f6f6
# Changelog
- * fa636d3 - 2018-11-12: Release v9.4.31
- * 720e6c3 - 2018-11-12: Release v9.4.32
- * f298b17 - 2018-11-12: Refactored speed.cd torrent provider to use cookie login.
- * 2abdafe - 2018-11-12: Release v9.4.31
- * fcdd0e0 - 2018-11-12: Added more UI notifications for version updater.
- * 971fc67 - 2018-11-12: Pre-Release v9.4.31.dev5
- * 4d0d839 - 2018-11-12: Pre-Release v9.4.31.dev4
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:39\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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.31\n"
"Project-Id-Version: sickrage 9.4.32\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-11-12 13:56-0800\n"
"POT-Creation-Date: 2018-11-12 15:38-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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:40\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:56\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:38\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:57\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:42\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\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-12 13:56-0800\n"
"PO-Revision-Date: 2018-11-12 21:58\n"
"POT-Creation-Date: 2018-11-12 15:38-0800\n"
"PO-Revision-Date: 2018-11-12 23:41\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Chinese Traditional\n"
"MIME-Version: 1.0\n"
......
......@@ -18,11 +18,8 @@
from __future__ import unicode_literals
import re
from urlparse import urljoin
from requests.utils import dict_from_cookiejar
import sickrage
from sickrage.core.caches.tv_cache import TVCache
from sickrage.core.helpers import bs4_parser, try_int, convert_size
......@@ -38,37 +35,47 @@ class SpeedCDProvider(TorrentProvider):
'search': '{base_url}/browse.php'.format(**self.urls),
})
self.username = None
self.password = None
# self.username = None
# self.password = None
self.freeleech = False
self.minseed = None
self.minleech = None
self.enable_cookies = True
self.required_cookies = ('inSpeed_uid', 'inSpeed_speedian')
self.proper_strings = ['PROPER', 'REPACK', 'REAL', 'RERIP']
self.cache = TVCache(self, min_time=20)
def login(self):
if any(dict_from_cookiejar(self.session.cookies).values()):
return True
login_params = {'username': self.username,
'password': self.password}
try:
data = bs4_parser(self.session.get(self.urls['login']).text)
login_url = data.soup.find('form', id='loginform').get('action')
response = self.session.post(login_url, data=login_params, timeout=30).text
except Exception:
sickrage.app.log.warning("Unable to connect to provider")
return False
if re.search('Incorrect username or Password. Please try again.', response):
sickrage.app.log.warning("Invalid username or password. Check your settings")
return False
return True
return self.cookie_login('log in')
# def login(self):
# if any(dict_from_cookiejar(self.session.cookies).values()):
# return True
#
# login_params = {
# 'username': self.username,
# 'password': self.password
# }
#
# try:
# with bs4_parser(self.session.get(self.urls['login']).text) as html:
# login_url = urljoin(self.urls['base_url'], html.find('form', id='loginform').get('action'))
# response = self.session.post(login_url, data=login_params, timeout=30).text
# except Exception:
# sickrage.app.log.warning("Unable to connect to provider")
# self.session.cookies.clear()
# return False
#
# if 'logout.php' not in response.lower():
# sickrage.app.log.warning("Invalid username or password, check your settings.")
# self.session.cookies.clear()
# return False
#
# return True
def search(self, search_strings, age=0, ep_obj=None, **kwargs):
results = []
......
9.4.31
\ No newline at end of file
9.4.32
\ 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