Skip to content

New feature: recursive playlists #381

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

Merged
biologist79 merged 9 commits into from
Oct 23, 2025
Merged

New feature: recursive playlists #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd8b5e1
Adding new recursive playmodes
Oct 15, 2025
8f58f23
Update README
Oct 13, 2025
800f951
Regression fix: remove volume-queue from IRreceiver.cpp
Oct 17, 2025
d5d32c7
Removal of 4bit-bitmask from playmode (thanks to @Joe91)
Oct 22, 2025
ffa54a3
Switch to long commit IDs
Oct 22, 2025
40850c9
Merge branch 'dev' into audiobook_multiple_folders
biologist79 Oct 22, 2025
162b21a
Rewrite + rename of findNextOrPrevDirectoryTrack()
Oct 23, 2025
2d4389b
Refactoring of NVS-wrapper to enable AUDIOBOOK_RECURSIVE (thanks to @…
Oct 23, 2025
85eeafb
Merge branch 'dev' into audiobook_multiple_folders
biologist79 Oct 23, 2025
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
80 changes: 77 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,80 @@
{
"cmake.configureOnOpen": false,
"gitlens.advanced.blame.customArguments": [
"--ignore-revs-file", ".git-blame-ignore-revs"
]
}
"--ignore-revs-file",
".git-blame-ignore-revs"
],
"files.associations": {
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"format": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"semaphore": "cpp",
"span": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"text_encoding": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"typeinfo": "cpp",
"variant": "cpp",
"csignal": "cpp",
"future": "cpp"
}
}
8 changes: 7 additions & 1 deletion html/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,12 @@
"2": "Einzelner Titel (Endlosschleife)",
"12": "Einzelner Titel eines Verzeichnis (zufällig). Danach schlafen.",
"3": "Hörbuch",
"16": "Hörbuch mit Unterverzeichnissen (rekursiv)",
"4": "Hörbuch (Endlosschleife)",
"5": "Alle Titel eines Verzeichnis (sortiert)",
"15": "Alle Titel eines Verzeichnis + Unterverzeichnisse (rekursiv, sortiert)",
"6": "Alle Titel eines Verzeichnis (zufällig)",
"17": "Alle Titel eines Verzeichnis + Unterverzeichnisse (rekursiv, zufällig)",
"7": "Alle Titel eines Verzeichnis (sortiert, Endlosschleife)",
"9": "Alle Titel eines Verzeichnis (zufällig, Endlosschleife)",
"13": "Alle Titel aus einem zufälligen Unterverzeichnis (sortiert)",
Expand Down Expand Up @@ -234,6 +237,8 @@
"181": "Springe rückwärts (n Sekunden)",
"182": "Stop",
"183": "Neustart",
"184": "Springe zum nächsten Ordner",
"185": "Springe zum vorherigen Ordner",
"199": "Taskauslastung anzeigen (Konsole)",
"241": "Spiele virtuelle RFID-Karte 01",
"242": "Spiele virtuelle RFID-Karte 02",
Expand Down Expand Up @@ -374,7 +379,8 @@
"sortMode": "Sortierungsmodus für Wiedergabeliste und Dateibrowser",
"strcmp": "Standardsortierung",
"strnatcmp": "Natürlich: Groß- und Kleinschreibung beachten",
"strnatcasecmp": "Natürlich: Groß- und Kleinschreibung ignorieren"
"strnatcasecmp": "Natürlich: Groß- und Kleinschreibung ignorieren",
"recDepth": "Maximale Rekursionstiefe beim Generieren der Rekursiv-Playlists"
}
},
"tools": {
Expand Down
8 changes: 7 additions & 1 deletion html/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,12 @@
"2": "Single track (loop)",
"12": "Single track of a directory (random). Followed by sleep.",
"3": "Audiobook",
"16": "Audiobook with subdirectories (rekursive)",
"4": "Audiobook (loop)",
"5": "All tracks of a directory (sorted)",
"15": "All tracks of a directory + subdirectories (sorted, recursive)",
"6": "All tracks of a directory (random)",
"17": "All tracks of a directory + subdirectories (random, recursive)",
"7": "All tracks of a directory (sorted, loop)",
"9": "All tracks of a directory (random, loop)",
"13": "All tracks of a random subdirectory (sorted)",
Expand Down Expand Up @@ -234,6 +237,8 @@
"181": "Seek backwards (n seconds)",
"182": "Stop",
"183": "Restart",
"184": "Jump to next folder",
"185": "Jump to previous folder",
"199": "Display task load (console)",
"241": "Play virtual RFID-card 01",
"242": "Play virtual RFID-card 02",
Expand Down Expand Up @@ -374,7 +379,8 @@
"sortMode": "Sorting mode for playlist and file browser",
"strcmp": "Standard sorting",
"strnatcmp": "Natural: case-sensitive",
"strnatcasecmp": "Natural: case-insensitive"
"strnatcasecmp": "Natural: case-insensitive",
"recDepth": "Maximum recursion depth at generation of recursive playlists"
}
},
"tools": {
Expand Down
8 changes: 7 additions & 1 deletion html/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,12 @@
"2": "Piste unique (boucle)",
"12": "Piste unique d'un répertoire (aléatoire). Suivi par un mode veille.",
"3": "Livre audio",
"16": "Livre audio avec sous-répertoires (récursif)",
"4": "Livre audio (boucle)",
"5": "Toutes les pistes d'un répertoire (triées)",
"15": "Tous les titres d'un répertoire + sous-répertoires (triées, récursif)",
"6": "Toutes les pistes d'un répertoire (aléatoire)",
"17": "Tous les titres d'un répertoire + sous-répertoires (aléatoire, récursif)",
"7": "Toutes les pistes d'un répertoire (triées, boucle)",
"9": "Toutes les pistes d'un répertoire (aléatoire, boucle)",
"13": "Toutes les pistes d'un sous-répertoire aléatoire (triées)",
Expand Down Expand Up @@ -234,6 +237,8 @@
"181": "Reculer de n secondes",
"182": "Stop",
"183": "Redémarrer",
"184": "Passer au dossier suivant",
"185": "Passer au dossier précédent",
"199": "Affichage de la charge de travail (console)",
"241": "Jouez à la carte RFID virtuelle 01",
"242": "Jouez à la carte RFID virtuelle 02",
Expand Down Expand Up @@ -374,7 +379,8 @@
"sortMode": "Mode de tri pour la liste de lecture et le navigateur de fichiers",
"strcmp": "Tri standard",
"strnatcmp": "Naturel: sensible à la casse",
"strnatcasecmp": "Naturel: insensible à la casse"
"strnatcasecmp": "Naturel: insensible à la casse",
"recDepth": "Profondeur de récursion maximale lors de la génération de playlists récursives"
}
},
"tools": {
Expand Down
25 changes: 22 additions & 3 deletions html/management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,12 +697,20 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
data-i18n="files.rfid.playmode.mode.12"></option>
<option class="option-file-and-folder" value="3"
data-i18n="files.rfid.playmode.mode.3"></option>
<option class="option-file-and-folder" value="16"
data-i18n="files.rfid.playmode.mode.16"></option>
<option class="option-file-and-folder" value="4"
data-i18n="files.rfid.playmode.mode.4"></option>
<option class="option-folder" value="5" data-i18n="files.rfid.playmode.mode.5">
</option>
<option class="option-folder" value="15"
data-i18n="files.rfid.playmode.mode.15">
</option>
<option class="option-folder" value="6" data-i18n="files.rfid.playmode.mode.6">
</option>
<option class="option-folder" value="17"
data-i18n="files.rfid.playmode.mode.17">
</option>
<option class="option-folder" value="7" data-i18n="files.rfid.playmode.mode.7">
</option>
<option class="option-folder" value="9" data-i18n="files.rfid.playmode.mode.9">
Expand Down Expand Up @@ -1117,6 +1125,15 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
<option value="1" data-i18n="general.playlist.strcmp"></option>
</select>
</fieldset>
<fieldset>
<label for="playlistRecDepth" data-i18n="[prepend]general.playlist.recDepth">:</label>
<select id="playlistRecDepth" name="playlistRecDepth" class="form-control form-select">
<option value="4">4</option>
<option value="3">3</option>
<option value="2">2</option>
<option value="1">1</option>
</select>
</fieldset>
</div>
<p data-i18n="settingsex.title"></p>
<button class="btn btn-primary" type="button" data-bs-toggle="collapse"
Expand Down Expand Up @@ -2287,6 +2304,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
let playlistSettings = settings.playlist;
if (playlistSettings) {
$("#playlistSortMode").val(playlistSettings.sortMode).change();
$("#playlistRecDepth").val(playlistSettings.recDepth).change();
}
// rotary encoder
let rotarySettings = settings.rotary;
Expand Down Expand Up @@ -2626,7 +2644,8 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
voltageCheckInterval: Number($('#voltageCheckInterval').val())
},
"playlist": {
sortMode: Number($('#playlistSortMode').val())
sortMode: Number($('#playlistSortMode').val()),
recDepth: Number($('#playlistRecDepth').val()),
},
"buttons": {
short0: Number(document.getElementById("cmdselect_short_0").value),
Expand Down Expand Up @@ -3162,7 +3181,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>
const cmdElem = document.createElement('select');
const cmdNothing = addOption(cmdElem, 0);
cmdNothing.setAttribute('data-i18n', "settingsex.buttons.noaction");
const cmds = [170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
const cmds = [170, 171, 172, 173, 174, 184, 185, 175, 176, 177, 178, 179, 180, 181, 182, 183, 199, 150, 151, 152, 120, 100, 101, 102, 103, 104, 105, 106, 107, 110, 111, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
for (const cmd of cmds) {
addOption(cmdElem, cmd);
}
Expand All @@ -3172,7 +3191,7 @@ <h5 class="modal-title" data-i18n="tools.nvs.erase.title"></h5>

/* The <select /> that houses all commands for the modification selectors */
const modElem = document.createElement('select');
const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 0, 170, 171, 172, 173, 174, 180, 181, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
const mods = [100, 179, 101, 102, 103, 104, 105, 106, 110, 111, 120, 130, 140, 141, 142, 150, 151, 152, 0, 170, 171, 172, 173, 174, 184, 185, 180, 181, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250];
for (const mod of mods) {
addOption(modElem, mod);
}
Expand Down
Loading
Loading