Merge pull request #35 from hredan/34-custom-logo-does-not-shown

34 custom logo does not shown
hredan · Feb 7, 2025 · 112c944 · 112c944
2 parents df2e048 + 451f5c2
commit 112c944
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
@@ -110,9 +110,9 @@ jobs:
         # A file, directory or wildcard pattern that describes what to upload
         path: ./ESPEasyFlasher_linux_armv7.tar.gz
         # The desired behavior if no files are found using the provided path.
-  macOs12_executable:
-    if: ${{ inputs.target == 'macos12' || inputs.target == 'all' }}
-    runs-on: macos-12
+  macOs_x64_executable:
+    if: ${{ inputs.target == 'macos_intel' || inputs.target == 'all' }}
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python "3.12"
@@ -125,18 +125,18 @@ jobs:
         pip install pyinstaller
         pip install esptool
         ./Scripts/build_macOS.sh
-        tar -czf ./dist/ESPEasyFlasher_macOs12_intel.tar.gz -C ./dist ./ESPEasyFlasher.app
+        tar -czf ./dist/ESPEasyFlasher_macOs_intel.tar.gz -C ./dist ./ESPEasyFlasher.app
     - name: Create macOs Artefact
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
-        name: espeasyflasher_macOs12_intel
+        name: espeasyflasher_macOs_intel
         # A file, directory or wildcard pattern that describes what to upload
-        path: ./dist/ESPEasyFlasher_macOs12_intel.tar.gz
+        path: ./dist/ESPEasyFlasher_macOs_intel.tar.gz
         retention-days: 10
         # The desired behavior if no files are found using the provided path.
-  macOs14_executable:
-    if: ${{ inputs.target == 'macos14' || inputs.target == 'all' }}
+  macOs_arm64_executable:
+    if: ${{ inputs.target == 'macos_arm64' || inputs.target == 'all' }}
     runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
@@ -150,14 +150,14 @@ jobs:
         pip install pyinstaller
         pip install esptool
         ./Scripts/build_macOS.sh
-        tar -czf ./dist/ESPEasyFlasher_macOs14_arm64.tar.gz -C ./dist ./ESPEasyFlasher.app
+        tar -czf ./dist/ESPEasyFlasher_macOs_arm64.tar.gz -C ./dist ./ESPEasyFlasher.app
 
     - name: Create macOs Artefact
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
-        name: espeasyflasher_macOs14_arm64
+        name: espeasyflasher_macOs_arm64
         # A file, directory or wildcard pattern that describes what to upload
-        path: ./dist/ESPEasyFlasher_macOs14_arm64.tar.gz
+        path: ./dist/ESPEasyFlasher_macOs_arm64.tar.gz
         retention-days: 10
         # The desired behavior if no files are found using the provided path.
diff --git a/.github/workflows/main_ci_cd.yml b/.github/workflows/main_ci_cd.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   test:
-    uses: hredan/ESPEASYFLASHER_2.0/.github/workflows/test.yml@main
+    uses: ./.github/workflows/test.yml
   build-targets:
     needs: test
-    uses: hredan/ESPEASYFLASHER_2.0/.github/workflows/build_targets.yml@main
+    uses: ./.github/workflows/build_targets.yml
     with:
       target: 'win64'
diff --git a/eef_modules/eef_esptool_com/esp_func_calls.py b/eef_modules/eef_esptool_com/esp_func_calls.py
@@ -36,6 +36,7 @@ def __init__(self, bottom_gui_elements, esp_com:EsptoolCom, label_frames) -> Non
 
     # R0913: Too many arguments (6/5) (too-many-arguments)
     # in this case allow more than 5 arguments, it is needed here
+    # pylint: disable=too-many-positional-arguments
     # pylint: disable=too-many-arguments
     def __base_thread(self, target_method, info_text,
                       second_arg=None, third_arg=None, fourth_arg=None):

diff --git a/eef_modules/eef_helper/eef_config.py b/eef_modules/eef_helper/eef_config.py
@@ -162,13 +162,15 @@ def __check_meipass(self):
     def logo_file_exists(self, logo_file):
         """check if logo file exists"""
         return_value = False
+        logo_path = logo_file
         if self.__check_meipass():
-            logo_path = os.path.join(self.__base_path, logo_file)
-        else:
-            logo_path = logo_file
+            if not exists(logo_file):
+                logo_path = os.path.join(self.__base_path, logo_file)
+                # self.__str_io.write(f"Info: MEIPASS '{logo_path}'\n")
 
         if os.path.exists(logo_path):
             self.__logo_file_path = logo_path
+            # self.__str_io.write(f"Info: set __logo_file_path'{logo_path}'\n")
             return_value = True
         else:
             return_value = False