From e343ffee5a4663374a77073a3e4370041f2fc431 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 1 Feb 2025 17:23:24 +0000 Subject: [PATCH 1/4] Add playlist browser Add a menu item to main menu and associated browser for playlist files in the root of the SD card --- lua/main_menu.lua | 8 ++++ lua/playlist_browser.lua | 91 ++++++++++++++++++++++++++++++++++++++++ lua/table_iterator.lua | 27 ++++++++++++ lua/widgets.lua | 2 +- 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 lua/playlist_browser.lua create mode 100644 lua/table_iterator.lua diff --git a/lua/main_menu.lua b/lua/main_menu.lua index cc7874d7..80d5b599 100644 --- a/lua/main_menu.lua +++ b/lua/main_menu.lua @@ -131,6 +131,14 @@ return widgets.MenuScreen:new { }) end + local playlist_btn = indexes_list:add_btn(nil, "Playlists") + playlist_btn:onClicked(function() + backstack.push(require("playlist_browser"):new { + title = "Playlists", + }) + end) + playlist_btn:add_style(styles.list_item) + local function show_no_indexes(msg) indexes_list:add_flag(lvgl.FLAG.HIDDEN) no_indexes_container:clear_flag(lvgl.FLAG.HIDDEN) diff --git a/lua/playlist_browser.lua b/lua/playlist_browser.lua new file mode 100644 index 00000000..da50f4c8 --- /dev/null +++ b/lua/playlist_browser.lua @@ -0,0 +1,91 @@ +-- SPDX-FileCopyrightText: 2025 Sam Lord +-- +-- SPDX-License-Identifier: GPL-3.0-only + +local lvgl = require("lvgl") +local widgets = require("widgets") +local database = require("database") +local sd_card = require("sd_card") +local backstack = require("backstack") +local browser = require("browser") +local playing = require("playing") +local styles = require("styles") +local filesystem = require("filesystem") +local screen = require("screen") +local font = require("font") +local theme = require("theme") +local img = require("images") +local playback = require("playback") +local queue = require("queue") +local table_iterator = require("table_iterator") + + +return screen:new { + create_ui = function(self) + self.root = lvgl.Object(nil, { + flex = { + flex_direction = "column", + flex_wrap = "wrap", + justify_content = "flex-start", + align_items = "flex-start", + align_content = "flex-start" + }, + w = lvgl.HOR_RES(), + h = lvgl.VER_RES() + }) + self.root:center() + + self.status_bar = widgets.StatusBar(self, { + back_cb = backstack.pop, + title = self.title + }) + + local header = self.root:Object { + flex = { + flex_direction = "column", + flex_wrap = "wrap", + justify_content = "flex-start", + align_items = "flex-start", + align_content = "flex-start" + }, + w = lvgl.HOR_RES(), + h = lvgl.SIZE_CONTENT, + pad_left = 4, + pad_right = 4, + pad_bottom = 2, + scrollbar_mode = lvgl.SCROLLBAR_MODE.OFF + } + theme.set_subject(header, "header") + + if self.breadcrumb then + header:Label { + text = self.breadcrumb, + text_font = font.fusion_10 + } + end + + local playlists = {} + -- Find playlists + local fs_iter = filesystem.iterator("") + for item in fs_iter do + if + item:filepath():match("%.playlist$") or + item:filepath():match("%.m3u8?$") then + table.insert(playlists, item) + end + end + + widgets.InfiniteList(self.root, table_iterator:create(playlists), { + focus_first_item = true, + callback = function(item) + return function() + queue.open_playlist(item:filepath()) + playback.playing:set(true) + backstack.push(playing:new()) + end + end + }) + end +} + + diff --git a/lua/table_iterator.lua b/lua/table_iterator.lua new file mode 100644 index 00000000..5bacada6 --- /dev/null +++ b/lua/table_iterator.lua @@ -0,0 +1,27 @@ + +local TableIterator = {} + +function TableIterator:create(table) + local iterator = {}; + iterator.index = 0; + iterator.table = table; + + function iterator:clone() + return TableIterator:create(table) + end + + function iterator:next() + self.index = self.index + 1 + return self.table[self.index] + end + + function iterator:prev() + self.index = self.index - 1 + return self.table[self.index] + end + + return iterator +end + + +return TableIterator \ No newline at end of file diff --git a/lua/widgets.lua b/lua/widgets.lua index 0aac7705..20f0cd2a 100644 --- a/lua/widgets.lua +++ b/lua/widgets.lua @@ -361,7 +361,7 @@ function widgets.InfiniteList(parent, iterator, opts) end for idx = 0, 8 do - local val = fwd_iterator() + local val = fwd_iterator:next() if not val then break end From 10ba00951be79d843c560e4199ac8325f3315f72 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 1 Feb 2025 17:26:23 +0000 Subject: [PATCH 2/4] Remove unused imports --- lua/playlist_browser.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lua/playlist_browser.lua b/lua/playlist_browser.lua index da50f4c8..d29899ad 100644 --- a/lua/playlist_browser.lua +++ b/lua/playlist_browser.lua @@ -4,17 +4,12 @@ local lvgl = require("lvgl") local widgets = require("widgets") -local database = require("database") -local sd_card = require("sd_card") local backstack = require("backstack") -local browser = require("browser") local playing = require("playing") -local styles = require("styles") local filesystem = require("filesystem") local screen = require("screen") local font = require("font") local theme = require("theme") -local img = require("images") local playback = require("playback") local queue = require("queue") local table_iterator = require("table_iterator") From 844b3f733ec30eff41c3b3d48c74561d7b11da8e Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 3 Feb 2025 20:13:23 +0000 Subject: [PATCH 3/4] Use Playlist subdirectory Target /Playlists, display and browse sub directories and playlists within --- lua/main_menu.lua | 1 + lua/playlist_browser.lua | 48 +++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/lua/main_menu.lua b/lua/main_menu.lua index 80d5b599..c8edf766 100644 --- a/lua/main_menu.lua +++ b/lua/main_menu.lua @@ -135,6 +135,7 @@ return widgets.MenuScreen:new { playlist_btn:onClicked(function() backstack.push(require("playlist_browser"):new { title = "Playlists", + iterator = filesystem.iterator("/Playlists") }) end) playlist_btn:add_style(styles.list_item) diff --git a/lua/playlist_browser.lua b/lua/playlist_browser.lua index d29899ad..4824b581 100644 --- a/lua/playlist_browser.lua +++ b/lua/playlist_browser.lua @@ -13,6 +13,7 @@ local theme = require("theme") local playback = require("playback") local queue = require("queue") local table_iterator = require("table_iterator") +local img = require("images") return screen:new { @@ -59,28 +60,49 @@ return screen:new { } end - local playlists = {} - -- Find playlists - local fs_iter = filesystem.iterator("") - for item in fs_iter do + local is_playlist = function(item) + return item:filepath():match("%.playlist$") + or item:filepath():match("%.m3u8?$") + end + + local get_icon_func = function(item) + if item:is_directory() then + return img.files + else + return img.enqueue + end + end + + local playlists_and_dirs = {}; + for item in self.iterator do if - item:filepath():match("%.playlist$") or - item:filepath():match("%.m3u8?$") then - table.insert(playlists, item) + is_playlist(item) or + item:is_directory() then + table.insert(playlists_and_dirs, item) end end - widgets.InfiniteList(self.root, table_iterator:create(playlists), { + widgets.InfiniteList(self.root, table_iterator:create(playlists_and_dirs), { focus_first_item = true, + get_icon = get_icon_func, callback = function(item) return function() - queue.open_playlist(item:filepath()) - playback.playing:set(true) - backstack.push(playing:new()) + if item:is_directory() then + backstack.push( + require("playlist_browser"):new { + title = self.title, + iterator = filesystem.iterator(item:filepath()), + breadcrumb = item:filepath() + }) + elseif + is_playlist(item) then + -- TODO: playlist viewer + queue.open_playlist(item:filepath()) + playback.playing:set(true) + backstack.push(playing:new()) + end end end }) end } - - From ff733e8f0c827e3d2d91bb7db29a85807867ab5e Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 4 Feb 2025 21:13:52 +0000 Subject: [PATCH 4/4] Wrap filesystem iterator Change to wrapping the filesystem iterator rather than iterating over table values. Also centralise the is_playlist check and hide Playlists menu if none are present --- lua/file_browser.lua | 5 ++--- lua/main_menu.lua | 16 +++++++++++++++- lua/playlist_browser.lua | 20 +++----------------- lua/playlist_iterator.lua | 35 +++++++++++++++++++++++++++++++++++ lua/table_iterator.lua | 27 --------------------------- 5 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 lua/playlist_iterator.lua delete mode 100644 lua/table_iterator.lua diff --git a/lua/file_browser.lua b/lua/file_browser.lua index 98261d55..6289828f 100644 --- a/lua/file_browser.lua +++ b/lua/file_browser.lua @@ -8,11 +8,11 @@ local backstack = require("backstack") local font = require("font") local queue = require("queue") local playing = require("playing") -local styles = require("styles") local playback = require("playback") local theme = require("theme") local screen = require("screen") local filesystem = require("filesystem") +local playlist_iterator = require("playlist_iterator") return screen:new { create_ui = function(self) @@ -70,8 +70,7 @@ return screen:new { breadcrumb = item:filepath() }) elseif - item:filepath():match("%.playlist$") or - item:filepath():match("%.m3u8?$") then + playlist_iterator:is_playlist(item) then queue.open_playlist(item:filepath()) playback.playing:set(true) backstack.push(playing:new()) diff --git a/lua/main_menu.lua b/lua/main_menu.lua index c8edf766..fdf11956 100644 --- a/lua/main_menu.lua +++ b/lua/main_menu.lua @@ -11,7 +11,6 @@ local browser = require("browser") local playing = require("playing") local styles = require("styles") local filesystem = require("filesystem") -local screen = require("screen") local font = require("font") local theme = require("theme") local img = require("images") @@ -151,6 +150,14 @@ return widgets.MenuScreen:new { indexes_list:clear_flag(lvgl.FLAG.HIDDEN) end + local function hide_playlist_listing() + playlist_btn:add_flag(lvgl.FLAG.HIDDEN) + end + + local function show_playlist_listing() + playlist_btn:clear_flag(lvgl.FLAG.HIDDEN) + end + local function update_visible_indexes() local has_valid_index = false for _, idx in ipairs(indexes) do @@ -164,6 +171,13 @@ return widgets.MenuScreen:new { end if has_valid_index then hide_no_indexes() + + -- If we have valid indexes, then also check for playlists + if filesystem.iterator("/Playlists/"):next() == nil then + hide_playlist_listing() + else + show_playlist_listing() + end else if require("database").updating:get() then show_no_indexes("The database is updating for the first time. Please wait.") diff --git a/lua/playlist_browser.lua b/lua/playlist_browser.lua index 4824b581..0339d59b 100644 --- a/lua/playlist_browser.lua +++ b/lua/playlist_browser.lua @@ -12,7 +12,7 @@ local font = require("font") local theme = require("theme") local playback = require("playback") local queue = require("queue") -local table_iterator = require("table_iterator") +local playlist_iterator = require("playlist_iterator") local img = require("images") @@ -60,11 +60,6 @@ return screen:new { } end - local is_playlist = function(item) - return item:filepath():match("%.playlist$") - or item:filepath():match("%.m3u8?$") - end - local get_icon_func = function(item) if item:is_directory() then return img.files @@ -73,16 +68,7 @@ return screen:new { end end - local playlists_and_dirs = {}; - for item in self.iterator do - if - is_playlist(item) or - item:is_directory() then - table.insert(playlists_and_dirs, item) - end - end - - widgets.InfiniteList(self.root, table_iterator:create(playlists_and_dirs), { + widgets.InfiniteList(self.root, playlist_iterator:create(self.iterator), { focus_first_item = true, get_icon = get_icon_func, callback = function(item) @@ -95,7 +81,7 @@ return screen:new { breadcrumb = item:filepath() }) elseif - is_playlist(item) then + playlist_iterator:is_playlist(item) then -- TODO: playlist viewer queue.open_playlist(item:filepath()) playback.playing:set(true) diff --git a/lua/playlist_iterator.lua b/lua/playlist_iterator.lua new file mode 100644 index 00000000..06e80ad2 --- /dev/null +++ b/lua/playlist_iterator.lua @@ -0,0 +1,35 @@ +local PlaylistIterator = {} + +function PlaylistIterator:is_playlist(item) + return item:filepath():match("%.playlist$") + or item:filepath():match("%.m3u8?$") +end + +function PlaylistIterator:create(fs_iterator) + local iterator = fs_iterator:clone() + local obj = {}; + + local find_matching = function(iterate_fn) + local next = iterate_fn(iterator); + while next and (not PlaylistIterator:is_playlist(next) and not next:is_directory()) do + next = iterate_fn(); + end + return next; + end + + function obj:clone() + return PlaylistIterator:create(iterator) + end + + function obj:next() + return find_matching(iterator.next) + end + + function obj:prev() + return find_matching(iterator.prev) + end + + return obj +end + +return PlaylistIterator diff --git a/lua/table_iterator.lua b/lua/table_iterator.lua deleted file mode 100644 index 5bacada6..00000000 --- a/lua/table_iterator.lua +++ /dev/null @@ -1,27 +0,0 @@ - -local TableIterator = {} - -function TableIterator:create(table) - local iterator = {}; - iterator.index = 0; - iterator.table = table; - - function iterator:clone() - return TableIterator:create(table) - end - - function iterator:next() - self.index = self.index + 1 - return self.table[self.index] - end - - function iterator:prev() - self.index = self.index - 1 - return self.table[self.index] - end - - return iterator -end - - -return TableIterator \ No newline at end of file