Refactor build process and update dependencies; add versioning support and improve error handling

Author: alevilar

.github/workflows/desktop.build.yml

@@ -59,7 +59,7 @@ jobs:
 
       # --- Build GUI ---
       - name: Install GUI dependencies (includes Kivy)
-        run: pip install -r requirements.kivy.txt # This should include CLI deps too
+        run: pip install .
 
 
       - name: Build GUI executable (${{ matrix.os_name }})
@@ -92,8 +92,8 @@ jobs:
           mkdir -p artifacts
           # Ensure the source path exists before moving
           if [ -e "${{ matrix.artifact_path_gui }}" ]; then
-            echo "Moving ${{ matrix.artifact_path_gui }} to artifacts/fiscalberry-gui-${{ matrix.asset_suffix_gui }}"
-            mv ${{ matrix.artifact_path_gui }} artifacts/fiscalberry-gui-${{ matrix.asset_suffix_gui }}
+            echo "Moving ${{ matrix.artifact_path_gui }} to artifacts/fiscalberry-${{ matrix.asset_suffix_gui }}"
+            mv ${{ matrix.artifact_path_gui }} artifacts/fiscalberry-${{ matrix.asset_suffix_gui }}
           else
             echo "ERROR: Source file ${{ matrix.artifact_path_gui }} not found!"
             # Optionally fail the step: exit 1

file_version_info.txt

@@ -0,0 +1,29 @@
+# file_version_info.txt
+VSVersionInfo(
+  ffi=FixedFileInfo(
+    filevers=(1, 0, 0, 0),
+    prodvers=(1, 0, 0, 0),
+    mask=0x3f,
+    flags=0x0,
+    OS=0x40004,
+    fileType=0x1,
+    subtype=0x0,
+    date=(0, 0)
+  ),
+  kids=[
+    StringFileInfo(
+      [
+      StringTable(
+        u'040904B0',
+        [StringStruct(u'CompanyName', u'Plus Abstracta'),
+        StringStruct(u'FileDescription', u'Servidor de Impresion GUI Application'),
+        StringStruct(u'FileVersion', u'2.0.1.0'),
+        StringStruct(u'InternalName', u'fiscalberry'),
+        StringStruct(u'LegalCopyright', u'© Plus Abstracta SRL. All rights reserved.'),
+        StringStruct(u'OriginalFilename', u'fiscalberry-gui.exe'),
+        StringStruct(u'ProductName', u'Fiscalberry'),
+        StringStruct(u'ProductVersion', u'1.0.0.0')])
+      ]), 
+    VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
+  ]
+)

fiscalberry-gui.spec

@@ -26,7 +26,7 @@ exe = EXE(
     debug=False,
     bootloader_ignore_signals=False,
     strip=False,
-    upx=True,
+    upx=False,
     upx_exclude=[],
     runtime_tmpdir=None,
     console=False,
@@ -36,4 +36,6 @@ exe = EXE(
     codesign_identity=None,
     entitlements_file=None,
     icon=['src/fiscalberry/ui/assets/fiscalberry.ico'],
+    version='file_version_info.txt',  # Add a version file (see below)
+    uac_admin=False,  # Don't request admin privileges unless necessary
 )

requirements.kivy.txt

@@ -1,7 +1 @@
-python-escpos[all]==3.1
-python-socketio[client]==5.11.4
-requests==2.32.3
-platformdirs==4.2.2
-pika
-pywin32; sys_platform == 'win32'
 kivy[base]==2.3.1

requirements.txt

@@ -0,0 +1,6 @@
+python-escpos[all]==3.1
+python-socketio[client]==5.11.4
+requests==2.32.3
+platformdirs==4.2.2
+pika
+pywin32; sys_platform == 'win32'

setup.py

@@ -6,8 +6,6 @@ def load_requirements(filename):
         return [line.strip() for line in req_file
                 if line.strip() and not line.startswith("#")]
 
-requirements_file = os.path.join(os.path.dirname(__file__), "requirements.kivy.txt")
-requirements = load_requirements(requirements_file)
 
 setup(
     name='fiscalberry',
@@ -17,7 +15,11 @@ def load_requirements(filename):
     author_email='[email protected]',
     package_dir={'': 'src'},  # Le decimos que los paquetes están en "src"
     packages=find_packages(where='src'),  # Esto encontrará "fiscalberry"
-    install_requires=requirements,
+    install_requires=load_requirements("requirements.txt"),  # Asume que load_requirements está fijo para tomar un nombre de archivo
+    extras_require={
+        'cli': load_requirements("requirements.cli.txt"),  # Assumes load_requirements is fixed to take a filename
+        'gui': load_requirements("requirements.kivy.txt"),  # Assumes load_requirements is fixed to take a filename
+    },
     entry_points={
         'console_scripts': [
             'fiscalberry_cli=fiscalberry.cli:main',

src/fiscalberry/__init__.py

@@ -4,5 +4,6 @@
 """
 Fiscalberry Server Package
 """
+from fiscalberry.version import VERSION
 
-__version__ = "2.0.1"  # Example version, update as needed
+__version__ = VERSION 

src/fiscalberry/cli.py

@@ -7,11 +7,13 @@
 logger = getLogger()
 from fiscalberry.common.service_controller import ServiceController
 
-
-
-if __name__ == "__main__":
+def main():
     try:
         ServiceController().start()
     except Exception as e:
         logger.error(f"Error occurred: {e}", exc_info=True)
         os._exit(1)
+
+if __name__ == "__main__":
+    main()
+    

src/fiscalberry/ui/fiscalberry_app.py

@@ -15,17 +15,18 @@
 import time
 import sys
 import os
-from pkg_resources import get_distribution
 
 
+from fiscalberry.version import VERSION
+
 class FiscalberryApp(App):
     name = StringProperty("Servidor de Impresión")
     uuid = StringProperty("")
     host = StringProperty("")
     tenant = StringProperty("")
     siteName = StringProperty("")
     siteAlias = StringProperty("")
-    version = StringProperty( get_distribution("fiscalberry").version )
+    version = StringProperty( VERSION )
 
 
     assetpath = os.path.join(os.path.dirname(__file__), "assets")

src/fiscalberry/version.py

@@ -0,0 +1 @@
+VERSION = "2.0.1"