From 23950fceb23e2e7af07d74ff8b8c637d2ef5f734 Mon Sep 17 00:00:00 2001
From: Jason Ross <jason.ross841@gmail.com>
Date: Mon, 25 Aug 2025 20:31:02 -0500
Subject: [PATCH] fixing some issues and creating spec files

---
 .../android-file-handler-linux.spec           | 47 +++++++++++++++++++
 .../android-file-handler-windows.spec         | 23 +++++----
 src/main.py                                   |  7 +--
 3 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 scripts/spec_scripts/android-file-handler-linux.spec
 rename android-file-handler-windows.spec => scripts/spec_scripts/android-file-handler-windows.spec (71%)

diff --git a/scripts/spec_scripts/android-file-handler-linux.spec b/scripts/spec_scripts/android-file-handler-linux.spec
new file mode 100644
index 0000000..50671f7
--- /dev/null
+++ b/scripts/spec_scripts/android-file-handler-linux.spec
@@ -0,0 +1,47 @@
+# -*- mode: python ; coding: utf-8 -*-
+block_cipher = None
+a = Analysis(
+    ['src/main.py'],
+    pathex=['src'],
+    binaries=[],
+    datas=[('src/gui', 'gui')],
+    hiddenimports=[
+        'gui',
+        'gui.file_browser',
+        'gui.license_agreement',
+        'gui.main_window',
+        'gui.progress_handler',
+        'adb_manager'
+    ],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='android-file-handler',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon='icon_media/robot_files_256.png',
+)
\ No newline at end of file
diff --git a/android-file-handler-windows.spec b/scripts/spec_scripts/android-file-handler-windows.spec
similarity index 71%
rename from android-file-handler-windows.spec
rename to scripts/spec_scripts/android-file-handler-windows.spec
index 46f1749..1303195 100644
--- a/android-file-handler-windows.spec
+++ b/scripts/spec_scripts/android-file-handler-windows.spec
@@ -1,15 +1,18 @@
 # -*- mode: python ; coding: utf-8 -*-
-
-
 block_cipher = None
-
-
 a = Analysis(
     ['src/main.py'],
-    pathex=[],
+    pathex=['src'],
     binaries=[],
-    datas=[],
-    hiddenimports=[],
+    datas=[('src/gui', 'gui')],
+    hiddenimports=[
+        'gui',
+        'gui.file_browser',
+        'gui.license_agreement',
+        'gui.main_window',
+        'gui.progress_handler'
+        'adb_manager'
+    ],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
@@ -20,7 +23,6 @@ a = Analysis(
     noarchive=False,
 )
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
-
 exe = EXE(
     pyz,
     a.scripts,
@@ -35,10 +37,11 @@ exe = EXE(
     upx=True,
     upx_exclude=[],
     runtime_tmpdir=None,
-    console=True,
+    console=False,
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-)
+    icon='icon_media/robot_files_256.ico',
+)
\ No newline at end of file
diff --git a/src/main.py b/src/main.py
index 60d80bf..a9186e4 100644
--- a/src/main.py
+++ b/src/main.py
@@ -4,12 +4,7 @@ Android File Handler - Main Entry Point
 Simple entry point to launch the Android file transfer application.
 """
 
-try:
-    # Try relative import first (when used as module)
-    from .gui.main_window import main
-except ImportError:
-    # Fall back to direct import (when run directly)
-    from gui.main_window import main
+from gui.main_window import main
 
 
 if __name__ == "__main__":