pyloid 0.19.2__py3-none-any.whl → 0.20.0__py3-none-any.whl

pyloid/__init__.py

@@ -3,6 +3,6 @@ from .api import PyloidAPI, Bridge
 from .utils import get_production_path, is_production
 from .tray import TrayEvent
 from .timer import PyloidTimer
-from .builder import build_from_spec, cleanup_after_build, create_spec_from_json
+from .builder import build_from_spec, cleanup_before_build, create_spec_from_json, get_site_packages
 
-__all__ = ['Pyloid', 'PyloidAPI', 'Bridge', 'get_production_path', 'is_production', 'TrayEvent', 'PyloidTimer', 'build_from_spec', 'cleanup_after_build', 'create_spec_from_json']
+__all__ = ['Pyloid', 'PyloidAPI', 'Bridge', 'get_production_path', 'is_production', 'TrayEvent', 'PyloidTimer', 'build_from_spec', 'cleanup_before_build', 'create_spec_from_json', 'get_site_packages']

pyloid/builder/__init__.py

@@ -1,229 +1,50 @@
 import json
-import os
-import subprocess
 from pathlib import Path
-from pyloid.utils import get_platform
 from PyInstaller.__main__ import run as pyinstaller_run
 import shutil
+import site
+from pyloid.builder.spec import create_spec_from_json
 
+__all__ = ['create_spec_from_json', 'cleanup_before_build', 'build_from_spec', 'get_site_packages']
 
-def create_spec_from_json(json_path):
-    with open(json_path, 'r', encoding='utf-8') as f:
-        config = json.load(f)
-
-    # Create spec file for each OS
-    os_type = get_platform()
-    
-    # Select template for each OS
-    if os_type == 'macos':
-        spec_content = _create_macos_spec(config)
-    elif os_type == 'linux':
-        spec_content = _create_linux_spec(config)
-    else:  # windows
-        spec_content = _create_windows_spec(config)
-    
-    # Save spec file
-    spec_path = Path(f"build-{os_type}.spec")
-    spec_path.write_text(spec_content, encoding='utf-8')
-    
-    return str(spec_path)
-
-def _create_windows_spec(config):
-    return f"""# -*- mode: python ; coding: utf-8 -*-
-
-block_cipher = None
-
-a = Analysis(
-    ['{config['main_script']}'],
-    pathex={config.get('pathex', [])},
-    binaries={config.get('binaries', [])},
-    datas={config.get('datas', [])},
-    hiddenimports={config.get('hiddenimports', [])},
-    hookspath={config.get('hookspath', [])},
-    hooksconfig={config.get('hooksconfig', {})},
-    runtime_hooks={config.get('runtime_hooks', [])},
-    excludes={config.get('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,
-    [],
-    exclude_binaries=True,
-    name='{config.get("name", "pyloid-app")}',
-    debug=False,
-    bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    console=False,
-    disable_windowed_traceback=False,
-    argv_emulation=False,
-    target_arch=None,
-    codesign_identity=None,
-    entitlements_file=None,
-    icon='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
-)
-
-coll = COLLECT(
-    exe,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    name='{config.get("name", "pyloid-app")}'
-)
-"""
-
-def _create_macos_spec(config):
-    return f"""# -*- mode: python ; coding: utf-8 -*-
-
-a = Analysis(
-    ['{config['main_script']}'],
-    pathex={config.get('pathex', [])},
-    binaries={config.get('binaries', [])},
-    datas={config.get('datas', [])},
-    hiddenimports={config.get('hiddenimports', [])},
-    hookspath={config.get('hookspath', [])},
-    hooksconfig={config.get('hooksconfig', {})},
-    runtime_hooks={config.get('runtime_hooks', [])},
-    excludes={config.get('excludes', [])},
-    noarchive=False,
-    optimize=0
-)
-
-pyz = PYZ(a.pure)
-
-exe = EXE(
-    pyz,
-    a.scripts,
-    [],
-    exclude_binaries=True,
-    name='{config.get("name", "pyloid-app")}',
-    debug=False,
-    bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    console=False,
-    disable_windowed_traceback=False,
-    argv_emulation=False,
-    target_arch=None,
-    codesign_identity=None,
-    entitlements_file=None,
-    icon='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
-)
-
-coll = COLLECT(
-    exe,
-    a.binaries,
-    a.datas,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    name='{config.get("name", "pyloid-app")}'
-)
-
-app = BUNDLE(
-    coll,
-    name='{config.get("name", "pyloid-app")}.app',
-    icon='{config.get('icon', 'src-pyloid/icons/icon.icns')}',
-    bundle_identifier=None
-)
-"""
-
-def _create_linux_spec(config):
-    return f"""# -*- mode: python ; coding: utf-8 -*-
-
-block_cipher = None
-
-a = Analysis(
-    ['{config['main_script']}'],
-    pathex={config.get('pathex', [])},
-    binaries={config.get('binaries', [])},
-    datas={config.get('datas', [])},
-    hiddenimports={config.get('hiddenimports', [])},
-    hookspath={config.get('hookspath', [])},
-    hooksconfig={config.get('hooksconfig', {})},
-    runtime_hooks={config.get('runtime_hooks', [])},
-    excludes={config.get('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,
-    [],
-    exclude_binaries=True,
-    name='{config.get("name", "pyloid-app")}',
-    debug=False,
-    bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    console=False,
-    disable_windowed_traceback=False,
-    argv_emulation=False,
-    target_arch=None,
-    codesign_identity=None,
-    entitlements_file=None,
-    icon={config.get('icon', 'src-pyloid/icons/icon.png')}
-)
-
-coll = COLLECT(
-    exe,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    name='{config.get("name", "pyloid-app")}'
-)
-"""
-
-def cleanup_after_build(json_path):
-    """Function to clean up unnecessary files after build"""
+def cleanup_before_build(json_path):
+    """Function to clean up unnecessary files before build"""
     try:
         with open(json_path, 'r', encoding='utf-8') as f:
             config = json.load(f)
         
-        cleanup_patterns = config.get('after_build', {}).get('cleanup_patterns', [])
+        cleanup_patterns = config.get('before_build', {}).get('cleanup_patterns', [])
         if not cleanup_patterns:
-            return True
+            return Exception("Cannot find cleanup patterns.")
+        
+        site_packages = get_site_packages()
+        if not site_packages:
+            raise Exception("Cannot find site-packages directory.")
             
-        dist_dir = Path(f'dist/{config.get("name", "pyloid-app")}')
+        dist_dir = Path(f'{site_packages}')
         if not dist_dir.exists():
-            print(f"Cannot find directory to clean: {dist_dir}")
-            return False
+            raise Exception(f"Cannot find directory to clean: {dist_dir}")
 
-        print("Cleaning up unnecessary files...")
-        for pattern in cleanup_patterns:
-            for file_path in dist_dir.glob(pattern):
-                if file_path.is_dir():
-                    shutil.rmtree(file_path)
-                else:
-                    file_path.unlink()
-                print(f"Removed: {file_path}")
+        if not cleanup_patterns:
+            print("\033[1;33mNo cleanup patterns found. Files may have already been removed.\033[0m")
+        else:
+            print("\033[1;34mCleaning up unnecessary files...\033[0m")
+            for pattern in cleanup_patterns:
+                matching_files = list(dist_dir.glob(pattern))
+                if not matching_files:
+                    print(f"\033[1;33mAleady removed: {pattern}\033[0m")
+                for file_path in matching_files:
+                    print(f"\033[33mRemoving: {file_path}\033[0m")
+                    if file_path.is_dir():
+                        shutil.rmtree(file_path)
+                    else:
+                        file_path.unlink()
+                    print(f"\033[32mRemoved: {file_path}\033[0m")
                 
-        print("File cleanup completed.")
-        return True
+        print("\033[1;32mFile cleanup completed.\033[0m")
         
     except Exception as e:
-        print(f"Error occurred during file cleanup: {e}")
-        return False
+        raise Exception(f"\033[1;31mError occurred during file cleanup: {e}\033[0m")
 
 def build_from_spec(spec_path):
     try:
@@ -233,17 +54,27 @@ def build_from_spec(spec_path):
         ])
         print("Build completed.")
     
-        return True
     except Exception as e:
-        print(f"Error occurred during build: {e}")
-        return False
+        raise Exception(f"Error occurred during build: {e}")
+
+def get_site_packages():
+    """
+    Returns the path to the site-packages directory.
+    Raises an exception if the directory is not found.
+    """
+    for path in site.getsitepackages():
+        if 'site-packages' in path:
+            return path
+    raise Exception("Site-packages directory not found.")
 
 def main():
     spec_path = create_spec_from_json('build_config.json')
     
-    build_from_spec(spec_path)
+    cleanup_before_build('build_config.json')
+    
+    # build_from_spec(spec_path)
+    
     
-    cleanup_after_build('build_config.json')
     
 if __name__ == "__main__":
     main()

pyloid/builder/build_config.schema.json

@@ -0,0 +1,73 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "required": ["before_build", "name", "main_script", "datas", "excludes", "icon", "bundle"],
+    "properties": {
+      "before_build": {
+        "type": "object",
+        "properties": {
+          "cleanup_patterns": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of file patterns to clean up in the library folder before building (used to remove files that cannot be excluded through pyinstaller) - default path is site-packages"
+          }
+        }
+      },
+      "name": {
+        "type": "string",
+        "description": "Application name"
+      },
+      "main_script": {
+        "type": "string",
+        "description": "Path to the main Python script"
+      },
+      "datas": {
+        "type": "array",
+        "items": {
+          "type": "array",
+          "minItems": 2,
+          "maxItems": 2,
+          "items": [
+            { "type": "string" },
+            { "type": "string" }
+          ]
+        },
+        "description": "List of data files to include [source path, destination path]"
+      },
+      "excludes": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        },
+        "description": "List of modules to exclude during build with pyinstaller"
+      },
+      "icon": {
+        "type": "string",
+        "description": "Path to the application icon file"
+      },
+      "bundle": {
+        "type": "object",
+        "properties": {
+          "windows": {
+            "type": "string",
+            "enum": ["onefile", "directory"],
+            "description": "Windows build type"
+          },
+          "macos": {
+            "type": "string",
+            "enum": ["app"],
+            "description": "macOS build type"
+          },
+          "linux": {
+            "type": "string",
+            "enum": ["onefile", "directory"],
+            "description": "Linux build type"
+          }
+        },
+        "required": ["windows", "macos", "linux"],
+        "description": "Build settings for each OS"
+      }
+    }
+  }

pyloid/builder/spec.py

@@ -0,0 +1,247 @@
+from pyloid.utils import get_platform
+import json
+from pathlib import Path
+
+def create_spec_from_json(json_path):
+    with open(json_path, 'r', encoding='utf-8') as f:
+        config = json.load(f)
+
+    os_type = get_platform()
+    
+    if os_type == 'macos':
+        spec_content = _create_macos_spec(config)
+    elif os_type == 'linux':
+        spec_content = _create_linux_spec(config)
+    else:  # windows
+        spec_content = _create_windows_spec(config)
+    
+    spec_path = Path(f"build-{os_type}.spec")
+    spec_path.write_text(spec_content, encoding='utf-8')
+    
+    return str(spec_path)
+
+def _create_windows_spec(config):
+    bundle_type = config.get('bundle', {}).get('windows', 'directory')
+    
+    base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+a = Analysis(
+    ['{config['main_script']}'],
+    pathex={config.get('pathex', [])},
+    binaries={config.get('binaries', [])},
+    datas={config.get('datas', [])},
+    hiddenimports={config.get('hiddenimports', [])},
+    hookspath={config.get('hookspath', [])},
+    hooksconfig={config.get('hooksconfig', {})},
+    runtime_hooks={config.get('runtime_hooks', [])},
+    excludes={config.get('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)
+"""
+
+    if bundle_type == 'onefile':
+        return base_spec + f"""
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='{config.get("name", "pyloid-app")}',
+    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='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
+)
+"""
+    else:
+        return base_spec + f"""
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='{config.get("name", "pyloid-app")}',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
+)
+
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='{config.get("name", "pyloid-app")}'
+)
+"""
+
+def _create_macos_spec(config):
+    return f"""# -*- mode: python ; coding: utf-8 -*-
+
+a = Analysis(
+    ['{config['main_script']}'],
+    pathex={config.get('pathex', [])},
+    binaries={config.get('binaries', [])},
+    datas={config.get('datas', [])},
+    hiddenimports={config.get('hiddenimports', [])},
+    hookspath={config.get('hookspath', [])},
+    hooksconfig={config.get('hooksconfig', {})},
+    runtime_hooks={config.get('runtime_hooks', [])},
+    excludes={config.get('excludes', [])},
+    noarchive=False,
+    optimize=0
+)
+
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='{config.get("name", "pyloid-app")}',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
+)
+
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='{config.get("name", "pyloid-app")}'
+)
+
+app = BUNDLE(
+    coll,
+    name='{config.get("name", "pyloid-app")}.app',
+    icon='{config.get('icon', 'src-pyloid/icons/icon.icns')}',
+    bundle_identifier=None
+)
+"""
+
+def _create_linux_spec(config):
+    bundle_type = config.get('bundle', {}).get('linux', 'directory')
+    
+    base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+a = Analysis(
+    ['{config['main_script']}'],
+    pathex={config.get('pathex', [])},
+    binaries={config.get('binaries', [])},
+    datas={config.get('datas', [])},
+    hiddenimports={config.get('hiddenimports', [])},
+    hookspath={config.get('hookspath', [])},
+    hooksconfig={config.get('hooksconfig', {})},
+    runtime_hooks={config.get('runtime_hooks', [])},
+    excludes={config.get('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)
+"""
+
+    if bundle_type == 'onefile':
+        return base_spec + f"""
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='{config.get("name", "pyloid-app")}',
+    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={config.get('icon', 'src-pyloid/icons/icon.png')}
+)
+"""
+    else:
+        return base_spec + f"""
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='{config.get("name", "pyloid-app")}',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon={config.get('icon', 'src-pyloid/icons/icon.png')}
+)
+
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='{config.get("name", "pyloid-app")}'
+)
+"""

{pyloid-0.19.2.dist-info → pyloid-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyloid
-Version: 0.19.2
+Version: 0.20.0
 Summary: 
 Author: aesthetics-of-record
 Author-email: 111675679+aesthetics-of-record@users.noreply.github.com

{pyloid-0.19.2.dist-info → pyloid-0.20.0.dist-info}/RECORD

@@ -1,9 +1,10 @@
-pyloid/__init__.py,sha256=QqCfIVNDNI-c-6Pi3SXgHve3miTXEoydABvwgAq3j90,442
+pyloid/__init__.py,sha256=t1_67LkSfP4F1TYq4-62z5Cc3Gx1jyWI1yXux7Ojaug,484
 pyloid/api.py,sha256=A61Kmddh8BlpT3LfA6NbPQNzFmD95vQ4WKX53oKsGYU,2419
 pyloid/autostart.py,sha256=K7DQYl4LHItvPp0bt1V9WwaaZmVSTeGvadkcwG-KKrI,3899
 pyloid/browser_window.py,sha256=6Es-DH45URUV6rlCBWj3ZWwrXLMUvqp5700WlU8Sdwo,62984
-pyloid/builder/__init__.py,sha256=yYgwdunMdj-FDVNAw3MJydKk954AuaiIx_QcaJqn42E,6556
-pyloid/builder/build_config.json,sha256=2jN7RTn7SwXU6gN2wGiyAmox4fD4P5722Zmi-xk0wgQ,618
+pyloid/builder/__init__.py,sha256=ZYWcCRp1PQISO0C9CBxlqwrRbQUNqdoMlH4xkhYzcrM,2856
+pyloid/builder/build_config.schema.json,sha256=Wj4_RCxXrQE9lq9Qxen1oy1Q0lhi2ojDkln8YX_LntM,2213
+pyloid/builder/spec.py,sha256=eTZ6b3ksysjH1mnorBtHFsMI7r9jGmCOJGcpJvNmY_E,6119
 pyloid/custom/titlebar.py,sha256=itzK9pJbZMQ7BKca9kdbuHMffurrw15UijR6OU03Xsk,3894
 pyloid/filewatcher.py,sha256=3M5zWVUf1OhlkWJcDFC8ZA9agO4Q-U8WdgGpy6kaVz0,4601
 pyloid/js_api/event_api.py,sha256=_52yyBonqecmMvJpFW7OMNi_jX8Nrteqw_kI6r-DGG0,951
@@ -14,7 +15,7 @@ pyloid/thread_pool.py,sha256=fKOBb8jMfZn_7crA_fJCno8dObBRZE31EIWaNQ759aw,14616
 pyloid/timer.py,sha256=RqMsChFUd93cxMVgkHWiIKrci0QDTBgJSTULnAtYT8M,8712
 pyloid/tray.py,sha256=D12opVEc2wc2T4tK9epaN1oOdeziScsIVNM2uCN7C-A,1710
 pyloid/utils.py,sha256=mAjuppRXlZAocggf8La00Ae0Qzi4IRL_ovG87x4wagI,3300
-pyloid-0.19.2.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
-pyloid-0.19.2.dist-info/METADATA,sha256=5LeUKevmQT5jh0iIDTg6PWcOb0XtN-9q4YszpP_QwcI,3095
-pyloid-0.19.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyloid-0.19.2.dist-info/RECORD,,
+pyloid-0.20.0.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
+pyloid-0.20.0.dist-info/METADATA,sha256=OBjfyn3s22LjbPf8wLVAbdKVnxuoJn8e8TPl84ZXOf0,3095
+pyloid-0.20.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyloid-0.20.0.dist-info/RECORD,,

pyloid/builder/build_config.json

@@ -1,27 +0,0 @@
-{
-  "name": "pyloid-app",
-  "datas": [
-    ["src-pyloid/icons/", "src-pyloid/icons/"],
-    ["dist-front/", "dist-front/"]
-  ],
-  "excludes": [
-    "PySide6.QtQml",
-    "PySide6.QtTest",
-    "PySide6.Qt3D",
-    "PySide6.QtSensors",
-    "PySide6.QtCharts",
-    "PySide6.QtGraphs",
-    "PySide6.QtDataVisualization",
-    "PySide6.QtQuick",
-    "PySide6.QtDesigner",
-    "PySide6.QtUiTools",
-    "PySide6.QtHelp"
-  ],
-  "icon": "src-pyloid/icons/icon.ico",
-  "after_build": {
-    "cleanup_patterns": [
-      "_internal/PySide*/opengl32sw.dll",
-      "_internal/PySide*/translations"
-    ]
-  }
-}