🐛 FIX: serve plays the song's own render first

A DJ set's mix came after its records' renders in subfolders once those
were newer (purge makes them fresh MP3s). The render next to the song's
report (or render/) comes first, then MP3, then the shallower path.

Author: austinginder

changelog.md

@@ -36,6 +36,7 @@ All notable changes to Wavelength. Versions follow semantic versioning.
 - `serve`: clicking a track name in the song player no longer solos it; soloing lives in the editor (the S button or a right-click).
 
 ### Fixed
+- `serve` plays the song's own render first (next to its report, or the kept render/): a DJ set's mix came after its records' renders in subfolders once those were newer.
 - `lint --harmony` reads a one-shot sample named like a drum (kick, snare, clap, hat, crash, ride, tom, perc...) as a drum, by its file name or its track's name: a 909 kick or ride that rings past 0.4 s with a clear pitch counted as notes and gave false key excursions (9 on one song).
 - `analyze <render folder>` finds the stems of a render made from another directory: the report names them relative to where the render ran, so they were all skipped.
 - `tracks[].postFaderLufs` is measured on every render: it read -120 for every track in a render without markers or a picture and in every `--from/--to` window. A streaming meter (`LoudnessMeter`, equal to the full-buffer measurement) needs no copy of the track's audio.

src/serve.cpp

@@ -419,9 +419,16 @@ json Server::song(const std::string &slug) {
     const bool hasReport = !reportPath.empty() && readJson(dir / reportPath, report);
     std::vector<std::string> audio;
     for (auto &[p, f] : files) if (isAudio(p)) audio.push_back(p);
+    // the song's own render first (next to its report, or the kept render/), then MP3 before WAV, then the
+    // shallower path: a set's mix ahead of the records' renders in its subfolders, however recent theirs are
+    const std::string ownDir = reportPath.empty() ? "out" : fs::path(reportPath).parent_path().generic_string();
+    auto own = [&](const std::string &p) { const std::string d = fs::path(p).parent_path().generic_string(); return d == ownDir || d == "render"; };
+    auto depth = [](const std::string &p) { return std::count(p.begin(), p.end(), '/'); };
     std::sort(audio.begin(), audio.end(), [&](const std::string &a, const std::string &b) {
+        if (own(a) != own(b)) return own(a);
         const bool am = a.substr(a.size() - 4) == ".mp3", bm = b.substr(b.size() - 4) == ".mp3";
         if (am != bm) return am;
+        if (depth(a) != depth(b)) return depth(a) < depth(b);
         return files.at(a).mtime > files.at(b).mtime;
     });
     json docs = json::object();