universal resource path

Author: Matteljay

data/labelpush.desktop data/applications/labelpush.desktopdata/labelpush.desktop renamed to data/applications/labelpush.desktop

@@ -58,18 +58,13 @@
 # System
 from io import BytesIO
 from subprocess import Popen, PIPE
+from pathlib import Path
 import os
 import sys
 import shutil
 
 name = 'labelpush'
-version = '2018.11.26'
-def_iconfiles = [
-    os.path.join(sys.prefix, 'local/share/pixmaps/labelpush.png'),
-    os.path.join(sys.prefix, 'share/pixmaps/labelpush.png'),
-    'data/labelpush.png',
-    'labelpush.png',
-]
+version = '2018.11.27'
 def_defaultcfg = {
     'lpname': 'default', # printer name
     'labw': 637, # labelwidth
@@ -319,6 +314,7 @@ def clock_thread(self):
     #    Thread(target=self.clock_thread).start()
 
 class LabelPushApp(App):
+    resource_rootpath = ''
     def populate_printers(self):
         # check if lp/cups is found
         if shutil.which('lp') is None or shutil.which('lpstat') is None:
@@ -439,13 +435,15 @@ def on_start(self):
     def on_stop(self):
         GLO.stop.set() # stop thread so that the program can exit
     def build(self):
-        for iconfile in def_iconfiles:
-            if os.access(iconfile, os.R_OK):
-                print(':: found app icon ' + iconfile)
-                self.icon = iconfile
+        app_path = Path(__file__).resolve()
+        for tryroot in (str(app_path.parents[1]) + '/share', str(app_path.parents[0]) + '/data'):
+            tryicon = tryroot + '/pixmaps/' + name + '.png'
+            if os.access(tryicon, os.R_OK):
+                self.icon = tryicon
+                self.resource_rootpath = tryroot
                 break
-        if not self.icon:
-            print('WARNING: Could not find application icon', file=sys.stderr)
+        else:
+            print('WARNING: Could not find application resource files', file=sys.stderr)
         return RootWidget()
 
 #

data/labelpush.png data/pixmaps/labelpush.pngdata/labelpush.png renamed to data/pixmaps/labelpush.png

@@ -1,21 +1,19 @@
 #!/usr/bin/env python3
-# requirements Mint/Ubuntu/Debian: sudo apt-get install python3-pip python3-dev libgl1-mesa-dev xsel
-# to build packages, invoke this script: ./setup.py bdist bdist_wheel
 # to install directly, invoke via pip: sudo pip3 install .
 # to generate a whl file: ./setup.py bdist_wheel
-#
 
 import setuptools
-import re
-import sys
+import os, sys, re
+from pathlib import Path
 mainscript = 'labelpush.py'
 
+resources = []
+for fil in (f for f in Path('data').rglob('*') if f.is_file()):
+    resources.append((str('share' / fil.parent.relative_to('data')), [str(fil)]))
 with open('requirements.txt') as fh:
     required = fh.read().strip().splitlines()
-
 with open('README.md', 'r') as fh:
     long_description = fh.read()
-
 with open(mainscript) as fh:
     for line in fh:
         out = re.search(r'version = \u0027(.+?)\u0027$', line)
@@ -44,10 +42,7 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
     ],
-    data_files = [
-        ('share/pixmaps', ['data/labelpush.png']),
-        ('share/applications', ['data/labelpush.desktop']),
-    ],
+    data_files = resources,
 )
 
 # End of file