Fix Log Issues (#4)

* Fix permissions issue for logging when installed
- Logs are now written to home dir on .battery-advisor.log

* Bump to 1.2.1

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = battery-advisor
 	pkgdesc = A simple tool to monitor and notify about battery status. Built with Python.
-	pkgver = 1.2.0
+	pkgver = 1.2.1
 	pkgrel = 1
 	url = https://github.com/fer-hnndz/battery-advisor
 	arch = any
@@ -16,7 +16,7 @@ pkgbase = battery-advisor
 	depends = python-pystray
 	depends = python-systemd
 	backup = etc/battery-advisor/defaultSettings.toml
-	source = https://files.pythonhosted.org/packages/source/b/battery_advisor/battery_advisor-1.2.0.tar.gz
-	sha256sums = e2128de236038d4beae221cd92e8c82a50a033d97bd7bdd6afab725e02bc8fc3
+	source = https://files.pythonhosted.org/packages/source/b/battery_advisor/battery_advisor-1.2.1.tar.gz
+	sha256sums = 2e40d3b6855c418c75d757cba720a7b93b2b98be055287e507bed82c20ebd447
 
 pkgname = battery-advisor

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Jorge Hernández <[email protected]>
 pkgname="battery-advisor"
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="A simple tool to monitor and notify about battery status. Built with Python."
 arch=('any')
@@ -11,7 +11,7 @@ backup=("etc/battery-advisor/defaultSettings.toml")
 makedepends=(python-build python-installer python-wheel)
 _name=${pkgname#python-}
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name//-/_}/${_name//-/_}-$pkgver.tar.gz")
-sha256sums=(e2128de236038d4beae221cd92e8c82a50a033d97bd7bdd6afab725e02bc8fc3)
+sha256sums=(2e40d3b6855c418c75d757cba720a7b93b2b98be055287e507bed82c20ebd447)
 validpgpkeys=()
 
 prepare() {

battery_advisor/battery_advisor.py

@@ -82,7 +82,7 @@ def _battery_checker(self):
                     notify("Battery Unplugged", "Battery is now discharging.")
 
             report = self.get_battery_reports()
-            logging.info("Battery Report:", report)
+            logging.info(f"Battery Report: {str(report)}")
 
             if report is None:
                 time.sleep(self.settings.check_interval)

battery_advisor/entry.py

@@ -2,26 +2,33 @@
 import argparse
 import logging
 import os
-from .utils import _get_project_root
+from .utils import get_log_path
+import traceback
 
 
 def cli():
-    log_path = os.path.join(_get_project_root(), "advisor.log")
+    try:
+        logging.basicConfig(
+            level=logging.DEBUG,
+            format="[%(asctime)s ] (%(module)s.%(funcName)s | %(levelname)s) %(message)s",
+            datefmt="%d/%m/%Y @ %H:%M:%S %Z",
+            filename=get_log_path(),
+        )
 
-    logging.basicConfig(
-        level=logging.DEBUG,
-        format="[%(asctime)s ] (%(module)s.%(funcName)s | %(levelname)s) %(message)s",
-        datefmt="%d/%m/%Y @ %H:%M:%S %Z",
-        filename=log_path,
-    )
+        parser = argparse.ArgumentParser(
+            prog="Battery Advisor",
+            description="A simple tool to monitor and notify about battery status. Built with Python.",
+            epilog="Made with ❤️ by Jorge Hernández.",
+        )
+        parser.add_argument(
+            "--version", action="version", version=f"%(prog)s {VERSION}"
+        )
+        parser.add_argument(
+            "--clean", action="store_true", help="Use default settings."
+        )
 
-    parser = argparse.ArgumentParser(
-        prog="Battery Advisor",
-        description="A simple tool to monitor and notify about battery status. Built with Python.",
-        epilog="Made with ❤️ by Jorge Hernández.",
-    )
-    parser.add_argument("--version", action="version", version=f"%(prog)s {VERSION}")
-    parser.add_argument("--clean", action="store_true", help="Use default settings.")
-
-    args = parser.parse_args()
-    BatteryAdvisor(clean=args.clean).start()
+        args = parser.parse_args()
+        BatteryAdvisor(clean=args.clean).start()
+    except Exception as e:
+        logging.error(traceback.format_exc())
+        quit(1)

battery_advisor/settings_loader.py

@@ -3,7 +3,10 @@
 from typing import Type
 from .types import SettingsFile
 from .utils import _get_project_root
+import logging
 
+
+logger = logging.getLogger(__name__)
 user_settings_path = os.path.expanduser("~/.config/battery-advisor/settings.toml")
 default_settings_path = _get_project_root() + "/defaultSettings.toml"
 
@@ -18,7 +21,7 @@ def load_settings(load_default: bool = False) -> SettingsFile:
     """
 
     if load_default:
-        print("Loading default settings...")
+        logging.info("(--clean) Loading default settings...")
         with open(default_settings_path) as f:
             return toml.load(f)
 
@@ -29,7 +32,7 @@ def load_settings(load_default: bool = False) -> SettingsFile:
     )
 
     if not os.path.exists(user_settings_path):
-        print("User settings not found. Using default settings.")
+        logging.warning("User settings not found. Using default settings.")
 
     with open(path) as f:
         return toml.load(f)

battery_advisor/utils.py

@@ -13,6 +13,10 @@ def _get_project_root() -> str:
     return os.path.expandvars(absolute_root)
 
 
+def get_log_path() -> str:
+    return os.path.expanduser("~/.battery-advisor.log")
+
+
 def _get_path_icon():
     icon_path = _get_project_root() + "/icon.png"
     return os.path.expandvars(icon_path)

battery_advisor/version.py

@@ -1 +1 @@
-VERSION = "1.2.0"
+VERSION = "1.2.1"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "battery-advisor"
-version = "1.2.0"
+version = "1.2.1"
 description = "A simple tool to monitor and notify about battery status. Built with Python."
 authors = ["fer-hnndz <[email protected]>"]
 license = "MIT"