je-editor 0.0.106__tar.gz → 0.0.108__tar.gz

{je_editor-0.0.106 → je_editor-0.0.108}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: je_editor
-Version: 0.0.106
+Version: 0.0.108
 Summary: JEditor is basic but powerful editor for python
 Author-email: JE-Chen <jechenmailman@gmail.com>
 License: MIT

{je_editor-0.0.106 → je_editor-0.0.108}/je_editor/__init__.py

@@ -16,7 +16,9 @@ from je_editor.pyside_ui.colors.global_color import error_color
 from je_editor.pyside_ui.colors.global_color import output_color
 # Exec and shell
 from je_editor.pyside_ui.code_process.code_exec import exec_manage
+from je_editor.pyside_ui.code_process.code_exec import ExecManager
 from je_editor.pyside_ui.shell_process.shell_exec import default_shell_manager
+from je_editor.pyside_ui.shell_process.shell_exec import ShellManager
 
 __all__ = [
     "start_editor", "EditorMain",
@@ -25,5 +27,5 @@ __all__ = [
     "JEditorOpenFileException", "JEditorContentFileException",
     "JEditorCantFindLanguageException", "JEditorJsonException",
     "error_color", "output_color",
-    "exec_manage", "default_shell_manager"
+    "exec_manage", "default_shell_manager", "ExecManager", "ShellManager"
 ]

{je_editor-0.0.106 → je_editor-0.0.108}/je_editor/pyside_ui/code_process/code_exec.py

@@ -11,7 +11,6 @@ from PySide6.QtWidgets import QMainWindow, QTextEdit
 
 from je_editor.pyside_ui.colors.global_color import error_color, output_color
 from je_editor.utils.exception.exception_tags import compiler_not_found_error, je_editor_init_error
-from je_editor.utils.exception.exception_tags import file_not_fond_error
 from je_editor.utils.exception.exceptions import JEditorExecException, JEditorException
 
 
@@ -32,6 +31,7 @@ class ExecManager(object):
         self.read_program_error_output_from_thread = None
         self.read_program_output_from_thread = None
         self.main_window: QMainWindow = main_window
+        self.compiler_path = None
         self.code_result: [QTextEdit, None] = None
         self.timer: [QTimer, None] = None
         self.still_run_program = True
@@ -41,6 +41,30 @@ class ExecManager(object):
         self.program_language = program_language
         self.program_encoding = program_encoding
         self.program_buffer = program_buffer
+        self.renew_path()
+
+    def renew_path(self):
+
+        if sys.platform in ["win32", "cygwin", "msys"]:
+            venv_path = Path(os.getcwd() + "/venv/Scripts")
+        else:
+            venv_path = Path(os.getcwd() + "/venv/bin")
+        if venv_path.is_dir() and venv_path.exists():
+            self.compiler_path = shutil.which(
+                cmd="python3",
+                path=str(venv_path)
+            )
+        else:
+            self.compiler_path = shutil.which(cmd="python3")
+        if self.compiler_path is None:
+            self.compiler_path = shutil.which(
+                cmd="python",
+                path=str(venv_path)
+            )
+        else:
+            self.compiler_path = shutil.which(cmd="python")
+        if self.compiler_path is None:
+            raise JEditorExecException(compiler_not_found_error)
 
     def later_init(self):
         if self.main_window is not None:
@@ -59,34 +83,9 @@ class ExecManager(object):
             self.code_result.setPlainText("")
             reformat_os_file_path = os.path.abspath(exec_file_name)
             # detect file is exist
-            try:
-                if not Path(exec_file_name).exists():
-                    raise JEditorExecException(file_not_fond_error)
-            except OSError as error:
-                raise JEditorExecException(error)
-            if sys.platform in ["win32", "cygwin", "msys"]:
-                venv_path = Path(os.getcwd() + "/venv/Scripts")
-            else:
-                venv_path = Path(os.getcwd() + "/venv/bin")
-            if venv_path.is_dir() and venv_path.exists():
-                compiler_path = shutil.which(
-                    cmd="python3",
-                    path=str(venv_path)
-                )
-            else:
-                compiler_path = shutil.which(cmd="python3")
-            if compiler_path is None:
-                compiler_path = shutil.which(
-                    cmd="python",
-                    path=str(venv_path)
-                )
-            else:
-                compiler_path = shutil.which(cmd="python")
-            if compiler_path is None:
-                raise JEditorExecException(compiler_not_found_error)
             exec_file = reformat_os_file_path
             # run program
-            execute_program_list = [compiler_path, exec_file]
+            execute_program_list = [self.compiler_path, exec_file]
             self.process = subprocess.Popen(
                 execute_program_list,
                 stdout=subprocess.PIPE,
@@ -107,7 +106,7 @@ class ExecManager(object):
             )
             self.read_program_error_output_from_thread.start()
             # show which file execute
-            self.code_result.append(compiler_path + " " + reformat_os_file_path)
+            self.code_result.append(self.compiler_path + " " + reformat_os_file_path)
             # start tkinter_ui update
             # start timer
             self.timer = QTimer(self.main_window)

{je_editor-0.0.106 → je_editor-0.0.108}/je_editor/pyside_ui/menu/menu_bar/venv_menu/build_venv_menu.py

@@ -1,6 +1,4 @@
 import os
-import shutil
-import sys
 from pathlib import Path
 
 from PySide6.QtGui import QAction
@@ -10,12 +8,6 @@ from je_editor.pyside_ui.shell_process.shell_exec import ShellManager
 
 
 def set_venv_menu(ui_we_want_to_set: QMainWindow):
-    # Install virtualenv
-    ui_we_want_to_set.venv_menu.install_virtualenv_action = QAction("Install virtualenv")
-    ui_we_want_to_set.venv_menu.install_virtualenv_action.triggered.connect(
-        lambda: install_virtualenv(ui_we_want_to_set)
-    )
-    ui_we_want_to_set.venv_menu.addAction(ui_we_want_to_set.venv_menu.install_virtualenv_action)
     # Create an venv
     ui_we_want_to_set.venv_menu.create_venv_action = QAction("Create Venv")
     ui_we_want_to_set.venv_menu.create_venv_action.setShortcut(
@@ -36,18 +28,14 @@ def set_venv_menu(ui_we_want_to_set: QMainWindow):
     ui_we_want_to_set.venv_menu.addAction(ui_we_want_to_set.venv_menu.pip_action)
 
 
-def install_virtualenv(ui_we_want_to_set: QMainWindow):
-    install_virtualenv_shell = ShellManager(main_window=ui_we_want_to_set)
-    install_virtualenv_shell.later_init()
-    install_virtualenv_shell.exec_shell("python -m pip install virtualenv")
-
-
 def create_venv(ui_we_want_to_set: QMainWindow):
     venv_path = Path(os.getcwd() + "/venv")
     if not venv_path.exists():
         create_venv_shell = ShellManager(main_window=ui_we_want_to_set)
         create_venv_shell.later_init()
-        create_venv_shell.exec_shell("python -m virtualenv venv")
+        create_venv_shell.exec_shell(
+            [f"{create_venv_shell.compiler_path}",  "-m", "venv", "venv"]
+        )
         print("Creating venv please waiting for shell exit code.")
     else:
         message_box = QMessageBox()
@@ -67,24 +55,8 @@ def pip_install_package(ui_we_want_to_set: QMainWindow):
             ui_we_want_to_set, "Install Package", "What Package you want to install"
         )
         if press_ok:
-            if sys.platform in ["win32", "cygwin", "msys"]:
-                venv_path = Path(os.getcwd() + "/venv/Scripts")
-            else:
-                venv_path = Path(os.getcwd() + "/venv/bin")
-            if venv_path.is_dir() and venv_path.exists():
-                compiler_path = shutil.which(
-                    cmd="python3",
-                    path=str(venv_path)
-                )
-            else:
-                compiler_path = shutil.which(cmd="python3")
-            if compiler_path is None:
-                compiler_path = shutil.which(
-                    cmd="python",
-                    path=str(venv_path)
-                )
-            else:
-                compiler_path = shutil.which(cmd="python")
             pip_install_shell = ShellManager(main_window=ui_we_want_to_set)
             pip_install_shell.later_init()
-            pip_install_shell.exec_shell(f"{compiler_path} -m pip install {package_text}")
+            pip_install_shell.exec_shell(
+                [f"{pip_install_shell.compiler_path}", "-m", "pip", "install", f"{package_text}"]
+            )

{je_editor-0.0.106 → je_editor-0.0.108}/je_editor/pyside_ui/shell_process/shell_exec.py

@@ -1,15 +1,18 @@
+import os
 import queue
 import shlex
+import shutil
 import subprocess
 import sys
+from pathlib import Path
 from threading import Thread
 
 from PySide6.QtCore import QTimer
 from PySide6.QtWidgets import QMainWindow, QTextEdit
 
 from je_editor.pyside_ui.colors.global_color import error_color, output_color
-from je_editor.utils.exception.exception_tags import je_editor_init_error
-from je_editor.utils.exception.exceptions import JEditorException
+from je_editor.utils.exception.exception_tags import je_editor_init_error, compiler_not_found_error
+from je_editor.utils.exception.exceptions import JEditorException, JEditorExecException
 
 
 class ShellManager(object):
@@ -26,6 +29,7 @@ class ShellManager(object):
         self.read_program_error_output_from_thread = None
         self.read_program_output_from_thread = None
         self.main_window: QMainWindow = main_window
+        self.compiler_path = None
         self.code_result: [QTextEdit, None] = None
         self.timer: [QTimer, None] = None
         self.still_run_shell: bool = True
@@ -34,6 +38,30 @@ class ShellManager(object):
         self.run_error_queue: queue = queue.Queue()
         self.program_encoding: str = shell_encoding
         self.program_buffer: int = program_buffer
+        self.renew_path()
+
+    def renew_path(self):
+
+        if sys.platform in ["win32", "cygwin", "msys"]:
+            venv_path = Path(os.getcwd() + "/venv/Scripts")
+        else:
+            venv_path = Path(os.getcwd() + "/venv/bin")
+        if venv_path.is_dir() and venv_path.exists():
+            self.compiler_path = shutil.which(
+                cmd="python3",
+                path=str(venv_path)
+            )
+        else:
+            self.compiler_path = shutil.which(cmd="python3")
+        if self.compiler_path is None:
+            self.compiler_path = shutil.which(
+                cmd="python",
+                path=str(venv_path)
+            )
+        else:
+            self.compiler_path = shutil.which(cmd="python")
+        if self.compiler_path is None:
+            raise JEditorExecException(compiler_not_found_error)
 
     def later_init(self):
         if self.main_window is not None:
@@ -53,8 +81,9 @@ class ShellManager(object):
                 args = shell_command
             else:
                 args = shlex.split(shell_command)
+            print(args)
             self.process = subprocess.Popen(
-                args,
+                args=args,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 shell=True,

{je_editor-0.0.106 → je_editor-0.0.108}/je_editor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: je-editor
-Version: 0.0.106
+Version: 0.0.108
 Summary: JEditor is basic but powerful editor for python
 Author-email: JE-Chen <jechenmailman@gmail.com>
 License: MIT

{je_editor-0.0.106 → je_editor-0.0.108}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor"
-version = "0.0.106"
+version = "0.0.108"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]