diff --git a/diskover-web/CHANGELOG.md b/diskover-web/CHANGELOG.md index 06cd78ed..32e86c48 100644 --- a/diskover-web/CHANGELOG.md +++ b/diskover-web/CHANGELOG.md @@ -1,5 +1,10 @@ # Diskover-web v2 Community Edition Change Log +# [2.3.1] - 2025-04-02 +### changed +- bug fixes + + # [2.3.0] - 2024-08-01 ### BREAKING CHANGES - Constants.php config file no longer used, changed to using sqlite db for storing diskover-web config settings instead of config file, existing settings are copied from Constants.php on upgrade diff --git a/diskover-web/src/diskover/Diskover.php b/diskover-web/src/diskover/Diskover.php index 28cea698..20f6f0b4 100644 --- a/diskover-web/src/diskover/Diskover.php +++ b/diskover-web/src/diskover/Diskover.php @@ -340,7 +340,10 @@ function indexInfo() // Get size of index // convert to bytes $indexsize = $val['store_size']; - if (strpos($indexsize, 'gb')) { + if (strpos($indexsize, 'tb')) { + $indexsize = str_replace('tb', '', $indexsize); + $indexsize = $indexsize * 1024 * 1024 * 1024 * 1024; + } elseif (strpos($indexsize, 'gb')) { $indexsize = str_replace('gb', '', $indexsize); $indexsize = $indexsize * 1024 * 1024 * 1024; } elseif (strpos($indexsize, 'mb')) { @@ -389,6 +392,8 @@ function indexInfo() if (isset($_SESSION['indexinfo'])) { $all_index_info = array_merge($_SESSION['indexinfo']['all_index_info'], $all_index_info); $completed_indices = array_merge($_SESSION['indexinfo']['completed_indices'], $completed_indices); + // remove any duplicate indices + $completed_indices = array_unique($completed_indices); $latest_completed_index = (!is_null($latest_completed_index)) ? $latest_completed_index : $_SESSION['indexinfo']['latest_completed_index']; $fields = array_merge($_SESSION['indexinfo']['fields'], $fields); // remove any duplicate fields diff --git a/diskover/CHANGELOG.md b/diskover/CHANGELOG.md index a69c03df..8eb4daff 100644 --- a/diskover/CHANGELOG.md +++ b/diskover/CHANGELOG.md @@ -1,5 +1,11 @@ # Diskover v2 Community Edition Change Log +# [2.3.1] - 2025-04-02 +### changed +- improved parallel scanning threads algorithm (rakitzis) +- removed urlib3 warnings for InsecureRequestWarning when using https with es ssl verify disabled + + # [2.3.0] - 2024-08-01 ### BREAKING CHANGES - diskover yaml config file no longer used, changed to using diskover-web sqlite db for storing diskover config settings instead of config file, settings from existing config file are copied over on upgrade and config.yaml renamed to config.yaml.old diff --git a/diskover/diskover.py b/diskover/diskover.py index 065d117c..5ebc924c 100644 --- a/diskover/diskover.py +++ b/diskover/diskover.py @@ -38,8 +38,13 @@ index_info_crawlend, get_parent_path, get_dir_name, \ get_file_name, load_plugins, list_plugins, get_plugins_info, set_times, \ get_mem_usage, get_win_path, rem_win_path + +# disable ES urlib3 InsecureRequestWarning warning log messages +import urllib3 +urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + -version = '2.3.0 community edition (ce)' +version = '2.3.1 community edition (ce)' __version__ = version # Windows check @@ -1256,4 +1261,4 @@ def log_setup(): logmsg = 'FATAL ERROR: an exception has occurred: {0}'.format(e) logger.critical(logmsg, exc_info=1) if config['LOGTOFILE']: logger_warn.critical(logmsg, exc_info=1) - close_app_critical_error() + close_app_critical_error() \ No newline at end of file