From 50af303d4f99015e00fd706c40a168b272433240 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Tue, 10 Nov 2026 00:00:40 +0700 Subject: [PATCH 1/3] feat(player): M3 one-tap music folder import and safe missing-song relink --- engine/player/PlayerLibraryPolicy.h | 57 +++++++++ site/preview-v2/assets/arson-player.js | 12 +- .../assets/mixer-contextual-buttons.css | 16 +++ .../assets/mixer-contextual-buttons.js | 4 +- src/Main.cpp | 115 ++++++++++++++++++ ...pproved_preview_mobile_navigation_smoke.py | 8 ++ tests/player_native_decode_test.cpp | 31 +++++ 7 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 engine/player/PlayerLibraryPolicy.h diff --git a/engine/player/PlayerLibraryPolicy.h b/engine/player/PlayerLibraryPolicy.h new file mode 100644 index 000000000..8a4570655 --- /dev/null +++ b/engine/player/PlayerLibraryPolicy.h @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: AGPL-3.0-only +#pragma once +#include +#include +#include +#include + +namespace armix::player { +// FILE/WORKER only. No audio callback, network, plugin or device access. +// Folder import is a bounded, naturally ordered, user-directed action. +struct PlayerLibraryPolicy final { + static constexpr std::size_t maxSongs=2000; + static constexpr std::size_t maxEntriesInspected=20000; + static bool supported(const juce::File& file) { + return file.hasFileExtension("wav;mp3;flac;aif;aiff;ogg"); + } + static bool sameSongName(const juce::File& saved,const juce::File& chosen) { + return supported(chosen) && chosen.existsAsFile() && + saved.getFileNameWithoutExtension().isNotEmpty() && + saved.getFileNameWithoutExtension().equalsIgnoreCase( + chosen.getFileNameWithoutExtension()); + } + struct Scan { + std::vector files; + bool truncated=false; + }; + static Scan scanFolder(const juce::File& folder) { + Scan result; + if(!folder.isDirectory())return result; + // Iterates lazily and stops at finite bounds, including deep folders. + // Executed by the import worker, never by the WebView message loop. + juce::DirectoryIterator files(folder,true,"*",juce::File::findFiles); + std::size_t inspected=0; + while(files.next()) { + if(++inspected>maxEntriesInspected) { + result.truncated=true;break; + } + const auto file=files.getFile(); + if(!supported(file))continue; + if(result.files.size()>=maxSongs) { + result.truncated=true;break; + } + result.files.push_back(file); + } + std::sort(result.files.begin(),result.files.end(), + [](const juce::File& a,const juce::File& b) { + const int c=a.getFileName().compareNatural(b.getFileName(),false); + if(c!=0)return c<0; + return a.getFullPathName().compareIgnoreCase( + b.getFullPathName())<0; + }); + result.files.erase(std::unique(result.files.begin(),result.files.end()), + result.files.end()); + return result; + } +}; +} // namespace armix::player diff --git a/site/preview-v2/assets/arson-player.js b/site/preview-v2/assets/arson-player.js index 1b7d349e7..79be6dc43 100644 --- a/site/preview-v2/assets/arson-player.js +++ b/site/preview-v2/assets/arson-player.js @@ -32,6 +32,8 @@ toggle.addEventListener("click",()=>open(root.hidden)); $("playerClose").addEventListener("click",()=>open(false)); $("playerAdd").addEventListener("click",()=>send("playerAdd")); + $("playerAddFolder").addEventListener("click",()=>send("playerAddFolder")); + $("playerRelink").addEventListener("click",()=>send("playerRelink")); $("playerPlay").addEventListener("click",()=>{ send(model.transport?.state==="PLAYING"?"playerPause":"playerPlay"); }); @@ -144,11 +146,17 @@ "Music playing · output muted", ERROR:"Unable to decode this file" }[state]||""); - const indicator=(t.processingChangePending && !model.error && !t.error && + const indicator=model.libraryBusy && !model.error? + "Adding songs from folder…": + (t.processingChangePending && !model.error && !t.error && state!=="EMPTY" && state!=="ERROR") - ?"Preparing music KEY/TEMPO in decoder…":detail; + ?"Preparing music KEY/TEMPO in decoder…":detail; showFeedback(indicator,Boolean(model.error||t.error)); $("playerChooseOutput").hidden=!native || !Boolean(model.chooseOutput); + const missing=model.tracks.find(x=>x.id===model.selected)?.missing; + $("playerRelink").hidden=!native || !missing; + $("playerAddFolder").disabled=Boolean(model.libraryBusy); + $("playerAdd").disabled=Boolean(model.libraryBusy); $("playerCount").textContent=model.tracks.length+" songs"; renderTracks(); } diff --git a/site/preview-v2/assets/mixer-contextual-buttons.css b/site/preview-v2/assets/mixer-contextual-buttons.css index 84f8b2ef8..6e1b662c5 100644 --- a/site/preview-v2/assets/mixer-contextual-buttons.css +++ b/site/preview-v2/assets/mixer-contextual-buttons.css @@ -322,3 +322,19 @@ body :is(.mx-peq-global,.mx-comp-power,.mx-harm-power):focus-visible{outline:2px #arsonPlayer #playerTempoValue{width:36px} #arsonPlayer .ap-reset{padding:5px} } + +/* M3 smart library controls: lightweight, keyboard-accessible icon and + one contextual Locate file action. No additional cards or UI modes. */ +#arsonPlayer #playerAddFolder{margin-left:auto;display:inline-flex; + align-items:center;justify-content:center;width:29px;height:29px; + flex:0 0 29px;border:1px solid #45616a;border-radius:6px; + background:#223941;color:#a7d4d2} +#arsonPlayer #playerAddFolder:hover{background:#2c5058} +#arsonPlayer #playerAdd{margin-left:0;white-space:nowrap} +#arsonPlayer #playerRelink{border:1px solid #41616a; + border-radius:6px;padding:5px 8px;background:#223f47; + color:#bfe9e6;white-space:nowrap;font-size:11px} +#arsonPlayer #playerRelink:hover{background:#2b5761} +#arsonPlayer #playerRelink[hidden]{display:none!important} +#arsonPlayer #playerAdd:disabled, +#arsonPlayer #playerAddFolder:disabled{opacity:.5;cursor:wait} diff --git a/site/preview-v2/assets/mixer-contextual-buttons.js b/site/preview-v2/assets/mixer-contextual-buttons.js index 54a05ea26..5c1088004 100644 --- a/site/preview-v2/assets/mixer-contextual-buttons.js +++ b/site/preview-v2/assets/mixer-contextual-buttons.js @@ -58,8 +58,8 @@
TEMPO100%
-
Add music to begin
-
Setlist0 songs
+
Add music to begin
+
Setlist0 songs
Click to prepare · Double-click to play · Native audio through your mixer
`; diff --git a/src/Main.cpp b/src/Main.cpp index d6391cc08..c820d720a 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -44,7 +44,9 @@ #include #include #include "../engine/player/PlayerSetlistPolicy.h" +#include "../engine/player/PlayerLibraryPolicy.h" #include +#include namespace { @@ -382,6 +384,7 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr int playerSelected_=-1,playerCurrent_=-1; int playerOutputPendingIndex_=-1; // only after explicit Choose output gesture bool playerAutoNext_=false; + bool playerFolderBusy_=false; // GUI only; background scanner never touches this std::uint64_t lastAutoAdvanceGeneration_=0; juce::String playerError_; juce::File lastPluginFolder_ = juce::File::getSpecialLocation (juce::File::userHomeDirectory); @@ -2448,6 +2451,7 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr obj->setProperty("selected",playerSelected_); obj->setProperty("current",playerCurrent_); obj->setProperty("autoNext",playerAutoNext_); + obj->setProperty("libraryBusy",playerFolderBusy_); obj->setProperty("error",playerError_); obj->setProperty("chooseOutput", playerError_.containsIgnoreCase("Choose a verified MAIN output") || @@ -2513,6 +2517,115 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr }); }); } + void choosePlayerFolder() { + if(playerFileChooser_ || playerFolderBusy_)return; + playerFileChooser_=std::make_unique( + "Add Music Folder", + juce::File::getSpecialLocation(juce::File::userMusicDirectory), + "*",true); + playerFileChooser_->launchAsync( + juce::FileBrowserComponent::openMode | + juce::FileBrowserComponent::canSelectDirectories, + [safe=juce::Component::SafePointer(this)] + (const juce::FileChooser& picker) { + if(!safe)return; + const auto folder=picker.getResult(); + // FileChooser must not be destroyed inside its callback. + juce::MessageManager::callAsync([safe] { + if(safe)safe->playerFileChooser_.reset(); + }); + if(!folder.isDirectory())return; + safe->playerFolderBusy_=true; + safe->playerError_.clear(); + safe->emitPlayerState(); + // Only filesystem enumeration, bounded in scope and output, + // is performed on the worker. Never block the JUCE message + // loop or ASIO callback while importing a large USB folder. + std::thread([safe,folder] { + auto scan=armix::player::PlayerLibraryPolicy::scanFolder(folder); + juce::MessageManager::callAsync( + [safe,scan=std::move(scan)]() mutable { + if(!safe)return; + safe->playerFolderBusy_=false; + int added=0; + int first=-1; + for(const auto& file:scan.files) { + const auto found=std::find( + safe->playerLibrary_.begin(), + safe->playerLibrary_.end(),file); + if(found!=safe->playerLibrary_.end())continue; + if(safe->playerLibrary_.size()>= + armix::player::PlayerLibraryPolicy::maxSongs)break; + if(first<0) + first=static_cast(safe->playerLibrary_.size()); + safe->playerLibrary_.push_back(file); + safe->playerTrackSettings_.push_back({}); + ++added; + } + if(safe->playerSelected_<0 && first>=0) + safe->playerSelected_=first; + safe->playerError_=scan.truncated? + "Folder scan reached its safe size limit; only some songs were added": + added==0? + "No new supported songs found in this folder": + juce::String{}; + safe->persistPlayerLibrary(); + safe->emitPlayerState(true); + }); + }).detach(); + }); + } + + void choosePlayerRelink() { + if(playerFileChooser_ || playerFolderBusy_)return; + const int index=playerSelected_; + if(index<0 || index>=static_cast(playerLibrary_.size()))return; + const auto old=playerLibrary_[static_cast(index)]; + if(old.existsAsFile())return; // only resolve genuinely missing music + playerFileChooser_=std::make_unique( + "Locate Missing Music — "+old.getFileName(), + old.getParentDirectory().isDirectory()? + old.getParentDirectory(): + juce::File::getSpecialLocation(juce::File::userMusicDirectory), + "*.wav;*.mp3;*.flac;*.aif;*.aiff;*.ogg",true); + playerFileChooser_->launchAsync( + juce::FileBrowserComponent::openMode | + juce::FileBrowserComponent::canSelectFiles, + [safe=juce::Component::SafePointer(this),index,old] + (const juce::FileChooser& picker) { + if(!safe)return; + const auto chosen=picker.getResult(); + juce::MessageManager::callAsync([safe] { + if(safe)safe->playerFileChooser_.reset(); + }); + if(chosen==juce::File{})return; + if(index>=static_cast(safe->playerLibrary_.size()) || + safe->playerLibrary_[static_cast(index)]!=old) { + safe->playerError_="Setlist changed; locate the song again"; + } else if(!armix::player::PlayerLibraryPolicy::sameSongName( + old,chosen)) { + safe->playerError_="Choose the same song filename to avoid relinking the wrong music"; + } else if(std::find(safe->playerLibrary_.begin(), + safe->playerLibrary_.end(),chosen)!= + safe->playerLibrary_.end()) { + safe->playerError_="This music file is already in your setlist"; + } else { + // Preserve same logical song ID, order and per-song + // KEY/TEMPO. Never start a song or switch the output + // as a side effect of locating a file. + if(safe->playerCurrent_==index) { + safe->engine_.playerStop(); + safe->playerCurrent_=-1; + } + safe->playerLibrary_[static_cast(index)]=chosen; + safe->playerOutputPendingIndex_=-1; + safe->playerError_.clear(); + safe->persistPlayerLibrary(); + } + safe->emitPlayerState(true); + }); + } + void playTransportMusic() { const auto phase=engine_.playerStatus().getProperty( "state","EMPTY").toString().toStdString(); @@ -2588,6 +2701,8 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr } if(action=="playerSubscribe")return emitPlayerState(true); if(action=="playerAdd")return choosePlayerFiles(); + if(action=="playerAddFolder")return choosePlayerFolder(); + if(action=="playerRelink")return choosePlayerRelink(); if(action=="playerKeyStep" || action=="playerTempoStep" || action=="playerPitchTempoReset") { const auto target=armix::player::SetlistPolicy::pitchTempoTarget( diff --git a/tests/approved_preview_mobile_navigation_smoke.py b/tests/approved_preview_mobile_navigation_smoke.py index a156320f8..3493a1285 100644 --- a/tests/approved_preview_mobile_navigation_smoke.py +++ b/tests/approved_preview_mobile_navigation_smoke.py @@ -139,6 +139,14 @@ async def verify_phone(browser, width: int, height: int): await page.locator("#playerKeyPlus").click() assert "desktop app" in await page.locator("#playerFeedback").inner_text() assert await page.locator("#playerKeyValue").inner_text() == "0 st" + folder_button=page.locator("#playerAddFolder") + assert await folder_button.is_visible() + folder_bounds=await folder_button.bounding_box() + assert folder_bounds and folder_bounds["x"]>=0 + assert folder_bounds["x"]+folder_bounds["width"]<=width+2 + assert await page.locator("#playerRelink").is_hidden() + await folder_button.click() + assert "desktop app" in await page.locator("#playerFeedback").inner_text() await page.locator("#playerAdd").click() feedback = await page.locator("#playerFeedback").inner_text() assert "desktop app" in feedback, ("public preview must not fake playback", feedback) diff --git a/tests/player_native_decode_test.cpp b/tests/player_native_decode_test.cpp index 54ea9008b..c93d2cbb3 100644 --- a/tests/player_native_decode_test.cpp +++ b/tests/player_native_decode_test.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: AGPL-3.0-only #include "../engine/player/NativePlayerDeck.h" #include "../engine/player/PlayerSetlistPolicy.h" +#include "../engine/player/PlayerLibraryPolicy.h" #ifdef NDEBUG #undef NDEBUG #endif @@ -34,6 +35,36 @@ int main() { assert(Policy::nextTrack(9,9,10)==-1); // STOP after last assert(Policy::nextTrack(-1,2,10)==2); // first song assert(Policy::nextTrack(3,99,10)==4); // invalid queue ignored + // A singer can select a folder containing nested backing tracks. + // Import order is natural, bounded and excludes unrelated files. + const auto folder=juce::File::getSpecialLocation( + juce::File::tempDirectory).getNonexistentChildFile( + "arson-player-library-policy","",false); + assert(folder.createDirectory().wasOk()); + const auto nested=folder.getChildFile("subfolder"); + assert(nested.createDirectory().wasOk()); + assert(folder.getChildFile("10-outro.FLAC").create().wasOk()); + assert(folder.getChildFile("02-verse.mp3").create().wasOk()); + assert(folder.getChildFile("01-intro.wav").create().wasOk()); + assert(folder.getChildFile("garbage.txt").create().wasOk()); + assert(nested.getChildFile("03-chorus.aiff").create().wasOk()); + const auto scanned=armix::player::PlayerLibraryPolicy::scanFolder(folder); + assert(!scanned.truncated && scanned.files.size()==4); + assert(scanned.files[0].getFileName()=="01-intro.wav"); + assert(scanned.files[1].getFileName()=="02-verse.mp3"); + assert(scanned.files[2].getFileName()=="03-chorus.aiff"); + assert(scanned.files[3].getFileName()=="10-outro.FLAC"); + assert(!armix::player::PlayerLibraryPolicy::supported( + folder.getChildFile("garbage.txt"))); + // Missing track relink requires explicit matching filename; never + // silently substitute a different backing song or change its preset. + const auto missing=folder.getChildFile("old").getChildFile("02-verse.mp3"); + assert(!missing.existsAsFile()); + assert(armix::player::PlayerLibraryPolicy::sameSongName( + missing,folder.getChildFile("02-verse.mp3"))); + assert(!armix::player::PlayerLibraryPolicy::sameSongName( + missing,folder.getChildFile("01-intro.wav"))); + assert(folder.deleteRecursively()); const auto file=juce::File::getSpecialLocation(juce::File::tempDirectory) .getNonexistentChildFile("arson-player-decoder-test",".wav",false); juce::WavAudioFormat wave; From 504e143865a2d27fe60f79c851d47208758e9cec Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Tue, 10 Nov 2026 00:06:40 +0700 Subject: [PATCH 2/3] fix(player): obey single CSS owner without late selector override --- site/preview-v2/assets/mixer-contextual-buttons.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/preview-v2/assets/mixer-contextual-buttons.css b/site/preview-v2/assets/mixer-contextual-buttons.css index 6e1b662c5..4ac0fa510 100644 --- a/site/preview-v2/assets/mixer-contextual-buttons.css +++ b/site/preview-v2/assets/mixer-contextual-buttons.css @@ -262,7 +262,7 @@ body :is(.mx-peq-global,.mx-comp-power,.mx-harm-power):focus-visible{outline:2px #arsonPlayer .ap-listhead{display:flex;align-items:center;gap:8px; padding:10px 13px;border-top:1px solid #273a43;border-bottom:1px solid #273a43} #arsonPlayer .ap-listhead strong{font-size:12px;font-weight:550} -#arsonPlayer #playerAdd{margin-left:auto;border:1px solid #41616a; +#arsonPlayer #playerAdd{margin-left:0;white-space:nowrap;border:1px solid #41616a; border-radius:6px;padding:6px 10px;background:#223f47;color:#bfe9e6} #arsonPlayer #playerSearch{width:calc(100% - 26px);margin:9px 13px; padding:8px 10px;border-radius:7px;background:#0f1b22; @@ -330,7 +330,6 @@ body :is(.mx-peq-global,.mx-comp-power,.mx-harm-power):focus-visible{outline:2px flex:0 0 29px;border:1px solid #45616a;border-radius:6px; background:#223941;color:#a7d4d2} #arsonPlayer #playerAddFolder:hover{background:#2c5058} -#arsonPlayer #playerAdd{margin-left:0;white-space:nowrap} #arsonPlayer #playerRelink{border:1px solid #41616a; border-radius:6px;padding:5px 8px;background:#223f47; color:#bfe9e6;white-space:nowrap;font-size:11px} From 13c49be3b92507d6de01c6733783385808cca0ca Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Tue, 10 Nov 2026 06:52:34 +0700 Subject: [PATCH 3/3] feat(player): conservative bulk USB-folder relink on scanner worker with unique full-name evidence --- engine/player/PlayerLibraryPolicy.h | 46 +++++++++++++++++++++++++++++ src/Main.cpp | 34 +++++++++++++++++---- tests/player_native_decode_test.cpp | 38 ++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 6 deletions(-) diff --git a/engine/player/PlayerLibraryPolicy.h b/engine/player/PlayerLibraryPolicy.h index 8a4570655..eaf5d0aeb 100644 --- a/engine/player/PlayerLibraryPolicy.h +++ b/engine/player/PlayerLibraryPolicy.h @@ -24,6 +24,52 @@ struct PlayerLibraryPolicy final { std::vector files; bool truncated=false; }; + struct SafeRelink { + std::size_t index=0; + juce::File replacement; + }; + // CONTROL thread after scan worker completes. A chosen folder is explicit + // permission to search, NOT permission to guess song identity. Relink only + // an unambiguous full filename (including extension), never a stem match, + // never a path already owned by another track, and never CURRENT live deck. + // Preserve the original row, per-song KEY/TEMPO, and selection. + static std::vector planMissingRelinks( + const std::vector& library, + const std::vector& scanned, + int protectedCurrent=-1) { + std::vector plan; + for(std::size_t i=0;i(i)==protectedCurrent || old.existsAsFile()) + continue; + const auto filename=old.getFileName(); + if(filename.isEmpty() || !supported(old))continue; + const juce::File* match=nullptr; + bool ambiguous=false; + for(const auto& candidate:scanned) { + if(!candidate.getFileName().equalsIgnoreCase(filename)) + continue; + if(!supported(candidate) || !candidate.existsAsFile()) + continue; + if(match) {ambiguous=true;break;} + match=&candidate; + } + if(!match || ambiguous)continue; + // An existing song or second missing row must not be silently + // mapped to one physical file. Require one-to-one ownership. + const auto alreadyOwned=std::any_of(library.begin(),library.end(), + [&](const juce::File& entry) {return entry==*match;}); + if(alreadyOwned)continue; + const auto duplicateMissing=std::count_if(library.begin(),library.end(), + [&](const juce::File& entry) { + return !entry.existsAsFile() && + entry.getFileName().equalsIgnoreCase(filename); + }); + if(duplicateMissing!=1)continue; + plan.push_back({i,*match}); + } + return plan; + } static Scan scanFolder(const juce::File& folder) { Scan result; if(!folder.isDirectory())return result; diff --git a/src/Main.cpp b/src/Main.cpp index c820d720a..a1d9d9ec9 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -2541,13 +2541,35 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr // Only filesystem enumeration, bounded in scope and output, // is performed on the worker. Never block the JUCE message // loop or ASIO callback while importing a large USB folder. - std::thread([safe,folder] { + // Copy immutable IDs/paths on GUI thread; expensive USB + // existence checks and relink planning belong on the worker. + const auto initialLibrary=safe->playerLibrary_; + const int protectedCurrent=safe->playerCurrent_; + std::thread([safe,folder,initialLibrary,protectedCurrent] { auto scan=armix::player::PlayerLibraryPolicy::scanFolder(folder); + auto relinks=armix::player::PlayerLibraryPolicy::planMissingRelinks( + initialLibrary,scan.files,protectedCurrent); juce::MessageManager::callAsync( - [safe,scan=std::move(scan)]() mutable { + [safe,scan=std::move(scan), + relinks=std::move(relinks),initialLibrary]() mutable { if(!safe)return; safe->playerFolderBusy_=false; - int added=0; + int added=0,relinked=0; + // Update only the exact rows the worker saw. + // Edits made during the scan must remain intact. + for(const auto& change:relinks) { + if(change.index>=initialLibrary.size() || + change.index>=safe->playerLibrary_.size() || + static_cast(change.index)==safe->playerCurrent_ || + safe->playerLibrary_[change.index]!= + initialLibrary[change.index] || + std::find(safe->playerLibrary_.begin(), + safe->playerLibrary_.end(), + change.replacement)!=safe->playerLibrary_.end()) + continue; + safe->playerLibrary_[change.index]=change.replacement; + ++relinked; // keep stable IDs + KEY/TEMPO + } int first=-1; for(const auto& file:scan.files) { const auto found=std::find( @@ -2565,9 +2587,9 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr if(safe->playerSelected_<0 && first>=0) safe->playerSelected_=first; safe->playerError_=scan.truncated? - "Folder scan reached its safe size limit; only some songs were added": - added==0? - "No new supported songs found in this folder": + "Folder scan reached its safe size limit; only some songs were found": + added==0 && relinked==0? + "No new supported songs or safe missing-file matches found": juce::String{}; safe->persistPlayerLibrary(); safe->emitPlayerState(true); diff --git a/tests/player_native_decode_test.cpp b/tests/player_native_decode_test.cpp index c93d2cbb3..7cbcba020 100644 --- a/tests/player_native_decode_test.cpp +++ b/tests/player_native_decode_test.cpp @@ -64,6 +64,44 @@ int main() { missing,folder.getChildFile("02-verse.mp3"))); assert(!armix::player::PlayerLibraryPolicy::sameSongName( missing,folder.getChildFile("01-intro.wav"))); + // An operator selects the NEW USB folder once. Only an unambiguous + // exact full filename can repair an old missing file path; a different + // extension with the same stem does not silently replace the song. + using Library=armix::player::PlayerLibraryPolicy; + const auto lost1=folder.getChildFile("old").getChildFile("01-intro.wav"); + const auto lost2=folder.getChildFile("old").getChildFile("02-verse.mp3"); + const auto lost3=folder.getChildFile("old").getChildFile("03-chorus.aiff"); + std::vector saved={lost1,lost2,lost3}; + auto repaired=Library::planMissingRelinks(saved,scanned.files); + assert(repaired.size()==3); + assert(repaired[0].index==0 && repaired[0].replacement== + folder.getChildFile("01-intro.wav")); + assert(repaired[1].index==1 && repaired[1].replacement== + folder.getChildFile("02-verse.mp3")); + assert(repaired[2].index==2 && repaired[2].replacement== + nested.getChildFile("03-chorus.aiff")); + // Preserve CURRENT live source even if its old file was unplugged. + repaired=Library::planMissingRelinks(saved,scanned.files,1); + assert(repaired.size()==2 && repaired[0].index==0 && + repaired[1].index==2); + // A song already represented elsewhere must not gain a second owner. + saved.push_back(folder.getChildFile("01-intro.wav")); + repaired=Library::planMissingRelinks(saved,scanned.files); + assert(repaired.size()==2); + // Ambiguous same-name alternatives in subfolders are never guessed. + const auto duplicate=nested.getChildFile("02-verse.mp3"); + assert(duplicate.create().wasOk()); + const auto ambiguous=Library::scanFolder(folder); + repaired=Library::planMissingRelinks(saved,ambiguous.files); + assert(repaired.size()==1 && repaired.front().index==2); + // Two missing IDs with the same basename must not collapse into one. + saved.push_back(folder.getChildFile("another").getChildFile("03-chorus.aiff")); + repaired=Library::planMissingRelinks(saved,ambiguous.files); + assert(repaired.empty()); + // Extension and name must match exactly even when a stem matches. + assert(Library::planMissingRelinks( + {folder.getChildFile("old").getChildFile("02-verse.wav")}, + {folder.getChildFile("02-verse.mp3")}).empty()); assert(folder.deleteRecursively()); const auto file=juce::File::getSpecialLocation(juce::File::tempDirectory) .getNonexistentChildFile("arson-player-decoder-test",".wav",false);