Commit 8045a676 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.26'

parents c0b5ab85 d4d06615
......@@ -2,8 +2,14 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.26](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.25...10.0.26)
- Refactored a core log entry from info to debug [`f7feab5`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/f7feab5c1ddd23d11ec411f75c90a307262db544)
#### [10.0.25](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.24...10.0.25)
 
> 3 August 2021
- Fixed ValueError sickrage.core.searchers.backlog_searcher in _get_wanted [`1633328`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/1633328e43dede0070c144748f5b2dafa10eeffd)
 
#### [10.0.24](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.23...10.0.24)
......
{
"name": "sickrage",
"version": "10.0.25",
"version": "10.0.26",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.25
current_version = 10.0.26
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.25"
__version__ = "10.0.26"
__install_type__ = ""
import argparse
......
sickrage/__init__.py = ad0b572fff43222402c8bbb7958acbc0
sickrage/__init__.py = 80c64b269e961fbf9a0aa974c9d7f6d6
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/version.txt = 4f41d49f1732abe4c271d2ca8bec355b
sickrage/version.txt = 5b954012921ec2c7312ca3a88e5a5644
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
......@@ -58,7 +58,7 @@ sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787
sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be
sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6
sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
sickrage/core/__init__.py = f93c16e190e49e1a4d84551fb9114716
sickrage/core/__init__.py = a4ec20386e16b6e8e44cafee458d8bca
sickrage/core/process_tv.py = 192c68108d5b5d1d0c84c7865209e21d
sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684
sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
......@@ -82,7 +82,7 @@ sickrage/core/tv/show/coming_episodes.py = 0d43711e559f1fbda75fc25b3485928f
sickrage/core/tv/show/__init__.py = 35291b3647ef4dbacebc60f2dfe48d39
sickrage/core/tv/show/helpers.py = 7e3bc2e2e744a50ac7188e79e9d98465
sickrage/core/tv/show/history.py = 02a46fa4946cdf7b80915da916f25ca0
sickrage/core/webserver/__init__.py = bd70e1e71370274f7128400c8d5b0bb0
sickrage/core/webserver/__init__.py = 4a3aa6da4015cdc5ece9fcd7ed4b2c91
sickrage/core/webserver/handlers/announcements.py = cca0415f047c367e5b41c0fed6a24dbf
sickrage/core/webserver/handlers/calendar.py = 8053d4d70a574a54d4bb9a0ad88f9f4e
sickrage/core/webserver/handlers/google_drive.py = 98fde470e65096ec71a8e3f1cce2bd44
......@@ -165,8 +165,8 @@ sickrage/core/webserver/static/images/backdrops/manage.jpg = 2e49098c0ed9aacf602
sickrage/core/webserver/static/images/backdrops/addshows.jpg = 7f3e186790208b63dadda09d6b91d334
sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
sickrage/core/webserver/static/js/core.js.map = d4ce3a80318fdff1182184661da1a56d
sickrage/core/webserver/static/js/core.min.js = 5db6fcd0202fdbc175bb0d762b086440
sickrage/core/webserver/static/js/core.js.map = e66c4708d7fb35ff9690a8c535bf79cd
sickrage/core/webserver/static/js/core.min.js = 82b6fc428bd4f14756e5745bdbad55f9
sickrage/core/webserver/static/fonts/fa-solid-900.eot = 89bd2e38475e441a5cd70f663f921d61
sickrage/core/webserver/static/fonts/fa-regular-400.eot = ad3a7c0d77e09602f4ab73db3660ffd8
sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
......
......@@ -613,7 +613,7 @@ class Core(object):
self.config.general.server_id = server_id
self.config.save(mark_dirty=True)
else:
self.log.info('Updating SiCKRAGE server data on SiCKRAGE API')
self.log.debug('Updating SiCKRAGE server data on SiCKRAGE API')
# update server information
self.api.server.update_server(
......
......@@ -501,26 +501,33 @@ class WebServer(object):
message = WebSocketUIHandler.message_queue.get()
WebSocketUIHandler.broadcast(message)
def load_ssl_certificate(self):
if os.path.exists(sickrage.app.config.general.https_key) and os.path.exists(sickrage.app.config.general.https_cert):
if self.is_certificate_valid() and not self.certificate_needs_renewal():
return True
resp = sickrage.app.api.server.get_server_certificate(sickrage.app.config.general.server_id)
if not resp or 'certificate' not in resp or 'private_key' not in resp:
if not create_https_certificates(sickrage.app.config.general.https_cert, sickrage.app.config.general.https_key):
return False
def load_ssl_certificate(self, certificate=None, private_key=None):
if certificate and private_key:
with open(sickrage.app.config.general.https_cert, 'w') as cert_out:
cert_out.write(certificate)
with open(sickrage.app.config.general.https_key, 'w') as key_out:
key_out.write(private_key)
else:
if os.path.exists(sickrage.app.config.general.https_key) and os.path.exists(sickrage.app.config.general.https_cert):
if self.is_certificate_valid() and not self.certificate_needs_renewal():
return True
resp = sickrage.app.api.server.get_server_certificate(sickrage.app.config.general.server_id)
if not resp or 'certificate' not in resp or 'private_key' not in resp:
if not create_https_certificates(sickrage.app.config.general.https_cert, sickrage.app.config.general.https_key):
return False
if not os.path.exists(sickrage.app.config.general.https_cert) or not os.path.exists(sickrage.app.config.general.https_key):
return False
if not os.path.exists(sickrage.app.config.general.https_cert) or not os.path.exists(sickrage.app.config.general.https_key):
return False
return True
return True
with open(sickrage.app.config.general.https_cert, 'w') as cert_out:
cert_out.write(resp['certificate'])
with open(sickrage.app.config.general.https_cert, 'w') as cert_out:
cert_out.write(resp['certificate'])
with open(sickrage.app.config.general.https_key, 'w') as key_out:
key_out.write(resp['private_key'])
with open(sickrage.app.config.general.https_key, 'w') as key_out:
key_out.write(resp['private_key'])
sickrage.app.log.info("Loaded SSL certificate successfully")
......
10.0.25
\ No newline at end of file
10.0.26
\ 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