diff --git a/scripts/images_history.py b/scripts/images_history.py index 1242114..a10105d 100644 --- a/scripts/images_history.py +++ b/scripts/images_history.py @@ -81,8 +81,9 @@ def img_path_add_remove(img_dir, path_recorder, add_remove, img_path_depth): else: del path_recorder[img_dir] wib_db.delete_path_recorder(img_dir) - path_recorder = {key: value for key, value in sorted(path_recorder.items(), key=lambda x: x[0].lower())} path_recorder_formatted = [value.get("path_display") for key, value in path_recorder.items()] + path_recorder_formatted = sorted(path_recorder_formatted, key=lambda x: natural_keys(x.lower())) + if add_remove == "remove": selected = None else: @@ -99,7 +100,8 @@ def sort_order_flip(turn_page_switch, sort_order): def read_path_recorder(path_recorder, path_recorder_formatted): path_recorder = wib_db.load_path_recorder() path_recorder_formatted = [value.get("path_display") for key, value in path_recorder.items()] - path_recorder_formatted = sorted(path_recorder_formatted, key=lambda x: x.lower()) + path_recorder_formatted = sorted(path_recorder_formatted, key=lambda x: natural_keys(x.lower())) + return path_recorder, path_recorder_formatted def pure_path(path): @@ -147,12 +149,20 @@ def reduplicative_file_move(src, dst): else: shutil.move(src, os.path.join(dst, name)) -def save_image(file_name): +def save_image(file_name, filenames, page_index, turn_page_switch): if file_name is not None and os.path.exists(file_name): reduplicative_file_move(file_name, opts.outdir_save) - return "