mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-21 12:21:49 +00:00
* Update GitHub repo references from feedback* to feedBack* * rename: slopsmith -> feedBack, byron -> got-feedBack Renames across the entire codebase: - slopsmith/Slopsmith/SLOPSMITH/SlopSmith -> feedBack/FeedBack/FEEDBACK/FeedBack - byron/Byron/Byrongamatos -> got-feedBack/got-feedBack/got-feedBack - /home/byron/ -> /opt/got-feedBack/ - byron@ougsoft.com -> hi@got-feedBack.org - github.com/byrongamatos/ -> github.com/got-feedback/ - com.byron. -> com.got-feedback. - SLOPSMITH_ env vars -> FEEDBACK_ with backward-compat fallback - Protocol/storage strings migrated with read-old/write-new pattern - window.slopsmith JS API -> window.feedBack (canonical) + backward-compat alias Refs: #rename-slopsmith * rename: complete regen against current main + fix backward-compat alias Regenerated the slopsmith->feedBack / byron->got-feedBack rename on top of current main (3 commits had landed since the branch: #572/#554/#574), resolving the four content conflicts in favour of main's newer content (autoplay/auto-exit, accuracy-badge, Virtuoso re-home, feedpak badge). Completion fixes on top of the mechanical rename: - Re-apply rename to post-branch content the original rename never saw: window.slopsmith(.Tour) consumers in lessons.js / notifications.js / onboarding-tour.js, and the matching JS + python tests (autoplay_exit, progression_*, test_feedpak_extension FEEDBACK_* env vars). The test env vars now match server.py (which reads FEEDBACK_SYNC_STARTUP / FEEDBACK_SKIP_STARTUP_TASKS), so the sync-startup test exercises the real path again. - Restore the window.slopsmith backward-compat alias dropped during conflict resolution, and move the bus aliases to AFTER the _feedBackExisting merge block so they reference the fully-assembled object (also fixes the loop_api.test.js API-surface regex, which the original PR latently broke). - Drop the stray empty data/web_library.db (runtime DB lives in CONFIG_DIR) and gitignore it. - Fix stale tone-source test: feed[dB]ack -> fee[dB]ack to match shipped source labels. Verified locally (org CI billing-blocked): JS 819/819 pass; pytest 1669 passed / 1683 collected with 0 import errors; zero residual slopsmith/byron except the two intentional window.slopsmith aliases. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * rename: implement advertised backward-compat + prune dead community plugins Address gaps where PR #537's "Backward compatibility" section was advertised but not implemented, and clean up the community plugin list. Env vars (FEEDBACK_* canonical, legacy SLOPSMITH_* honoured): - New lib/env_compat.py (getenv_compat / env_flag_compat) + tests. server.py (_env_flag + all FEEDBACK_* reads), diagnostics_hardware, gp2midi and tailwind_rebuild now resolve the legacy alias, so existing SLOPSMITH_UI / SLOPSMITH_PLUGINS_DIR / etc. deployments keep working. - Fix the rename collapsing plugins/__init__.py and minigames/routes.py from `FEEDBACK_PLUGINS_DIR or SLOPSMITH_PLUGINS_DIR` into a redundant `FEEDBACK_ or FEEDBACK_` (the fallback was silently lost). Storage (app.js update-channel): - Read feedBack-update-channel, fall back to legacy slopsmith-update-channel, and clear the legacy key on write — so a user's update-channel preference survives the rename instead of resetting to "stable". Community plugin list (README): the rename rewrote third-party repo URLs we don't own. Probed every one; their owners never renamed, so: - Restore the 13 live community plugins to their real slopsmith-* names. - Prune 6 that are 404 to the public (topkoa splitscreen/stems, OmikronApex tuner, Jafz2001 nam-rig-builder, DeathlySin song-preview, Erikcb91 shuffle). - Fix a pre-existing Guitar Theory clone-command typo (nam-tone -> guitar-theory). Verified: env_compat 7/7, JS 819/819, pytest 1690 collected / 0 import errors, rename-sensitive + startup suites green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: byrongamatos <xasiklas@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
130 lines
5.0 KiB
Python
130 lines
5.0 KiB
Python
"""Tests for the desktop-bundle binary resolution in lib/audio.py.
|
|
|
|
Desktop builds ship `resources/bin/ffmpeg` (and vgmstream-cli, ffprobe).
|
|
Electron's child PATH on macOS / Linux puts user-installed binaries
|
|
(Homebrew `/opt/homebrew/bin`, `/usr/local`) before our `resources/bin`,
|
|
so a plain `shutil.which` would pick up the user's binary — which may
|
|
have been built without the features we rely on (e.g. Homebrew ffmpeg
|
|
formulas that omit libvorbis). `_bundled_bin_dir()` + `_bundled_or_path()`
|
|
detect the desktop layout via the vgmstream-cli marker and prefer the
|
|
bundled binary; outside the bundle, `shutil.which` is used unchanged.
|
|
"""
|
|
|
|
import shutil
|
|
|
|
import audio
|
|
|
|
|
|
def _set_audio_file(monkeypatch, fake_lib_dir):
|
|
"""Point lib/audio.py's __file__ at a fake location so parents[2] resolves
|
|
to the test's fake resources root."""
|
|
monkeypatch.setattr(audio, "__file__", str(fake_lib_dir / "audio.py"))
|
|
|
|
|
|
def test_bundled_bin_dir_returns_path_when_vgmstream_marker_present(tmp_path, monkeypatch):
|
|
"""Desktop-bundle layout: resources/feedBack/lib/audio.py with a
|
|
vgmstream-cli marker file in resources/bin/."""
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
fake_bin = fake_resources / "bin"
|
|
fake_bin.mkdir()
|
|
(fake_bin / "vgmstream-cli").write_text("") # marker
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
|
|
assert audio._bundled_bin_dir() == fake_bin
|
|
|
|
|
|
def test_bundled_bin_dir_returns_none_without_marker(tmp_path, monkeypatch):
|
|
"""When parents[2]/bin/ exists but lacks the vgmstream-cli marker
|
|
(e.g. Docker's /bin, dev layouts where parents[2] is the repo root),
|
|
we must NOT treat it as a desktop bundle — otherwise we'd shell out
|
|
to whatever ffmpeg/etc. lives there."""
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
fake_bin = fake_resources / "bin"
|
|
fake_bin.mkdir()
|
|
# No vgmstream-cli marker. Drop an ffmpeg there to make sure absence
|
|
# of the marker still wins over presence of the target binary.
|
|
(fake_bin / "ffmpeg").write_text("")
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
|
|
assert audio._bundled_bin_dir() is None
|
|
|
|
|
|
def test_bundled_bin_dir_returns_none_when_bin_dir_missing(tmp_path, monkeypatch):
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
# no bin/ dir at all
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
|
|
assert audio._bundled_bin_dir() is None
|
|
|
|
|
|
def test_bundled_or_path_prefers_bundled_when_marker_present(tmp_path, monkeypatch):
|
|
"""When the desktop layout is detected, the bundled binary wins over
|
|
whatever shutil.which would find on PATH."""
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
fake_bin = fake_resources / "bin"
|
|
fake_bin.mkdir()
|
|
(fake_bin / "vgmstream-cli").write_text("")
|
|
(fake_bin / "ffmpeg").write_text("")
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
|
|
# Pretend shutil.which would have returned a Homebrew ffmpeg — bundled
|
|
# must still win.
|
|
monkeypatch.setattr(shutil, "which", lambda name: "/opt/homebrew/bin/ffmpeg")
|
|
|
|
assert audio._bundled_or_path("ffmpeg") == str(fake_bin / "ffmpeg")
|
|
|
|
|
|
def test_bundled_or_path_falls_back_to_which_outside_bundle(tmp_path, monkeypatch):
|
|
"""No marker → no bundle → shutil.which result is returned verbatim."""
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
# No bin/ dir → no marker → not a bundle.
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
monkeypatch.setattr(shutil, "which", lambda name: "/usr/bin/ffmpeg")
|
|
|
|
assert audio._bundled_or_path("ffmpeg") == "/usr/bin/ffmpeg"
|
|
|
|
|
|
def test_bundled_or_path_returns_none_when_neither_available(tmp_path, monkeypatch):
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
monkeypatch.setattr(shutil, "which", lambda name: None)
|
|
|
|
assert audio._bundled_or_path("ffmpeg") is None
|
|
|
|
|
|
def test_bundled_or_path_falls_through_to_which_when_bundle_has_marker_but_not_target(tmp_path, monkeypatch):
|
|
"""If the bundle is detected (vgmstream-cli marker present) but the
|
|
*requested* binary isn't actually in resources/bin/, we should still
|
|
fall through to PATH rather than returning None — otherwise a partial
|
|
desktop bundle would silently disable any binary it forgot to ship."""
|
|
fake_resources = tmp_path / "resources"
|
|
fake_lib = fake_resources / "feedBack" / "lib"
|
|
fake_lib.mkdir(parents=True)
|
|
fake_bin = fake_resources / "bin"
|
|
fake_bin.mkdir()
|
|
(fake_bin / "vgmstream-cli").write_text("") # marker present
|
|
# ffmpeg deliberately NOT in fake_bin
|
|
|
|
_set_audio_file(monkeypatch, fake_lib)
|
|
monkeypatch.setattr(shutil, "which", lambda name: "/usr/bin/ffmpeg")
|
|
|
|
assert audio._bundled_or_path("ffmpeg") == "/usr/bin/ffmpeg"
|