diff --git a/corrscope/cli.py b/corrscope/cli.py index 6fd9c34..1428801 100644 --- a/corrscope/cli.py +++ b/corrscope/cli.py @@ -9,7 +9,7 @@ import click import corrscope from corrscope.channel import ChannelConfig from corrscope.config import yaml -from corrscope.ffmpeg_path import MissingFFmpegError +from corrscope.settings.paths import MissingFFmpegError from corrscope.outputs import IOutputConfig, FFplayOutputConfig, FFmpegOutputConfig from corrscope.corrscope import default_config, CorrScope, Config, Arguments diff --git a/corrscope/gui/__init__.py b/corrscope/gui/__init__.py index d3f187b..aafbe18 100644 --- a/corrscope/gui/__init__.py +++ b/corrscope/gui/__init__.py @@ -16,7 +16,7 @@ from PyQt5.QtWidgets import QShortcut import corrscope from corrscope import cli # module wtf? -from corrscope import ffmpeg_path +from corrscope.settings import paths from corrscope.channel import ChannelConfig from corrscope.config import CorrError, copy_config, yaml from corrscope.corrscope import CorrScope, Config, Arguments, default_config @@ -410,7 +410,7 @@ class CorrThread(qc.QThread): try: CorrScope(cfg, arg).play() - except ffmpeg_path.MissingFFmpegError: + except paths.MissingFFmpegError: arg.on_end() self.ffmpeg_missing.emit() @@ -911,10 +911,10 @@ nope = qc.QVariant() class DownloadFFmpegActivity: title = "Missing FFmpeg" - ffmpeg_url = ffmpeg_path.get_ffmpeg_url() + ffmpeg_url = paths.get_ffmpeg_url() can_download = bool(ffmpeg_url) - path_uri = qc.QUrl.fromLocalFile(ffmpeg_path.path_dir).toString() + path_uri = qc.QUrl.fromLocalFile(paths.path_dir).toString() required = ( f"FFmpeg must be in PATH or " diff --git a/corrscope/outputs.py b/corrscope/outputs.py index 05f95b4..90ff573 100644 --- a/corrscope/outputs.py +++ b/corrscope/outputs.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Type, List, Union, Optional import numpy as np from corrscope.config import register_config -from corrscope.ffmpeg_path import MissingFFmpegError +from corrscope.settings.paths import MissingFFmpegError if TYPE_CHECKING: from corrscope.corrscope import Config diff --git a/corrscope/ffmpeg_path.py b/corrscope/settings/paths.py similarity index 100% rename from corrscope/ffmpeg_path.py rename to corrscope/settings/paths.py