github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-10 23:42:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve database import error messages

Browse source
This commit is contained in:
JonnyWong16 2020-05-03 16:52:17 -07:00
parent 73f6012507
commit b336f07ff9
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
data/interfaces/default/app_import.html
View file

@ -123,6 +123,7 @@
}); });
$("#import_db").click(function() { $("#import_db").click(function() {
$(this).prop('disabled', true);
var database_file = false; var database_file = false;
var formData = new FormData(); var formData = new FormData();
@ -145,7 +146,9 @@
formData.append('ignore_interval', $("#import_ignore_interval").val()); formData.append('ignore_interval', $("#import_ignore_interval").val());
} }
if (database_file) { if (database_file) {
$("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i> Uploading database file...'); $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>&nbsp; Uploading database file...');
} else {
$("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
} }
$.ajax({ $.ajax({
@ -157,10 +160,26 @@
contentType: false, contentType: false,
processData: false, processData: false,
success: function(data) { success: function(data) {
$("#status-message").html(data); var msg;
if (data.result === 'success') {
msg = "<i class='fa fa-check'></i>&nbsp; " + data.message;
} else {
msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; " + data.message;
}
$("#status-message").html(msg);
$("#import_database_file").val(null); $("#import_database_file").val(null);
$('#import_database_file_name').val(''); $("#import_database_file_name").val('');
$("#import_database_path").val(''); $("#import_database_path").val('');
},
error: function (xhr) {
var msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; Error (" + xhr.status + ")";
if (xhr.status === 413) {
msg += ": file is too large to upload"
}
$("#status-message").html(msg);
},
complete: function(xhr) {
$("#import_db").prop('disabled', false);
} }
}); });
}); });

29
plexpy/webserve.py
View file

@ -3739,6 +3739,7 @@ class WebInterface(object):
return {'result': 'error', 'message': 'Failed to delete device.'} return {'result': 'error', 'message': 'Failed to delete device.'}
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def import_database(self, app=None, database_file=None, database_path=None, method=None, backup=True, def import_database(self, app=None, database_file=None, database_path=None, method=None, backup=True,
@ -3762,11 +3763,14 @@ class WebInterface(object):
of seconds for a stream to import of seconds for a stream to import
Returns: Returns:
None json:
{"result": "success",
"message": "Import has started. Check the logs to monitor any problems."
}
``` ```
""" """
if not app: if not app:
return 'No app specified for import' return {'result': 'error', 'message': 'No app specified for import'}
if database_file: if database_file:
database_path = os.path.join(plexpy.CONFIG.CACHE_DIR, database_file.filename) database_path = os.path.join(plexpy.CONFIG.CACHE_DIR, database_file.filename)
@ -3780,7 +3784,7 @@ class WebInterface(object):
f.write(data) f.write(data)
if not database_path: if not database_path:
return 'No database specified for import' return {'result': 'error', 'message': 'No database specified for import'}
if app.lower() == 'tautulli': if app.lower() == 'tautulli':
db_check_msg = database.validate_database(database=database_path) db_check_msg = database.validate_database(database=database_path)
@ -3789,9 +3793,10 @@ class WebInterface(object):
kwargs={'database': database_path, kwargs={'database': database_path,
'method': method, 'method': method,
'backup': helpers.bool_true(backup)}).start() 'backup': helpers.bool_true(backup)}).start()
return 'Import has started. Check the Tautulli logs to monitor any problems.' return {'result': 'success',
'message': 'Import has started. Check the logs to monitor any problems.'}
else: else:
return db_check_msg return {'result': 'error', 'message': db_check_msg}
elif app.lower() == 'plexwatch': elif app.lower() == 'plexwatch':
db_check_msg = plexwatch_import.validate_database(database=database_path, db_check_msg = plexwatch_import.validate_database(database=database_path,
@ -3801,10 +3806,11 @@ class WebInterface(object):
kwargs={'database': database_path, kwargs={'database': database_path,
'table_name': table_name, 'table_name': table_name,
'import_ignore_interval': import_ignore_interval}).start() 'import_ignore_interval': import_ignore_interval}).start()
return 'Import has started. Check the Tautulli logs to monitor any problems.' return {'result': 'success',
'message': 'Import has started. Check the logs to monitor any problems.'}
else: else:
return db_check_msg return {'result': 'error', 'message': db_check_msg}
elif app.lower() == 'plexivity': elif app.lower() == 'plexivity':
db_check_msg = plexivity_import.validate_database(database=database_path, db_check_msg = plexivity_import.validate_database(database=database_path,
table_name=table_name) table_name=table_name)
@ -3813,12 +3819,13 @@ class WebInterface(object):
kwargs={'database': database_path, kwargs={'database': database_path,
'table_name': table_name, 'table_name': table_name,
'import_ignore_interval': import_ignore_interval}).start() 'import_ignore_interval': import_ignore_interval}).start()
return 'Import has started. Check the Tautulli logs to monitor any problems.' return {'result': 'success',
'message': 'Import has started. Check the logs to monitor any problems.'}
else: else:
return db_check_msg return {'result': 'error', 'message': db_check_msg}
else: else:
return 'App not recognized for import' return {'result': 'error', 'message': 'App not recognized for import'}
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))