Commit 3fbe0fbe authored by echel0n's avatar echel0n

Merge branch '9.4.84'

parents 6ab37e8f c41a995d
......@@ -35,17 +35,17 @@ module.exports = function (grunt) {
},
exec: {
// Translations
'crowdin_upload_sources': {cmd: 'crowdin-cli-py upload sources'},
'crowdin_upload_translations': {cmd: 'crowdin-cli-py upload translations'},
'crowdin_download_translations': {cmd: 'crowdin-cli-py download'},
'babel_extract': {cmd: 'python setup.py extract_messages'},
'babel_update': {cmd: 'python setup.py update_catalog'},
'babel_compile': {cmd: 'python setup.py compile_catalog'},
'crowdin_upload_sources': {cmd: 'c:\\python27\\scripts\\crowdin-cli-py upload sources'},
'crowdin_upload_translations': {cmd: 'c:\\python27\\scripts\\crowdin-cli-py upload translations'},
'crowdin_download_translations': {cmd: 'c:\\python27\\scripts\\crowdin-cli-py download'},
'babel_extract': {cmd: 'c:\\python27\\python setup.py extract_messages'},
'babel_update': {cmd: 'c:\\python27\\python setup.py update_catalog'},
'babel_compile': {cmd: 'c:\\python27\\python setup.py compile_catalog'},
// PyPi Commands
'pypi_create': {cmd: 'python setup.py sdist bdist_wheel'},
'pypi_upload': {cmd: 'twine upload dist/*'},
'pypi_cleanup': {cmd: 'python setup.py clean'},
'pypi_create': {cmd: 'c:\\python27\\python setup.py sdist bdist_wheel'},
'pypi_upload': {cmd: 'c:\\python27\\scripts\\twine upload dist/*'},
'pypi_cleanup': {cmd: 'c:\\python27\\python setup.py clean'},
// Git Commands
'git': {
......
This diff is collapsed.
......@@ -28,7 +28,6 @@ gntp == 1.0.3
python_twitter == 3.5
pyxdg == 0.26
urllib3 == 1.24.1
py-unrar2 == 0.99.6
lockfile == 0.12.2
requests == 2.20.1
codernitydb == 0.5.0
......
......@@ -69,7 +69,7 @@ class Config(object):
self.auto_update = True
self.notify_on_update = True
self.notify_on_login = False
self.pip_path = ""
self.pip2_path = ""
self.git_reset = True
self.git_username = ""
self.git_password = ""
......@@ -732,7 +732,7 @@ class Config(object):
'display_all_seasons': True,
'usenet_retention': 500,
'download_propers': True,
'pip_path': 'pip2',
'pip2_path': 'pip2',
'del_rar_contents': False,
'process_method': 'copy',
'file_timestamp_timezone': 'network',
......@@ -1407,7 +1407,7 @@ class Config(object):
self.log_size = self.check_setting_int('General', 'log_size')
self.socket_timeout = self.check_setting_int('General', 'socket_timeout')
self.default_page = self.check_setting_str('General', 'default_page')
self.pip_path = self.check_setting_str('General', 'pip_path')
self.pip2_path = self.check_setting_str('General', 'pip2_path')
self.git_path = self.check_setting_str('General', 'git_path')
self.git_autoissues = self.check_setting_bool('General', 'git_autoissues')
self.git_username = self.check_setting_str('General', 'git_username', censor=True)
......@@ -2007,7 +2007,7 @@ class Config(object):
'create_missing_show_dirs': int(self.create_missing_show_dirs),
'add_shows_wo_dir': int(self.add_shows_wo_dir),
'extra_scripts': '|'.join(self.extra_scripts),
'pip_path': self.pip_path,
'pip2_path': self.pip2_path,
'git_path': self.git_path,
'ignore_words': self.ignore_words,
'require_words': self.require_words,
......
......@@ -1002,7 +1002,7 @@ def restoreConfigZip(archive, targetDir, restore_database=True, restore_config=T
shutil.rmtree(targetDir)
def backupSR(backupDir, keep_latest=False, migrate=True):
def backupSR(backupDir, keep_latest=False):
source = []
file_list = [os.path.basename(sickrage.app.config_file)]
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1105,15 +1105,6 @@ class Home(WebHandler):
else:
return _('Failed to find {path}'.format(path=path))
def installRequirements(self):
sickrage.app.alerts.message(_('Installing SiCKRAGE requirements'))
if not sickrage.app.version_updater.updater.install_requirements():
sickrage.app.alerts.message(_('Failed to install SiCKRAGE requirements'))
else:
sickrage.app.alerts.message(_('Installed SiCKRAGE requirements successfully!'))
return self.redirect(self.previous_url())
def branchCheckout(self, branch):
if branch and sickrage.app.version_updater.updater.current_branch != branch:
sickrage.app.alerts.message(_('Checking out branch: '), branch)
......@@ -3778,14 +3769,14 @@ class ConfigGeneral(Config):
api_key=None, indexer_default=None, timezone_display=None, cpu_preset='NORMAL',
version_notify=None, enable_https=None, https_cert=None, https_key=None, handle_reverse_proxy=None,
sort_article=None, auto_update=None, notify_on_update=None, proxy_setting=None, proxy_indexers=None,
anon_redirect=None, git_path=None, pip_path=None, calendar_unprotected=None, calendar_icons=None,
anon_redirect=None, git_path=None, calendar_unprotected=None, calendar_icons=None,
debug=None, ssl_verify=None, no_restart=None, coming_eps_missed_range=None, filter_row=None,
fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
indexer_timeout=None, download_url=None, rootDir=None, theme_name=None, default_page=None,
git_reset=None, git_username=None, git_password=None, git_autoissues=None, gui_language=None,
display_all_seasons=None, showupdate_stale=None, notify_on_login=None, allowed_video_file_exts=None,
enable_api_providers_cache=None, enable_upnp=None, web_external_port=None,
strip_special_file_bits=None, **kwargs):
strip_special_file_bits=None, pip2_path=None, **kwargs):
results = []
......@@ -3829,7 +3820,7 @@ class ConfigGeneral(Config):
sickrage.app.config.git_reset = 1
sickrage.app.config.git_autoissues = checkbox_to_value(git_autoissues)
sickrage.app.config.git_path = git_path
sickrage.app.config.pip_path = pip_path
sickrage.app.config.pip2_path = pip2_path
sickrage.app.config.calendar_unprotected = checkbox_to_value(calendar_unprotected)
sickrage.app.config.calendar_icons = checkbox_to_value(calendar_icons)
sickrage.app.config.no_restart = checkbox_to_value(no_restart)
......
......@@ -1253,7 +1253,7 @@
<fieldset class="col-lg-9 col-md-8 col-sm-8 card-text">
<div class="form-row form-group">
<div class="col-lg-3 col-md-4 col-sm-5">
<label class="component-title">${_('PIP executable path')}</label>
<label class="component-title">${_('PIP2 executable path')}</label>
</div>
<div class="col-lg-9 col-md-8 col-sm-7 component-desc">
<div class="form-row">
......@@ -1264,15 +1264,15 @@
<span class="fas fa-file"></span>
</span>
</div>
<input id="pip_path" name="pip_path"
value="${sickrage.app.config.pip_path}"
placeholder="${_('ex: /path/to/pip')}"
title="only needed if OS is unable to locate pip from env"
<input id="pip2_path" name="pip2_path"
value="${sickrage.app.config.pip2_path}"
placeholder="${_('ex: /path/to/pip2')}"
title="only needed if OS is unable to locate pip2 from env"
class="form-control" autocapitalize="off"/>
<div class="input-group-append">
<span class="input-group-text">
<span class="btn" id="verifyPipPath">
${_('Verify Path')}
<span class="btn" id="verifyPip2Path">
${_('Verify PIP2 Path')}
</span>
</span>
</div>
......@@ -1282,14 +1282,11 @@
<p></p>
<div class="form-row">
<div class="col-md-12">
<div class="testNotification" id="testPIP-result">
${_('Click vefify path to test.')}
<div class="testNotification" id="testPIP2-result">
${_('Click verify path to test.')}
</div>
<input class="btn btn-inline" type="button" id="installRequirements"
value="Install Requirements">
</div>
</div>
</div>
</div>
......
This diff is collapsed.
9.4.83
\ No newline at end of file
9.4.84
\ No newline at end of file
......@@ -2998,28 +2998,28 @@ $(document).ready(function ($) {
});
});
if ($('#pip_path').length) {
$('#pip_path').fileBrowser({
title: gt('Select path to pip'),
key: 'pip_path',
if ($('#pip2_path').length) {
$('#pip2_path').fileBrowser({
title: gt('Select path to pip2'),
key: 'pip2_path',
includeFiles: 1
});
$('#verifyPipPath').click(function () {
var pip_path = $.trim($('#pip_path').val());
if (!pip_path) {
$('#testPIP-result').html(gt('Please fill out the necessary fields above.'));
$('#pip_path').addClass('warning');
$('#verifyPip2Path').click(function () {
var pip2_path = $.trim($('#pip2_path').val());
if (!pip2_path) {
$('#testPIP2-result').html(gt('Please fill out the necessary fields above.'));
$('#pip2_path').addClass('warning');
return;
}
$('#pip_path').removeClass('warning');
$('#pip2_path').removeClass('warning');
$(this).prop('disabled', true);
$('#testPIP-result').html(SICKRAGE.loadingHTML);
$('#testPIP2-result').html(SICKRAGE.loadingHTML);
$.get(SICKRAGE.srWebRoot + '/home/verifyPath', {
'path': pip_path
'path': pip2_path
}).done(function (data) {
$('#testPIP-result').html(data);
$('#verifyPipPath').prop('disabled', false);
$('#testPIP2-result').html(data);
$('#verifyPip2Path').prop('disabled', false);
});
});
}
......@@ -3050,10 +3050,6 @@ $(document).ready(function ($) {
});
}
$('#installRequirements').on('click', function () {
window.location.href = SICKRAGE.srWebRoot + '/home/installRequirements';
});
$('#branchCheckout').on('click', function () {
window.location.href = SICKRAGE.srWebRoot + '/home/branchCheckout?branch=' + $("#branchVersion").val();
});
......
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