p3lib 1.1.104__tar.gz → 1.1.106__tar.gz

{p3lib-1.1.104 → p3lib-1.1.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: p3lib
-Version: 1.1.104
+Version: 1.1.106
 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.104 → p3lib-1.1.106}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.104
+version = 1.1.106
 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.104 → p3lib-1.1.106}/src/p3lib/gnome_desktop_app.py

@@ -3,7 +3,6 @@
 import os
 import sys
 import platform
-import site
 
 class GnomeDesktopApp(object):
     """@brief Responsible for adding and removing gnome desktop files for launching applications on a Linux system."""
@@ -73,11 +72,16 @@ class GnomeDesktopApp(object):
                 path2 = os.path.join(startup_parent_path, 'assets')
                 self._abs_icon_file = os.path.join(path2, icon_file)
                 if not os.path.isfile(self._abs_icon_file):
-                    site_packages_folder = site.getusersitepackages()
-                    path3 = os.path.join(site_packages_folder, 'assets')
-                    self._abs_icon_file = os.path.join(path3, icon_file)
-                    if not os.path.isfile(self._abs_icon_file):
-                        raise Exception(f"{self._app_name} icon file ({icon_file}) not found.")
+                    # 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')
+                            self._abs_icon_file = os.path.join(path3, icon_file)
+                            if os.path.isfile(self._abs_icon_file):
+                                return self._abs_icon_file
+
+                    raise Exception(f"{self._app_name} icon file ({icon_file}) not found.")
 
     def _get_gnome_desktop_file(self):
         """@brief Determine and return the name of the gnome desktop file.
@@ -105,7 +109,7 @@ class GnomeDesktopApp(object):
         lines.append(f'Name={self._app_name}')
         lines.append(f'Comment={self._comment}')
         lines.append(f'Icon={self._abs_icon_file}')
-        lines.append(f'Exec=python3 {self._startup_file}')
+        lines.append(f'Exec={self._startup_file}')
         lines.append('Terminal=false')
         lines.append(f'Categories={self._categories}')
 

{p3lib-1.1.104 → p3lib-1.1.106}/src/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-1.1.104 → p3lib-1.1.106}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: p3lib
-Version: 1.1.104
+Version: 1.1.106
 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