Merge pull request #126 from paxapos/v1.0.3

refactor: Update build workflow to include separate specifications for Windows and Linux builds and improve artifact upload process
paxapos · Sep 12, 2024 · 002903d · 002903d
2 parents b1ea421 + 0fc0e95
commit 002903d
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 54 deletions.
diff --git a/.github/workflows/desktop.build.yml b/.github/workflows/desktop.build.yml
@@ -1,9 +1,6 @@
 name: Build Desktop Ejecutables - on Release
 
-on:
-  push:
-    branches:
-      - main
+on: push
 
 jobs:
   build-windows:
@@ -115,8 +112,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v1.0.2
-          release_name: Release v1.0.2
+          tag_name: v1.0.3
+          release_name: Release v1.0.3
           draft: false
           prerelease: false
 

diff --git a/buildozer.spec b/buildozer.spec
@@ -16,7 +16,7 @@ source.dir = src
 #source.include_exts = py,png,jpg,kv,atlas
 
 # (list) List of inclusions using pattern matching
-source.include_patterns = src/fiscalberry_app/assets/*
+source.include_patterns = src/assets/*
 
 # (list) Source files to exclude (let empty to not exclude anything)
 #source.exclude_exts = spec
@@ -44,10 +44,10 @@ requirements = python3,kivy,python-escpos,python-socketio,simple-websocket,uuid,
 # requirements.source.kivy = ../../kivy
 
 # (str) Presplash of the application
-presplash.filename = %(source.dir)s/fiscalberry_app/assets/fiscalberry.png
+presplash.filename = %(source.dir)s/assets/fiscalberry.png
 
 # (str) Icon of the application
-icon.filename = %(source.dir)s/fiscalberry_app/assets/fiscalberry.png
+icon.filename = %(source.dir)s/assets/fiscalberry.png
 
 # (list) Supported orientations
 # Valid options are: landscape, portrait, portrait-reverse or landscape-reverse

diff --git a/fiscalberry-lin.spec b/fiscalberry-lin.spec
@@ -35,5 +35,5 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon=['src/fiscalberry_app/assets/fiscalberry.ico'],
+    icon=['src/assets/fiscalberry.ico'],
 )
diff --git a/fiscalberry-win.spec b/fiscalberry-win.spec
@@ -35,5 +35,5 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon=['src/fiscalberry_app/assets/fiscalberry.ico'],
+    icon=['src/assets/fiscalberry.ico'],
 )
diff --git a/requirements.cli.txt b/requirements.cli.txt
@@ -7,5 +7,4 @@ aiohttp==3.10.2
 argparse==1.4.0
 uuid==1.30
 appdirs==1.4.4
-python-dotenv==1.0.1
 platformdirs==4.2.2
diff --git a/requirements.kivy.txt b/requirements.kivy.txt
@@ -7,6 +7,5 @@ aiohttp==3.10.2
 argparse==1.4.0
 uuid==1.30
 appdirs==1.4.4
-python-dotenv==1.0.1
 platformdirs==4.2.2
 kivy==2.3.0
diff --git a/requirements.txt b/requirements.txt
@@ -25,7 +25,6 @@ wsproto==1.2.0
 aiohttp==3.10.2
 argparse==1.4.0
 uuid==1.30
-python-dotenv==1.0.1
 platformdirs==4.2.2
 kivy==2.3.0
 cython==3.0.11

diff --git a/setup.py b/setup.py
@@ -18,7 +18,6 @@
         'uuid==1.30',
         'appdirs==1.4.4',
         'kivy==2.3.0',
-        'python-dotenv==1.0.1',
         'platformdirs==4.2.2',
     ],
     entry_points={

diff --git a/src/fiscalberry_app/assets/bg.jpg → src/assets/bg.jpg b/src/fiscalberry_app/assets/bg.jpg → src/assets/bg.jpg
diff --git a/src/fiscalberry_app/assets/connected.png → src/assets/connected.png b/src/fiscalberry_app/assets/connected.png → src/assets/connected.png
diff --git a/src/fiscalberry_app/assets/disconnected.png → src/assets/disconnected.png b/src/fiscalberry_app/assets/disconnected.png → src/assets/disconnected.png
diff --git a/src/fiscalberry_app/assets/fiscalberry.ico → src/assets/fiscalberry.ico b/src/fiscalberry_app/assets/fiscalberry.ico → src/assets/fiscalberry.ico
diff --git a/src/fiscalberry_app/assets/fiscalberry.jpg → src/assets/fiscalberry.jpg b/src/fiscalberry_app/assets/fiscalberry.jpg → src/assets/fiscalberry.jpg
diff --git a/src/fiscalberry_app/assets/fiscalberry.png → src/assets/fiscalberry.png b/src/fiscalberry_app/assets/fiscalberry.png → src/assets/fiscalberry.png
diff --git a/src/fiscalberry_app/assets/lion.ico → src/assets/lion.ico b/src/fiscalberry_app/assets/lion.ico → src/assets/lion.ico
diff --git a/src/fiscalberry_app/assets/lion.jpg → src/assets/lion.jpg b/src/fiscalberry_app/assets/lion.jpg → src/assets/lion.jpg
diff --git a/src/fiscalberry_app/assets/lion.png → src/assets/lion.png b/src/fiscalberry_app/assets/lion.png → src/assets/lion.png
diff --git a/src/cli.py b/src/cli.py
@@ -3,12 +3,13 @@
 import os
 import logging
 
-from dotenv import load_dotenv
-load_dotenv()
+from common.Configberry import Configberry
+
+configberry = Configberry()
 
+environment = configberry.config.get("SERVIDOR", "environment", fallback="production")
 
 # configuro logger segun ambiente
-environment = os.getenv('ENVIRONMENT', 'production')
 if environment == 'development':
     print("* * * * * Modo de desarrollo * * * * *")
     logging.basicConfig(level=logging.DEBUG)
@@ -22,14 +23,12 @@
 
 
 # importo el modulo que se encarga de la comunicacion con el servidor
-from fiscalberry_sio import FiscalberrySio
+from common.fiscalberry_sio import FiscalberrySio
 from common.discover import send_discover_in_thread
-from common.Configberry import Configberry
 
 
 
-def main():
-    configberry = Configberry()
+def start():
 
     while True:
         logger.info("Preparando Fiscalberry Server")
@@ -42,5 +41,6 @@ def main():
         logger.warning("Termino ejecucion de server socketio?.. reconectando en 5s")
         time.sleep(5)
 
+
 if __name__ == "__main__":
-    main()
+    start()
diff --git a/src/common/__init__.py b/src/common/__init__.py
@@ -0,0 +1 @@
+# archivo init del modulo common
diff --git a/src/fiscalberry_sio.py → src/common/fiscalberry_sio.py b/src/fiscalberry_sio.py → src/common/fiscalberry_sio.py
@@ -34,7 +34,7 @@ class FiscalberrySio():
     stop_event = threading.Event()
 
     def __init__(self, sockeiIoServer, uuid, namespaces = ["/paxaprinter"]) -> None:
-        self.sio = socketio.Client(reconnection=True, reconnection_attempts=0, reconnection_delay=2, reconnection_delay_max=15, logger=sioLogger, engineio_logger=False)
+        self.sio = socketio.Client(reconnection=True, reconnection_attempts=0, reconnection_delay=2, reconnection_delay_max=15, logger=sioLogger, engineio_logger=sioLogger)
 
         self.sockeiIoServer = sockeiIoServer
         self.uuid = uuid
@@ -65,24 +65,18 @@ def start_only_status_in_thread(self) -> threading.Thread:
         return self.thread
 
     def __run(self):
-        while not self.stop_event.is_set():
-            try:
-                self.sio.connect(self.sockeiIoServer, namespaces=self.namespaces, headers={"X_UUID":self.uuid})
-                logger.info("Iniciado SioClient en %s con uuid %s" % (self.sockeiIoServer, self.uuid))
-                self.sio.wait()
-
-            except socketio.exceptions.ConnectionError as e:
-                logger.error(f"socketio Connection error: {e}")
-                self.sio.disconnect()
-            except Exception as e:
-                self.sio.disconnect()
-                logger.error(f"An unexpected error occurred: {e}")
-
-        logger.info("FiscalberrySio: stopped, reconectando en 3s")
-        for i in range(3, 0, -1):
-            time.sleep(1)
-            logger.info(f"FiscalberrySio: stopped, reconectando en {i}s")
-
+        try:
+            logger.info("FiscalberrySio: ******************************* CONECTANDO *******************************")
+            self.sio.connect(self.sockeiIoServer, namespaces=self.namespaces, headers={"X_UUID":self.uuid})
+            logger.info("Iniciado SioClient en %s con uuid %s" % (self.sockeiIoServer, self.uuid))
+            self.sio.wait()
+
+        except socketio.exceptions.ConnectionError as e:
+            logger.error(f"socketio Connection error: {e}")
+            self.sio.disconnect()
+        except Exception as e:
+            self.sio.disconnect()
+            logger.error(f"An unexpected error occurred: {e}")
 
 
     def start_print_server(self):

diff --git a/src/fiscalberryservice.android.py b/src/fiscalberryservice.android.py
@@ -11,7 +11,7 @@
 
 
 # importo el modulo que se encarga de la comunicacion con el servidor
-from fiscalberry_sio import FiscalberrySio
+from common.fiscalberry_sio import FiscalberrySio
 from common.discover import send_discover_in_thread
 from common.Configberry import Configberry
 

diff --git a/src/main.py b/src/main.py
@@ -2,14 +2,14 @@
 import os
 import logging
 
-from dotenv import load_dotenv
-load_dotenv()
+from common.Configberry import Configberry
 
-__version__ = "0.1.0"
+configberry = Configberry()
+
+environment = configberry.config.get("SERVIDOR", "environment", fallback="production")
 
 
 # Configuro logger según ambiente
-environment = os.getenv('ENVIRONMENT', 'production')
 if environment == 'development':
     print("* * * * * Modo de desarrollo * * * * *")
     logging.basicConfig(level=logging.DEBUG)
@@ -18,13 +18,27 @@
     logging.basicConfig(level=logging.WARNING)
 
 
-from fiscalberry_app.fiscalberry_app import FiscalberryApp
+import sys
 
 
-if __name__ == "__main__":
+__version__ = "0.1.0"
 
-    # Crear la aplicación Kivy
-    app = FiscalberryApp()
 
-    # Ejecutar la aplicación Kivy
-    app.run()
+if __name__ == "__main__":
+
+    if len(sys.argv) > 1 and sys.argv[1] == "cli":
+        import cli as cli
+
+        cli.start()
+
+    else:
+        from ui.fiscalberry_app import FiscalberryApp
+
+        # Llamar a la función que maneja la interfaz de usuario
+        start_ui()
+        # Crear la aplicación Kivy
+        app = FiscalberryApp()
+
+        # Ejecutar la aplicación Kivy
+        app.run()
+
diff --git a/src/ui/__init__.py b/src/ui/__init__.py
diff --git a/src/fiscalberry_app/fiscalberry.kv → src/ui/fiscalberry.kv b/src/fiscalberry_app/fiscalberry.kv → src/ui/fiscalberry.kv
diff --git a/src/fiscalberry_app/fiscalberry_app.py → src/ui/fiscalberry_app.py b/src/fiscalberry_app/fiscalberry_app.py → src/ui/fiscalberry_app.py
@@ -60,7 +60,7 @@ def __init__(self, **kwargs):
 
 
 class FiscalberryApp(App):
-    assetpath = os.path.dirname(os.path.abspath(__file__))
+    assetpath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
     background_image = StringProperty(f"{assetpath}/assets/bg.jpg")
     logo_image = StringProperty(f"{assetpath}/assets/fiscalberry.png")