v1.0.0b2

main.py

@@ -1,35 +1,12 @@
 import os
+import logging
 import configparser
 
 import requests
 
-import logger
+from logger import setup_log
 from package import pkg
 
-# Local Variables
-
-## Autopkg Environment Setup
-_target = os.getenv("APKG_TARGET")
-
-if _target == "prod":
-    datafile = "/etc/autopkg/data.ini"
-    logfile = "/var/log/autopkg.log"
-elif _target == "test":
-    datafile = "test/data.ini"
-    logfile = "test/autopkg.log"
-else:
-    logger.log("APKG_TARGET not defined", 50)
-    exit()
-
-
-## Setup Config
-data = configparser.ConfigParser()
-
-data.read(datafile)
-
-if "Versions" not in data: ## Setup file if not present
-    data["Versions"] = {}
-
 
 ## Autopkg Apps
 apps = {
@@ -38,10 +15,7 @@ apps = {
 }
 
 
-# Main Application
-if __name__ == "__main__":
-    logger.log("Running Autopkg (c) 2025 phantom <phantom@shadeouts.net> https://shadeouts.net/")
-
+def main():
     # Handle apps (get versions)
     for app, url in apps.items():
         ini_version = data["Versions"][app] # Version previously packaged from data.ini
@@ -57,10 +31,40 @@ if __name__ == "__main__":
 
             # Package new versions if available
             if version != ini_version:
-                logger.log(f"Found new version ({version}) for {app}, packaging..")
+                logging.info(f"Found new version ({version}) for {app}, packaging..")
 
                 pkg(app, version)
 
     # Write changes
     with open("data.ini", "w") as datafile:
             data.write(datafile) 
+
+
+# Main Application
+if __name__ == "__main__":
+    # Logging Setup
+    setup_log()
+
+    logging.info("Running Autopkg (c) 2025 phantom <phantom@shadeouts.net> https://shadeouts.net/")
+
+    # Environment Setup
+    target = os.getenv("APKG_TARGET")
+
+    if target == "prod":
+        datafile = "/etc/autopkg/data.ini"
+    elif target == "test" or None:
+        logging.warning("Running autopkg in testing mode!")
+
+        datafile = "test/data.ini"
+
+    ## Config File Setup
+    data = configparser.ConfigParser()
+ 
+    data.read(datafile)
+
+    ## Setup file if not present
+    if "Versions" not in data:
+        data["Versions"] = {}
+
+    # Call main function
+    main()