pyloid 0.18.2__tar.gz → 0.20.2.dev2__tar.gz

{pyloid-0.18.2 → pyloid-0.20.2.dev2}/LICENSE

@@ -198,4 +198,4 @@ Apache License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

{pyloid-0.18.2 → pyloid-0.20.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyloid
-Version: 0.18.2
+Version: 0.20.2.dev2
 Summary: 
 Author: aesthetics-of-record
 Author-email: 111675679+aesthetics-of-record@users.noreply.github.com
@@ -10,6 +10,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: pyinstaller (>=6.11.1,<7.0.0)
 Requires-Dist: pyside6 (>=6.8.1,<7.0.0)
 Description-Content-Type: text/markdown
 
@@ -85,7 +87,7 @@ This project uses PySide6, which is licensed under the LGPL (Lesser General Publ
 
 ## Contributing 🤝
 
-(Add information about how to contribute here)
+Not Yet
 
 ## Issues
 

{pyloid-0.18.2 → pyloid-0.20.2.dev2}/README.md

@@ -70,7 +70,7 @@ This project uses PySide6, which is licensed under the LGPL (Lesser General Publ
 
 ## Contributing 🤝
 
-(Add information about how to contribute here)
+Not Yet
 
 ## Issues
 

{pyloid-0.18.2 → pyloid-0.20.2.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyloid"
-version = "0.18.2"
+version = "0.20.2-dev2"
 description = ""
 authors = ["aesthetics-of-record <111675679+aesthetics-of-record@users.noreply.github.com>"]
 readme = "README.md"
@@ -11,6 +11,7 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.9,<3.14"
 pyside6 = "^6.8.1"
+pyinstaller = "^6.11.1"
 
 
 [build-system]

pyloid-0.20.2.dev2/src/pyloid/__init__.py

@@ -0,0 +1,8 @@
+from .pyloid import Pyloid
+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_before_build, create_spec_from_json, get_site_packages
+
+__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.18.2 → pyloid-0.20.2.dev2}/src/pyloid/browser_window.py

@@ -11,7 +11,11 @@ from PySide6.QtGui import (
     QCursor,
 )
 from PySide6.QtCore import Qt, QPoint, QUrl, QEvent, QFile
-from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings
+from PySide6.QtWebEngineCore import (
+    QWebEnginePage,
+    QWebEngineSettings,
+    QWebEngineUrlRequestInterceptor,
+)
 from .api import PyloidAPI
 import uuid
 from typing import List, Optional, Dict, Callable
@@ -40,10 +44,15 @@ class CustomWebPage(QWebEnginePage):
         self.desktopMediaRequested.connect(self._handleDesktopMediaRequest)
         self._permission_handlers = {}
         self._desktop_media_handler = None
+        self._url_handlers = {}  # URL 핸들러 저장을 위한 딕셔너리 추가
+
+        # interceptor ( all url request )
+        self.interceptor = CustomUrlInterceptor()
+        self.profile().setUrlRequestInterceptor(self.interceptor)
 
     def _handlePermissionRequest(self, origin: QUrl, feature: QWebEnginePage.Feature):
         print(origin, feature)
-        
+
         """Default permission request handler"""
         if feature in self._permission_handlers:
             # Execute if a handler is registered
@@ -62,9 +71,41 @@ class CustomWebPage(QWebEnginePage):
     def _handleDesktopMediaRequest(self, *args, **kwargs):
         print("Desktop media request received:", args, kwargs)
 
-    # def setDesktopMediaHandler(self, handler):
-    #     """desktop media handler"""
-    #     self._desktop_media_handler = handler
+    # interceptor ( navigation request )
+    def acceptNavigationRequest(self, url, navigation_type, is_main_frame):
+        """네비게이션 요청을 처리하는 메서드"""
+        print(f"Navigation Request - URL: {url.toString()}")
+        print(f"Navigation Type: {navigation_type}")
+        print(f"Is Main Frame: {is_main_frame}")
+
+        # # URL이 구글이 아닐 경우에만 구글로 리다이렉트
+        # if "example.com" not in url.toString():
+        #     self.setUrl(QUrl("https://www.example.com"))
+        #     return False
+
+        return True
+
+    def add_url_handler(self, pattern: str, handler):
+        """URL 패턴에 대한 핸들러 등록
+
+        Parameters:
+        -----------
+        pattern : str
+            정규표현식 패턴
+        handler : callable
+            URL을 인자로 받고 bool을 반환해야 함
+            True를 반환하면 네비게이션을 허용, False를 반환하면 차단
+        """
+        import re
+
+        self._url_handlers[re.compile(pattern)] = handler
+
+
+# interceptor ( all url request )
+class CustomUrlInterceptor(QWebEngineUrlRequestInterceptor):
+    def interceptRequest(self, info):
+        url = info.requestUrl().toString()
+        print(url)
 
 
 class CustomWebEngineView(QWebEngineView):
@@ -81,15 +122,15 @@ class CustomWebEngineView(QWebEngineView):
         self.resize_direction = None
         self.screen_geometry = self.screen().virtualGeometry()
         self.is_resizing_enabled = True
-        
+
         self.setAttribute(Qt.WA_SetCursor, False)
-        
+
         self.is_in_resize_area = False
 
     def mouse_press_event(self, event):
         if self.parent.frame or not self.is_resizing_enabled:
             return
-        
+
         if event.button() == Qt.LeftButton:
             self.resize_direction = self.get_resize_direction(event.pos())
             if self.resize_direction:
@@ -104,19 +145,19 @@ class CustomWebEngineView(QWebEngineView):
     def mouse_move_event(self, event):
         if self.parent.frame or not self.is_resizing_enabled:
             return
-        
+
         # Check resize direction
         was_in_resize_area = self.is_in_resize_area
         resize_direction = self.get_resize_direction(event.pos())
         self.is_in_resize_area = bool(resize_direction)
-        
+
         if resize_direction and not self.is_resizing:
             self.set_cursor_for_resize_direction(resize_direction)
-            
+
         if self.is_resizing:
             self.resize_window(event.globalPos())
             return
-            
+
         # Change cursor when entering/leaving resize area
         if self.is_in_resize_area != was_in_resize_area:
             if self.is_in_resize_area:
@@ -129,12 +170,12 @@ class CustomWebEngineView(QWebEngineView):
     def mouse_release_event(self, event):
         if self.parent.frame or not self.is_resizing_enabled:
             return
-        
+
         if event.button() == Qt.LeftButton:
             self.is_resizing = False
-            
+
             if self.resize_direction:
-                self.unsetCursor()     
+                self.unsetCursor()
                 self.resize_direction = None
 
             self.setAttribute(Qt.WA_SetCursor, False)
@@ -181,7 +222,7 @@ class CustomWebEngineView(QWebEngineView):
                 cursor = Qt.SizeFDiagCursor
             elif direction in ["right-top", "left-bottom"]:
                 cursor = Qt.SizeBDiagCursor
-                
+
             if cursor:
                 self.setCursor(cursor)
                 self.setAttribute(Qt.WA_SetCursor, True)
@@ -378,7 +419,7 @@ class BrowserWindow:
                 js_api.window_id = self.id
                 js_api.window = self
                 js_api.app = self.app
-                
+
                 self.channel.registerObject(js_api.__class__.__name__, js_api)
 
         self.web_view.page().setWebChannel(self.channel)
@@ -1887,12 +1928,12 @@ class BrowserWindow:
     def set_desktop_media_handler(self, handler):
         """
         데스크톱 미디어(화면/윈도우) 선택 핸들러를 설정합니다.
-        
+
         Parameters
         ----------
         handler : callable
-            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest��� 인자로 받습니다.
-            
+            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest 인자로 받습니다.
+
         Examples
         --------
         ```python
@@ -1900,15 +1941,15 @@ class BrowserWindow:
             # 사용 가능한 화면 목록 출력
             for screen in request.screenList():
                 print(f"Screen: {screen.name}")
-            
+
             # 사용 가능한 윈도우 목록 출력
             for window in request.windowList():
                 print(f"Window: {window.name}")
-                
+
             # 첫 번째 화면 선택
             if request.screenList():
                 request.selectScreen(request.screenList()[0])
-            
+
         window.set_desktop_media_handler(custom_media_handler)
         ```
         """

pyloid-0.20.2.dev2/src/pyloid/builder/__init__.py

@@ -0,0 +1,81 @@
+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}")
+
+        print("\033[1;34mCleaning up unnecessary files...\033[0m")
+        exclude_patterns = [p[1:] for p in cleanup_patterns if p.startswith('!')]
+        include_patterns = [p for p in cleanup_patterns if not p.startswith('!')]  
+        
+        for pattern in include_patterns:
+            matching_files = list(dist_dir.glob(pattern))
+            for file_path in matching_files:
+                if any(file_path.match(p) for p in exclude_patterns):
+                    print(f"\033[33mSkipping: {file_path}\033[0m")
+                    continue
+                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.2.dev2/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.20.2.dev2/src/pyloid/builder/spec.py

@@ -0,0 +1,266 @@
+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")
+    console = config.get("console", False)
+
+    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={console},
+    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={console},
+    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):
+    console = config.get("console", False)
+    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={console},
+    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")
+    console = config.get("console", False)
+
+    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={console},
+    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={console},
+    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.18.2 → pyloid-0.20.2.dev2}/src/pyloid/utils.py

@@ -25,17 +25,20 @@ def get_production_path(path: Optional[str] = None) -> Optional[str]:
     >>>     print("Not in a production environment.")
     """
     if is_production():
-        # Nuitka
         if hasattr(sys, '_MEIPASS'):
             # PyInstaller
             base_path = sys._MEIPASS
         else:
-            # Nuitka의 경우 실행 파일이 있는 디렉토리를 기준으로 함
-            base_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+            # Nuitka
+            base_path = os.path.dirname(sys.executable)
+
+            if base_path is None:
+                # 환경변수가 없는 경우 실행 파일 디렉토리 사용
+                base_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
         
         return os.path.join(base_path, path) if path else base_path
     else:
-        # 일반 Python 스크립트로 실행 중일 때
         return None
 
 
@@ -71,19 +74,28 @@ def get_platform() -> str:
 
     Returns
     -------
-    "Windows" | "Darwin" | "Linux"
-        - "Windows" for Windows systems
-        - "Darwin" for macOS systems
-        - "Linux" for Linux systems
+    "windows" | "macos" | "linux"
+        - "windows" for Windows systems
+        - "macos" for macOS systems
+        - "linux" for Linux systems
 
     Examples
     --------
     >>> from pyloid.utils import get_platform
     >>> platform_name = get_platform()
     >>> print(platform_name)
-    Windows
+    windows
     """
-    return platform.system()
+    os_name = platform.system().lower()
+    os_type = {
+        'darwin': 'macos',
+        'linux': 'linux',
+        'windows': 'windows'
+    }.get(os_name)
+    if os_type is None:
+        raise ValueError(f"Unsupported platform: {os_name}")
+    
+    return os_type
 
 def get_absolute_path(path: str) -> str:
     """

pyloid-0.18.2/src/pyloid/__init__.py

@@ -1,7 +0,0 @@
-from .pyloid import Pyloid
-from .api import PyloidAPI, Bridge
-from .utils import get_production_path, is_production
-from .tray import TrayEvent
-from .timer import PyloidTimer
-
-__all__ = ['Pyloid', 'PyloidAPI', 'Bridge', 'get_production_path', 'is_production', 'TrayEvent', 'PyloidTimer']