Commit fac83cc2 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.48'

parents 45fb67c0 80774c8a
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.48](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.47...10.0.48)
#### [10.0.47](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.46...10.0.47)
 
> 1 January 2022
- Refactored video files to be mime typed by built-in module mimetypes, no longer requires end-user to specify allowed video file extensions [`9f0903d`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/9f0903deafba49880b6003bacf8fc3f579070ea0)
 
#### [10.0.46](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.45...10.0.46)
......
{
"name": "sickrage",
"version": "10.0.47",
"version": "10.0.48",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.47
current_version = 10.0.48
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.47"
__version__ = "10.0.48"
__install_type__ = ""
import argparse
......
This diff is collapsed.
......@@ -23,7 +23,7 @@ import os
import re
from urllib.parse import unquote_plus, urlencode
from tornado.escape import json_encode
from tornado.escape import json_encode, url_unescape, xhtml_unescape
from tornado.httputil import url_concat
from tornado.web import authenticated
......@@ -84,7 +84,7 @@ class SearchSeriesProviderForShowNameHandler(BaseHandler):
# search via series name
series_provider = sickrage.app.series_providers[SeriesProviderID[series_provider_id]]
series_results = series_provider.search(query=search_term, language=series_provider_language)
series_results = series_provider.search(query=xhtml_unescape(search_term), language=series_provider_language)
if series_results:
for series in series_results:
if not series.get('name', None):
......@@ -111,7 +111,7 @@ class MassAddTableHandler(BaseHandler):
def get(self, *args, **kwargs):
root_dir = self.get_arguments('rootDir')
root_dirs = [unquote_plus(x) for x in root_dir]
root_dirs = [unquote_plus(xhtml_unescape(x)) for x in root_dir]
if sickrage.app.config.general.root_dirs:
default_index = int(sickrage.app.config.general.root_dirs.split('|')[0])
......@@ -398,18 +398,18 @@ class AddNewShowHandler(BaseHandler):
series_provider_id = series_pieces[1]
series_id = int(series_pieces[3])
show_name = series_pieces[4]
show_name = xhtml_unescape(series_pieces[4])
else:
series_provider_id = provided_series_provider_id or sickrage.app.config.general.series_provider_default
series_id = int(whichSeries)
if fullShowPath:
show_name = os.path.basename(os.path.normpath(fullShowPath))
show_name = os.path.basename(os.path.normpath(xhtml_unescape(fullShowPath)))
else:
show_name = provided_series_name
show_name = xhtml_unescape(provided_series_name)
# use the whole path if it's given, or else append the show name to the root dir to get the full show path
if fullShowPath:
show_dir = os.path.normpath(fullShowPath)
show_dir = os.path.normpath(xhtml_unescape(fullShowPath))
else:
show_dir = os.path.join(rootDir, sanitize_file_name(show_name))
if add_show_year and not re.match(r'.*\(\d+\)$', show_dir) and re.search(r'\d{4}', series_pieces[5]):
......@@ -495,7 +495,7 @@ class AddExistingShowsHandler(BaseHandler):
prompt_for_settings = self.get_argument('promptForSettings')
# grab a list of other shows to add, if provided
shows_to_add = [unquote_plus(x) for x in shows_to_add]
shows_to_add = [unquote_plus(xhtml_unescape(x)) for x in shows_to_add]
prompt_for_settings = checkbox_to_value(prompt_for_settings)
......
......@@ -21,7 +21,7 @@
import os
from functools import cmp_to_key
from tornado.escape import json_encode, json_decode
from tornado.escape import json_encode, json_decode, xhtml_unescape
from tornado.web import authenticated
import sickrage
......@@ -249,9 +249,11 @@ def edit_show(series_id, any_qualities, best_qualities, exceptions_list, locatio
show_obj.rls_require_words = rls_require_words.strip()
show_obj.search_delay = int(search_delay)
location = os.path.normpath(xhtml_unescape(location))
# if we change location clear the db of episodes, change it, write to db, and rescan
if os.path.normpath(show_obj.location) != os.path.normpath(location):
sickrage.app.log.debug(os.path.normpath(show_obj.location) + " != " + os.path.normpath(location))
if os.path.normpath(show_obj.location) != location:
sickrage.app.log.debug(os.path.normpath(show_obj.location) + " != " + location)
if not os.path.isdir(location) and not sickrage.app.config.general.create_missing_show_dirs:
warnings.append("New location {} does not exist".format(location))
......
......@@ -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.47"}).NODE_DEBUG || '';
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.48"}).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.47",
release: "10.0.48",
beforeSend: function beforeSend(event, hint) {
if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) {
10.0.47
\ No newline at end of file
10.0.48
\ 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