X-Git-Url: http://git.treefish.org/~alex/photosort.git/blobdiff_plain/727a9ebdde342105d608e7f657ad24462967891e..401e40082e476ff449e5d25a60a2bddc2d7f4345:/src/misc.py?ds=inline diff --git a/src/misc.py b/src/misc.py index cd31858..6ca4749 100644 --- a/src/misc.py +++ b/src/misc.py @@ -10,15 +10,15 @@ def walk_media_files(dir_path): for root, dirs, files in os.walk(dir_path): for f in files: file_path = os.path.join(root, f) - if _is_media_file(file_path): + if is_media_file(file_path): yield (f, file_path) def extract_timestamp(file_path, use_meta=False): time = None if use_meta: - if _is_media_file(file_path, types=['image']): + if is_media_file(file_path, types=['image']): time = _extract_image_timestamp(file_path) - elif _is_media_file(file_path, types=['video']): + elif is_media_file(file_path, types=['video']): time = _extract_video_timestamp(file_path) if time: return time @@ -42,15 +42,7 @@ def import_file(src_file_path, dst_file_path): dst_stat = os.stat(dst_file_path) os.utime( dst_file_path, ns=(dst_stat.st_atime_ns, src_stat.st_mtime_ns) ) -def delete_dir_contents(dir_path): - for file_name in os.listdir(dir_path): - file_path = os.path.join(dir_path, file_name) - if os.path.isfile(file_path) or os.path.islink(file_path): - os.unlink(file_path) - elif os.path.isdir(file_path): - shutil.rmtree(file_path) - -def _is_media_file(file_path, types=['image', 'video']): +def is_media_file(file_path, types=['image', 'video']): if not os.path.isfile(file_path): return False mime_type = mimetypes.guess_type(file_path)[0]