diff --git a/analyzer/libretime_analyzer/ffmpeg.py b/analyzer/libretime_analyzer/pipeline/_ffmpeg.py similarity index 99% rename from analyzer/libretime_analyzer/ffmpeg.py rename to analyzer/libretime_analyzer/pipeline/_ffmpeg.py index 31ca69640..735a58e71 100644 --- a/analyzer/libretime_analyzer/ffmpeg.py +++ b/analyzer/libretime_analyzer/pipeline/_ffmpeg.py @@ -3,7 +3,7 @@ from math import inf from pathlib import Path from typing import List, Optional, Tuple -from .utils import run_ +from ._utils import run_ def _ffmpeg(*args, **kwargs): diff --git a/analyzer/libretime_analyzer/utils.py b/analyzer/libretime_analyzer/pipeline/_utils.py similarity index 100% rename from analyzer/libretime_analyzer/utils.py rename to analyzer/libretime_analyzer/pipeline/_utils.py diff --git a/analyzer/libretime_analyzer/pipeline/analyze_cuepoint.py b/analyzer/libretime_analyzer/pipeline/analyze_cuepoint.py index 0e73a27f7..3a75e6bf0 100644 --- a/analyzer/libretime_analyzer/pipeline/analyze_cuepoint.py +++ b/analyzer/libretime_analyzer/pipeline/analyze_cuepoint.py @@ -5,7 +5,7 @@ from typing import Any, Dict from loguru import logger -from ..ffmpeg import compute_silences, probe_duration +from ._ffmpeg import compute_silences, probe_duration def analyze_cuepoint(filepath: str, metadata: Dict[str, Any]) -> Dict[str, Any]: diff --git a/analyzer/libretime_analyzer/pipeline/analyze_replaygain.py b/analyzer/libretime_analyzer/pipeline/analyze_replaygain.py index 59144b830..d7c4274e4 100644 --- a/analyzer/libretime_analyzer/pipeline/analyze_replaygain.py +++ b/analyzer/libretime_analyzer/pipeline/analyze_replaygain.py @@ -1,7 +1,7 @@ from subprocess import CalledProcessError from typing import Any, Dict -from ..ffmpeg import compute_replaygain, probe_replaygain +from ._ffmpeg import compute_replaygain, probe_replaygain def analyze_replaygain(filepath: str, metadata: Dict[str, Any]): diff --git a/analyzer/tests/ffmpeg_test.py b/analyzer/tests/pipeline/ffmpeg_test.py similarity index 97% rename from analyzer/tests/ffmpeg_test.py rename to analyzer/tests/pipeline/ffmpeg_test.py index 47ab63236..4dff1739d 100644 --- a/analyzer/tests/ffmpeg_test.py +++ b/analyzer/tests/pipeline/ffmpeg_test.py @@ -3,7 +3,7 @@ from math import inf import distro import pytest -from libretime_analyzer.ffmpeg import ( +from libretime_analyzer.pipeline._ffmpeg import ( _SILENCE_DETECT_RE, compute_replaygain, compute_silences, @@ -11,7 +11,7 @@ from libretime_analyzer.ffmpeg import ( probe_replaygain, ) -from .fixtures import FILES +from ..fixtures import FILES @pytest.mark.skip(reason="fixtures files are missing replaygain metadata")