Commit ae3c0ec3 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.19'

parents 45a09087 52717f73
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.19](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.18...10.0.19)
#### [10.0.18](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.17...10.0.18)
 
> 29 July 2021
#### [10.0.17](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.16...10.0.17)
 
> 29 July 2021
......
{
"name": "sickrage",
"version": "10.0.18",
"version": "10.0.19",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.18
current_version = 10.0.19
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.18"
__version__ = "10.0.19"
__install_type__ = ""
import argparse
......@@ -163,16 +163,23 @@ class Daemon(object):
sys.exit(1)
def isElevatedUser():
try:
return os.getuid() == 0
except AttributeError:
import ctypes
return ctypes.windll.shell32.IsUserAnAdmin() != 0
def version():
# Return the version number
return __version__
def isVirtualEnv():
return hasattr(sys, 'real_prefix')
def install_type():
# Return the install type
if not __install_type__ and os.path.isdir(os.path.join(MAIN_DIR, '.git')):
return 'git'
else:
return __install_type__ or 'source'
def changelog():
# Return contents of CHANGELOG.md
with open(CHANGELOG_FILE) as f:
return f.read()
def check_requirements():
......@@ -222,17 +229,6 @@ def file_cleanup(remove=False):
print('Unable to delete filename {} during cleanup, you should delete this file manually!'.format(full_filename))
def version():
# Get the version number
return __version__
def changelog():
# Get the version number
with open(CHANGELOG_FILE) as f:
return f.read()
def main():
global app
......@@ -324,7 +320,7 @@ def main():
sys.exit("Sorry, SiCKRAGE requires Python 3.6+")
# check lib requirements
if __install_type__ not in ['windows', 'synology', 'docker', 'qnap', 'readynas', 'pip']:
if install_type() not in ['windows', 'synology', 'docker', 'qnap', 'readynas', 'pip']:
check_requirements()
# cleanup unwanted files
......
sickrage/__init__.py = 60631e4f394b568b243930a8d8f683a4
sickrage/__init__.py = 681b857bc1b409135fec75f8033c0076
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/version.txt = fe883d52c6b62be628ca5b3ad8f62f78
sickrage/version.txt = f2cc55f41fd7dcd4e683fcab414c67d3
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 = f6955f7c69738656faf6e8cb3e1044c7
sickrage/core/__init__.py = 983a0719bbf41afa0274462f0ec14542
sickrage/core/process_tv.py = 192c68108d5b5d1d0c84c7865209e21d
sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684
sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
......@@ -66,7 +66,7 @@ sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
sickrage/core/search.py = c8d189e6b61f29e6a364520c5142192e
sickrage/core/nzbSplitter.py = 8bb813262916d2208e905fb53e575284
sickrage/core/traktapi.py = e30a23461b7e5d3af7619ad3e229bc40
sickrage/core/version_updater.py = 3d9beb4ead2dbd0cd16bc9db884245e0
sickrage/core/version_updater.py = 586ff2f932bf72f25618668e64993192
sickrage/core/imdb_popular.py = 4739028ad8dac20901db175ef9df5875
sickrage/core/scene_numbering.py = e517e5232d3b9ca186fe8b33578abd4b
sickrage/core/config/__init__.py = de29a2b668fe871cda8103664adc8853
......@@ -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 = a4ea3d0e1984a7188718cd80847af90e
sickrage/core/webserver/static/js/core.min.js = 9375203fd6bc49c155bd74684b2c13f0
sickrage/core/webserver/static/js/core.js.map = f773029695982e612fe140efbf8e7eec
sickrage/core/webserver/static/js/core.min.js = 268c0e08f139de2cef7bb0aa170ab2d7
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
......@@ -256,7 +256,7 @@ sickrage/core/caches/image_cache.py = e97a0b7f9d95ad22813b9c2b5f1f9ffd
sickrage/core/caches/tv_cache.py = 9b4d289ac83882d5b682df97b89d5fd3
sickrage/core/caches/__init__.py = bf0bdb641ddd7af015537ca503e49977
sickrage/core/caches/name_cache.py = 8cceca1983838af2e581c6187912b2cc
sickrage/core/amqp/__init__.py = 029538ce759eb97082da63c6f0936688
sickrage/core/amqp/__init__.py = e4d174ed4147d61ef3ba0042465e8228
sickrage/core/databases/__init__.py = b232e45d8996a662866178c2d6d6169b
sickrage/core/databases/config/__init__.py = 2ece97d07008bf50e49aea26f3a50342
sickrage/core/databases/config/schemas.py = fb5ab0a7e0b851bb5fef6f4a7cd55912
......
......@@ -599,7 +599,8 @@ class Core(object):
sentry_tags = {
'platform': platform.platform(),
'locale': repr(locale.getdefaultlocale()),
'python': platform.python_version()
'python': platform.python_version(),
'install_type': sickrage.install_type()
}
# set sentry tags
......
......@@ -102,6 +102,7 @@ class AMQPClient(object):
port=self._amqp_port,
virtual_host=self._amqp_vhost,
credentials=credentials,
socket_timeout=300,
ssl_options=pika.SSLOptions(context)
)
......
......@@ -49,25 +49,25 @@ class VersionUpdater(object):
# default to source install type
install_type = SourceUpdateManager()
if not sickrage.__install_type__ and os.path.isdir(os.path.join(sickrage.MAIN_DIR, '.git')):
if sickrage.install_type() == 'git':
# GIT install type
install_type = GitUpdateManager()
elif sickrage.__install_type__ == 'windows':
elif sickrage.install_type() == 'windows':
# PIP install type
install_type = WindowsUpdateManager()
elif sickrage.__install_type__ == 'synology':
elif sickrage.install_type() == 'synology':
# PIP install type
install_type = SynologyUpdateManager()
elif sickrage.__install_type__ == 'docker':
elif sickrage.install_type() == 'docker':
# PIP install type
install_type = DockerUpdateManager()
elif sickrage.__install_type__ == 'qnap':
elif sickrage.install_type() == 'qnap':
# PIP install type
install_type = QnapUpdateManager()
elif sickrage.__install_type__ == 'readynas':
elif sickrage.install_type() == 'readynas':
# PIP install type
install_type = ReadynasUpdateManager()
elif sickrage.__install_type__ == 'pip':
elif sickrage.install_type() == 'pip':
# PIP install type
install_type = PipUpdateManager()
......
10.0.18
\ No newline at end of file
10.0.19
\ 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