prim-ctrl 0.8.4__tar.gz → 0.8.6__tar.gz

{prim_ctrl-0.8.4 → prim_ctrl-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prim-ctrl
-Version: 0.8.4
+Version: 0.8.6
 Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -112,6 +112,8 @@ Optionally, if you want to edit or even contribute to the source, you also need
 - Configuration tab
   - UI
     - Show notification to start/stop server(s): disable - this is necessary to determine whether Primitive FTPd is running on the phone or not, because the Automate flow determines whether the server is started with checking the existence of it's notification, and if the notification is always shown, that would make it false positive; please use another way, eg. a Quick Settings Tile to start/stop the server manually
+  - System
+    - Enable Tasker: enable
 
 ### Tailscale VPN (optional)
 

{prim_ctrl-0.8.4 → prim_ctrl-0.8.6}/README.md

@@ -91,6 +91,8 @@ Optionally, if you want to edit or even contribute to the source, you also need
 - Configuration tab
   - UI
     - Show notification to start/stop server(s): disable - this is necessary to determine whether Primitive FTPd is running on the phone or not, because the Automate flow determines whether the server is started with checking the existence of it's notification, and if the notification is always shown, that would make it false positive; please use another way, eg. a Quick Settings Tile to start/stop the server manually
+  - System
+    - Enable Tasker: enable
 
 ### Tailscale VPN (optional)
 

{prim_ctrl-0.8.4 → prim_ctrl-0.8.6}/prim_ctrl/__main__.py

@@ -44,13 +44,19 @@ class LevelFormatter(logging.Formatter):
         return self.formatters.get(record.levelno, self.default_formatter).format(record)
 
 class Logger(logging.Logger):
+    timestamp: bool = False
+
+    @staticmethod
+    def setConfiguration(timestamp: bool):
+        Logger.timestamp = timestamp
+
     def __init__(self, name, level = logging.NOTSET):
         super().__init__(name, level)
-        self.exitcode = 0
+        self.addHandler(logging.StreamHandler(sys.stderr))
+        self.configure()
 
-    def prepare(self, timestamp: bool, silent: bool):
-        handler = logging.StreamHandler(sys.stderr)
-        handler.setFormatter(
+    def configure(self):
+        formatter = (
             LevelFormatter(
                 {
                     logging.WARNING: '%(asctime)s %(message)s',
@@ -58,7 +64,7 @@ class Logger(logging.Logger):
                     logging.DEBUG: '%(asctime)s %(levelname)s %(message)s',
                 },
                 '%(asctime)s %(name)s: %(levelname)s: %(message)s')
-            if timestamp else
+            if Logger.timestamp else
             LevelFormatter(
                 {
                     logging.WARNING: '%(message)s',
@@ -67,9 +73,16 @@ class Logger(logging.Logger):
                 },
                 '%(name)s: %(levelname)s: %(message)s')
         )
-        self.addHandler(handler)
-        if self.level == logging.NOTSET:
-            self.setLevel(logging.WARNING if silent else logging.INFO)
+        for handler in self.handlers:
+            handler.setFormatter(formatter)
+
+class MainLogger(Logger):
+    def __init__(self, name, level = logging.NOTSET):
+        super().__init__(name, level)
+        self.exitcode = 0
+
+    def setConfiguration(self, level: int):
+        self.setLevel(level)
 
     def exception_or_error(self, e: Exception):
         if self.level == logging.NOTSET or self.level == logging.DEBUG:
@@ -109,7 +122,7 @@ class LazyStr:
                 self.result = str(self.func)
         return self.result
 
-logger = Logger(Path(sys.argv[0]).name)
+logger = MainLogger(Path(sys.argv[0]).name)
 
 ########
 
@@ -1168,9 +1181,11 @@ class Control:
 
     @staticmethod
     def prepare(args: argparse.Namespace):
-        if args.debug:
-            logger.setLevel(logging.DEBUG)
-        logger.prepare(args.timestamp or args.debug, args.silent)
+        Logger.setConfiguration(args.timestamp or args.debug)
+        logging.setLoggerClass(Logger)
+        logger.setConfiguration(
+            logging.DEBUG if args.debug else logging.WARNING if args.silent else logging.INFO) #NOSONAR(S3358)
+        logger.configure()
 
         if args.accept_cellular and args.intent != 'start':
             raise ValueError("The --accept-cellular options can be enabled only for the start intent")

{prim_ctrl-0.8.4 → prim_ctrl-0.8.6}/pyproject.toml

@@ -3,7 +3,7 @@ packages = [{include = "prim_ctrl"}]
 
 [project]
 name = "prim-ctrl"
-version = "0.8.4"
+version = "0.8.6"
 description = "Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN."
 license = "Apache-2.0"
 authors = [