pyloid 0.19.2__tar.gz → 0.20.0__tar.gz

{pyloid-0.19.2 → pyloid-0.20.0}/PKG-INFO

@@ -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 → pyloid-0.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyloid"
-version = "0.19.2"
+version = "0.20.0"
 description = ""
 authors = ["aesthetics-of-record <111675679+aesthetics-of-record@users.noreply.github.com>"]
 readme = "README.md"

{pyloid-0.19.2 → pyloid-0.20.0}/src/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-0.20.0/src/pyloid/builder/__init__.py

@@ -0,0 +1,80 @@
+import json
+from pathlib import Path
+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 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('before_build', {}).get('cleanup_patterns', [])
+        if not cleanup_patterns:
+            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'{site_packages}')
+        if not dist_dir.exists():
+            raise Exception(f"Cannot find directory to clean: {dist_dir}")
+
+        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("\033[1;32mFile cleanup completed.\033[0m")
+        
+    except Exception as e:
+        raise Exception(f"\033[1;31mError occurred during file cleanup: {e}\033[0m")
+
+def build_from_spec(spec_path):
+    try:
+        pyinstaller_run([
+            '--clean',  # Clean temporary files
+            spec_path   # Spec file path
+        ])
+        print("Build completed.")
+    
+    except Exception as e:
+        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')
+    
+    cleanup_before_build('build_config.json')
+    
+    # build_from_spec(spec_path)
+    
+    
+    
+if __name__ == "__main__":
+    main()

pyloid-0.20.0/src/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-0.19.2/src/pyloid/builder/__init__.py → pyloid-0.20.0/src/pyloid/builder/spec.py

@@ -1,20 +1,13 @@
+from pyloid.utils import get_platform
 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
-
 
 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':
@@ -22,14 +15,15 @@ def create_spec_from_json(json_path):
     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 -*-
+    bundle_type = config.get('bundle', {}).get('windows', 'directory')
+    
+    base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
 
@@ -51,7 +45,35 @@ a = Analysis(
 
 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,
@@ -140,7 +162,9 @@ app = BUNDLE(
 """
 
 def _create_linux_spec(config):
-    return f"""# -*- mode: python ; coding: utf-8 -*-
+    bundle_type = config.get('bundle', {}).get('linux', 'directory')
+    
+    base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
 
@@ -162,7 +186,35 @@ a = Analysis(
 
 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,
@@ -192,58 +244,4 @@ coll = COLLECT(
     upx_exclude=[],
     name='{config.get("name", "pyloid-app")}'
 )
-"""
-
-def cleanup_after_build(json_path):
-    """Function to clean up unnecessary files after 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', [])
-        if not cleanup_patterns:
-            return True
-            
-        dist_dir = Path(f'dist/{config.get("name", "pyloid-app")}')
-        if not dist_dir.exists():
-            print(f"Cannot find directory to clean: {dist_dir}")
-            return False
-
-        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}")
-                
-        print("File cleanup completed.")
-        return True
-        
-    except Exception as e:
-        print(f"Error occurred during file cleanup: {e}")
-        return False
-
-def build_from_spec(spec_path):
-    try:
-        pyinstaller_run([
-            '--clean',  # Clean temporary files
-            spec_path   # Spec file path
-        ])
-        print("Build completed.")
-    
-        return True
-    except Exception as e:
-        print(f"Error occurred during build: {e}")
-        return False
-
-def main():
-    spec_path = create_spec_from_json('build_config.json')
-    
-    build_from_spec(spec_path)
-    
-    cleanup_after_build('build_config.json')
-    
-if __name__ == "__main__":
-    main()
+"""

pyloid-0.19.2/src/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"
-    ]
-  }
-}