X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/5ad2c3b2ac3baf7b9e64d07a7f0b37d3493a03d4..980f757c6edacec24d90e73c046d513b9d22d15e:/src/misc.py?ds=sidebyside diff --git a/src/misc.py b/src/misc.py index 5b331b5..acd5c94 100644 --- a/src/misc.py +++ b/src/misc.py @@ -20,16 +20,16 @@ def extract_meta_time(file_path): elif is_media_file(file_path, types=['video']): return _extract_video_timestamp(file_path) -def find_alt_file(base_dir, name, size, meta_time, exclude_dir): +def find_file(base_dir, name, size, meta_time, exclude_dir): for root, dirs, files in os.walk(base_dir): if root.startswith(exclude_dir): continue - for alt_name in files: - if alt_name == name: - full_path = os.path.join(root, alt_name) + for other_name in files: + if other_name == name: + full_path = os.path.join(root, other_name) if os.path.getsize(full_path) == size: - alt_meta_time = extract_meta_time(full_path) - if meta_time == alt_meta_time: + other_meta_time = extract_meta_time(full_path) + if meta_time == other_meta_time: return root return None