Commit a83747e1 authored by echel0n's avatar echel0n

Merge branch 'release/10.0.10'

parents 1dbe6321 1c158f53
......@@ -2,7 +2,14 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [v10.0.9](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.8...v10.0.9)
#### [v10.0.10](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.9...v10.0.10)
- Fixed issues with mass episode status editing [`3e21025`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/3e21025960645f480f6b366f9fd6d6603c874e44)
- Fixed issues with mass editing show search format and default episode status [`34e22ae`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/34e22ae4b3738a45eec384df72936e740bd55fcf)
#### [10.0.9](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.8...10.0.9)
> 8 February 2021
- Performed webpack [`03897ba`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/03897baf59f8bbf2f73449905b5c1de93be821d7)
- Fixed "Multiple rows were found for one_or_none()" exception when getting json object of episode object [`5761806`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/5761806f6896148c6250c236faa489ba847258fc)
......
{
"name": "sickrage",
"version": "10.0.9",
"version": "10.0.10",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.9
current_version = 10.0.10
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
This diff is collapsed.
......@@ -684,11 +684,11 @@ class Qualities(enum.IntFlag):
# extend episode status enum class with composite statuses
[extend_enum(EpisodeStatus, f"{status.name}_{q.name}", status + 100 * q)
for status in list(EpisodeStatus).copy()
for q in Qualities if not q.is_preset and status in [EpisodeStatus.DOWNLOADED,
EpisodeStatus.SNATCHED,
EpisodeStatus.SNATCHED_BEST,
EpisodeStatus.SNATCHED_PROPER,
EpisodeStatus.ARCHIVED,
EpisodeStatus.FAILED,
EpisodeStatus.IGNORED]]
for status in list(EpisodeStatus).copy() for q in Qualities if not q.is_preset and status in [EpisodeStatus.DOWNLOADED,
EpisodeStatus.SNATCHED,
EpisodeStatus.SNATCHED_BEST,
EpisodeStatus.SNATCHED_PROPER,
EpisodeStatus.ARCHIVED,
EpisodeStatus.FAILED,
EpisodeStatus.IGNORED,
EpisodeStatus.SUBTITLED]]
......@@ -51,7 +51,7 @@ class BaseHandler(RequestHandler):
return locale.get(sickrage.app.config.gui.gui_lang)
def write_error(self, status_code, **kwargs):
if "exc_info" in kwargs:
if status_code not in [401, 404] and "exc_info" in kwargs:
exc_info = kwargs["exc_info"]
error = repr(exc_info[1])
......
......@@ -30,7 +30,7 @@ from sickrage.core.common import Quality, Qualities, EpisodeStatus
from sickrage.core.databases.main import MainDB
from sickrage.core.enums import SearchFormat, SeriesProviderID
from sickrage.core.exceptions import CantUpdateShowException, CantRefreshShowException, EpisodeNotFoundException, AnidbAdbaConnectionException, NoNFOException
from sickrage.core.helpers import try_int, checkbox_to_value, flatten
from sickrage.core.helpers import checkbox_to_value, flatten
from sickrage.core.helpers.anidb import get_release_groups_for_anime, short_group_names
from sickrage.core.queues.search import BacklogSearchTask, FailedSearchTask
from sickrage.core.scene_numbering import xem_refresh
......@@ -197,10 +197,10 @@ def edit_show(series_id, any_qualities, best_qualities, exceptions_list, locatio
show_obj.paused = paused
show_obj.anime = anime
show_obj.scene = scene
show_obj.search_format = SearchFormat[search_format]
show_obj.search_format = search_format
show_obj.subtitles = subtitles
show_obj.sub_use_sr_metadata = sub_use_sr_metadata
show_obj.default_ep_status = EpisodeStatus[default_ep_status]
show_obj.default_ep_status = default_ep_status
show_obj.skip_downloaded = skip_downloaded
# If directCall from mass_edit_update no scene exceptions handling or black and white list handling
......@@ -673,13 +673,12 @@ class EditShowHandler(BaseHandler):
search_delay = self.get_argument('search_delay', None)
status, message = edit_show(series_id=show, location=location, any_qualities=any_qualities, best_qualities=best_qualities,
exceptions_list=exceptions_list,
flatten_folders=flatten_folders, paused=paused, direct_call=direct_call, search_format=search_format,
dvd_order=dvd_order, series_provider_language=series_provider_language, subtitles=subtitles,
sub_use_sr_metadata=sub_use_sr_metadata,
skip_downloaded=skip_downloaded, rls_ignore_words=rls_ignore_words, rls_require_words=rls_require_words, anime=anime,
blacklist=blacklist, whitelist=whitelist, default_ep_status=default_ep_status, quality_preset=quality_preset,
scene=scene, search_delay=search_delay)
exceptions_list=exceptions_list, flatten_folders=flatten_folders, paused=paused, direct_call=direct_call,
search_format=SearchFormat[search_format], dvd_order=dvd_order, series_provider_language=series_provider_language,
subtitles=subtitles, sub_use_sr_metadata=sub_use_sr_metadata, skip_downloaded=skip_downloaded,
rls_ignore_words=rls_ignore_words, rls_require_words=rls_require_words, anime=anime, blacklist=blacklist,
whitelist=whitelist, default_ep_status=EpisodeStatus[default_ep_status], quality_preset=quality_preset, scene=scene,
search_delay=search_delay)
if direct_call:
return json_encode({'result': 'success'}) if status is True else json_encode({'result': 'error', 'message': message})
......@@ -890,7 +889,7 @@ class MassEditHandler(BaseHandler):
if default_ep_status == 'keep':
new_default_ep_status = show_obj.default_ep_status
else:
new_default_ep_status = default_ep_status
new_default_ep_status = EpisodeStatus[default_ep_status]
if anime == 'keep':
new_anime = show_obj.anime
......@@ -901,7 +900,7 @@ class MassEditHandler(BaseHandler):
if search_format == 'keep':
new_search_format = show_obj.search_format
else:
new_search_format = search_format
new_search_format = SearchFormat[search_format]
if flatten_folders == 'keep':
new_flatten_folders = show_obj.flatten_folders
......
......@@ -28,15 +28,11 @@ from sickrage.core.webserver.handlers.base import BaseHandler
class NotFoundHandler(BaseHandler):
def prepare(self):
url = self.request.uri
if sickrage.app.config.general.web_root:
if not self.request.uri.startswith(sickrage.app.config.general.web_root):
return self.redirect(url)
url = url[len(sickrage.app.config.general.web_root) + 1:]
return self.redirect(self.request.uri)
if url[:3] != 'api':
if self.request.uri[len(sickrage.app.config.general.web_root) + 1:][:3] != 'api':
raise tornado.web.HTTPError(
status_code=404,
reason="You have reached this page by accident, please check the url."
......
10.0.9
\ No newline at end of file
10.0.10
\ 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