Commit 0eca5abc authored by echel0n's avatar echel0n

Merge branch 'release/10.0.7'

parents ff0a39b4 584f8f27
......@@ -80,7 +80,6 @@ Thumbs.db
# Build Files #
######################
.yarn-cache
yarn.lock
package-lock.json
/bower_components/
/node_modules/
......
......@@ -2,7 +2,11 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [v10.0.6](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.5...v10.0.6)
#### [v10.0.7](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.6...v10.0.7)
#### [10.0.6](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.5...10.0.6)
> 14 January 2021
- Fixed issue with launching browser after app starts up via scheduler [`f554180`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/f5541800645d5b78fb4723a9a194269fde283378)
......
{
"name": "sickrage",
"version": "10.0.6",
"version": "10.0.7",
"private": true,
"repository": {
"type": "git",
......@@ -34,6 +34,7 @@
"eslint-loader": "~4.0.0",
"file-loader": "~6.0.0",
"gettext-parser": "~2.1.0",
"graceful-fs": "~4.2.4",
"imagesloaded": "~4.1.4",
"isotope-layout": "~3.0.6",
"jquery": "~3.5.1",
......
[bumpversion]
current_version = 10.0.6
current_version = 10.0.7
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
sickrage/__init__.py = ee31957103672bcc905eba42109fbc90
sickrage/version.txt = 021238f8f26a23cdf07ea7ba40a25ec2
sickrage/version.txt = 2bf38dcde64f773206f266753b973b8a
sickrage/clients/__init__.py = abafc862109398700c9fee676cdeef6b
sickrage/clients/nzb/nzbget.py = 2a23083d4915fed22c73f4966588cac8
sickrage/clients/nzb/sabnzbd.py = f76666e47017abaf366f4a3e8b71c47b
......@@ -255,7 +255,7 @@ sickrage/core/websocket/__init__.py = 5425db61e032458c0bba655014322d86
sickrage/core/nameparser/validator.py = f40f97984b47eefa927fedcaaa314a6c
sickrage/core/nameparser/regexes.py = fbfb89e90f012a287266be8db0e2faf9
sickrage/core/nameparser/__init__.py = 27c01e5b187d2197b6fdaa418d178f4f
sickrage/core/databases/__init__.py = f72f9bc569312e3bb3dee5868c3aa372
sickrage/core/databases/__init__.py = 1b7f8c6008bfddd5ff46fdd7d3ae6712
sickrage/core/databases/cache/__init__.py = 10d9d660b502d32bc3f8c99b7d5a3b27
sickrage/core/databases/cache/migrations/script.py.mako = 55bff267625bd1f0799d24848df6c3e8
sickrage/core/databases/cache/migrations/env.py = 5cdd195b4adf08a9eda769316ffcc57d
......@@ -334,7 +334,7 @@ sickrage/core/webserver/handlers/irc.py = fc9ccf600ff1c883b2886df042e14b39
sickrage/core/webserver/handlers/manage/queues.py = 49ade8ce4385a899b8cf1a196b82cd57
sickrage/core/webserver/handlers/manage/__init__.py = 2d0e383e72ca6df23202277a3c4eeb46
sickrage/core/webserver/handlers/api/schemas.py = 7fcfd3dee63378ba5bd8fcbaebbf49ef
sickrage/core/webserver/handlers/api/__init__.py = 669f6af97a4c92b22451050022c653df
sickrage/core/webserver/handlers/api/__init__.py = aa7272e5553979a0bfc1e092055733f8
sickrage/core/webserver/handlers/api/v1/__init__.py = c1a32b139c291bffd8f14c883a6bd0e3
sickrage/core/webserver/handlers/api/v2/__init__.py = e8e3e20065fd63c2a41dca9779f90271
sickrage/core/webserver/handlers/api/v2/file_browser/__init__.py = 3ea22c808e52793f29f2c55a48afac94
......@@ -344,8 +344,8 @@ sickrage/core/webserver/handlers/api/v2/schedule/__init__.py = c4cb94f09fb9549ab
sickrage/core/webserver/handlers/api/v2/series_provider/__init__.py = dd1a7c5fdcaa800334e2e09d7a45a3a9
sickrage/core/webserver/handlers/api/v2/episode/schemas.py = 01d92b617db99d2f2d52010c1c8d1bfc
sickrage/core/webserver/handlers/api/v2/episode/__init__.py = af39777e18f6c27280ce5591c0c4671a
sickrage/core/webserver/handlers/api/v2/postprocess/schemas.py = b10c6d09a7c134fbb9c0cf1edbea52c2
sickrage/core/webserver/handlers/api/v2/postprocess/__init__.py = b2b454b5f99b27a8ba8995d6e049e28f
sickrage/core/webserver/handlers/api/v2/postprocess/schemas.py = 994d368e0a2321b8311700d613695563
sickrage/core/webserver/handlers/api/v2/postprocess/__init__.py = f85bc7d459534c990dfabf17e2895fb6
sickrage/core/webserver/handlers/api/v2/config/__init__.py = b2511c3a63779100f8ea30c774048d3d
sickrage/core/webserver/handlers/config/subtitles.py = 0134a7fe351cd9e0dbe6c1952d8d2dd7
sickrage/core/webserver/handlers/config/quality_settings.py = 6a2849c97b8635d46a92b758ba641428
......@@ -408,7 +408,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/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
sickrage/core/webserver/static/images/backdrops/history.jpg = b4911bfe3ec57a894b5a16fa1ab479cf
sickrage/core/webserver/static/js/core.min.js = 989a65720510532062115f71cf719c71
sickrage/core/webserver/static/js/core.min.js = 3ab9493a5beebffba3b849a42afc7422
sickrage/core/webserver/views/login.mako = 3f6c8e8325928539d6bb70a77b378116
sickrage/core/webserver/views/login_failed.mako = 5684d10edff37970a2285d7d5bb815eb
sickrage/core/webserver/views/announcements.mako = d5902b3926cc0d02cc1329676d8a9e1b
......
......@@ -205,6 +205,14 @@ class SRDatabase(object):
backup_filename = os.path.join(sickrage.app.data_dir, f'{self.name}_db_backup_{datetime.datetime.now().strftime("%Y%m%d_%H%M%S")}.json')
if db_version < alembic_version:
# temp code to resolve a migration bug introduced from v10.0.0, fixed in v10.0.2+
if db_version < 21 and self.name == 'main':
if self.engine.dialect.has_table(self.engine, 'indexer_mapping') and self.engine.dialect.has_table(self.engine, 'series_provider_mapping'):
sickrage.app.log.debug('Found offending series_provider_mapping table, removing!')
metadata = MetaData(self.engine, reflect=True)
table = metadata.tables.get('series_provider_mapping')
table.drop(self.engine)
sickrage.app.log.info(f'Backing up {self.name} database')
self.backup(backup_filename)
......
......@@ -124,7 +124,7 @@ class APIBaseHandler(BaseHandler):
clean_stack = [i for i in stack if i[0][-6:] != 'gen.py' and i[0][-13:] != 'concurrent.py']
error_msg = '{}\n Exception: {}'.format(''.join(traceback.format_list(clean_stack)), excp)
else:
error_msg = kwargs.get('reason', '') or kwargs.get('error', '')
error_msg = kwargs.get('reason', '') or kwargs.get('error', '') or kwargs.get('errors', '')
sickrage.app.log.error(error_msg)
......
......@@ -58,6 +58,7 @@ class Apiv2PostProcessHandler(APIBaseHandler):
NotAuthorizedSchema
"""
path = self.get_argument("path", sickrage.app.config.general.tv_download_dir)
nzb_name = self.get_argument("nzbName", None)
process_method = self.get_argument("processMethod", ProcessMethod.COPY.name)
proc_type = self.get_argument("type", 'manual')
delete = self._parse_boolean(self.get_argument("delete", 'false'))
......@@ -74,10 +75,10 @@ class Apiv2PostProcessHandler(APIBaseHandler):
if not path and not sickrage.app.config.general.tv_download_dir:
return self.send_error(400, error={"path": "You need to provide a path or set TV Download Dir"})
json_data = sickrage.app.postprocessor_queue.put(path, process_method=ProcessMethod[process_method.upper()], force=force_replace,
json_data = sickrage.app.postprocessor_queue.put(path, nzbName=nzb_name, process_method=ProcessMethod[process_method.upper()], force=force_replace,
is_priority=is_priority, delete_on=delete, failed=failed, proc_type=proc_type, force_next=force_next)
if 'Processing succeeded' not in json_data:
return self.send_error(400, error=json_data)
self.write_json({'data': json_data if return_data else ''})
\ No newline at end of file
self.write_json({'data': json_data if return_data else ''})
......@@ -32,6 +32,10 @@ class PostProcessSchema(BaseSchema):
required=False,
description="The path to the folder to post-process",
)
nzbName = fields.String(
required=False,
description="Release / NZB name if available",
)
processMethod = fields.String(
required=False,
default="copy",
......
10.0.6
\ No newline at end of file
10.0.7
\ No newline at end of file
const path = require('path');
const fs = require('fs');
const fs = require('graceful-fs').gracefulify(require('fs'));
const packageJson = fs.readFileSync('./package.json');
const version = JSON.parse(packageJson).version;
const webpack = require('webpack');
......
This diff is collapsed.
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