p3lib 1.1.95__tar.gz → 1.1.97__tar.gz

{p3lib-1.1.95 → p3lib-1.1.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.95
+Version: 1.1.97
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.95 → p3lib-1.1.97}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.95
+version = 1.1.97
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.95 → p3lib-1.1.97}/src/p3lib/boot_manager.py

@@ -40,7 +40,7 @@ class BootManager(object):
            @return True if handled , False if not."""
         handled = False
         if options.check_auto_start:
-            BootManager.CheckAutoStartStatus(uio)
+            BootManager.CheckAutoStartStatus(uio, appName)
             handled = True
             
         elif options.enable_auto_start:
@@ -48,7 +48,7 @@ class BootManager(object):
             handled = True
             
         elif options.disable_auto_start:
-            BootManager.DisableAutoStart(uio)
+            BootManager.DisableAutoStart(uio, appName)
             handled = True
 
         return handled
@@ -68,15 +68,21 @@ class BootManager(object):
         bootManager.add(argString=arsString, enableSyslog=enable_syslog)
 
     @staticmethod
-    def DisableAutoStart(uio):
-        """@brief Enable this program to auto start when the computer on which it is installed starts."""
-        bootManager = BootManager(uio=uio, ensureRootUser=True)
+    def DisableAutoStart(uio, appName):
+        """@brief Enable this program to auto start when the computer on which it is installed starts.
+           @param uio A UIO instance.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used."""
+        bootManager = BootManager(uio=uio, ensureRootUser=True, appName=appName)
         bootManager.remove()
         
     @staticmethod
-    def CheckAutoStartStatus(uio):
-        """@brief Check the status of a process previously set to auto start."""
-        bootManager = BootManager(uio=uio)
+    def CheckAutoStartStatus(uio, appName):
+        """@brief Check the status of a process previously set to auto start.
+           @param uio A UIO instance.
+           @param appName The name of the app. This is used as the service name. If not set then
+                          the name of the initially executed python file is used."""
+        bootManager = BootManager(uio=uio, appName=appName)
         lines = bootManager.getStatus()
         if lines and len(lines) > 0:
             for line in lines:
@@ -269,25 +275,18 @@ class LinuxBootManager(object):
         if not os.path.isdir(exePath):
             self._fatalError("{} path not found".format(exePath))
 
-        # If the appName was set in the constructor then use this.
-        if self._appName:
-            appName = self._appName
-
-        # Else we use the initially executed python file.
-        else:
-
-            appName = os.path.basename(exeFile)
-            if len(appName) == 0:
-                self._fatalError("No app found to execute.")
+        appName = os.path.basename(exeFile)
+        if len(appName) == 0:
+            self._fatalError("No app found to execute.")
 
-            absApp = os.path.join(exePath, appName)
-            if not os.path.isfile( absApp ):
-                self._fatalError("{} file not found.".format(absApp) )
+        absApp = os.path.join(exePath, appName)
+        if not os.path.isfile( absApp ):
+            self._fatalError("{} file not found.".format(absApp) )
 
-            appName = appName.replace(".py", "")
-            if self._rootMode:
-                # We can only save to /var/log/ is we are root user.
-                self._logFile = os.path.join(LinuxBootManager.LOG_PATH, appName)
+        appName = appName.replace(".py", "")
+        if self._rootMode:
+            # We can only save to /var/log/ is we are root user.
+            self._logFile = os.path.join(LinuxBootManager.LOG_PATH, appName)
 
         return (appName, absApp)
 
@@ -316,7 +315,12 @@ class LinuxBootManager(object):
 
         appName, absApp = self._getApp()
 
-        serviceFile = self._getServiceFile(appName)
+        if self._appName:
+            serviceName = self._appName
+        else:
+            serviceName = appName
+
+        serviceFile = self._getServiceFile(serviceName)
 
         lines = []
         lines.append("[Unit]")

{p3lib-1.1.95 → p3lib-1.1.97}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.95
+Version: 1.1.97
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen