From 980c4f76187f67dc2e5c857c5572a750ba66a406 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sun, 3 May 2020 14:33:25 -0700 Subject: [PATCH] Add option to upload or browse for a database file to import --- data/interfaces/default/app_import.html | 208 ++++++++++++++--------- data/interfaces/default/css/tautulli.css | 6 +- data/interfaces/default/js/script.js | 21 +++ data/interfaces/default/settings.html | 64 +++++++ plexpy/helpers.py | 62 +++++++ plexpy/webserve.py | 34 +++- 6 files changed, 316 insertions(+), 79 deletions(-) diff --git a/data/interfaces/default/app_import.html b/data/interfaces/default/app_import.html index 94441cc3..3971166e 100644 --- a/data/interfaces/default/app_import.html +++ b/data/interfaces/default/app_import.html @@ -5,75 +5,97 @@
- <% - v = '' - if app == 'PlexWatch': - v = '0.3.2' - elif app == 'Plexivity': - v = '0.9.8' - %> - Please ensure your ${app} database is at version ${v} or higher. -
- % endif -Browse for the ${app} database you wish to import.
Select how you would like to import the Tautulli history.
-Note: Libraries, users, notification agents, newsletter agents, and registered mobile devices will also be imported
-Automatically create a backup of the current database before importing.
-Select how you would like to import the Tautulli history.
+Note: Libraries, users, notification agents, newsletter agents, and registered mobile devices will also be imported
Select the table name from which you wish to import. Only import one of these, importing both will result in duplicated data.
-Automatically create a backup of the current database before importing.
+Select the table name from which you wish to import. Only import one of these, importing both will result in duplicated data.
Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.
-Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.
+