re-implemented cleanup

diff --git a/src/misc.py b/src/misc.py
index cd31858ffe69b74455643762963d7b206f640edc..d805e0c48a9200652d9f9c2bc6e876e1c1d33499 100644 (file)
--- a/src/misc.py
+++ b/src/misc.py
@@ -42,13 +42,21 @@ 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 cleanup_dir(dir_path):
+    for root, dirs, files in os.walk(dir_path, topdown=False):
+        for name in files:
+            full_path = os.path.join(root, name)
+            if not _is_media_file(full_path):
+                try:
+                    os.remove(full_path)
+                except Exception as e:
+                    logging.warn('Error cleaning file %s: %s', full_path, str(e))
+        for name in dirs:
+            full_path = os.path.join(root, name)
+            try:
+                os.rmdir(full_path)
+            except Exception as e:
+                logging.warn('Error cleaning dir %s: %s', full_path, str(e))
 
 def _is_media_file(file_path, types=['image', 'video']):
     if not os.path.isfile(file_path):

diff --git a/src/photosort.py b/src/photosort.py
index efe1790f106c9035e88f90d3b741553b6f403e01..a25b70b442885993bf1759f0dfb6ae795a416287 100755 (executable)
--- a/src/photosort.py
+++ b/src/photosort.py
@@ -12,42 +12,57 @@ parser.add_argument('SOURCE_DIR', type=str, help='source directory')
 parser.add_argument('DEST_DIR', type=str, help='target directory')
 parser.add_argument('-c', '--cleanup', action='store_true', dest='cleanup',
                     default=False, help='clean-up source dir')
-parser.add_argument('-l', '--log-level', type=str, default='INFO', dest='log_lvl',
-                    choices=['DEBUG', 'INFO', 'WARNING'], help='select log level')
+parser.add_argument('-v', '--verbose', action='store_true', dest='verbose',
+                    default=False, help='enable verbose output')
+parser.add_argument('-q', '--quiet', action='store_true', dest='quiet',
+                    default=False, help='suppress non-error output')
 
 args = parser.parse_args()
 
+if args.verbose:
+    log_level = logging.INFO
+elif args.quiet:
+    log_level = logging.ERROR
+else:
+    log_level = logging.WARNING
+
 logging.basicConfig(format='[%(asctime)s] %(levelname)s: %(message)s',
-                    level=logging.getLevelName(args.log_lvl),
-                    datefmt='%m/%d/%Y %H:%M:%S')
+                    level=log_level, datefmt='%m/%d/%Y %H:%M:%S')
 
 for src_file_name, src_file_path in misc.walk_media_files(args.SOURCE_DIR):
     logging.info('Processing %s...', src_file_name)
 
-    meta_time = misc.extract_timestamp(src_file_path, use_meta=True)
-
-    dst_dir = os.path.join(args.DEST_DIR,
-                           datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m"))
-    dst_file_path = os.path.join(dst_dir, src_file_name)
-
-    if not os.path.exists(dst_file_path):
-        alt_dst_dir = misc.find_file(args.DEST_DIR,
-                                     src_file_name,
-                                     os.path.getsize(src_file_path),
-                                     exclude_dir=args.SOURCE_DIR)
-        if alt_dst_dir:
-            dst_dir = alt_dst_dir
-            dst_file_path = os.path.join(dst_dir, src_file_name)
-
-    if not os.path.exists(dst_file_path):
-        if not os.path.exists(dst_dir):
-            os.makedirs(dst_dir)
-        misc.import_file(src_file_path, dst_file_path)
-    else:
-        src_time = misc.extract_timestamp(src_file_path)
-        dst_time = misc.extract_timestamp(dst_file_path)
-        if src_time > dst_time:
+    try:
+        meta_time = misc.extract_timestamp(src_file_path, use_meta=True)
+
+        dst_dir = os.path.join(args.DEST_DIR,
+                               datetime.datetime.fromtimestamp(meta_time).strftime("%Y/%m"))
+        dst_file_path = os.path.join(dst_dir, src_file_name)
+
+        if not os.path.exists(dst_file_path):
+            alt_dst_dir = misc.find_file(args.DEST_DIR,
+                                         src_file_name,
+                                         os.path.getsize(src_file_path),
+                                         exclude_dir=args.SOURCE_DIR)
+            if alt_dst_dir:
+                dst_dir = alt_dst_dir
+                dst_file_path = os.path.join(dst_dir, src_file_name)
+
+        if not os.path.exists(dst_file_path):
+            if not os.path.exists(dst_dir):
+                os.makedirs(dst_dir)
             misc.import_file(src_file_path, dst_file_path)
+        else:
+            src_time = misc.extract_timestamp(src_file_path)
+            dst_time = misc.extract_timestamp(dst_file_path)
+            if src_time > dst_time:
+                misc.import_file(src_file_path, dst_file_path)
+
+        if args.cleanup:
+            os.remove(src_file_path)
+
+    except Exception as e:
+        logging.error('Error processing %s: %s', src_file_path, str(e))
 
 if args.cleanup:
-    misc.delete_dir_contents(args.SOURCE_DIR)
+    misc.cleanup_dir(args.SOURCE_DIR)