forked from hkc/cc-stuff
1
0
Fork 0

Proper drive state handling

This commit is contained in:
Casey 2023-10-20 04:05:28 +03:00
parent eece2153e4
commit 18de04bfc1
Signed by: hkc
GPG Key ID: F0F6CFE11CDB0960
1 changed files with 13 additions and 4 deletions

View File

@ -378,10 +378,19 @@ function()
term.clearLine() term.clearLine()
local timeString = string.format("[%s:%s]", time2str(time), time2str(duration)) local timeString = string.format("[%s:%s]", time2str(time), time2str(duration))
if drive.getState() == "PLAYING" then if drive.getState() ~= "STOPPED" then
term.setTextColor(mplayer.colors.status) term.setTextColor(mplayer.colors.status)
local speen = spinner[(math.floor(drive.getPosition() / 600) % #spinner) + 1] local speen = spinner[(math.floor(drive.getPosition() / 600) % #spinner) + 1]
term.write(speen .. " Playing: ") -- 11 characters local action = ""
if drive.getState() == "PLAYING" then action = "Playing:"
elseif drive.getState() == "REWINDING" then action = "Rewinding"
elseif drive.getState() == "FORWARDING" then action = "Forwarding"
else
printError("Unknown drive state: "..tostring(drive.getState()))
return
end
action = speen .. " " .. action
term.write(action)
-- Progressbar -- Progressbar
local lw = math.floor(tw * time / duration) local lw = math.floor(tw * time / duration)
@ -394,8 +403,8 @@ function()
term.write(string.rep("\xad", tw - lw - 1)) term.write(string.rep("\xad", tw - lw - 1))
-- Statusline text -- Statusline text
term.setCursorPos(12, th) term.setCursorPos(#action + 2, th)
local w = tw - #timeString - 12 -- "Playing: " plus extra space local w = tw - #timeString - #action - 2 -- "Playing: ", spinner plus spacing
term.setTextColor(mplayer.colors.current) term.setTextColor(mplayer.colors.current)
if #title <= w then if #title <= w then