p3lib 1.1.105__py3-none-any.whl → 1.1.107__py3-none-any.whl

p3lib/helper.py

@@ -377,3 +377,44 @@ def appendCreateFile(uio, aFile, quiet=False):
         fd.close()
         if not quiet:
             uio.info("Created {}".format(aFile))
+
+def getAbsFile(filename):
+    """@brief Check that the file exists in several places.
+                1 - The startup folder
+                2 - An 'assets' folder in the startup folder
+                3 - An 'assets' folder in the startup parent folder
+                3 - In an 'assets' folder in a python site-packages folder.
+        @param filename The name of the icon file.
+        @return The abs path of the file or None if not found."""
+    file_found = None
+    abs_filename = os.path.abspath(filename)
+    if os.path.isfile(abs_filename):
+        file_found = abs_filename
+
+    else:
+        startup_file = os.path.abspath(sys.argv[0])
+        startup_path = os.path.dirname(startup_file)
+        path1 = os.path.join(startup_path, 'assets')
+        abs_filename = os.path.join(path1, filename)
+        if os.path.isfile(abs_filename):
+            file_found = abs_filename
+
+        else:
+            startup_parent_path = os.path.join(startup_path, '..')
+            path2 = os.path.join(startup_parent_path, 'assets')
+            abs_filename = os.path.join(path2, filename)
+            if os.path.isfile(abs_filename):
+                file_found = abs_filename
+
+            else:
+                # Try all the site packages folders we know about.
+                for path in sys.path:
+                    if 'site-packages' in path:
+                        site_packages_path = path
+                        path3 = os.path.join(site_packages_path, 'assets')
+                        abs_filename = os.path.join(path3, filename)
+                        if os.path.isfile(abs_filename):
+                            file_found = abs_filename
+                            break
+
+    return file_found

p3lib/pconfig.py

@@ -339,7 +339,15 @@ class ConfigManager(object):
 
         return join( configPath, cfgFilename )
 
-    def __init__(self, uio, cfgFilename, defaultConfig, addDotToFilename=True, encrypt=False, cfgPath=None):
+    def __init__(self,
+                 uio,
+                 cfgFilename,
+                 defaultConfig,
+                 addDotToFilename=True,
+                 encrypt=False,
+                 cfgPath=None,
+                 stripUnknownKeys=True,
+                 addNewKeys=True):
         """@brief Constructor
            @param uio A UIO (User Input Output) instance. May be set to None if no user messages are required.
            @param cfgFilename   The name of the config file. If this is None then the default config filename is used.
@@ -351,13 +359,17 @@ class ConfigManager(object):
                           probably the best we can do. Therefore if encrypt is set True then the
                           an ssh key must be present in the ~/.ssh folder named id_rsa.
            @param cfgPath The config path when the config file will be stored. By default this is unset and the
-                          current users home folder is the location of the config file."""
+                          current users home folder is the location of the config file.
+           @param stripUnknownKeys If True then keys in the dict but not in the default config dict are stripped from the config.
+           @param addNewKeys If keys are found in the default config that are not in the config dict, add them."""
         self._uio               = uio
         self._cfgFilename       = cfgFilename
         self._defaultConfig     = defaultConfig
         self._addDotToFilename  = addDotToFilename
         self._encrypt           = encrypt
         self._cfgPath           = cfgPath
+        self._stripUnknownKeys  = stripUnknownKeys
+        self._addNewKeys        = addNewKeys
         self._configDict        = {}
 
         # If the user passed None in as the cfg filename then generate the default config file.
@@ -463,7 +475,8 @@ class ConfigManager(object):
       return dictLoaded
 
     def load(self, showLoadedMsg=True):
-        """@brief Load the config."""
+        """@brief Load the config.
+           @param showLoadedMsg If True load messages are displayed."""
 
         if not isfile(self._cfgFile):
 
@@ -483,17 +496,19 @@ class ConfigManager(object):
             # Config parameters may be added or dropped over time. We use the default config to
             # check for parameters that should be added/removed.
 
-            # Add any missing keys to the loaded config from the default config.
-            for defaultKey in defaultConfigKeys:
-                if defaultKey not in loadedConfigKeys:
-                    loadedConfig[defaultKey] = self._defaultConfig[defaultKey]
-                    self._debug("----------> DEFAULT VALUE ADDED: {} = {}".format(defaultKey, loadedConfig[defaultKey]))
+            if self._addNewKeys:
+                # Add any missing keys to the loaded config from the default config.
+                for defaultKey in defaultConfigKeys:
+                    if defaultKey not in loadedConfigKeys:
+                        loadedConfig[defaultKey] = self._defaultConfig[defaultKey]
+                        self._debug("----------> DEFAULT VALUE ADDED: {} = {}".format(defaultKey, loadedConfig[defaultKey]))
 
-            # If some keys have been dropped from the config, remove them.
-            for loadedConfigKey in loadedConfigKeys:
-                if loadedConfigKey not in defaultConfigKeys:
-                    self._debug("----------> DROPPED FROM CONFIG: {} = {}".format(loadedConfigKey, loadedConfig[loadedConfigKey]))
-                    loadedConfig.pop(loadedConfigKey, None)
+            if self._stripUnknownKeys:
+                # If some keys have been dropped from the config, remove them.
+                for loadedConfigKey in loadedConfigKeys:
+                    if loadedConfigKey not in defaultConfigKeys:
+                        self._debug("----------> DROPPED FROM CONFIG: {} = {}".format(loadedConfigKey, loadedConfig[loadedConfigKey]))
+                        loadedConfig.pop(loadedConfigKey, None)
 
             self._configDict = loadedConfig
         self._info("Loaded config from %s" % (self._cfgFile) )
@@ -760,10 +775,12 @@ class DotConfigManager(ConfigManager):
     KEY_EDIT_ORDER_LIST = None
 
     @staticmethod
-    def GetDefaultConfigFilename():
+    def GetDefaultConfigFilename(filenameOverride=None):
         """@brief Get the default name of the config file for this app. This will be the program name
                   (file that started up initially) without the .py extension. A .cfg extension is added
-                  and it will be found in the ~/.config folder."""
+                  and it will be found in the ~/.config folder.
+           @param filenameOverride The name for the config file in the .config folder. If left as None then the program name ise used
+                                   as the config filename."""
         dotConfigFolder = '.config'
         if platform.system() == 'Linux' and os.geteuid() == 0:
             homePath = "/root"
@@ -779,10 +796,13 @@ class DotConfigManager(ConfigManager):
             # Create the ~/.config folder
             os.makedirs(configFolder)
 
-        progName = sys.argv[0]
-        if progName.endswith('.py'):
-            progName = progName[0:-3]
-        progName = os.path.basename(progName).strip()
+        if filenameOverride:
+            progName = filenameOverride
+        else:
+            progName = sys.argv[0]
+            if progName.endswith('.py'):
+                progName = progName[0:-3]
+            progName = os.path.basename(progName).strip()
 
         # Note that we assume that addDotToFilename in the ConfigManager constructor is set True
         # as this will prefix the filename with the . character.
@@ -794,7 +814,14 @@ class DotConfigManager(ConfigManager):
 
         return configFilename
 
-    def __init__(self, defaultConfig, keyEditOrderList=None, uio=None, encrypt=False):
+    def __init__(self,
+                 defaultConfig,
+                 keyEditOrderList=None,
+                 uio=None,
+                 encrypt=False,
+                 stripUnknownKeys=True,
+                 addNewKeys=True,
+                 filenameOverride=None):
         """@brief Constructor
            @param defaultConfig A default config instance containing all the default key-value pairs.
            @param keyEditOrderList A list of all the dict keys in the order that the caller wishes them to be displayed top the user.
@@ -804,8 +831,17 @@ class DotConfigManager(ConfigManager):
                           This is not secure but assuming the private key has not been compromised it's
                           probably the best we can do.
                           !!! Therefore if encrypt is set True then the an ssh key must be present !!!
-                          ||| in the ~/.ssh folder named id_rsa.                                   !!!"""
-        super().__init__(uio, DotConfigManager.GetDefaultConfigFilename(), defaultConfig, encrypt=encrypt)
+                          ||| in the ~/.ssh folder named id_rsa.                                   !!!
+           @param stripUnknownKeys If True then keys in the dict but not in the default config dict are stripped from the config.
+           @param addNewKeys If keys are found in the default config that are not in the config dict, add them.
+           @param filenameOverride The name for the config file in the .config folder. If left as None then the program name ise used
+                                   as the config filename."""
+        super().__init__(uio,
+                         DotConfigManager.GetDefaultConfigFilename(filenameOverride),
+                         defaultConfig,
+                         encrypt=encrypt,
+                         stripUnknownKeys=stripUnknownKeys,
+                         addNewKeys=addNewKeys)
         self._keyEditOrderList = keyEditOrderList
         # Ensure the config file is present and loaded into the internal dict.
         self.load()

{p3lib-1.1.105.dist-info → p3lib-1.1.107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: p3lib
-Version: 1.1.105
+Version: 1.1.107
 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.105.dist-info → p3lib-1.1.107.dist-info}/RECORD

@@ -7,18 +7,18 @@ p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
 p3lib/database_if.py,sha256=XKu1w3zftGbj4Rh54wrWJnoCtqHkhCzJUPN2S70XIKg,11915
 p3lib/file_io.py,sha256=A7_GKYPlmjRjq6U1YuWhmB0OhLhNm6cWQfQX8qfgYTk,5041
 p3lib/gnome_desktop_app.py,sha256=zl9SKRBV8ipVg2faCs_gbAr8c42J1N_pntbFGG2BMiE,6694
-p3lib/helper.py,sha256=xTKPgpziwr4zyaoc0sjZRFr0M91fo7Tok_nSAvtiTZE,12020
+p3lib/helper.py,sha256=RHA0T1ckG3wLgTXgI_1mrtbzvMBaIwd8ow7x9orXUfA,13730
 p3lib/json_networking.py,sha256=6u4s1SmypjTYPnSxHP712OgQ3ZJaxOqIkgHQ1J7Qews,9738
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
 p3lib/netif.py,sha256=3QV5OGdHhELIf4MBj6mx5MNCtVeZ7JXoNEkeu4KzCaE,9796
 p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/ngt.py,sha256=Y4HsSiaBEYi7OFWkqkDDJende_yyxsvIjUremfArXgA,39204
-p3lib/pconfig.py,sha256=2yZUK5nkqpAm4Y_xcJq5H9Lxmc8dfYei1Pi0Ek2Crh0,35376
+p3lib/pconfig.py,sha256=wVWEYk4DghKQZaOuihJF2NcQzY1kdgCtW54BQ2McviE,37200
 p3lib/ssh.py,sha256=OyoAQ_h1L2RfkjTAChDrvLFfl4Fe_gBNdX5rvK-wKiw,42125
 p3lib/table_plot.py,sha256=RPncwVlGUkkx5Fw0dHQedXo0TSPlTi__VrJBDzaMsuI,32116
 p3lib/uio.py,sha256=Aaxc99XiE3d2f9vLjaN-bZsckoNxay5t0ujdK6PXGrw,23265
-p3lib-1.1.105.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.105.dist-info/METADATA,sha256=Uc29N8eWR5fxCJ3MDRMnytOWcXHl7ds3Uuucw32-oMs,919
-p3lib-1.1.105.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-p3lib-1.1.105.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.105.dist-info/RECORD,,
+p3lib-1.1.107.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.107.dist-info/METADATA,sha256=kh2ALja9g0U6Wl8ZsW1ATL63LJKlVli7ilyqjYtH4MI,919
+p3lib-1.1.107.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+p3lib-1.1.107.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.107.dist-info/RECORD,,

{p3lib-1.1.105.dist-info → p3lib-1.1.107.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any