From 5b9939ec4dcf076e5c4ee5f551ba9a2f70e8b206 Mon Sep 17 00:00:00 2001
From: Emma Nora Theuer <git@entheuer.de>
Date: Mon, 3 Feb 2025 22:35:51 +0100
Subject: [PATCH] Move directories to standard layout.

---
 wallman/__init__.py                 | 0
 wallman/__main__.py                 | 6 ++++++
 src/wallman.py => wallman/main.py   | 6 +++---
 {src => wallman}/wallman_classes.py | 0
 {src => wallman}/wallman_lib.py     | 3 ++-
 {src => wallman}/wallman_systray.py | 0
 6 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 wallman/__init__.py
 create mode 100644 wallman/__main__.py
 rename src/wallman.py => wallman/main.py (51%)
 rename {src => wallman}/wallman_classes.py (100%)
 rename {src => wallman}/wallman_lib.py (99%)
 rename {src => wallman}/wallman_systray.py (100%)

diff --git a/wallman/__init__.py b/wallman/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/wallman/__main__.py b/wallman/__main__.py
new file mode 100644
index 0000000..0d5846c
--- /dev/null
+++ b/wallman/__main__.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+from main import main
+
+if __name__ == "__main__":
+    main()
diff --git a/src/wallman.py b/wallman/main.py
similarity index 51%
rename from src/wallman.py
rename to wallman/main.py
index 70b6a25..95686ff 100644
--- a/src/wallman.py
+++ b/wallman/main.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-import wallman_lib
+from wallman_lib import ConfigValidity, WallpaperLogic
 
 def main():
-    validator: wallman_lib.ConfigValidity = wallman_lib.ConfigValidity()
-    logic: wallman_lib.WallpaperLogic = wallman_lib.WallpaperLogic()
+    validator: ConfigValidity = ConfigValidity()
+    logic: WallpaperLogic = WallpaperLogic()
     validator.validate_config()
     logic.set_wallpaper_by_time()
     logic.schedule_wallpapers()
diff --git a/src/wallman_classes.py b/wallman/wallman_classes.py
similarity index 100%
rename from src/wallman_classes.py
rename to wallman/wallman_classes.py
diff --git a/src/wallman_lib.py b/wallman/wallman_lib.py
similarity index 99%
rename from src/wallman_lib.py
rename to wallman/wallman_lib.py
index 66101a1..32fcac0 100644
--- a/src/wallman_lib.py
+++ b/wallman/wallman_lib.py
@@ -5,8 +5,9 @@ import tomllib
 from datetime import datetime, time
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.cron import CronTrigger
+from typing import Dict, List
 
-from wallman_classes import *
+from wallman_classes import ConfigError, ConfigGeneral, ConfigFile
 
 # Setup Logging. NOTE: Declaration as a global variable is necessary to ensure correct functionality across multiple modules.
 global logger
diff --git a/src/wallman_systray.py b/wallman/wallman_systray.py
similarity index 100%
rename from src/wallman_systray.py
rename to wallman/wallman_systray.py