Skip to content

Add Nix path to ffmpeg locations on macOS #990

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Nix path to ffmpeg locations on macOS #990

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
8 changes: 7 additions & 1 deletion src/tagstudio/qt/helpers/vendored/ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) 2022 Karl Kroening (kkroening).
# Licensed under the GPL-3.0 License.
# Vendored from ffmpeg-python and ffmpeg-python PR#790 by amamic1803
Expand All @@ -15,7 +15,13 @@

logger = structlog.get_logger(__name__)

FFMPEG_MACOS_LOCATIONS: list[str] = ["", "/opt/homebrew/bin/", "/usr/local/bin/"]
user = os.environ["USER"]

Check failure on line 18 in src/tagstudio/qt/helpers/vendored/ffmpeg.py

View workflow job for this annotation

GitHub Actions / Run MyPy 

[mypy] reported by reviewdog 🐶
Name "os" is not defined  [name-defined]

Raw Output:
/home/runner/work/TagStudio/TagStudio/src/tagstudio/qt/helpers/vendored/ffmpeg.py:18:8: error: Name "os" is not defined  [name-defined]

Check failure on line 18 in src/tagstudio/qt/helpers/vendored/ffmpeg.py

View workflow job for this annotation

GitHub Actions / Run Ruff check

Ruff (F821) 

src/tagstudio/qt/helpers/vendored/ffmpeg.py:18:8: F821 Undefined name `os`
FFMPEG_MACOS_LOCATIONS: list[str] = [
"",
"/opt/homebrew/bin/",
"/usr/local/bin/",
f"/etc/profiles/per-user/{user}/bin"
]


def _get_ffprobe_location() -> str:
Expand Down
Loading