Commit 332eda0c authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.62'

parents 01c8b1fe cf2978a2
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
   
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
   
#### [10.0.62](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.61...10.0.62)
#### [10.0.61](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.60...10.0.61) #### [10.0.61](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.60...10.0.61)
   
> 8 May 2022
- fixed issues with blank URLs being sent to get_image function when populating show/season/episode images [`bda6105`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/bda61054c9b8ac46cf036413d83fd4769dfa6ae3) - fixed issues with blank URLs being sent to get_image function when populating show/season/episode images [`bda6105`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/bda61054c9b8ac46cf036413d83fd4769dfa6ae3)
   
#### [10.0.60](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.59...10.0.60) #### [10.0.60](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.59...10.0.60)
......
{ {
"name": "sickrage", "name": "sickrage",
"version": "10.0.61", "version": "10.0.62",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
......
[bumpversion] [bumpversion]
current_version = 10.0.61 current_version = 10.0.62
commit = False commit = False
tag = False tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>. # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ############################################################################## # ##############################################################################
__version__ = "10.0.61" __version__ = "10.0.62"
__install_type__ = "" __install_type__ = ""
import argparse import argparse
......
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = 63720d34dea954ada099526f656f5e1e sickrage/__init__.py = 5e8ef66867fb59cf27e1cbc36ce89714
sickrage/version.txt = bbfd01890110a71ef8a413a7bb715779 sickrage/version.txt = 570ad05ace6f5b5d0e4a0620504a4a1a
sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b
sickrage/clients/nzb/nzbget.py = 2a23083d4915fed22c73f4966588cac8 sickrage/clients/nzb/nzbget.py = 2a23083d4915fed22c73f4966588cac8
sickrage/clients/nzb/sabnzbd.py = f76666e47017abaf366f4a3e8b71c47b sickrage/clients/nzb/sabnzbd.py = f76666e47017abaf366f4a3e8b71c47b
...@@ -16,7 +16,7 @@ sickrage/clients/torrent/mlnet.py = 0e73345f3516a57eeaf9dea40ecbbddc ...@@ -16,7 +16,7 @@ sickrage/clients/torrent/mlnet.py = 0e73345f3516a57eeaf9dea40ecbbddc
sickrage/clients/torrent/putio.py = e3635cb458be1bd9e6dbdf10ceaa2bd4 sickrage/clients/torrent/putio.py = e3635cb458be1bd9e6dbdf10ceaa2bd4
sickrage/clients/torrent/deluged.py = f7291242ab46a4668c0b54cd7821dff0 sickrage/clients/torrent/deluged.py = f7291242ab46a4668c0b54cd7821dff0
sickrage/clients/torrent/__init__.py = 014e84083401e6b05a9626cb29bd8467 sickrage/clients/torrent/__init__.py = 014e84083401e6b05a9626cb29bd8467
sickrage/locale/messages.pot = 162cb342c89a34115a1a2e988b320599 sickrage/locale/messages.pot = 9081b3418be9f5a499d0e435a7cf6d75
sickrage/locale/no_NO/LC_MESSAGES/messages.po = 665add0ac4385bce84e16cb1dba3267a sickrage/locale/no_NO/LC_MESSAGES/messages.po = 665add0ac4385bce84e16cb1dba3267a
sickrage/locale/no_NO/LC_MESSAGES/messages.json = a8e45d067d9f0e279a23e959db8fa1e7 sickrage/locale/no_NO/LC_MESSAGES/messages.json = a8e45d067d9f0e279a23e959db8fa1e7
sickrage/locale/no_NO/LC_MESSAGES/messages.mo = 81d7c78f3be5a5c414493c37657a1097 sickrage/locale/no_NO/LC_MESSAGES/messages.mo = 81d7c78f3be5a5c414493c37657a1097
...@@ -50,9 +50,9 @@ sickrage/locale/zh_TW/LC_MESSAGES/messages.mo = d946e6bf24f511ffa16bd567484998fb ...@@ -50,9 +50,9 @@ sickrage/locale/zh_TW/LC_MESSAGES/messages.mo = d946e6bf24f511ffa16bd567484998fb
sickrage/locale/el_GR/LC_MESSAGES/messages.po = 9d8087cfea2d4348f804c043f3d3e740 sickrage/locale/el_GR/LC_MESSAGES/messages.po = 9d8087cfea2d4348f804c043f3d3e740
sickrage/locale/el_GR/LC_MESSAGES/messages.json = d0043052f4d192e19eaec90b2d907e5d sickrage/locale/el_GR/LC_MESSAGES/messages.json = d0043052f4d192e19eaec90b2d907e5d
sickrage/locale/el_GR/LC_MESSAGES/messages.mo = e6c8522c5232bd7835e5f85c0e5d93f3 sickrage/locale/el_GR/LC_MESSAGES/messages.mo = e6c8522c5232bd7835e5f85c0e5d93f3
sickrage/locale/en_US/LC_MESSAGES/messages.po = 2ae22ef0ed5f6ab9018159666f6dbee8 sickrage/locale/en_US/LC_MESSAGES/messages.po = 73f13ad19e9524dba696e1c22297eb63
sickrage/locale/en_US/LC_MESSAGES/messages.json = 34be851b221b72688c9c5c7caa9f450a sickrage/locale/en_US/LC_MESSAGES/messages.json = 34be851b221b72688c9c5c7caa9f450a
sickrage/locale/en_US/LC_MESSAGES/messages.mo = 79c8345173173703d339467ab18b661a sickrage/locale/en_US/LC_MESSAGES/messages.mo = 908ad64ab6850ba71e84c596db87d246
sickrage/locale/ar_SA/LC_MESSAGES/messages.po = 905109fc0c7ea4b653122b7397d2d55b sickrage/locale/ar_SA/LC_MESSAGES/messages.po = 905109fc0c7ea4b653122b7397d2d55b
sickrage/locale/ar_SA/LC_MESSAGES/messages.json = 8c47f610aec954cc75530578b9e1af6a sickrage/locale/ar_SA/LC_MESSAGES/messages.json = 8c47f610aec954cc75530578b9e1af6a
sickrage/locale/ar_SA/LC_MESSAGES/messages.mo = 40c217dfcc15eef7b61ddab8318825cc sickrage/locale/ar_SA/LC_MESSAGES/messages.mo = 40c217dfcc15eef7b61ddab8318825cc
...@@ -353,7 +353,7 @@ sickrage/core/webserver/handlers/manage/queues.py = f92d4a8b34b1872e529886f4aa80 ...@@ -353,7 +353,7 @@ sickrage/core/webserver/handlers/manage/queues.py = f92d4a8b34b1872e529886f4aa80
sickrage/core/webserver/handlers/manage/__init__.py = 6b79f83afdd5565b06310e22245f882b sickrage/core/webserver/handlers/manage/__init__.py = 6b79f83afdd5565b06310e22245f882b
sickrage/core/webserver/handlers/api/schemas.py = 7fcfd3dee63378ba5bd8fcbaebbf49ef sickrage/core/webserver/handlers/api/schemas.py = 7fcfd3dee63378ba5bd8fcbaebbf49ef
sickrage/core/webserver/handlers/api/__init__.py = d4e5ae21437bff15091baf20e3632059 sickrage/core/webserver/handlers/api/__init__.py = d4e5ae21437bff15091baf20e3632059
sickrage/core/webserver/handlers/api/v1/__init__.py = 5183beff16716288f9ed33a86f11a87c sickrage/core/webserver/handlers/api/v1/__init__.py = 97d37e3898f6602c069a3a0cc573ff2e
sickrage/core/webserver/handlers/api/v2/__init__.py = 331c145796355d52ae1818bf9fd69ced sickrage/core/webserver/handlers/api/v2/__init__.py = 331c145796355d52ae1818bf9fd69ced
sickrage/core/webserver/handlers/api/v2/file_browser/schemas.py = 014e84083401e6b05a9626cb29bd8467 sickrage/core/webserver/handlers/api/v2/file_browser/schemas.py = 014e84083401e6b05a9626cb29bd8467
sickrage/core/webserver/handlers/api/v2/file_browser/__init__.py = 5e348f6f96a80a98dca3ae2b9151ac33 sickrage/core/webserver/handlers/api/v2/file_browser/__init__.py = 5e348f6f96a80a98dca3ae2b9151ac33
...@@ -433,7 +433,7 @@ sickrage/core/webserver/static/images/backdrops/config.jpg = ddbe8915317f7860d91 ...@@ -433,7 +433,7 @@ sickrage/core/webserver/static/images/backdrops/config.jpg = ddbe8915317f7860d91
sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015 sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
sickrage/core/webserver/static/images/backdrops/history.jpg = b4911bfe3ec57a894b5a16fa1ab479cf sickrage/core/webserver/static/images/backdrops/history.jpg = b4911bfe3ec57a894b5a16fa1ab479cf
sickrage/core/webserver/static/js/core.min.js = 3db088023c8e5f47b0f202de1628770d sickrage/core/webserver/static/js/core.min.js = 9222de59003b938d7dfde7eeafe1f79f
sickrage/core/webserver/static/js/core.js.map = cdf19c1422438fb68dd84471031b2c56 sickrage/core/webserver/static/js/core.js.map = cdf19c1422438fb68dd84471031b2c56
sickrage/core/webserver/views/login.mako = 3f6c8e8325928539d6bb70a77b378116 sickrage/core/webserver/views/login.mako = 3f6c8e8325928539d6bb70a77b378116
sickrage/core/webserver/views/login_failed.mako = 5684d10edff37970a2285d7d5bb815eb sickrage/core/webserver/views/login_failed.mako = 5684d10edff37970a2285d7d5bb815eb
......
...@@ -847,9 +847,8 @@ class CMD_EpisodeSetStatus(ApiV1Handler): ...@@ -847,9 +847,8 @@ class CMD_EpisodeSetStatus(ApiV1Handler):
# get all episode numbers in specified season # get all episode numbers in specified season
ep_list = [x for x in show_obj.episodes if x.season == self.s] ep_list = [x for x in show_obj.episodes if x.season == self.s]
def _epResult(result_code, ep, msg=""): def _ep_result(result_code, ep, msg=""):
return {'season': ep.season, 'episode': ep.episode, 'status': ep.status.display_name, return {'season': ep.season, 'episode': ep.episode, 'status': ep.status.display_name, 'result': result_type_map[result_code], 'message': msg}
'result': result_type_map[result_code], 'message': msg}
ep_results = [] ep_results = []
failure = False failure = False
...@@ -857,31 +856,31 @@ class CMD_EpisodeSetStatus(ApiV1Handler): ...@@ -857,31 +856,31 @@ class CMD_EpisodeSetStatus(ApiV1Handler):
wanted = [] wanted = []
for epObj in ep_list: for epObj in ep_list:
if self.status == EpisodeStatus.WANTED:
# figure out what episodes are wanted so we can backlog them
wanted += [(epObj.season, epObj.episode)]
# don't let them mess up UNAIRED episodes # don't let them mess up UNAIRED episodes
if epObj.status == EpisodeStatus.UNAIRED: if epObj.status == EpisodeStatus.UNAIRED:
if self.e is not None: if self.e is not None:
ep_results.append(_epResult(RESULT_FAILURE, epObj, "Refusing to change status because it is UNAIRED")) ep_results.append(_ep_result(RESULT_FAILURE, epObj, "Refusing to change status because it is UNAIRED"))
failure = True failure = True
continue continue
# allow the user to force setting the status for an already downloaded episode # allow the user to force setting the status for an already downloaded episode
if epObj.status in flatten( if epObj.status in flatten(
[EpisodeStatus.composites(EpisodeStatus.DOWNLOADED), EpisodeStatus.composites(EpisodeStatus.ARCHIVED)]) and not self.force: [EpisodeStatus.composites(EpisodeStatus.DOWNLOADED), EpisodeStatus.composites(EpisodeStatus.ARCHIVED)]) and not self.force:
ep_results.append(_epResult(RESULT_FAILURE, epObj, "Refusing to change status because it is already marked as DOWNLOADED")) ep_results.append(_ep_result(RESULT_FAILURE, epObj, "Refusing to change status because it is already marked as DOWNLOADED"))
failure = True failure = True
continue continue
if self.status == EpisodeStatus.WANTED:
# figure out what episodes are wanted so we can backlog them
wanted += [(epObj.season, epObj.episode)]
epObj.status = self.status epObj.status = self.status
epObj.save() epObj.save()
if self.status == EpisodeStatus.WANTED: if self.status == EpisodeStatus.WANTED:
start_backlog = True start_backlog = True
ep_results.append(_epResult(RESULT_SUCCESS, epObj)) ep_results.append(_ep_result(RESULT_SUCCESS, epObj))
extra_msg = "" extra_msg = ""
if start_backlog: if start_backlog:
...@@ -894,7 +893,7 @@ class CMD_EpisodeSetStatus(ApiV1Handler): ...@@ -894,7 +893,7 @@ class CMD_EpisodeSetStatus(ApiV1Handler):
if failure: if failure:
return _responds(RESULT_FAILURE, ep_results, 'Failed to set all or some status. Check data.' + extra_msg) return _responds(RESULT_FAILURE, ep_results, 'Failed to set all or some status. Check data.' + extra_msg)
else: else:
return _responds(RESULT_SUCCESS, msg='All status set successfully.' + extra_msg) return _responds(RESULT_SUCCESS, ep_results, 'All status set successfully.' + extra_msg)
class CMD_SubtitleSearch(ApiV1Handler): class CMD_SubtitleSearch(ApiV1Handler):
...@@ -2362,9 +2361,6 @@ class CMD_ShowSeasonList(ApiV1Handler): ...@@ -2362,9 +2361,6 @@ class CMD_ShowSeasonList(ApiV1Handler):
if not show_obj: if not show_obj:
return _responds(RESULT_FAILURE, msg="Show not found") return _responds(RESULT_FAILURE, msg="Show not found")
while show_obj.is_loading_episodes:
time.sleep(1)
season_list = set() season_list = set()
for episode_object in show_obj.episodes: for episode_object in show_obj.episodes:
season_list.add(episode_object.season) season_list.add(episode_object.season)
...@@ -2411,6 +2407,8 @@ class CMD_ShowSeasons(ApiV1Handler): ...@@ -2411,6 +2407,8 @@ class CMD_ShowSeasons(ApiV1Handler):
db_data = session.query(MainDB.TVEpisode).filter_by(series_id=self.series_id, series_provider_id=show_obj.series_provider_id) db_data = session.query(MainDB.TVEpisode).filter_by(series_id=self.series_id, series_provider_id=show_obj.series_provider_id)
else: else:
db_data = session.query(MainDB.TVEpisode).filter_by(series_id=self.series_id, series_provider_id=show_obj.series_provider_id, season=self.season) db_data = session.query(MainDB.TVEpisode).filter_by(series_id=self.series_id, series_provider_id=show_obj.series_provider_id, season=self.season)
if not db_data.all():
return _responds(RESULT_FAILURE, msg="Season not found")
for row in db_data: for row in db_data:
episode_dict = row.as_dict() episode_dict = row.as_dict()
......
...@@ -81729,7 +81729,7 @@ var debugs = {}; ...@@ -81729,7 +81729,7 @@ var debugs = {};
var debugEnviron; var debugEnviron;
exports.debuglog = function(set) { exports.debuglog = function(set) {
if (isUndefined(debugEnviron)) if (isUndefined(debugEnviron))
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.61"}).NODE_DEBUG || ''; debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.62"}).NODE_DEBUG || '';
set = set.toUpperCase(); set = set.toUpperCase();
if (!debugs[set]) { if (!debugs[set]) {
if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) { if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
...@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de ...@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   
Sentry.init({ Sentry.init({
dsn: 'https://[email protected]/2', dsn: 'https://[email protected]/2',
release: "10.0.61", release: "10.0.62",
beforeSend: function beforeSend(event, hint) { beforeSend: function beforeSend(event, hint) {
if (event.exception) { if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) { event.exception.values[0].stacktrace.frames.forEach(function (frame) {
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: sickrage 10.0.61.dev2\n" "Project-Id-Version: sickrage 10.0.62.dev2\n"
"Report-Msgid-Bugs-To: [email protected]\n" "Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-08 20:23+0000\n" "POT-Creation-Date: 2022-05-09 07:43+0000\n"
"PO-Revision-Date: 2022-05-08 20:23+0000\n" "PO-Revision-Date: 2022-05-09 07:43+0000\n"
"Last-Translator: FULL NAME <[email protected]>\n" "Last-Translator: FULL NAME <[email protected]>\n"
"Language: en_US\n" "Language: en_US\n"
"Language-Team: en_US <[email protected]>\n" "Language-Team: en_US <[email protected]>\n"
...@@ -4168,7 +4168,7 @@ msgstr "" ...@@ -4168,7 +4168,7 @@ msgstr ""
msgid "Test Connection" msgid "Test Connection"
msgstr "" msgstr ""
#: sickrage/core/webserver/handlers/api/v1/__init__.py:953 #: sickrage/core/webserver/handlers/api/v1/__init__.py:952
#: sickrage/core/webserver/views/config/subtitles.mako:10 #: sickrage/core/webserver/views/config/subtitles.mako:10
#: sickrage/core/webserver/views/config/subtitles.mako:26 #: sickrage/core/webserver/views/config/subtitles.mako:26
#: sickrage/core/webserver/views/home/display_show.mako:725 #: sickrage/core/webserver/views/home/display_show.mako:725
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: sickrage 10.0.61.dev2\n" "Project-Id-Version: sickrage 10.0.62.dev2\n"
"Report-Msgid-Bugs-To: [email protected]\n" "Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-08 20:23+0000\n" "POT-Creation-Date: 2022-05-09 07:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n" "Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n"
...@@ -4147,7 +4147,7 @@ msgstr "" ...@@ -4147,7 +4147,7 @@ msgstr ""
msgid "Test Connection" msgid "Test Connection"
msgstr "" msgstr ""
#: sickrage/core/webserver/handlers/api/v1/__init__.py:953 #: sickrage/core/webserver/handlers/api/v1/__init__.py:952
#: sickrage/core/webserver/views/config/subtitles.mako:10 #: sickrage/core/webserver/views/config/subtitles.mako:10
#: sickrage/core/webserver/views/config/subtitles.mako:26 #: sickrage/core/webserver/views/config/subtitles.mako:26
#: sickrage/core/webserver/views/home/display_show.mako:725 #: sickrage/core/webserver/views/home/display_show.mako:725
......
10.0.61 10.0.62
\ No newline at end of file \ 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