From cb782b8b91a05ff09c1462afe1f03cb074d21fdb Mon Sep 17 00:00:00 2001
From: DasMoorhuhn <dasmoorhuhn@proton.me>
Date: Thu, 30 Nov 2023 04:33:28 +0100
Subject: [PATCH] good night...

---
 README.md           |  3 +--
 src/.version.yml    |  1 +
 src/file_handler.py |  8 +++-----
 src/main.py         | 21 +++++++++++++++++----
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 src/.version.yml

diff --git a/README.md b/README.md
index ecab691..6d51a82 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # AutoPicture V3
 
-Dies ist die dritte Version von AutoPicture. Diese Version läuft wie AutoPicture V2 mit Python3 aber dieses mal in einem Dockercontainer. Damit vereinfacht sich die Nutzung auf den verschiedenen Betriebssystemen
+Dies ist die dritte Version von AutoPicture.
 
 # Erste Schritte
 
-Um AutoPicture V3 nutzen zu können muss als erstes das Script `buildForLinux.sh` oder auf Windows `buildForWindows.bat` ausgeführt werden.
\ No newline at end of file
diff --git a/src/.version.yml b/src/.version.yml
new file mode 100644
index 0000000..99329fd
--- /dev/null
+++ b/src/.version.yml
@@ -0,0 +1 @@
+version: 3.0.0
\ No newline at end of file
diff --git a/src/file_handler.py b/src/file_handler.py
index 149ebf7..ca8ce52 100644
--- a/src/file_handler.py
+++ b/src/file_handler.py
@@ -18,7 +18,7 @@ def sort_pictures(images:list, dst:str, logger:logging.Logger):
 
   print(f"Start sorting {image_total} images\n")
   progress_bar.start()
-  start_timer = time.process_time()
+  start_timer = time.time()
   for image in images:
     image:ExifData
     path = os.path.join(dst, str(image.make), str(image.year), str(image.month), str(image.day))
@@ -27,13 +27,11 @@ def sort_pictures(images:list, dst:str, logger:logging.Logger):
     stat_info = os.stat(image.path)
     shutil.move(src=image.path, dst=f"{path}/{image.name}")
     # os.chmod(path=f"{path}/{image.name}", mode=stat_info.st_mode)
-    # logging_infos.append(f"Moved {image.path} -> {path}/{image.name}")
     logger.info(f"Moved {image.path} -> {path}/{image.name}")
 
     progress_bar.update(image_counter)
     image_counter += 1
-
+  end_timer = time.time()
   progress_bar.finish()
-  print(f"\nDone\nSorted {image_total} images in {round(start_timer, 2)} seconds")
+  print(f"\nDone\nSorted {image_total} images in {round(end_timer - start_timer, 2)} seconds")
 
-  return logging_infos
diff --git a/src/main.py b/src/main.py
index c1225dc..054c30c 100644
--- a/src/main.py
+++ b/src/main.py
@@ -13,11 +13,24 @@ dst = "../app/Bilder"
 logger = logging.getLogger('AutoPicture')
 logger.setLevel(logging.DEBUG)
 handler = logging.FileHandler(filename=f'{log_folder}/AutoPicture.log', encoding='utf-8', mode='a')
-handler.setFormatter(logging.Formatter('%(asctime)s|%(levelname)s|%(name)s|:%(message)s'))
+handler.setFormatter(logging.Formatter('%(asctime)s|:%(message)s'))
 logger.addHandler(handler)
 
 metadata_handler = MetadataHandler()
 
-files = recursive_scan_dir("../app")
-exif_data = metadata_handler.get_meta_data(images=files)
-sort_pictures(images=exif_data, dst=dst, logger=logger)
+
+def start_process():
+  try:
+    exif_data = metadata_handler.get_meta_data(images=files)
+    sort_pictures(images=exif_data, dst=dst, logger=logger)
+  except Exception as err:
+    print(err)
+    logger.error(err)
+    raise err
+
+
+files = recursive_scan_dir(src)
+if len(files) > 0:
+  start_process()
+else:
+  print("No images found")