Merge pull request #147 from Integration-Automation/dev

Dev

Author: JE-Chen

.idea/discord.xml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.199"
+version = "0.0.200"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

dev.toml

@@ -1,6 +1,6 @@
 frontengine
-PySide6==6.7.3
+PySide6==6.8.1
 sphinx
 twine
-je_editor_dev
-build
+build
+je_editor_dev

dev_requirements.txt

@@ -1,4 +1,4 @@
-from je_editor.pyside_ui.browser.browser_widget import JEBrowser
+from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.code_process.code_exec import ExecManager
 from je_editor.pyside_ui.code.shell_process.shell_exec import ShellManager
 from je_editor.pyside_ui.code.syntax.python_syntax import PythonHighlighter
@@ -28,7 +28,7 @@
     "JEditorRunOnShellException", "JEditorSaveFileException", "syntax_rule_setting_dict",
     "JEditorOpenFileException", "JEditorContentFileException", "syntax_word_setting_dict",
     "JEditorCantFindLanguageException", "JEditorJsonException", "PythonHighlighter",
-    "user_setting_dict", "user_setting_color_dict", "EditorWidget", "JEBrowser",
+    "user_setting_dict", "user_setting_color_dict", "EditorWidget", "BrowserWidget",
     "ExecManager", "ShellManager", "traditional_chinese_word_dict", "english_word_dict",
     "language_wrapper"
 ]

je_editor/__init__.py

@@ -2,13 +2,16 @@
 from PySide6.QtWebEngineCore import QWebEngineDownloadRequest
 from PySide6.QtWidgets import QWidget, QBoxLayout, QPlainTextEdit
 
+from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 
 
 class BrowserDownloadWindow(QWidget):
 
     def __init__(self, download_instance: QWebEngineDownloadRequest):
         super().__init__()
+        jeditor_logger.info(f"Init BrowserDownloadWindow "
+                            f"download_instance: {download_instance}")
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
         self.box_layout = QBoxLayout(QBoxLayout.Direction.TopToBottom)
         self.show_download_detail_plaintext = QPlainTextEdit()
@@ -22,11 +25,15 @@ def __init__(self, download_instance: QWebEngineDownloadRequest):
         self.box_layout.addWidget(self.show_download_detail_plaintext)
         self.setLayout(self.box_layout)
 
+
     def print_finish(self):
+        jeditor_logger.info("BrowserDownloadWindow Print Download is Finished")
         self.show_download_detail_plaintext.appendPlainText(str(self.download_instance.isFinished()))
 
     def print_interrupt(self):
+        jeditor_logger.info("BrowserDownloadWindow Print interruptReason")
         self.show_download_detail_plaintext.appendPlainText(str(self.download_instance.interruptReason()))
 
     def print_state(self):
+        jeditor_logger.info("BrowserDownloadWindow Print State")
         self.show_download_detail_plaintext.appendPlainText(str(self.download_instance.state()))

je_editor/pyside_ui/browser/browser_download_window.py

@@ -5,18 +5,23 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QLineEdit
 
+from je_editor.utils.logging.loggin_instance import jeditor_logger
+
 if TYPE_CHECKING:
-    from je_editor.pyside_ui.browser.browser_widget import JEBrowser
+    from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 
 
 class BrowserLineSearch(QLineEdit):
 
-    def __init__(self, browser_widget: JEBrowser):
+    def __init__(self, browser_widget: BrowserWidget):
         super().__init__()
+        jeditor_logger.info(f"Init BrowserLineSearch "
+                            f"browser_widget: {browser_widget}")
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
         self.browser = browser_widget
 
     def keyPressEvent(self, event) -> None:
         if event.key() in [Qt.Key.Key_Enter, Qt.Key.Key_Return]:
+            jeditor_logger.info("Browser Search")
             self.browser.search()
         super().keyPressEvent(event)

je_editor/pyside_ui/browser/browser_serach_lineedit.py

@@ -5,25 +5,31 @@
 from PySide6.QtWebEngineWidgets import QWebEngineView
 
 from je_editor.pyside_ui.browser.browser_download_window import BrowserDownloadWindow
+from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 
 class BrowserView(QWebEngineView):
 
     def __init__(self, start_url: str = "https://www.google.com/"):
         super().__init__()
+        jeditor_logger.info(f"Init BrowserView "
+                            f"start_url: {start_url}")
         self.setUrl(start_url)
         self.download_list: List[QWebEngineDownloadRequest] = list()
         self.download_window_list: List[BrowserDownloadWindow] = list()
         self.page().profile().downloadRequested.connect(self.download_file)
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
 
     def download_file(self, download_instance: QWebEngineDownloadRequest):
+        jeditor_logger.info(f"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:
+        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:

je_editor/pyside_ui/browser/browser_view.py

@@ -3,14 +3,18 @@
 
 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
 
 
-class JEBrowser(QWidget):
+class BrowserWidget(QWidget):
 
     def __init__(self, start_url: str = "https://www.google.com/",
                  search_prefix: str = "https://www.google.com.tw/search?q="):
         super().__init__()
+        jeditor_logger.info(f"Init BrowserWidget "
+                            f"start_url: {start_url} "
+                            f"search_prefix: {search_prefix}")
         # Browser setting
         self.browser = BrowserView(start_url)
         self.search_prefix = search_prefix
@@ -41,9 +45,11 @@ def __init__(self, start_url: str = "https://www.google.com/",
         self.setLayout(self.grid_layout)
 
     def search(self):
+        jeditor_logger.info("BrowserWidget Search")
         self.browser.setUrl(f"{self.search_prefix}{self.url_input.text()}")
 
     def find_text(self):
+        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"),

je_editor/pyside_ui/browser/browser_widget.py

@@ -2,6 +2,8 @@
 
 from typing import TYPE_CHECKING
 
+from je_editor.utils.logging.loggin_instance import jeditor_logger
+
 if TYPE_CHECKING:
     from je_editor.pyside_ui.main_ui.main_editor import EditorWidget
 
@@ -13,6 +15,9 @@
 
 
 def init_new_auto_save_thread(file_path: str, widget: EditorWidget):
+    jeditor_logger.info(f"auto_save_manager.py init_new_auto_save_thread "
+                        f"file_path: {file_path} "
+                        f"widget: {widget}")
     widget.current_file = file_path
     if auto_save_manager_dict.get(file_path, None) is None:
         widget.code_save_thread = CodeEditSaveThread(

je_editor/pyside_ui/code/auto_save/auto_save_manager.py

@@ -5,6 +5,7 @@
 
 from je_editor.pyside_ui.code.plaintext_code_edit.code_edit_plaintext import CodeEditor
 from je_editor.utils.file.save.save_file import write_file
+from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 
 class CodeEditSaveThread(Thread):
@@ -16,6 +17,9 @@ def __init__(
         :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} "
+                            f"editor: {editor}")
         super().__init__()
         self.file: str = file_to_save
         self.editor: Union[None, CodeEditor] = editor
@@ -27,6 +31,7 @@ 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)
             while path.is_file() and self.editor is not None: