Commit 2cf6f31a authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.17'

parents a2e6f0e5 dfafacd9
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.17](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.16...10.0.17)
#### [10.0.16](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.15...10.0.16)
 
> 29 July 2021
#### [10.0.15](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.14...10.0.15)
 
> 28 July 2021
......
{
"name": "sickrage",
"version": "10.0.16",
"version": "10.0.17",
"private": true,
"repository": {
"type": "git",
......
......@@ -13,7 +13,7 @@ beautifulsoup4==4.9.1
bencode3==0.1.0
bleach==3.3.0
CacheControl==0.12.6
certifi==2020.6.20
certifi==2021.5.30
cffi==1.14.1
chardet==3.0.4
click==7.1.2
......@@ -98,4 +98,4 @@ Unidecode==1.1.1
urllib3==1.25.10
webencodings==0.5.1
xmltodict==0.12.0
zipp==3.1.0
\ No newline at end of file
zipp==3.1.0
[bumpversion]
current_version = 10.0.16
current_version = 10.0.17
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
......@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
__version__ = "10.0.16"
__version__ = "10.0.17"
__install_type__ = ""
import argparse
......
This diff is collapsed.
......@@ -19,13 +19,13 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
import urllib.parse
from ssl import SSLCertVerificationError
import pika
from google.protobuf.json_format import MessageToDict
from pika.adapters.tornado_connection import TornadoConnection
from pika.adapters.utils.connection_workflow import AMQPConnectorSocketConnectError, AMQPConnectorTransportSetupError, AMQPConnectorAMQPHandshakeError, \
AMQPConnectionWorkflowFailed, AMQPConnectorException
from pika.exceptions import StreamLostError, AMQPConnectionError, AMQPError, ConnectionClosedByBroker
from pika.adapters.utils.connection_workflow import AMQPConnectorException
from pika.exceptions import StreamLostError, AMQPConnectionError
from tornado.ioloop import IOLoop
import sickrage
......@@ -38,6 +38,7 @@ from sickrage.protos.updates_v1_pb2 import UpdatedAppResponse
class AMQPClient(object):
def __init__(self):
self._name = 'AMQP'
self._amqp_host = 'rmq.sickrage.ca'
self._amqp_port = 5671
self._amqp_vhost = 'sickrage-app'
......@@ -98,7 +99,7 @@ class AMQPClient(object):
on_close_callback=self.on_connection_close,
on_open_error_callback=self.on_connection_open_error
)
except (AMQPConnectorException, AMQPConnectionError):
except (AMQPConnectorException, AMQPConnectionError, SSLCertVerificationError):
sickrage.app.log.debug("AMQP connection error, attempting to reconnect")
IOLoop.current().call_later(5, self.reconnect)
......
......@@ -177,8 +177,11 @@ class API(object):
}
if self.token_url:
client = OAuth2Session(sickrage.app.auth_server.client_id, token=self.token)
self.token = client.refresh_token(self.token_url, **extra)
try:
client = OAuth2Session(sickrage.app.auth_server.client_id, token=self.token)
self.token = client.refresh_token(self.token_url, **extra)
except requests.exceptions.RequestException:
pass
def exchange_token(self, access_token, scope='offline_access'):
exchange = {'scope': scope, 'subject_token': access_token}
......
......@@ -88,9 +88,6 @@ class VersionUpdater(object):
try:
self.running = True
# set thread name
threading.currentThread().setName(self.name)
if not self.check_for_update():
return
......
......@@ -352,7 +352,7 @@ class ItaSAProvider(Provider):
# get the show id
series_id = self.get_show_id(series, country)
if series_id is None:
logger.error('No show id found for %r ', series)
logger.debug('No show id found for %r ', series)
return []
# get the page of the season of the show
......
......@@ -145,7 +145,11 @@ class SubsceneProvider(Provider):
r = self.session.get(self.server_url + page_link, timeout=30)
r.raise_for_status()
soup2 = ParserBeautifulSoup(r.content, ['html5lib', 'html.parser'])
sub_id = re.search(r'\?mac=(.*)', soup2.find('a', id='downloadButton')['href']).group(1)
try:
sub_id = re.search(r'\?mac=(.*)', soup2.find('a', id='downloadButton')['href']).group(1)
except AttributeError:
continue
# add the release and increment downloaded count if we already have the subtitle
if sub_id in subtitles:
......
10.0.16
\ No newline at end of file
10.0.17
\ No newline at end of file
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