Commit 63872148 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.36'

parents 48753a11 d082cb18
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.36](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.35...10.0.36)
#### [10.0.35](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.34...10.0.35)
 
> 27 August 2021
#### [10.0.34](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.33...10.0.34)
 
> 27 August 2021
......
{
"name": "sickrage",
"version": "10.0.35",
"version": "10.0.36",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.35
current_version = 10.0.36
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.35"
__version__ = "10.0.36"
__install_type__ = ""
import argparse
......
sickrage/version.txt = 91582e6df3fe16f1ad0e712e8f65bafa
sickrage/version.txt = 1d36f7bc522bafaf229557519d512741
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = a023ace9a6a3d6ed51541cc0421b2da5
sickrage/__init__.py = 9bbb58db99a98f23ee36e30a688c71e1
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
......@@ -290,8 +290,8 @@ sickrage/core/exceptions/__init__.py = bb106687a1cb41cf0da10e125e0c82c7
sickrage/core/websession/__init__.py = 6d3d11bec0c0855e08a4c8f2cb6b759e
sickrage/core/config/helpers.py = 8d0d9e502b0fa5eff071558ca0f496d3
sickrage/core/config/__init__.py = e0bca86f699956c7cfb440dda36a61d7
sickrage/core/amqp/__init__.py = d7deb18744fdf1d18ab9191d08838419
sickrage/core/amqp/consumer.py = 9e489bad0db4eb4dc544382bdb97b2c1
sickrage/core/amqp/__init__.py = 5e00ced30a10ee785c79a4654216e8cf
sickrage/core/amqp/consumer.py = 8c7d9aaf2f084c41c7fb1b35394adbed
sickrage/core/webserver/__init__.py = b56927ec9027045d1656f9a55344a09e
sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
sickrage/core/webserver/static/images/poster-thumb.png = b788e8476ff0a2d3dfca0eb1d31bab58
......@@ -341,8 +341,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 = 81b198c2a60332c8d43bf9103260877e
sickrage/core/webserver/static/js/core.min.js = 6d5cec9a09385049dcfc936c67c58106
sickrage/core/webserver/static/js/core.js.map = 2c09db7a34cbd874a6c175b9718637d8
sickrage/core/webserver/static/js/core.min.js = b3239b478ff6f9cee14e63a7776d9800
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
......@@ -436,7 +436,7 @@ sickrage/core/webserver/handlers/api/v2/series_provider/schemas.py = 014e8408340
sickrage/core/webserver/handlers/api/v2/series_provider/__init__.py = 1e0538b415c3346d724effb9fbf8f92a
sickrage/core/webserver/handlers/api/v2/history/schemas.py = 014e84083401e6b05a9626cb29bd8467
sickrage/core/webserver/handlers/api/v2/history/__init__.py = 96ec5aabeb125e7340012655ccb499c7
sickrage/core/webserver/handlers/api/v1/__init__.py = 08acffa6224dc735dea096a4a4ac27fa
sickrage/core/webserver/handlers/api/v1/__init__.py = 78c6dc7e505a04c11b104e387d8e2a2a
sickrage/core/webserver/handlers/manage/queues.py = f92d4a8b34b1872e529886f4aa80ed08
sickrage/core/webserver/handlers/manage/__init__.py = 99ba915c56a2f50b76803e0ef7b1235f
sickrage/core/webserver/handlers/home/add_shows.py = 63773c53ec9288661aadeb242e15ab0e
......
......@@ -23,7 +23,7 @@ import ssl
import pika
from pika.adapters.tornado_connection import TornadoConnection
from pika.adapters.utils.connection_workflow import AMQPConnectorException
from pika.exceptions import StreamLostError, AMQPConnectionError
from pika.exceptions import StreamLostError, AMQPConnectionError, ChannelWrongStateError
from tornado.ioloop import IOLoop
import sickrage
......@@ -91,13 +91,13 @@ class AMQPBase(object):
if self._channel and not self._channel.is_closed:
try:
self._channel.close()
except StreamLostError:
except (ChannelWrongStateError, StreamLostError):
pass
if self._connection and not self._connection.is_closed:
try:
self._connection.close()
except StreamLostError:
except (ChannelWrongStateError, StreamLostError):
pass
self._channel = None
......@@ -118,7 +118,6 @@ class AMQPBase(object):
def reconnect(self):
if not self._closing:
self.disconnect()
self.connect()
def on_channel_open(self, channel):
......
......@@ -20,6 +20,7 @@
# ##############################################################################
from google.protobuf.json_format import MessageToDict
from pika.exceptions import ChannelWrongStateError, StreamLostError
from tornado.ioloop import IOLoop
import sickrage
......@@ -102,6 +103,6 @@ class AMQPConsumer(AMQPBase):
on_message_callback=self.on_message,
queue=f'{sickrage.app.config.user.sub_id}.{sickrage.app.config.general.server_id}',
)
except Exception as e:
sickrage.app.log.debug(f'Exception happened during consuming AMQP messages: {e!r}')
IOLoop.current().call_later(5, self.reconnect)
except (ChannelWrongStateError, StreamLostError):
sickrage.app.log.debug('AMQP channel error, attempting to reconnect')
IOLoop.current().call_later(5, self.reconnect)
\ No newline at end of file
......@@ -38,7 +38,7 @@ from sickrage.core.caches import image_cache
from sickrage.core.common import dateFormat, dateTimeFormat, Overview, timeFormat, Quality, Qualities, EpisodeStatus
from sickrage.core.databases.main import MainDB
from sickrage.core.databases.main.schemas import TVEpisodeSchema
from sickrage.core.enums import ProcessMethod, SeriesProviderID
from sickrage.core.enums import ProcessMethod, SeriesProviderID, SearchFormat
from sickrage.core.exceptions import EpisodeNotFoundException, CantRemoveShowException, CantRefreshShowException, CantUpdateShowException
from sickrage.core.helpers import backup_app_data, srdatetime, pretty_file_size, read_file_buffered, try_int, sanitize_file_name, chmod_as_parent, flatten, \
make_dir
......@@ -1731,7 +1731,7 @@ class CMD_Show(ApiV1Handler):
showDict["show_name"] = show_object.name
showDict["paused"] = (0, 1)[show_object.paused]
showDict["subtitles"] = (0, 1)[show_object.subtitles]
showDict["search_format"] = show_object.search_format
showDict["search_format"] = SearchFormat(show_object.search_format).display_name
showDict["flatten_folders"] = (0, 1)[show_object.flatten_folders]
showDict["scene"] = (0, 1)[show_object.scene]
showDict["anime"] = (0, 1)[show_object.anime]
......@@ -2354,6 +2354,8 @@ class CMD_ShowSeasons(ApiV1Handler):
for row in db_data:
episode_dict = row.as_dict()
episode_dict['series_provider_id'] = SeriesProviderID(episode_dict['series_provider_id']).display_name
status, quality = Quality.split_composite_status(int(episode_dict['status']))
episode_dict['status'] = status.display_name
episode_dict['quality'] = quality.display_name
......@@ -2596,7 +2598,7 @@ class CMD_Shows(ApiV1Handler):
"paused": (0, 1)[curShow.paused],
"quality": Qualities(curShow.quality).display_name,
"language": curShow.lang,
"search_format": curShow.search_format,
"search_format": SearchFormat(curShow.search_format).display_name,
"anime": (0, 1)[curShow.anime],
"series_id": curShow.series_id,
"series_provider_id": curShow.series_provider.name,
......
10.0.35
\ No newline at end of file
10.0.36
\ 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