Commit 93bf0343 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.57'

parents 346b0784 9770cb87
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.57](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.56...10.0.57)
#### [10.0.56](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.55...10.0.56)
 
> 20 March 2022
#### [10.0.55](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.54...10.0.55)
 
> 20 March 2022
......
{
"name": "sickrage",
"version": "10.0.56",
"version": "10.0.57",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.56
current_version = 10.0.57
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.56"
__version__ = "10.0.57"
__install_type__ = ""
import argparse
......
This diff is collapsed.
......@@ -1428,16 +1428,17 @@ class TVShow(object):
'banner': self.banner
}
# qualities section
json_data['qualities'] = {
'allowedQualities': [x.name for x in self.allowed_qualities],
'preferredQualities': [x.name for x in self.preferred_qualities]
}
# show queue status
json_data['showQueueStatus'] = self.show_queue_status
# detail sections
if details:
# qualities section
json_data['qualities'] = {
'allowedQualities': [x.name for x in self.allowed_qualities],
'preferredQualities': [x.name for x in self.preferred_qualities]
}
# imdb info section
imdb_info = session.query(MainDB.IMDbInfo).filter_by(series_id=self.series_id, imdb_id=self.imdb_id).one_or_none()
json_data['imdbInfo'] = IMDbInfoSchema().dump(imdb_info)
......
......@@ -56,5 +56,5 @@ def find_show_by_location(location):
return show
def get_show_list():
return list(sickrage.app.shows.values())
def get_show_list(offset=0, limit=0):
return list(sickrage.app.shows.values())[offset:(limit + offset if limit else None)]
......@@ -20,13 +20,15 @@
# ##############################################################################
import os
import re
import time
from itertools import zip_longest
from tornado.escape import json_decode
import sickrage
from sickrage.core.common import Quality, Qualities, EpisodeStatus
from sickrage.core.databases.main import MainDB
from sickrage.core.databases.main.schemas import IMDbInfoSchema, BlacklistSchema, WhitelistSchema
from sickrage.core.databases.main.schemas import IMDbInfoSchema, BlacklistSchema, WhitelistSchema, TVShowSchema
from sickrage.core.enums import SearchFormat, SeriesProviderID
from sickrage.core.exceptions import CantUpdateShowException, NoNFOException, CantRefreshShowException
from sickrage.core.helpers import checkbox_to_value, sanitize_file_name, make_dir, chmod_as_parent
......@@ -78,14 +80,40 @@ class ApiV2SeriesHandler(ApiV2BaseHandler):
NotFoundSchema
"""
offset = int(self.get_argument('offset', 0))
limit = int(self.get_argument('limit', 0))
if not series_slug:
all_series = []
for show in get_show_list():
if sickrage.app.show_queue.is_being_removed(show.series_id):
continue
all_series.append(show.to_json(progress=True))
# start = time.time()
with sickrage.app.main_db.session() as session:
for series in session.query(MainDB.TVShow).with_entities(MainDB.TVShow.series_id, MainDB.TVShow.series_provider_id, MainDB.TVShow.name):
json_data = TVShowSchema().dump(series)
json_data['seriesSlug'] = f'{series.series_id}-{series.series_provider_id.value}'
json_data['isLoading'] = sickrage.app.show_queue.is_being_added(series.series_id)
json_data['isRemoving'] = sickrage.app.show_queue.is_being_removed(series.series_id)
json_data['images'] = {
'poster': series_image(series.series_id, series.series_provider_id, SeriesImageType.POSTER).url,
'banner': series_image(series.series_id, series.series_provider_id, SeriesImageType.BANNER).url
}
all_series.append(json_data)
# end = time.time()
# print(end - start)
# start = time.time()
#
# for show in get_show_list(offset, limit):
# if show.is_removing:
# continue
#
# all_series.append(show.to_json())
#
# end = time.time()
# print(end - start)
return self.json_response(all_series)
......
......@@ -72,17 +72,14 @@ def is_certificate_valid(cert_file):
if 'ZeroSSL' not in issuer.value:
return False
if subject.value != f'{sickrage.app.config.general.server_id}.external.sickrage.direct':
if subject.value != f'*.{sickrage.app.config.general.server_id}.sickrage.direct':
return False
try:
ext = cert.extensions.get_extension_for_class(x509.SubjectAlternativeName).value
sans = ext.get_values_for_type(x509.DNSName)
domains = [
f'{sickrage.app.config.general.server_id}.external.sickrage.direct',
f'{sickrage.app.config.general.server_id}.internal.sickrage.direct'
]
domains = [f'*.{sickrage.app.config.general.server_id}.sickrage.direct']
for domain in sans:
if domain not in domains:
......
......@@ -81729,7 +81729,7 @@ var debugs = {};
var debugEnviron;
exports.debuglog = function(set) {
if (isUndefined(debugEnviron))
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.56"}).NODE_DEBUG || '';
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.57"}).NODE_DEBUG || '';
set = set.toUpperCase();
if (!debugs[set]) {
if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
......@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
Sentry.init({
dsn: 'https://[email protected]/2',
release: "10.0.56",
release: "10.0.57",
beforeSend: function beforeSend(event, hint) {
if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) {
10.0.56
\ No newline at end of file
10.0.57
\ 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