v4.9.0 - Refactor (#41)
* fix imports
remove unused imports
use full import path
sort import (1. Standard Library, 2. Third-Party, 3. Local) in alphabetic.
* - remove: Method 3 from src.core.ytsage_downlader:cleanup_subtitle_file
- it could delete the subtitle file of other movies if it present in same directory as it scane recursively.
- refactor: migrate from os.path to pathlib.Path for path handling
- Replaced os.path methods with pathlib.Path to improve readability,
- avoid repeatation.
- cross-platform compatibility, and maintain cleaner code.
- improve: enhance code readability
- Standardized string literals to use double quotes for consistency
- Removed unnecessary spaces to maintain cleaner formatting
- Applied code formatting for better readability and maintainability
* - add: ytsage_constants.py file for one place to store all constants.
- imporve: return type hint for function.
- remove: src/gui/ytsage_gui_dialogs.py file to avoid repetation
- src/gui/dialogs is renamed to src/gui/ytsage_gui_dialogs for same naming convection. (future import will remains same)
- use of src/gui/ytsage_gui_dialogs/__init__.py to import the dilogs modules.
- change: variable self.parent to self._parent so it does not overwrite the parent()
- add type hint checking.
* - refactor: QMetaObject.invokeMethod to Signal
- I encounter error with incokeMethod. Could not solve it.
- So, Changed it to Signal to match app code language.
- implement: the ytsage_constants.py to code
- remove: unnecessary logic
- remove: repetitive code logic.
- update: yt-dlp logic for src\gui\ytsage_gui_dialogs\ytsage_dialogs_update:_update_binary
- yt-dlp update logic will use `yt-dlp -U`
* refactor: remove unused imports and streamline code formatting across multiple files
* - **refactor: drop `pygame` in favor of built-in `PySide6` sound**
- Removed `pygame` dependency (too heavy just for notifications).
- Replaced with `QSoundEffect`, which is lightweight and built into `PySide6`.
- Dropped `pygame.mixer` + threading → Qt handles async playback.
- Implemented sound playback with `QUrl.fromLocalFile()` and `.play()`.
- Added `setVolume(0.9)` as a configurable example.
- Converted notification sound from `.mp3` to `.wav` (only format supported).
* **refactor(utils): simplify logger module**
- Moved `logger` to `src.utils`
- Removed unnecessary import checks (logger is always available)
- Replaced `raise` statements with error logging to prevent crashes
- Use `logger.exception()` in `except` blocks to capture traceback (logged as error)
**style: remove redundant str() in f-strings**
- Dropped explicit `str()` calls inside f-strings
- f-strings already call `str()` under the hood
**chore: add type hints for GUI mixins**
- Added type hints for `FormatTableMixin` (`src.gui.ytsage_gui_format_table`)
- Added type hints for `VideoInfoMixin` (`src.gui.ytsage_gui_video_info`)
- Improves autocomplete and type safety in IDEs
* - **introduce the `ytsage_config_manager.py` module to manage app setting.**
- Loads settings from a JSON config file (`APP_CONFIG_FILE`).
- Creates the config file with default values if missing or corrupt.
- Retrieves, sets, and deletes settings using simple dot-separated keys.
- Provides safe error handling with logging instead of raising exceptions.
- Persists updates back to disk automatically.
- **Usage**
```python
from src.utils.ytsage_config_manager import ConfigManager
download_path = ConfigManager.get("download_path")
ConfigManager.set("download_path", "D:/Downloads")
last_check = ConfigManager.get("cached_versions.ytdlp.last_check")
ConfigManager.delete("cached_versions.ffmpeg.path")
```
* **Refactore: pkg_resources with importlib.metadata.version**
- UserWarning: pkg_resources is deprecated as an API.
- See https://setuptools.pypa.io/en/latest/pkg_resources.html.
- The pkg_resources package is slated for removal as early as 2025-11-30.
* **refactore: notification sound**
- `QSoundEffect` is chnaged back to `pyglet` as per mainter `@oop7` choise.
- simplify the logic.
* remove: import check, it should always work.
* **fix: runtime error**
- yt_dlp moved from `--excludes` to `--packages` in `build-windows.yml`
- In frozen build, logger will not log to consol. insted will log to file.
- In frozen build, `app_dir` is next to `.exe` file.
* chang back to checking import for ytdlp
* Bump version to 4.8.1
Update version references from 4.8.0b to 4.8.1 in __init__.py, main app, and About dialog to reflect the new release.
* Update asset paths in build workflows
Changed asset inclusion and screenshot removal paths from 'assets' to 'lib/assets' in Linux, macOS, and Windows build workflows to reflect new directory structure and ensure screenshots are excluded from packaged builds.
* Bump version to 4.8.2
Update version references from 4.8.1 to 4.8.2 in source files and documentation to prepare for a new patch release.
* Fix asset include path in Windows build workflow
Corrects the syntax for including asset files in the build-windows.yml workflow by changing 'assets,lib/assets' to 'assets=lib/assets'. This ensures assets are properly mapped during the build process.
* Update release tag examples in CI/CD README
Changed the example git tag commands from v4.8.0 and v4.8.2 to v4.8.1 for consistency in the CI/CD documentation.
* Fix include-files mapping in Windows build workflow
Changed the cx_Freeze --include-files argument from '=' to ':' for source:destination mapping in build-windows.yml. This resolves an issue where '=' was treated as a literal path, ensuring assets are correctly copied to the destination directory.
* Remove redundant comments in build-windows workflow
Deleted comments explaining the colon usage for source:destination mapping in the cx_Freeze CLI, as the mapping is already clear from the context.
* Refactor Windows build to use cx_Freeze setup script
Replaces direct cx_Freeze CLI calls with dynamically generated setup scripts for both standard and FFmpeg builds. This improves maintainability and flexibility of build configuration in the GitHub Actions workflow.
* Bump version to 4.8.3
Updated version references from 4.8.2 to 4.8.3 in __init__.py, main app, and About dialog to reflect the new release.
* revert(build): move yt_dlp from --packages to --excludes in build-windows.yml
---------
Co-authored-by: Your Name <mohamed.mohamed112@ai.mnu.edu.eg>
This commit is contained in:
Viren Hirpara
@@ -8,7 +8,7 @@ import threading
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING, cast
|
||||
|
||||
from PySide6.QtCore import Q_ARG, QMetaObject, Qt, Signal, QObject
|
||||
from PySide6.QtCore import Q_ARG, QMetaObject, QObject, Qt, Signal
|
||||
from PySide6.QtWidgets import (
|
||||
QCheckBox,
|
||||
QComboBox,
|
||||
@@ -31,31 +31,24 @@ from PySide6.QtWidgets import (
|
||||
from src.core.ytsage_yt_dlp import get_yt_dlp_path
|
||||
from src.utils.ytsage_constants import YTDLP_DOCS_URL
|
||||
|
||||
try:
|
||||
import yt_dlp
|
||||
|
||||
YT_DLP_AVAILABLE = True
|
||||
except ImportError:
|
||||
YT_DLP_AVAILABLE = False
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from src.gui.ytsage_gui_main import YTSageApp # only for type hints (no runtime import)
|
||||
|
||||
|
||||
class CommandWorker(QObject):
|
||||
"""Worker class for running yt-dlp commands in a separate thread"""
|
||||
|
||||
|
||||
# Signals for communicating with the main thread
|
||||
output_received = Signal(str) # For command output lines
|
||||
command_finished = Signal(bool, int) # For completion (success, exit_code)
|
||||
error_occurred = Signal(str) # For errors
|
||||
|
||||
|
||||
def __init__(self, command, url, path):
|
||||
super().__init__()
|
||||
self.command = command
|
||||
self.url = url
|
||||
self.path = path
|
||||
|
||||
|
||||
def run_command(self):
|
||||
"""Run the yt-dlp command and emit signals for output"""
|
||||
try:
|
||||
@@ -65,11 +58,11 @@ class CommandWorker(QObject):
|
||||
# Build the full command
|
||||
yt_dlp_path = get_yt_dlp_path()
|
||||
base_cmd = [yt_dlp_path] + args
|
||||
|
||||
|
||||
# Add download path if specified
|
||||
if self.path:
|
||||
base_cmd.extend(["-P", self.path])
|
||||
|
||||
|
||||
# Add URL at the end
|
||||
base_cmd.append(self.url)
|
||||
|
||||
@@ -94,14 +87,14 @@ class CommandWorker(QObject):
|
||||
|
||||
ret = proc.wait()
|
||||
self.output_received.emit("=" * 50)
|
||||
|
||||
|
||||
if ret != 0:
|
||||
self.output_received.emit(f"❌ Command failed with exit code {ret}")
|
||||
self.command_finished.emit(False, ret)
|
||||
else:
|
||||
self.output_received.emit("✅ Command completed successfully!")
|
||||
self.command_finished.emit(True, ret)
|
||||
|
||||
|
||||
except Exception as e:
|
||||
self.output_received.emit("=" * 50)
|
||||
self.error_occurred.emit(f"❌ Error executing command: {str(e)}")
|
||||
@@ -160,7 +153,7 @@ class CustomOptionsDialog(QDialog):
|
||||
# Convert Path to string properly and validate
|
||||
cookie_path_str = str(self._parent.cookie_file_path)
|
||||
# Only set if it looks like a valid path (more than just a drive letter)
|
||||
if len(cookie_path_str) > 3 and not cookie_path_str.endswith(':'):
|
||||
if len(cookie_path_str) > 3 and not cookie_path_str.endswith(":"):
|
||||
self.cookie_path_input.setText(cookie_path_str)
|
||||
path_layout.addWidget(self.cookie_path_input)
|
||||
|
||||
@@ -175,9 +168,7 @@ class CustomOptionsDialog(QDialog):
|
||||
self.cookie_browser_group = QGroupBox("Browser Selection")
|
||||
browser_layout = QVBoxLayout(self.cookie_browser_group)
|
||||
|
||||
browser_help = QLabel(
|
||||
"Select the browser to extract cookies from. Make sure the browser is closed before extraction."
|
||||
)
|
||||
browser_help = QLabel("Select the browser to extract cookies from. Make sure the browser is closed before extraction.")
|
||||
browser_help.setWordWrap(True)
|
||||
browser_help.setStyleSheet("color: #999999; font-size: 11px;")
|
||||
browser_layout.addWidget(browser_help)
|
||||
@@ -186,16 +177,7 @@ class CustomOptionsDialog(QDialog):
|
||||
browser_select_layout.addWidget(QLabel("Browser:"))
|
||||
|
||||
self.browser_combo = QComboBox()
|
||||
self.browser_combo.addItems([
|
||||
"chrome",
|
||||
"firefox",
|
||||
"safari",
|
||||
"edge",
|
||||
"opera",
|
||||
"brave",
|
||||
"chromium",
|
||||
"vivaldi"
|
||||
])
|
||||
self.browser_combo.addItems(["chrome", "firefox", "safari", "edge", "opera", "brave", "chromium", "vivaldi"])
|
||||
browser_select_layout.addWidget(self.browser_combo)
|
||||
browser_layout.addLayout(browser_select_layout)
|
||||
|
||||
@@ -261,10 +243,7 @@ class CustomOptionsDialog(QDialog):
|
||||
|
||||
# Command input
|
||||
self.command_input = QPlainTextEdit()
|
||||
self.command_input.setPlaceholderText(
|
||||
"Enter yt-dlp arguments here...\n\n"
|
||||
"e.g. --extract-audio --audio-format mp3"
|
||||
)
|
||||
self.command_input.setPlaceholderText("Enter yt-dlp arguments here...\n\n" "e.g. --extract-audio --audio-format mp3")
|
||||
self.command_input.setMinimumHeight(80) # Reduced further from 100
|
||||
self.command_input.setStyleSheet(
|
||||
"""
|
||||
@@ -288,7 +267,7 @@ class CustomOptionsDialog(QDialog):
|
||||
# Button layout
|
||||
button_layout = QHBoxLayout()
|
||||
button_layout.setSpacing(10)
|
||||
|
||||
|
||||
clear_btn = QPushButton("Clear")
|
||||
clear_btn.clicked.connect(lambda: self.command_input.clear())
|
||||
clear_btn.setStyleSheet(
|
||||
@@ -308,15 +287,15 @@ class CustomOptionsDialog(QDialog):
|
||||
"""
|
||||
)
|
||||
button_layout.addWidget(clear_btn)
|
||||
|
||||
|
||||
button_layout.addStretch() # Push run button to the right
|
||||
|
||||
|
||||
# Run command button
|
||||
self.run_btn = QPushButton("Run Command")
|
||||
self.run_btn.clicked.connect(self.run_custom_command)
|
||||
self.run_btn.setDefault(True)
|
||||
button_layout.addWidget(self.run_btn)
|
||||
|
||||
|
||||
command_layout.addLayout(button_layout)
|
||||
|
||||
# Output label
|
||||
@@ -469,18 +448,18 @@ class CustomOptionsDialog(QDialog):
|
||||
if hasattr(self._parent, "browser_cookies_option") and self._parent.browser_cookies_option:
|
||||
# Browser cookies are active
|
||||
self.cookie_browser_radio.setChecked(True)
|
||||
browser_parts = self._parent.browser_cookies_option.split(':')
|
||||
browser_parts = self._parent.browser_cookies_option.split(":")
|
||||
browser = browser_parts[0]
|
||||
profile = browser_parts[1] if len(browser_parts) > 1 else ""
|
||||
|
||||
|
||||
# Set browser selection
|
||||
index = self.browser_combo.findText(browser)
|
||||
if index >= 0:
|
||||
self.browser_combo.setCurrentIndex(index)
|
||||
|
||||
|
||||
# Set profile if any
|
||||
self.profile_input.setText(profile)
|
||||
|
||||
|
||||
self.cookie_status.setText(f"Browser cookies active: {self._parent.browser_cookies_option}")
|
||||
self.cookie_status.setStyleSheet("color: #00cc00; font-style: italic;")
|
||||
elif hasattr(self._parent, "cookie_file_path") and self._parent.cookie_file_path:
|
||||
@@ -533,7 +512,7 @@ class CustomOptionsDialog(QDialog):
|
||||
if self.cookie_browser_radio.isChecked():
|
||||
browser = self.browser_combo.currentText()
|
||||
profile = self.profile_input.text().strip()
|
||||
|
||||
|
||||
if profile:
|
||||
return f"{browser}:{profile}"
|
||||
else:
|
||||
@@ -571,12 +550,12 @@ class CustomOptionsDialog(QDialog):
|
||||
# Create worker and thread
|
||||
self.worker = CommandWorker(command, url, path)
|
||||
self.worker_thread = threading.Thread(target=self.worker.run_command, daemon=True)
|
||||
|
||||
|
||||
# Connect worker signals to our slots
|
||||
self.worker.output_received.connect(self.on_output_received)
|
||||
self.worker.command_finished.connect(self.on_command_finished)
|
||||
self.worker.error_occurred.connect(self.on_error_occurred)
|
||||
|
||||
|
||||
# Start the thread
|
||||
self.worker_thread.start()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user