Commit 9e4dc5ff authored by echel0n's avatar echel0n

Fixed issue with file browser and clicking on files not properly choosing file...

Fixed issue with file browser and clicking on files not properly choosing file and closing browser dialog.
parent 0972ec50
# Changelog
- * bce57f6 - 2018-11-10: Removed restoring of application ID from backup/restore functions
- * 837cab0 - 2018-11-10: Fixed issue with file browser and clicking on files not properly choosing file and closing browser dialog.
- * 0972ec5 - 2018-11-10: Removed restoring of application ID from backup/restore functions
- * 9cf70c3 - 2018-11-10: Release v9.4.25
- * af3348b - 2018-11-10: Refactored misc logging errors to warnings.
- * 73acd71 - 2018-11-09: Release v9.4.24
......
......@@ -903,7 +903,7 @@ def extract_zipfile(archive, targetDir):
zip_file.close()
return True
except Exception as e:
sickrage.app.log.error("Zip extraction error: %r " % repr(e))
sickrage.app.log.warning("Zip extraction error: %r " % repr(e))
return False
......@@ -923,7 +923,7 @@ def create_zipfile(fileList, archive, arcname=None):
z.write(f, os.path.relpath(f, arcname))
return True
except Exception as e:
sickrage.app.log.error("Zip creation error: {} ".format(e))
sickrage.app.log.warning("Zip creation error: {} ".format(e))
return False
......@@ -936,6 +936,9 @@ def restoreConfigZip(archive, targetDir, restore_database=True, restore_config=T
:return: True on success, False on failure
"""
if not os.path.isfile(archive):
return
try:
if not os.path.exists(targetDir):
os.mkdir(targetDir)
......@@ -962,7 +965,7 @@ def restoreConfigZip(archive, targetDir, restore_database=True, restore_config=T
return True
except Exception as e:
sickrage.app.log.error("Zip extraction error: {}".format(e))
sickrage.app.log.warning("Zip extraction error: {}".format(e))
shutil.rmtree(targetDir)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -855,7 +855,7 @@ $(document).ready(function ($) {
link = $('<a href="javascript:void(0)">').on('click', function () {
if (entry.isFile) {
SICKRAGE.browser.currentBrowserPath = entry.path;
$('.browserDialog .ui-button:contains("Ok")').click();
SICKRAGE.browser.fileBrowserDialog.find('.modal-footer .btn-success').click();
} else {
SICKRAGE.browser.browse(entry.path, endpoint, includeFiles, fileTypes);
}
......
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