|
10 | 10 | import zipfile
|
11 | 11 |
|
12 | 12 | from flask import send_file, url_for
|
| 13 | +from packaging.version import parse |
13 | 14 | from werkzeug.utils import secure_filename
|
14 | 15 |
|
15 |
| -from mycodo.config import (ALEMBIC_VERSION, DATABASE_NAME, DEPENDENCY_LOG_FILE, |
16 |
| - DOCKER_CONTAINER, IMPORT_LOG_FILE, |
| 16 | +from mycodo.config import (ALEMBIC_VERSION, DATABASE_NAME, DOCKER_CONTAINER, IMPORT_LOG_FILE, |
17 | 17 | INSTALL_DIRECTORY, MYCODO_VERSION,
|
18 | 18 | PATH_ACTIONS_CUSTOM, PATH_FUNCTIONS_CUSTOM,
|
19 | 19 | PATH_HTML_USER, PATH_INPUTS_CUSTOM,
|
20 | 20 | PATH_OUTPUTS_CUSTOM, PATH_PYTHON_CODE_USER,
|
21 | 21 | PATH_USER_SCRIPTS, PATH_WIDGETS_CUSTOM,
|
22 | 22 | SQL_DATABASE_MYCODO)
|
23 | 23 | from mycodo.config_translations import TRANSLATIONS
|
24 |
| -from mycodo.databases.models import Misc |
25 | 24 | from mycodo.mycodo_flask.utils.utils_general import (flash_form_errors,
|
26 | 25 | flash_success_errors)
|
27 | 26 | from mycodo.scripts.measurement_db import get_influxdb_info
|
@@ -240,10 +239,10 @@ def import_settings(form):
|
240 | 239 | error.append(f"Correct format is: {correct_format}")
|
241 | 240 | elif extension != correct_extension:
|
242 | 241 | error.append("Extension not 'zip'")
|
243 |
| - elif name_split[1] > MYCODO_VERSION: |
| 242 | + elif parse(name_split[1]) > parse(MYCODO_VERSION): |
244 | 243 | error.append(
|
245 | 244 | f"Invalid Mycodo version: {name_split[1]} > {MYCODO_VERSION}. "
|
246 |
| - f"Only databases <= {name_split[1]} can only be imported") |
| 245 | + f"Only databases <= {name_split[1]} can be imported") |
247 | 246 | except Exception as err:
|
248 | 247 | error.append(f"Exception while verifying file name: {err}")
|
249 | 248 |
|
|
0 commit comments