prim-ctrl 0.7.3__tar.gz → 0.7.5__tar.gz

{prim_ctrl-0.7.3 → prim_ctrl-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prim-ctrl
-Version: 0.7.3
+Version: 0.7.5
 Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
 Home-page: https://github.com/lmagyar/prim-ctrl
 License: Apache-2.0

{prim_ctrl-0.7.3 → prim_ctrl-0.7.5}/prim_ctrl/__main__.py

@@ -69,8 +69,8 @@ class Logger(logging.Logger):
         if self.level == logging.NOTSET:
             self.setLevel(logging.WARNING if silent else logging.INFO)
 
-    def exception_or_error(self, e: Exception, args):
-        if not args or args.debug:
+    def exception_or_error(self, e: Exception):
+        if self.level == logging.NOTSET or self.level == logging.DEBUG:
             logger.exception(e)
         else:
             if hasattr(e, '__notes__'):
@@ -143,7 +143,11 @@ class Subprocess:
         command = ['tailscale']
         command.extend(args)
         creationflags = subprocess.CREATE_NO_WINDOW if platform.system().lower() == 'windows' else 0
-        proc = await asyncio.create_subprocess_exec(*command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, creationflags=creationflags)
+        try:
+            proc = await asyncio.create_subprocess_exec(*command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, creationflags=creationflags)
+        except FileNotFoundError as e:
+            e.add_note(f"Please check that Tailscale is installed properly")
+            raise
         stdout, _stderr = await proc.communicate()
         return proc.returncode == 0, stdout
 
@@ -986,24 +990,24 @@ class Control:
                     try:
                         await phone.remote_sftp.stop(10, 30)
                     except Exception as e:
-                        logger.exception_or_error(e, args)
+                        logger.exception_or_error(e)
                 if restore_state is None or not restore_state.get(Control.PHONE_VPN, stop_only_started):
                     try:
                         await phone.vpn.stop(10, 60)
                     except Exception as e:
-                        logger.exception_or_error(e, args)
+                        logger.exception_or_error(e)
             else:
                 if (restore_state is None or not restore_state.get(Control.PHONE_SFTP, stop_only_started)):
                     try:
                         await phone.zeroconf_sftp.stop(10, 30)
                     except Exception as e:
-                        logger.exception_or_error(e, args)
+                        logger.exception_or_error(e)
             if local.vpn:
                 if restore_state is None or not restore_state.get(Control.LOCAL_VPN, stop_only_started):
                     try:
                         await local.vpn.stop(10, 30)
                     except Exception as e:
-                        logger.exception_or_error(e, args)
+                        logger.exception_or_error(e)
         match args.intent:
             case 'test':
                 if local.vpn and phone.vpn and phone.remote_sftp and phone.state:
@@ -1089,7 +1093,7 @@ class Control:
                         try:
                             await _stop(state, stop_only_started = True)
                         except Exception as e:
-                            logger.exception_or_error(e, args)
+                            logger.exception_or_error(e)
                         raise
                 else:
                     try:
@@ -1213,7 +1217,7 @@ async def main():
         await args.ctor().run(args)
 
     except Exception as e:
-        logger.exception_or_error(e, args)
+        logger.exception_or_error(e)
 
     return logger.exitcode
 

{prim_ctrl-0.7.3 → prim_ctrl-0.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prim-ctrl"
-version = "0.7.3"
+version = "0.7.5"
 description = "Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN."
 license = "Apache-2.0"
 authors = ["Laszlo Magyar <lmagyar1973@gmail.com>"]