Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop using .vspreview #186

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Stop using .vspreview #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions vspreview/main/window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from fractions import Fraction
from functools import partial
from importlib import reload as reload_module
from pathlib import Path
from time import time
from typing import Any, Iterable, cast

Expand All @@ -16,7 +15,7 @@
from PyQt6.QtGui import QCloseEvent, QColorSpace, QKeySequence, QMoveEvent, QShortcut, QShowEvent
from PyQt6.QtWidgets import QApplication, QLabel, QMainWindow, QSizePolicy, QSplitter, QTabWidget
from vsengine import vpy # type: ignore
from vstools import PackageStorage, get_prop
from vstools import PackageStorage, SPath, get_prop

from ..core import (
PRELOADED_MODULES, AbstractQItem, ArInfo, CroppingInfo, DragNavigator, ExtendedWidget, Frame, GraphicsImageItem,
Expand Down Expand Up @@ -79,8 +78,8 @@ def on_splitter_moved(self) -> None:


class MainWindow(AbstractQItem, QMainWindow, QAbstractYAMLObjectSingleton):
VSP_DIR_NAME = '.vspreview'
VSP_GLOBAL_DIR_NAME = Path(
VSP_DIR_NAME = 'vspreview'
VSP_GLOBAL_DIR_NAME = SPath(
expandvars('%APPDATA%') if sys.platform == "win32" else expanduser('~/.config') # type: ignore
)

Expand Down Expand Up @@ -122,11 +121,13 @@ class MainWindow(AbstractQItem, QMainWindow, QAbstractYAMLObjectSingleton):
no_exit: bool
reload_enabled: bool

def __init__(self, config_dir: Path, no_exit: bool, reload_enabled: bool, force_storage: bool) -> None:
def __init__(self, config_dir: SPath, no_exit: bool, reload_enabled: bool, force_storage: bool) -> None:
from ..toolbars import MainToolbar

super().__init__()

self.move_legacy_vspdir()

self.no_exit = no_exit
self.reload_enabled = reload_enabled
self.force_storage = force_storage
Expand All @@ -153,7 +154,7 @@ def __init__(self, config_dir: Path, no_exit: bool, reload_enabled: bool, force_
self.setup_ui()
self.storage_not_found = False
self.timecodes = dict[
int, tuple[str | Path | dict[
int, tuple[str | SPath | dict[
tuple[int | None, int | None], float | tuple[int, int] | Fraction
] | list[Fraction], int | None]
]()
Expand All @@ -169,9 +170,9 @@ def __init__(self, config_dir: Path, no_exit: bool, reload_enabled: bool, force_
# global
self.clipboard = self.app.clipboard()
self.external_args = list[tuple[str, str]]()
self.script_path = Path()
self.script_path = SPath()
self.script_exec_failed = False
self.current_storage_path = Path()
self.current_storage_path = SPath()

# timeline
self.timeline.clicked.connect(self.on_timeline_clicked)
Expand Down Expand Up @@ -281,7 +282,7 @@ def apply_stylesheet(self) -> None:
self.repaint()

def load_script(
self, script_path: Path, external_args: list[tuple[str, str]] | None = None, reloading: bool = False,
self, script_path: SPath, external_args: list[tuple[str, str]] | None = None, reloading: bool = False,
start_frame: int | None = None, display_name: str | None = None,
resolve_plugin: FileResolverPlugin | None = None
) -> None:
Expand Down Expand Up @@ -317,7 +318,7 @@ def load_script(

try:
if reloading:
std_path_lib = Path(logging.__file__).parent.parent
std_path_lib = SPath(logging.__file__).parent.parent
std_path_dlls = std_path_lib.parent / 'DLLs'

check_reloaded = set[str]()
Expand All @@ -331,7 +332,7 @@ def load_script(
if main_mod in check_reloaded:
continue

mod_file = Path(module.__file__)
mod_file = SPath(module.__file__)

if 'vspreview' in mod_file.parts:
continue
Expand All @@ -352,7 +353,7 @@ def load_script(

for mod_name in all_submodules:
try:
if Path(sys.modules[mod_name].__file__).stat().st_mtime > self.last_reload_time:
if SPath(sys.modules[mod_name].__file__).stat().st_mtime > self.last_reload_time:
break
except Exception:
...
Expand Down Expand Up @@ -457,7 +458,8 @@ def handle_error(self, e: Exception) -> None:
e.parent_error).lower()
):
logging.error(
'If you\'re trying to open a video you first have to install the vssource package and have it working with a source plugin!'
'If you\'re trying to open a video you first have to install '
'the vssource package and have it working with a source plugin!'
)

self.script_exec_failed = True
Expand All @@ -467,6 +469,17 @@ def handle_error(self, e: Exception) -> None:
]), True
)

def move_legacy_vspdir(self) -> None:
legacy_vspdir = self.VSP_GLOBAL_DIR_NAME / '.vspreview'

if not legacy_vspdir.exists():
return

logging.warning(f'Moving legacy vspreview directory from \'{legacy_vspdir}\' to \'{self.global_config_dir}\'!')

legacy_vspdir.move_dir(self.global_config_dir)
# TODO: Reload plugins

@set_status_label('Loading...')
def load_storage(self) -> None:
storage_paths = [self.global_storage_path, self.current_storage_path]
Expand Down Expand Up @@ -896,7 +909,7 @@ def set_temporary_scenes(self, scenes: list[SceningList]) -> None:
self.temporary_scenes = scenes

def update_timecodes_info(
self, index: int, timecodes: str | Path | dict[
self, index: int, timecodes: str | SPath | dict[
tuple[int | None, int | None], float | tuple[int, int] | Fraction
] | list[Fraction], den: int | None = None
) -> None:
Expand Down
Loading