je-editor 0.0.202__py3-none-any.whl → 0.0.228__py3-none-any.whl

je_editor/pyside_ui/browser/browser_view.py

@@ -1,8 +1,12 @@
-import pathlib
-from typing import List
+from __future__ import annotations
+
+from typing import List, TYPE_CHECKING
+
+from PySide6.QtCore import Signal
+
+if TYPE_CHECKING:
+    from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 
-from PySide6.QtCore import Qt
-from PySide6.QtNetwork import QNetworkCookie
 from PySide6.QtWebEngineCore import QWebEngineDownloadRequest
 from PySide6.QtWebEngineWidgets import QWebEngineView
 
@@ -11,28 +15,73 @@ from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 
 class BrowserView(QWebEngineView):
+    new_tab_requested = Signal(QWebEngineView)
+    """
+    A custom QWebEngineView that supports file downloads and manages download windows.
+    自訂的 QWebEngineView，支援檔案下載並管理下載視窗。
+    """
 
-    def __init__(self, start_url: str = "https://www.google.com/"):
-        super().__init__()
+    def __init__(self, start_url: str = "https://www.google.com/",
+                 main_widget: BrowserWidget = None, parent=None):
+        """
+        Initialize the browser view with a start URL.
+        使用指定的起始網址初始化瀏覽器視圖。
+        """
+        super().__init__(parent)
+        # 記錄初始化訊息
         jeditor_logger.info("Init BrowserView "
                             f"start_url: {start_url}")
+
+        # 設定初始網址
         self.setUrl(start_url)
+
+        # 儲存下載請求的清單
         self.download_list: List[QWebEngineDownloadRequest] = list()
+
+        # 儲存下載視窗的清單
         self.download_window_list: List[BrowserDownloadWindow] = list()
+
+        # 綁定下載事件：當有下載請求時觸發 download_file
         self.page().profile().downloadRequested.connect(self.download_file)
 
+        self.main_widget = main_widget
+
     def download_file(self, download_instance: QWebEngineDownloadRequest):
+        """
+        Handle a new download request.
+        當有新的下載請求時觸發：
+        - 將下載請求加入清單
+        - 建立並顯示下載細節視窗
+        """
         jeditor_logger.info("Download File "
                             f"download_instance: {download_instance}")
+
+        # 加入下載請求到清單
         self.download_list.append(download_instance)
+
+        # 建立下載細節視窗
         download_detail_window = BrowserDownloadWindow(download_instance)
+
+        # 加入視窗到清單並顯示
         self.download_window_list.append(download_detail_window)
         download_detail_window.show()
 
     def closeEvent(self, event) -> None:
+        """
+        Handle the close event of the browser view.
+        當瀏覽器視窗關閉時：
+        - 取消所有進行中的下載
+        - 關閉所有下載細節視窗
+        """
         jeditor_logger.info(f"BrowserView closeEvent event: {event}")
+
+        # 取消所有下載
         for download_instance in self.download_list:
             download_instance.cancel()
+
+        # 關閉所有下載視窗
         for download_window in self.download_window_list:
             download_window.close()
+
+        # 呼叫父類別的 closeEvent，確保正常關閉
         super().closeEvent(event)

je_editor/pyside_ui/browser/browser_widget.py

@@ -1,60 +1,103 @@
-from PySide6.QtGui import QAction, Qt
-from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton, QInputDialog
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from je_editor.pyside_ui.browser.main_browser_widget import MainBrowserWidget
+
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QWidget, QPushButton, QGridLayout, QInputDialog
 
 from je_editor.pyside_ui.browser.browser_serach_lineedit import BrowserLineSearch
-from je_editor.pyside_ui.browser.browser_view import BrowserView
 from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 
+from je_editor.pyside_ui.browser.browser_view import BrowserView
 
-class BrowserWidget(QWidget):
 
+class BrowserWidget(QWidget):
     def __init__(self, start_url: str = "https://www.google.com/",
-                 search_prefix: str = "https://www.google.com.tw/search?q="):
+                 search_prefix: str = "https://www.google.com.tw/search?q=",
+                 main_widget: MainBrowserWidget = None, browser_view: BrowserView = None):
+        # --- Browser setting / 瀏覽器設定 ---
         super().__init__()
-        jeditor_logger.info("Init BrowserWidget "
-                            f"start_url: {start_url} "
-                            f"search_prefix: {search_prefix}")
-        # Browser setting
-        self.browser = BrowserView(start_url)
-        self.search_prefix = search_prefix
-        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
-        # Top bar
+        self.main_widget = main_widget
+        if browser_view:
+            self.browser = browser_view
+        else:
+            # 建立內嵌的瀏覽器視圖
+            # Create embedded browser view
+            self.browser = BrowserView(start_url, main_widget=main_widget)
+        self.search_prefix = search_prefix  # 搜尋引擎前綴字串 / Search engine prefix
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)  # 視窗關閉時釋放資源 / Free resources on close
+
+        # --- Top bar buttons / 上方工具列按鈕 ---
+        # 返回上一頁 / Back button
         self.back_button = QPushButton(language_wrapper.language_word_dict.get("browser_back_button"))
         self.back_button.clicked.connect(self.browser.back)
+
+        # 前往下一頁 / Forward button
         self.forward_button = QPushButton(language_wrapper.language_word_dict.get("browser_forward_button"))
         self.forward_button.clicked.connect(self.browser.forward)
+
+        # 重新整理 / Reload button
         self.reload_button = QPushButton(language_wrapper.language_word_dict.get("browser_reload_button"))
         self.reload_button.clicked.connect(self.browser.reload)
+
+        # 搜尋按鈕 / Search button
         self.search_button = QPushButton(language_wrapper.language_word_dict.get("browser_search_button"))
         self.search_button.clicked.connect(self.search)
+
+        # URL / Search input line (自訂義 QLineEdit)
+        # Custom QLineEdit for URL or search input
         self.url_input = BrowserLineSearch(self)
-        # Action
+
+        # --- Action: Ctrl+F to find text / 快捷鍵 Ctrl+F 搜尋文字 ---
         self.find_action = QAction()
-        self.find_action.setShortcut("Ctrl+f")
-        self.find_action.triggered.connect(self.find_text)
+        self.find_action.setShortcut("Ctrl+f")  # 設定快捷鍵 / Set shortcut
+        self.find_action.triggered.connect(self.find_text)  # 綁定搜尋文字功能 / Connect to find_text
         self.addAction(self.find_action)
-        # Layout
+
+        # --- Layout / 版面配置 ---
         self.grid_layout = QGridLayout()
         self.grid_layout.addWidget(self.back_button, 0, 0)
         self.grid_layout.addWidget(self.forward_button, 0, 1)
         self.grid_layout.addWidget(self.reload_button, 0, 2)
         self.grid_layout.addWidget(self.url_input, 0, 3)
         self.grid_layout.addWidget(self.search_button, 0, 4)
+        # 瀏覽器視圖佔滿下方所有空間
+        # Browser view fills the lower area
         self.grid_layout.addWidget(self.browser, 1, 0, -1, -1)
         self.setLayout(self.grid_layout)
 
     def search(self):
+        """
+        Perform a search using the text in the input line.
+        使用輸入框的文字進行搜尋，將字串附加到 search_prefix 後送出。
+        """
         jeditor_logger.info("BrowserWidget Search")
+        # 將輸入框文字拼接到搜尋前綴，並設定為瀏覽器 URL
+        # Append input text to search prefix and set as browser URL
         self.browser.setUrl(f"{self.search_prefix}{self.url_input.text()}")
 
     def find_text(self):
+        """
+        Open a dialog to find text in the current page.
+        開啟輸入對話框，在當前頁面中搜尋文字。
+        - 如果按下 OK，搜尋輸入的文字
+        - 如果取消，清除搜尋
+        """
         jeditor_logger.info("BrowserWidget Find Text")
         search_box = QInputDialog(self)
         search_text, press_ok = search_box.getText(
-            self, language_wrapper.language_word_dict.get("browser_find_text"),
-            language_wrapper.language_word_dict.get("browser_find_text_input"))
+            self,
+            language_wrapper.language_word_dict.get("browser_find_text"),
+            language_wrapper.language_word_dict.get("browser_find_text_input")
+        )
         if press_ok:
+            # 在頁面中搜尋輸入文字 / Search entered text in page
             self.browser.findText(search_text)
         else:
+            # 清除搜尋結果 / Clear search
             self.browser.findText("")

je_editor/pyside_ui/browser/main_browser_widget.py

@@ -0,0 +1,85 @@
+from PySide6.QtWidgets import QWidget, QGridLayout, QTabWidget, QTabBar
+
+from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
+from je_editor.utils.logging.loggin_instance import jeditor_logger
+
+
+class MainBrowserWidget(QWidget):
+    """
+    瀏覽器元件：包含分頁，並在最右方固定一個「+」分頁。
+    Browser component: includes tabs, with a fixed "+" tab at the far right.
+    """
+
+    def __init__(self, start_url: str = "https://www.google.com/",
+                 search_prefix: str = "https://www.google.com.tw/search?q="):
+        super().__init__()
+        # 初始化時記錄訊息 (方便除錯)
+        # Log initialization info (for debugging)
+        jeditor_logger.info("Init BrowserWidget "
+                            f"start_url: {start_url} "
+                            f"search_prefix: {search_prefix}")
+
+        grid_layout = QGridLayout()  # 建立網格佈局 / Create grid layout
+
+        self.browser_tab = QTabWidget()  # 建立分頁容器 / Create tab widget
+        self.browser_tab.setTabsClosable(True)  # 分頁可關閉 / Tabs can be closed
+        self.browser_tab.tabCloseRequested.connect(self.close_tab)  # 綁定關閉事件 / Connect close event
+
+        self.search_prefix = search_prefix  # 搜尋前綴字串 / Search prefix string
+
+        # 預設第一個分頁 (Google)
+        # Default first tab (Google)
+        self.add_browser_tab(
+            BrowserWidget(start_url=start_url, search_prefix=search_prefix), "Google"
+        )
+
+        # 固定一個「+」分頁
+        # Add a fixed "+" tab
+        self.add_plus_tab()
+
+        grid_layout.addWidget(self.browser_tab)  # 把分頁加入佈局 / Add tab widget to layout
+        self.setLayout(grid_layout)  # 設定主視窗佈局 / Set main layout
+
+    def add_browser_tab(self, browser_widget: BrowserWidget, title: str = "New Tab"):
+        # 在「+」分頁前插入新分頁
+        # Insert new tab before the "+" tab
+        plus_index = self.browser_tab.count() - 1
+        index = self.browser_tab.insertTab(plus_index, browser_widget, title)
+        self.browser_tab.setCurrentIndex(index)  # 自動切換到新分頁 / Switch to new tab
+
+        # 更新分頁標題 (當網頁標題改變時)
+        # Update tab title when browser title changes
+        browser_widget.browser.titleChanged.connect(
+            lambda t, i=index: self.browser_tab.setTabText(i, t)
+        )
+
+    def add_plus_tab(self):
+        """新增一個固定的「+」分頁 / Add a fixed "+" tab"""
+        add_new_page_widget = QWidget()
+        self.browser_tab.addTab(add_new_page_widget, "+")
+        # 禁止關閉「+」分頁 / Disable closing of "+" tab
+        self.browser_tab.tabBar().setTabButton(self.browser_tab.count() - 1,
+                                               QTabBar.ButtonPosition.RightSide, None)
+        # 點擊分頁時觸發事件 / Connect tab click event
+        self.browser_tab.tabBar().tabBarClicked.connect(self.handle_tab_changed)
+
+    def handle_tab_changed(self, index: int):
+        """如果點到「+」分頁，就開新分頁
+        If "+" tab is clicked, open a new tab
+        """
+        if self.browser_tab.tabText(index) == "+":  # 檢查是否為「+」分頁 / Check if "+" tab
+            # 建立新分頁（會自動切換到新分頁）
+            # Create a new tab (auto switch to it)
+            self.add_browser_tab(
+                BrowserWidget(start_url="https://www.google.com/",
+                              search_prefix=self.search_prefix),
+                "Google"
+            )
+
+    def close_tab(self, index: int):
+        """關閉指定分頁，但保留「+」
+        Close the specified tab, but keep the "+"
+        """
+        widget = self.browser_tab.widget(index)  # 取得要關閉的分頁元件 / Get tab widget
+        self.browser_tab.removeTab(index)  # 移除分頁 / Remove tab
+        widget.deleteLater()  # 釋放資源 / Free memory

je_editor/pyside_ui/code/auto_save/auto_save_manager.py

@@ -5,24 +5,56 @@ from typing import TYPE_CHECKING
 from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 if TYPE_CHECKING:
+    # 僅在型別檢查時匯入，避免循環匯入問題
+    # Import only for type checking, prevents circular imports
     from je_editor.pyside_ui.main_ui.main_editor import EditorWidget
 
 from je_editor.pyside_ui.code.auto_save.auto_save_thread import CodeEditSaveThread
 
+# --- 全域管理字典 / Global manager dictionaries ---
+
+# 管理每個檔案對應的自動儲存執行緒
+# Manage auto-save threads for each file
 auto_save_manager_dict: dict = dict()
 
+# 管理檔案是否已經開啟
+# Track whether a file is currently open
 file_is_open_manager_dict: dict = dict()
 
 
 def init_new_auto_save_thread(file_path: str, widget: EditorWidget):
+    """
+    初始化新的自動儲存執行緒
+    Initialize a new auto-save thread for the given file and editor widget.
+
+    :param file_path: 檔案路徑 / Path of the file to be auto-saved
+    :param widget: 編輯器元件 / Editor widget instance
+    """
+    # 記錄初始化訊息 (方便除錯)
+    # Log initialization info (for debugging)
     jeditor_logger.info(f"auto_save_manager.py init_new_auto_save_thread "
                         f"file_path: {file_path} "
                         f"widget: {widget}")
+
+    # 將目前編輯器綁定的檔案設為 file_path
+    # Set the current file of the editor widget
     widget.current_file = file_path
+
+    # 如果該檔案尚未有自動儲存執行緒
+    # If no auto-save thread exists for this file
     if auto_save_manager_dict.get(file_path, None) is None:
+        # 建立新的自動儲存執行緒，綁定到編輯器
+        # Create a new auto-save thread for this file
         widget.code_save_thread = CodeEditSaveThread(
-            file_to_save=widget.current_file, editor=widget.code_edit)
+            file_to_save=widget.current_file, editor=widget.code_edit
+        )
+
+        # 更新管理字典，記錄該檔案對應的執行緒
+        # Update manager dict with the new thread
         auto_save_manager_dict.update({
             file_path: widget.code_save_thread
         })
+
+        # 啟動自動儲存執行緒
+        # Start the auto-save thread
         widget.code_save_thread.start()

je_editor/pyside_ui/code/auto_save/auto_save_thread.py

@@ -14,8 +14,12 @@ class CodeEditSaveThread(Thread):
             self, file_to_save: Union[str, None] = None, editor: Union[None, CodeEditor] = None):
         """
         This thread is used to auto save current file.
+        這個執行緒用來自動儲存當前檔案。
+
         :param file_to_save: file we want to auto save
+                             要自動儲存的檔案路徑
         :param editor: code editor to auto save
+                       要自動儲存內容的編輯器元件
         """
         jeditor_logger.info(f"Init CodeEditSaveThread "
                             f"file_to_save: {file_to_save} "
@@ -23,24 +27,33 @@ class CodeEditSaveThread(Thread):
         super().__init__()
         self.file: str = file_to_save
         self.editor: Union[None, CodeEditor] = editor
-        self.still_run: bool = True
-        # set daemon
-        self.daemon = True
-        self.skip_this_round: bool = False
+        self.still_run: bool = True  # 控制執行緒是否繼續運行 / Flag to control thread loop
+        self.daemon = True  # 設定為守護執行緒，主程式結束時自動結束
+        # Set as daemon thread, ends with main program
+        self.skip_this_round: bool = False  # 是否跳過本次儲存 / Skip this save cycle
 
     def run(self) -> None:
         """
         loop and save current edit file
+        持續迴圈，每隔一段時間自動儲存當前編輯檔案
         """
         jeditor_logger.info("CodeEditSaveThread run")
         if self.file is not None:
             path = Path(self.file)
+            # 當檔案存在且編輯器不為 None 時持續運行
+            # Keep running while file exists and editor is valid
             while path.is_file() and self.editor is not None:
-                time.sleep(5)
+                time.sleep(5)  # 每 5 秒檢查一次 / Check every 5 seconds
                 if self.still_run:
                     if self.skip_this_round:
+                        # 如果設定跳過本輪，什麼都不做
+                        # Skip this round if flag is set
                         pass
                     else:
+                        # 將編輯器內容寫入檔案
+                        # Write editor content to file
                         write_file(self.file, self.editor.toPlainText())
                 else:
+                    # 如果 still_run 為 False，結束迴圈
+                    # Exit loop if still_run is False
                     break

je_editor/pyside_ui/code/code_format/pep8_format.py

@@ -6,13 +6,17 @@ from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 
 class PEP8FormatChecker(pycodestyle.Checker):
-
     def __init__(self, filename: str, **kwargs):
+        """
+        自訂的 PEP8 格式檢查器，繼承自 pycodestyle.Checker。
+        Custom PEP8 format checker, inherits from pycodestyle.Checker.
+        """
         jeditor_logger.info(f"Init PEP8FormatChecker "
                             f"filename: {filename} "
                             f"kwargs: {kwargs}")
         super().__init__(filename, **kwargs)
-        # Init variable
+
+        # 初始化變數 / Initialize variables
         self.physical_line = None
         self.blank_before = None
         self.blank_lines = None
@@ -24,28 +28,51 @@ class PEP8FormatChecker(pycodestyle.Checker):
         self.line_number = None
         self.indent_char = None
         self.total_lines = None
+
+        # 定義換行符號集合 / Define newline token set
         self.new_line = frozenset([tokenize.NL, tokenize.NEWLINE])
+
+        # 將 report_error 替換為自訂方法 / Override report_error with custom method
         self.report_error = self.replace_report_error
+
+        # 當前檔案名稱 / Current file name
         self.current_file: str = filename
+
+        # 儲存錯誤訊息的清單 / List to store error messages
         self.error_list: list = list()
 
     def replace_report_error(self, line_number, offset, text, check):
+        """
+        自訂錯誤回報方法，過濾掉特定錯誤 (例如 W191)。
+        Custom error reporting method, filters out specific errors (e.g., W191).
+        """
         jeditor_logger.info(f"PEP8FormatChecker replace_report_error "
                             f"line_number: {line_number} "
                             f"offset: {offset} "
                             f"text: {text}")
+        # 忽略 W191 (縮排使用 Tab 的警告)
+        # Ignore W191 (indentation contains tabs)
         if not text.startswith("W191"):
             self.error_list.append(f"{text} on line: {line_number}, offset: {offset}")
 
     def check_all_format(self, expected=None, line_offset=0) -> int:
-        """Run all checks on the input file."""
+        """
+        執行所有格式檢查。
+        Run all checks on the input file.
+        """
         jeditor_logger.info(f"PEP8FormatChecker check_all_format "
                             f"expected: {expected} "
                             f"line_offset: {line_offset}")
+
+        # 初始化檔案檢查 / Initialize file check
         self.report.init_file(self.filename, self.lines, expected, line_offset)
         self.total_lines = len(self.lines)
+
+        # 如果有 AST 檢查，先執行 / Run AST checks if available
         if self._ast_checks:
             self.check_ast()
+
+        # 重設狀態變數 / Reset state variables
         self.line_number = 0
         self.indent_char = None
         self.indent_level = self.previous_indent_level = 0
@@ -53,33 +80,51 @@ class PEP8FormatChecker(pycodestyle.Checker):
         self.previous_unindented_logical_line = ''
         self.tokens = []
         self.blank_lines = self.blank_before = 0
-        parens = 0
+        parens = 0  # 括號層級計數器 / Parentheses nesting counter
+
+        # 逐一處理 Token / Process tokens one by one
         for token in self.generate_tokens():
             self.tokens.append(token)
             token_type, text = token[0:2]
+
+            # 如果 verbose >= 3，輸出詳細 Token 資訊
+            # If verbose >= 3, log detailed token info
             if self.verbose >= 3:
                 if token[2][0] == token[3][0]:
                     pos = '[{}:{}]'.format(token[2][1] or '', token[3][1])
                 else:
                     pos = 'l.%s' % token[3][0]
                 self.replace_report_error(token[2][0], pos, tokenize.tok_name[token[0]], text)
+
+            # 檢查括號層級 / Track parentheses nesting
             if token_type == tokenize.OP:
                 if text in '([{':
                     parens += 1
                 elif text in '}])':
                     parens -= 1
+            # 當不在括號內時，檢查換行 / When not inside parentheses, check newlines
             elif not parens:
                 if token_type in self.new_line:
                     if token_type == tokenize.NEWLINE:
+                        # 完整邏輯行結束，檢查邏輯行
+                        # End of logical line, check it
                         self.check_logical()
                         self.blank_before = 0
                     elif len(self.tokens) == 1:
-                        # The physical line contains only this token.
+                        # 只有換行符號，代表空行
+                        # Line contains only newline, count as blank line
                         self.blank_lines += 1
                         del self.tokens[0]
                     else:
+                        # 其他情況也檢查邏輯行
+                        # Otherwise, check logical line
                         self.check_logical()
+
+        # 如果還有剩餘 Token，檢查最後一行
+        # If tokens remain, check the last line
         if self.tokens:
-            self.check_physical(self.lines[-1])
-            self.check_logical()
+            self.check_physical(self.lines[-1])  # 檢查物理行 / Check physical line
+            self.check_logical()  # 檢查邏輯行 / Check logical line
+
+        # 回傳檔案檢查結果 / Return file check results
         return self.report.get_file_results()