Commit 268be296 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.13'

parents 579c00fc 0b7cce7d
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.13](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.12...10.0.13)
#### [10.0.12](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.11...10.0.12)
 
> 28 July 2021
- Refactored episode slug to sXXeXX [`993479f`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/993479fd84e3c97cc172efaf5dd5cfa395dbce3a)
- Misc fixes for series api v2 [`a86cc48`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/a86cc485efd6072954a658f9741bdbfff90414c8)
- Refactored multi-project pipeline strategy to depend for CI script [`776e1f6`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/776e1f6e7c5dec268956e8da162982185c60e807)
......
{
"name": "sickrage",
"version": "10.0.12",
"version": "10.0.13",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.12
current_version = 10.0.13
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.12"
__version__ = "10.0.13"
__install_type__ = ""
import argparse
......
sickrage/version.txt = 622b316dc1289da8010d878be076ea6f
sickrage/version.txt = d576d8456c03446bcb99a32b8a6b4c25
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = cd90ff6ccef37b6627bcb8664282ec97
sickrage/__init__.py = 1e6de3f658c4ed467fcae17f4f280fff
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
......@@ -264,7 +264,7 @@ sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be
sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
sickrage/core/common.py = 8eca84658272c806858b105179285693
sickrage/core/__init__.py = 502c11221d5837a324abfb317789700f
sickrage/core/__init__.py = f6955f7c69738656faf6e8cb3e1044c7
sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787
sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
sickrage/core/media/fanart.py = e9a4232ff01ef3473e628e3eecf80e6c
......@@ -290,7 +290,7 @@ sickrage/core/exceptions/__init__.py = bb106687a1cb41cf0da10e125e0c82c7
sickrage/core/websession/__init__.py = 6d3d11bec0c0855e08a4c8f2cb6b759e
sickrage/core/config/helpers.py = 8d8d00e7e7b4f04d91ce099245deb13a
sickrage/core/config/__init__.py = de29a2b668fe871cda8103664adc8853
sickrage/core/amqp/__init__.py = b1b78f1ad6b6aadfe9e6eb5fcca72554
sickrage/core/amqp/__init__.py = 34e52f4798a60b580f18f1070c39f02b
sickrage/core/webserver/__init__.py = a1c9bc9c3d8ab1e1afc00d92cf645e69
sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
sickrage/core/webserver/static/images/poster-thumb.png = b788e8476ff0a2d3dfca0eb1d31bab58
......@@ -340,8 +340,8 @@ sickrage/core/webserver/static/fonts/fa-regular-400.ttf = 1a78af4105d4d56e6c34f7
sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
sickrage/core/webserver/static/fonts/fa-solid-900.svg = 03ba7cb710104df27f1c9c46d64bee4e
sickrage/core/webserver/static/css/core.min.css = 05ca1e9c48f013d71d97ecec458b9f76
sickrage/core/webserver/static/js/core.js.map = c765b251b76d4f99df7c724ffd3b9edf
sickrage/core/webserver/static/js/core.min.js = 5e5a1a7fa5f3ae53d1046a155d4d6d86
sickrage/core/webserver/static/js/core.js.map = 5c2d9b0bba21bb10785d87b56931190c
sickrage/core/webserver/static/js/core.min.js = ed45eee4d27165e92d17c5205c07b899
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
......@@ -404,7 +404,7 @@ sickrage/core/webserver/handlers/__init__.py = 4e94a1192bc45368b8cc3cd5f6d1debc
sickrage/core/webserver/handlers/logs.py = a0bfa797b3e3d5cf4539da53606bf94e
sickrage/core/webserver/handlers/history.py = 34961ffbbb07803515ded9626c7f853a
sickrage/core/webserver/handlers/account.py = 60c21b6e169f52c98c9c03814c2ea683
sickrage/core/webserver/handlers/login.py = 983ea3790adee499def38d5374342bb9
sickrage/core/webserver/handlers/login.py = 8ecd1957b142f226e5a04d6aa30af12a
sickrage/core/webserver/handlers/google_drive.py = 98fde470e65096ec71a8e3f1cce2bd44
sickrage/core/webserver/handlers/config/subtitles.py = 0134a7fe351cd9e0dbe6c1952d8d2dd7
sickrage/core/webserver/handlers/config/quality_settings.py = 6a2849c97b8635d46a92b758ba641428
......@@ -417,7 +417,7 @@ sickrage/core/webserver/handlers/config/notifications.py = 88ee26540e55fa1aa65de
sickrage/core/webserver/handlers/config/providers.py = bd3f764a491e56e818aec356a0d25ba7
sickrage/core/webserver/handlers/config/__init__.py = 1b9eeca6d49289e7c36bf369450e459c
sickrage/core/webserver/handlers/api/schemas.py = 7fcfd3dee63378ba5bd8fcbaebbf49ef
sickrage/core/webserver/handlers/api/__init__.py = 7924db6a4ccc7efa9981ffa4ef378630
sickrage/core/webserver/handlers/api/__init__.py = 56d5abc39345b7e584e41c9845d8826d
sickrage/core/webserver/handlers/api/v2/__init__.py = e8e3e20065fd63c2a41dca9779f90271
sickrage/core/webserver/handlers/api/v2/schedule/schemas.py = 4af02a112f828040cbb1cf34ad03fdd5
sickrage/core/webserver/handlers/api/v2/schedule/__init__.py = a144a01b4b90f36b7c92f2c07a612d03
......@@ -458,7 +458,7 @@ sickrage/core/nameparser/__init__.py = 27c01e5b187d2197b6fdaa418d178f4f
sickrage/core/nameparser/regexes.py = fbfb89e90f012a287266be8db0e2faf9
sickrage/core/websocket/__init__.py = 164614bb211d5e36520dd564a27661b5
sickrage/core/api/exceptions.py = bdac7bcebad3d9ce2809f2d7e65810e0
sickrage/core/api/__init__.py = 70fbd18f93d347a84bf2b05aafb42b27
sickrage/core/api/__init__.py = 206ee786cf67ece194dc7edd531e83f8
sickrage/core/databases/__init__.py = b232e45d8996a662866178c2d6d6169b
sickrage/core/databases/main/schemas.py = 7264494b24575ea1dcab57f0b3edc01d
sickrage/core/databases/main/__init__.py = e99217a8bcc3e5ef41741aebb789e751
......
......@@ -405,6 +405,18 @@ class Core(object):
if self.config.general.show_update_hour < 0 or self.config.general.show_update_hour > 23:
self.config.general.show_update_hour = 0
# add app updater job
self.scheduler.add_job(
self.version_updater.task,
IntervalTrigger(
hours=1,
start_date=datetime.datetime.now() + datetime.timedelta(minutes=4),
timezone='utc'
),
name=self.version_updater.name,
id=self.version_updater.name
)
# add show updater job
self.scheduler.add_job(
self.show_updater.task,
......
......@@ -23,7 +23,8 @@ import urllib.parse
import pika
from google.protobuf.json_format import MessageToDict
from pika.adapters.tornado_connection import TornadoConnection
from pika.exceptions import StreamLostError, AMQPConnectionError
from pika.adapters.utils.connection_workflow import AMQPConnectorSocketConnectError
from pika.exceptions import StreamLostError, AMQPConnectionError, AMQPError
from tornado.ioloop import IOLoop
import sickrage
......@@ -96,7 +97,7 @@ class AMQPClient(object):
on_close_callback=self.on_connection_close,
on_open_error_callback=self.on_connection_open_error
)
except AMQPConnectionError:
except (AMQPError, AMQPConnectorSocketConnectError, AMQPConnectionError):
sickrage.app.log.debug("AMQP connection error, attempting to reconnect")
IOLoop.current().call_later(5, self.reconnect)
......
......@@ -26,7 +26,7 @@ class API(object):
@property
def is_enabled(self):
return sickrage.app.config.general.enable_sickrage_api and self.token
return self.token
@property
def imdb(self):
......
......@@ -84,7 +84,7 @@ class APIBaseHandler(BaseHandler):
if sickrage.app.config.user.sub_id != decoded_token.get('sub'):
return self.send_error(401, error='user is not authorized')
if sickrage.app.config.general.enable_sickrage_api and not sickrage.app.api.token:
if not sickrage.app.api.token:
exchanged_token = sickrage.app.auth_server.token_exchange(token)
if exchanged_token:
sickrage.app.api.token = exchanged_token
......
......@@ -94,7 +94,7 @@ class LoginHandler(BaseHandler):
if sickrage.app.config.user.sub_id != decoded_token.get('sub'):
return
if sickrage.app.config.general.enable_sickrage_api and not sickrage.app.api.token:
if not sickrage.app.api.token:
exchanged_token = sickrage.app.auth_server.token_exchange(auth_token)
if exchanged_token:
sickrage.app.api.token = exchanged_token
......@@ -177,7 +177,7 @@ class LoginHandler(BaseHandler):
return self.redirect('/logout')
else:
return self.redirect('/logout')
elif sickrage.app.config.general.enable_sickrage_api and not sickrage.app.api.token:
elif not sickrage.app.api.token:
exchanged_token = sickrage.app.auth_server.token_exchange(token['access_token'])
if exchanged_token:
sickrage.app.api.token = exchanged_token
......
10.0.12
\ No newline at end of file
10.0.13
\ 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