* Add spotify-lyrics plugin * fix(spotify-lyrics): resolve race conditions and add plugin_api * fix(spotify-lyrics): update plugin_api to 3 * fix(spotify-lyrics): resolve github actions validation errors * fix(spotify-lyrics): resize thumbnail to 960x540 to fix validation error * fix(spotify-lyrics): bump version to 1.2.1 * fix(spotify-lyrics): update namespace and replace misleading thumbnail * fix(spotify-lyrics): declare runtime dependencies in plugin.toml and update README requirements * feat(lyrics): implement dynamic panel width sizing * Revert "feat(lyrics): implement dynamic panel width sizing" This reverts commit ef91e6f9f688df7deeb41ba9e5c7606a4904b47a. * feat(spotify-lyrics): implement dynamic panel width sizing * fix(spotify-lyrics): correct target width pre-calculation for upcoming lines * fix(spotify-lyrics): prevent vertical spill by enforcing maxLines=1 * fix(spotify-lyrics): implement dynamic height resizing to encapsulate wrapped text * fix(spotify-lyrics): remove horizontal cap to prevent vertical spill * fix(spotify-lyrics): restore minHeight and implement perfectly safe wrapping height prediction * fix(spotify-lyrics): lock panel width and use vertical dynamic resizing exclusively * fix(spotify-lyrics): implement dynamic font scaling and remove panel dimension animations * fix(spotify-lyrics): restore robust dynamic height logic and discard font scaling * refactor(spotify-lyrics): rewrite height estimation and clean up codebase Root cause: the charUnits per-character width estimation consistently underestimated real rendered widths because the 0.80 multipliers in getLineWidth and getLinesCount cancelled each other out, making the effective calculation ignore the safety margin entirely. Fix: replaced the complex charUnits/toChars/getLineWidth machinery with a simple #text / chars-per-line heuristic using a conservative 0.60x character width factor. This reliably overestimates line count, ensuring the panel always allocates enough height for wrapped text. Quality of life improvements: - Split monolithic render() into renderEmpty/renderPaused/renderPlaying - Reduced update interval from 33ms (30 FPS) to 100ms (10 FPS) - Removed file-read timer (reads every frame at lower FPS instead) - Added clear section headers and inline documentation - Removed all dead code (charUnits, toChars, getLineWidth, etc.) * fix(spotify-lyrics): set panel height=280 in plugin.toml — the actual fix The root cause of the lyrics spilling was never in the Lua code. Noctalia panels are sized exclusively by plugin.toml, not by minHeight on the column layout. Since we had removed width/height from plugin.toml to make sizing 'dynamic', noctalia used a tiny default that couldn't contain wrapped lyrics. minHeight on ui.column had zero effect on the actual panel window size. Set height=280 to comfortably fit 3 lyrics lines even when they wrap. * feat(spotify-lyrics): add dynamic font scaling for long lyrics Long lyrics (>40 chars) now get progressively smaller fonts: - Every 15 chars beyond 40 reduces font by 2px - Minimum font: 10px (panel) / 11px (widget) This prevents vertical overflow regardless of container size by ensuring long lines take up less vertical space when they wrap. * fix(spotify-lyrics): fix plugin IDs and tilde path expansion - Updated bar.luau to toggle correct panel ID - Replaced ~ in noctalia.readFile with absolute path since Lua doesn't auto-expand it - Updated plugin.toml height to 280 and id to noctalia/spotify-lyrics * Fix UI bugs, implement reactive updates, and add album art * Fix plugin manifest validation errors * fix(spotify-lyrics): address PR review comments - Change plugin id from noctalia/ to goatnath/ namespace - Declare runtime dependencies: playerctl, python3, syncedlyrics - Replace hardcoded /home/goatnath path with noctalia.expandPath() - Add [[desktop_widget]] manifest entry for widget.luau - Rewrite README to follow README_TEMPLATE.md structure - Update all references to use corrected plugin id --------- Co-authored-by: goatnath <aadinathkeshav1978@gmail.com>
254 lines
8.4 KiB
Luau
254 lines
8.4 KiB
Luau
--!nonstrict
|
||
-- Spotify Lyrics Desktop Widget – floating overlay version.
|
||
--
|
||
-- Same data source as panel.luau but rendered via desktopWidget.render()
|
||
-- with larger font sizes for desktop readability.
|
||
-- Long lyrics are dynamically scaled to smaller fonts to prevent overflow.
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Layout constants
|
||
--------------------------------------------------------------------------------
|
||
local WIDGET_WIDTH = 400
|
||
local WIDGET_PADDING = 10
|
||
local INNER_WIDTH = WIDGET_WIDTH - WIDGET_PADDING * 2 -- 380px usable
|
||
local MIN_HEIGHT = 160
|
||
local MAX_HEIGHT = 300 -- absolute ceiling to prevent spill
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Runtime state
|
||
--------------------------------------------------------------------------------
|
||
local currentHeight = MIN_HEIGHT
|
||
local lastState = nil
|
||
local lastClock = os.clock()
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Dynamic font sizing (see panel.luau for rationale)
|
||
--------------------------------------------------------------------------------
|
||
|
||
local function fitFontSize(text, defaultSize)
|
||
if not text or text == "" then return defaultSize end
|
||
local len = #text
|
||
if len <= 40 then return defaultSize end
|
||
local reduction = math.floor((len - 40) / 15) * 2
|
||
return math.max(11, defaultSize - reduction)
|
||
end
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Text truncation – hard-clamp text to prevent overflow
|
||
--------------------------------------------------------------------------------
|
||
|
||
local function clampText(text, fontSize, maxLines)
|
||
if not text or text == "" then return text end
|
||
local charsPerLine = math.max(1, math.floor(INNER_WIDTH / (fontSize * 0.60)))
|
||
local maxChars = charsPerLine * maxLines
|
||
if #text > maxChars then
|
||
return string.sub(text, 1, maxChars - 1) .. "…"
|
||
end
|
||
return text
|
||
end
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Height estimation
|
||
--------------------------------------------------------------------------------
|
||
|
||
local function estimateLines(text, fontSize)
|
||
if not text or text == "" then return 0 end
|
||
local charsPerLine = math.max(1, math.floor(INNER_WIDTH / (fontSize * 0.60)))
|
||
return math.max(1, math.ceil(#text / charsPerLine))
|
||
end
|
||
|
||
local function estimateContentHeight(state)
|
||
local h = WIDGET_PADDING * 2
|
||
|
||
local title = state.title or ""
|
||
local artist = state.artist or ""
|
||
if title ~= "" and artist ~= "" then
|
||
h = h + 12 + 6 + estimateLines(title .. " — " .. artist, 11) * 16
|
||
h = h + 10 + 1 + 10
|
||
end
|
||
|
||
local prevSize = fitFontSize(state.prev, 18)
|
||
if (state.prev or "") ~= "" then
|
||
h = h + math.min(2, estimateLines(state.prev, prevSize)) * math.ceil(prevSize * 1.4)
|
||
else
|
||
h = h + 18
|
||
end
|
||
h = h + 10
|
||
|
||
local currentSize = fitFontSize(state.current, 26)
|
||
h = h + math.min(3, estimateLines(state.current or "...", currentSize)) * math.ceil(currentSize * 1.4)
|
||
h = h + 10
|
||
|
||
local nextSize = fitFontSize(state.next, 18)
|
||
if (state.next or "") ~= "" then
|
||
h = h + math.min(2, estimateLines(state.next, nextSize)) * math.ceil(nextSize * 1.4)
|
||
else
|
||
h = h + 18
|
||
end
|
||
|
||
h = h + 24
|
||
return math.max(MIN_HEIGHT, math.min(MAX_HEIGHT, h))
|
||
end
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- State reader – pulls lyrics data from noctalia.state (populated by bar.luau)
|
||
--------------------------------------------------------------------------------
|
||
|
||
local function readState()
|
||
local status = noctalia.state.get("lyricsStatus")
|
||
if not status or status == "" then return nil end
|
||
|
||
return {
|
||
status = status,
|
||
title = noctalia.state.get("lyricsTitle") or "",
|
||
artist = noctalia.state.get("lyricsArtist") or "",
|
||
prev_prev = noctalia.state.get("lyricsPrevPrev") or "",
|
||
prev = noctalia.state.get("lyricsPrev") or "",
|
||
current = noctalia.state.get("lyricsCurrent") or "",
|
||
next = noctalia.state.get("lyricsNext") or "",
|
||
next_next = noctalia.state.get("lyricsNextNext") or "",
|
||
}
|
||
end
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Rendering
|
||
--------------------------------------------------------------------------------
|
||
|
||
local function renderEmpty()
|
||
desktopWidget.render(ui.column({
|
||
gap = 8, align = "center", justify = "center",
|
||
minWidth = WIDGET_WIDTH, minHeight = currentHeight,
|
||
maxHeight = MAX_HEIGHT, overflow = "hidden",
|
||
}, {
|
||
ui.glyph({ name = "music", size = 28, color = "on_surface/0.3" }),
|
||
ui.label({
|
||
text = "No music playing",
|
||
fontSize = 16, fontWeight = "medium", color = "on_surface/0.3",
|
||
}),
|
||
}))
|
||
end
|
||
|
||
local function renderPaused(state)
|
||
desktopWidget.render(ui.column({
|
||
gap = 8, align = "center", justify = "center",
|
||
minWidth = WIDGET_WIDTH, minHeight = currentHeight,
|
||
maxHeight = MAX_HEIGHT, overflow = "hidden",
|
||
}, {
|
||
ui.glyph({ name = "player-pause", size = 22, color = "on_surface/0.4" }),
|
||
ui.label({
|
||
text = state.current or "Paused",
|
||
fontSize = 22, fontWeight = "bold",
|
||
color = "on_surface/0.5", wrap = true, textAlign = "center",
|
||
maxLines = 2,
|
||
}),
|
||
}))
|
||
end
|
||
|
||
local function renderPlaying(state)
|
||
local rows = {}
|
||
|
||
-- Track header
|
||
local title = state.title or ""
|
||
local artist = state.artist or ""
|
||
if title ~= "" and artist ~= "" then
|
||
table.insert(rows, ui.row({ gap = 6, align = "center" }, {
|
||
ui.glyph({ name = "music", size = 12, color = "primary/0.7" }),
|
||
ui.label({
|
||
text = title .. " — " .. artist,
|
||
fontSize = 11, fontWeight = "medium",
|
||
color = "primary/0.6", wrap = true,
|
||
maxLines = 1,
|
||
}),
|
||
}))
|
||
table.insert(rows, ui.box({ height = 1, fill = "on_surface/0.08" }))
|
||
end
|
||
|
||
-- Previous lyric (dynamically scaled, clamped to 2 lines)
|
||
local prevText = state.prev or ""
|
||
if prevText ~= "" then
|
||
local prevSize = fitFontSize(prevText, 18)
|
||
table.insert(rows, ui.label({
|
||
text = clampText(prevText, prevSize, 2),
|
||
fontSize = prevSize, fontWeight = "normal",
|
||
color = "on_surface/0.3", textAlign = "center", wrap = true,
|
||
maxLines = 2,
|
||
}))
|
||
else
|
||
table.insert(rows, ui.box({ height = 18 }))
|
||
end
|
||
|
||
-- Current lyric (dynamically scaled, clamped to 3 lines)
|
||
local currentText = state.current or "..."
|
||
if currentText == "" then currentText = "..." end
|
||
local currentSize = fitFontSize(currentText, 26)
|
||
table.insert(rows, ui.label({
|
||
text = clampText(currentText, currentSize, 3),
|
||
fontSize = currentSize, fontWeight = "bold",
|
||
color = "on_surface", textAlign = "center", wrap = true,
|
||
maxLines = 3,
|
||
}))
|
||
|
||
-- Next lyric (dynamically scaled, clamped to 2 lines)
|
||
local nextText = state.next or ""
|
||
if nextText ~= "" then
|
||
local nextSize = fitFontSize(nextText, 18)
|
||
table.insert(rows, ui.label({
|
||
text = clampText(nextText, nextSize, 2),
|
||
fontSize = nextSize, fontWeight = "normal",
|
||
color = "on_surface/0.3", textAlign = "center", wrap = true,
|
||
maxLines = 2,
|
||
}))
|
||
else
|
||
table.insert(rows, ui.box({ height = 18 }))
|
||
end
|
||
|
||
desktopWidget.render(ui.column({
|
||
gap = 10, align = "center", justify = "center",
|
||
minWidth = WIDGET_WIDTH, minHeight = currentHeight,
|
||
maxHeight = MAX_HEIGHT, overflow = "hidden",
|
||
}, rows))
|
||
end
|
||
|
||
local function render(state)
|
||
if not state or state.status == "Stopped" or state.status == "" then
|
||
renderEmpty()
|
||
elseif state.status == "Paused" then
|
||
renderPaused(state)
|
||
else
|
||
renderPlaying(state)
|
||
end
|
||
end
|
||
|
||
--------------------------------------------------------------------------------
|
||
-- Update loop
|
||
--------------------------------------------------------------------------------
|
||
|
||
function update()
|
||
noctalia.setUpdateInterval(100)
|
||
|
||
-- Subscribe to the tick so noctalia re-runs this on state changes
|
||
noctalia.state.get("lyricsTick")
|
||
|
||
local now = os.clock()
|
||
local delta = lastClock > 0 and now - lastClock or 0
|
||
lastClock = now
|
||
|
||
lastState = readState() or lastState
|
||
|
||
local targetHeight = MIN_HEIGHT
|
||
if lastState and lastState.status == "Playing" then
|
||
targetHeight = estimateContentHeight(lastState)
|
||
end
|
||
|
||
if targetHeight > currentHeight then
|
||
currentHeight = targetHeight
|
||
else
|
||
currentHeight = currentHeight + (targetHeight - currentHeight) * math.min(1, delta * 4)
|
||
end
|
||
|
||
-- Clamp final height to never exceed MAX_HEIGHT
|
||
currentHeight = math.min(currentHeight, MAX_HEIGHT)
|
||
|
||
render(lastState)
|
||
end
|