pyloid 0.20.2.dev0__tar.gz → 0.21.0.dev1__tar.gz

{pyloid-0.20.2.dev0 → pyloid-0.21.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyloid
-Version: 0.20.2.dev0
+Version: 0.21.0.dev1
 Summary: 
 Author: aesthetics-of-record
 Author-email: 111675679+aesthetics-of-record@users.noreply.github.com
@@ -11,8 +11,8 @@ 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)
+Requires-Dist: pyinstaller (>=6.12.0,<7.0.0)
+Requires-Dist: pyside6 (>=6.8.2.1,<7.0.0.0)
 Description-Content-Type: text/markdown
 
 # Pyloid 👋

{pyloid-0.20.2.dev0 → pyloid-0.21.0.dev1}/pyproject.toml

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

{pyloid-0.20.2.dev0 → pyloid-0.21.0.dev1}/src/pyloid/browser_window.py

@@ -28,15 +28,18 @@ from .custom.titlebar import CustomTitleBar
 from .js_api.window_api import WindowAPI
 from PySide6.QtGui import QPixmap, QMovie
 from PySide6.QtWidgets import QSplashScreen, QLabel
-from PySide6.QtCore import QSize
 from typing import TYPE_CHECKING
-from PySide6.QtWebEngineCore import QWebEngineSettings
+from PySide6.QtWebEngineCore import (
+    QWebEngineSettings,
+    QWebEngineDesktopMediaRequest,
+    QWebEngineUrlRequestInterceptor,
+)
+from .utils import get_production_path, is_production
 
 if TYPE_CHECKING:
     from ..pyloid import Pyloid
 
 
-# 어차피 load 부분에만 쓰이니까 나중에 분리해서 load 위에서 선언하자.
 class CustomWebPage(QWebEnginePage):
     def __init__(self, profile=None):
         super().__init__(profile)
@@ -47,11 +50,11 @@ class CustomWebPage(QWebEnginePage):
         self._url_handlers = {}  # URL 핸들러 저장을 위한 딕셔너리 추가
 
         # interceptor ( all url request )
-        self.interceptor = CustomUrlInterceptor()
-        self.profile().setUrlRequestInterceptor(self.interceptor)
+        # self.interceptor = CustomUrlInterceptor()
+        # self.profile().setUrlRequestInterceptor(self.interceptor)
 
     def _handlePermissionRequest(self, origin: QUrl, feature: QWebEnginePage.Feature):
-        print(origin, feature)
+        # print(origin, feature)
 
         """Default permission request handler"""
         if feature in self._permission_handlers:
@@ -68,37 +71,47 @@ class CustomWebPage(QWebEnginePage):
         """Register a handler for a specific permission"""
         self._permission_handlers[feature] = handler
 
-    def _handleDesktopMediaRequest(self, *args, **kwargs):
-        print("Desktop media request received:", args, kwargs)
+    def _handleDesktopMediaRequest(self, request: QWebEngineDesktopMediaRequest):
+        print("Desktop media request received:", request)
+
+        # 사용 가능한 화면 목록 확인
+        screens_model = request.screensModel()
+        print("\n=== Available Screens ===")
+        for i in range(screens_model.rowCount()):
+            screen_index = screens_model.index(i)
+            screen_name = screens_model.data(screen_index)
+            print(f"Screen {i}: {screen_name}")
+
+        # 사용 가능한 창 목록 확인
+        windows_model = request.windowsModel()
+        print("\n=== Available Windows ===")
+        for i in range(windows_model.rowCount()):
+            window_index = windows_model.index(i)
+            window_name = windows_model.data(window_index)
+            print(f"Window {i}: {window_name}")
+
+        request.selectWindow(windows_model.index(3))
 
     # interceptor ( navigation request )
     def acceptNavigationRequest(self, url, navigation_type, is_main_frame):
         """네비게이션 요청을 처리하는 메서드"""
-        print(f"Navigation Request - URL: {url.toString()}")
+        url_string = url.toString()
+        print(f"Navigation Request - URL: {url_string}")
         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
+        # file:// 프로토콜 처리
+        if url.scheme() == "file":
+            # 파일 경로에서 file:/// 제거
+            file_path = url_string.replace("file:///", "").rstrip("/")
 
-        return True
+            # HTML 파일이 아닌 경우에만 index.html로 리다이렉트
+            if not file_path.endswith(".html"):
+                base_path = os.path.dirname(file_path)
+                self.setUrl(QUrl.fromLocalFile(os.path.join(base_path, "index.html")))
+                return False
 
-    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
+        return True
 
 
 # interceptor ( all url request )
@@ -108,6 +121,50 @@ class CustomUrlInterceptor(QWebEngineUrlRequestInterceptor):
         print(url)
 
 
+# class CustomInterceptor(QWebEngineUrlRequestInterceptor):
+#     def __init__(self, index_path=None):
+#         super().__init__()
+#         self.index_path = get_production_path()
+#         self.last_path = "/"
+
+#     def interceptRequest(self, info):
+#         url = info.requestUrl()
+#         navigation_type = info.navigationType()
+
+#         print("--------------------------------")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeTyped:
+#             print("NavigationTypeTyped")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeReload:
+#             print("NavigationTypeReload")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeBackForward:
+#             print("NavigationTypeBackForward")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeLinkClicked:
+#             print("NavigationTypeLinkClicked")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeFormSubmitted:
+#             print("NavigationTypeFormSubmitted")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeTyped:
+#             print("NavigationTypeTyped")
+
+#         if navigation_type == QWebEnginePage.NavigationType.NavigationTypeOther:
+#             print("NavigationTypeOther")
+
+#         print(navigation_type.value)
+
+#         print(url)
+#         print(url.scheme())
+#         print(url.host())
+#         print(url.url())
+#         print(self.last_path)
+
+#         self.last_path = url.path()
+
+
 class CustomWebEngineView(QWebEngineView):
     def __init__(self, parent: "BrowserWindow" = None):
         super().__init__(parent._window)
@@ -433,6 +490,13 @@ class BrowserWindow:
         # Set F12 shortcut
         self.set_dev_tools(self.dev_tools)
 
+        # 프로필 가져오기 및 인터셉터 설정
+        profile = self.web_view.page().profile()
+
+        # # 기존 인터셉터가 있다면 제거
+        # if self.interceptor:
+        #     profile.setUrlRequestInterceptor(None)
+
     def _on_load_finished(self, ok):
         """Handles the event when the web page finishes loading."""
         if ok and self.js_apis:

{pyloid-0.20.2.dev0 → pyloid-0.21.0.dev1}/src/pyloid/builder/spec.py

@@ -2,27 +2,30 @@ 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:
+    with open(json_path, "r", encoding="utf-8") as f:
         config = json.load(f)
 
     os_type = get_platform()
-    
-    if os_type == 'macos':
+
+    if os_type == "macos":
         spec_content = _create_macos_spec(config)
-    elif os_type == 'linux':
+    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')
-    
+    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')
-    
+    bundle_type = config.get("bundle", {}).get("windows", "directory")
+    console = config.get("console", False)
+
     base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
@@ -47,8 +50,10 @@ pyz = PYZ(a.pure, a.zipped_data,
           cipher=block_cipher)
 """
 
-    if bundle_type == 'onefile':
-        return base_spec + f"""
+    if bundle_type == "onefile":
+        return (
+            base_spec
+            + f"""
 exe = EXE(
     pyz,
     a.scripts,
@@ -63,7 +68,7 @@ exe = EXE(
     upx=True,
     upx_exclude=[],
     runtime_tmpdir=None,
-    console=False,
+    console={console},
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
@@ -72,8 +77,11 @@ exe = EXE(
     icon='{config.get('icon', 'src-pyloid/icons/icon.ico')}'
 )
 """
+        )
     else:
-        return base_spec + f"""
+        return (
+            base_spec
+            + f"""
 exe = EXE(
     pyz,
     a.scripts,
@@ -84,7 +92,7 @@ exe = EXE(
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
-    console=False,
+    console={console},
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
@@ -104,8 +112,11 @@ coll = COLLECT(
     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(
@@ -134,7 +145,7 @@ exe = EXE(
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
-    console=False,
+    console={console},
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
@@ -161,9 +172,11 @@ app = BUNDLE(
 )
 """
 
+
 def _create_linux_spec(config):
-    bundle_type = config.get('bundle', {}).get('linux', 'directory')
-    
+    bundle_type = config.get("bundle", {}).get("linux", "directory")
+    console = config.get("console", False)
+
     base_spec = f"""# -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
@@ -188,8 +201,10 @@ pyz = PYZ(a.pure, a.zipped_data,
           cipher=block_cipher)
 """
 
-    if bundle_type == 'onefile':
-        return base_spec + f"""
+    if bundle_type == "onefile":
+        return (
+            base_spec
+            + f"""
 exe = EXE(
     pyz,
     a.scripts,
@@ -204,7 +219,7 @@ exe = EXE(
     upx=True,
     upx_exclude=[],
     runtime_tmpdir=None,
-    console=False,
+    console={console},
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
@@ -213,8 +228,11 @@ exe = EXE(
     icon='{config.get('icon', 'src-pyloid/icons/icon.png')}'
 )
 """
+        )
     else:
-        return base_spec + f"""
+        return (
+            base_spec
+            + f"""
 exe = EXE(
     pyz,
     a.scripts,
@@ -225,7 +243,7 @@ exe = EXE(
     bootloader_ignore_signals=False,
     strip=False,
     upx=True,
-    console=False,
+    console={console},
     disable_windowed_traceback=False,
     argv_emulation=False,
     target_arch=None,
@@ -244,4 +262,5 @@ coll = COLLECT(
     upx_exclude=[],
     name='{config.get("name", "pyloid-app")}'
 )
-"""
+"""
+        )