pyloid 0.20.1.dev2__tar.gz → 0.20.2.dev0__tar.gz

{pyloid-0.20.1.dev2 → pyloid-0.20.2.dev0}/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.20.1.dev2 → pyloid-0.20.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyloid
-Version: 0.20.1.dev2
+Version: 0.20.2.dev0
 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
 

{pyloid-0.20.1.dev2 → pyloid-0.20.2.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyloid"
-version = "0.20.1-dev2"
+version = "0.20.2-dev"
 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.1.dev2 → pyloid-0.20.2.dev0}/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
@@ -26,8 +30,7 @@ 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, QWebEngineUrlRequestInterceptor
-from .utils import get_production_path, is_production
+from PySide6.QtWebEngineCore import QWebEngineSettings
 
 if TYPE_CHECKING:
     from ..pyloid import Pyloid
@@ -41,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
@@ -63,52 +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
+
 
-class CustomInterceptor(QWebEngineUrlRequestInterceptor):
-    def __init__(self, index_path=None):
-        super().__init__()
-        self.index_path = get_production_path()
-        self.last_path = "/"
-        
+# interceptor ( all url request )
+class CustomUrlInterceptor(QWebEngineUrlRequestInterceptor):
     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)
-        
+        url = info.requestUrl().toString()
         print(url)
-        print(url.scheme())
-        print(url.host())
-        print(url.url())
-        print(self.last_path)
-        
-        self.last_path = url.path()
 
 
 class CustomWebEngineView(QWebEngineView):
@@ -125,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:
@@ -148,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:
@@ -173,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)
@@ -225,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)
@@ -422,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)
@@ -435,17 +432,6 @@ class BrowserWindow:
 
         # Set F12 shortcut
         self.set_dev_tools(self.dev_tools)
-        
-        # 프로필 가져오기 및 인터셉터 설정
-        profile = self.web_view.page().profile()
-        
-        # # 기존 인터셉터가 있다면 제거
-        # if self.interceptor:
-        #     profile.setUrlRequestInterceptor(None)
-            
-        # 새 인터셉터 설정
-        self.interceptor = CustomInterceptor()
-        profile.setUrlRequestInterceptor(self.interceptor)
 
     def _on_load_finished(self, ok):
         """Handles the event when the web page finishes loading."""
@@ -1942,12 +1928,12 @@ class BrowserWindow:
     def set_desktop_media_handler(self, handler):
         """
         데스크톱 미디어(화면/윈도우) 선택 핸들러를 설정합니다.
-        
+
         Parameters
         ----------
         handler : callable
-            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest��� 인자로 받습니다.
-            
+            요청을 처리할 핸들러 함수. QWebEngineDesktopMediaRequest 인자로 받습니다.
+
         Examples
         --------
         ```python
@@ -1955,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.1.dev2 → pyloid-0.20.2.dev0}/src/pyloid/builder/spec.py

@@ -210,7 +210,7 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon={config.get('icon', 'src-pyloid/icons/icon.png')}
+    icon='{config.get('icon', 'src-pyloid/icons/icon.png')}'
 )
 """
     else:
@@ -231,7 +231,7 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon={config.get('icon', 'src-pyloid/icons/icon.png')}
+    icon='{config.get('icon', 'src-pyloid/icons/icon.png')}'
 )
 
 coll = COLLECT(