diff --git a/app/core/entities.py b/app/core/entities.py index 90f56bb..100a1ac 100644 --- a/app/core/entities.py +++ b/app/core/entities.py @@ -4,7 +4,6 @@ from enum import Enum from random import randint from typing import Optional -from ..core.thread.create_task_thread import CreateTaskThread class MuEnum(Enum): """ Mutable Enum. Unlike regular Enum, its values can be set again. """ @@ -542,7 +541,7 @@ class Type(MuEnum): completed_at: Optional[datetime.datetime] = None status: Status = Status.PENDING type: Type = Type.SUBTITLE - task_thread: CreateTaskThread = None + task_thread = None fraction_downloaded: float = 0.0 work_dir: Optional[str] = None diff --git a/app/view/transcription_interface.py b/app/view/transcription_interface.py index 6d15ea4..b6941df 100644 --- a/app/view/transcription_interface.py +++ b/app/view/transcription_interface.py @@ -39,24 +39,29 @@ def __init__(self, parent=None): def setup_ui(self): self.cardLayout = QVBoxLayout(self) self.cardLayout.setContentsMargins(20,15,20,15) + self.setup_log_toolbar_layout() + # Log area + self.process_log = QPlainTextEdit(self) + self.process_log.setReadOnly(True) + self.process_log.setMinimumWidth(200) + text_color = "#cccccc" if isDarkTheme() else "#000000" + self.process_log.setStyleSheet(f"QPlainTextEdit{{background:transparent; font-size:12px; color:{text_color}}}") + self.cardLayout.addWidget(self.process_log) + + def setup_log_toolbar_layout(self): # Layout for log - self.log_toolbar_layout = QHBoxLayout(self) + self.log_toolbar_layout = QHBoxLayout() self.log_label = BodyLabel(self) self.log_clear_button = PushButton(self.tr("Clear"),self) + self.log_toolbar_layout.addWidget(self.log_label) self.log_toolbar_layout.addStretch(1) self.log_toolbar_layout.addWidget(self.log_clear_button) self.log_label.setText(self.tr("程序日志:")) - # Log area - self.process_log = QPlainTextEdit(self) - self.process_log.setReadOnly(True) - self.process_log.setMinimumWidth(200) - text_color = "#cccccc" if isDarkTheme() else "#000000" - self.process_log.setStyleSheet(f"QPlainTextEdit{{background:transparent; font-size:12px; color:{text_color}}}") - self.cardLayout.addLayout(self.log_toolbar_layout) - self.cardLayout.addWidget(self.process_log) + + def addLine(self, text: str): # After adding a message diff --git a/requirements.txt b/requirements.txt index e75075e..3bc2c7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ requests +psutil + openai retry diff --git a/run.bat b/run.bat index 6f57693..8dbcaa7 100644 --- a/run.bat +++ b/run.bat @@ -1,2 +1,2 @@ -call .\.venv\Scripts\activate.bat -python main.py \ No newline at end of file +.\.venv\Scripts\activate.bat +python main.py