Compare commits

...

3 Commits

Author SHA1 Message Date
ksyasuda
52a2197fbb update color configuration 2023-08-03 00:49:56 -07:00
ksyasuda
84332bc7e2 fix second row incorrect indent on print function 2023-08-03 00:30:29 -07:00
ksyasuda
0bae7c76f0 add icon and coloring 2023-08-03 00:10:55 -07:00
2 changed files with 90 additions and 39 deletions

View File

@ -11,3 +11,6 @@ print_current_video=ctrl+P
browser=firefox browser=firefox
clipboard_command=xclip -o clipboard_command=xclip -o
display_limit=6 display_limit=6
cursor_icon=
font_size=24
font_name=JetBrains Mono

View File

@ -23,6 +23,8 @@ local current_video = nil
local index = 0 local index = 0
local selected_index = 1 local selected_index = 1
local MSG_DURATION = 1.5 local MSG_DURATION = 1.5
local styleOn = mp.get_property("osd-ass-cc/0")
local styleOff = mp.get_property("osd-ass-cc/1")
local options = { local options = {
add_to_queue = "ctrl+a", add_to_queue = "ctrl+a",
@ -37,8 +39,19 @@ local options = {
print_current_video = "ctrl+P", print_current_video = "ctrl+P",
browser = "firefox", browser = "firefox",
clipboard_command = "xclip -o", clipboard_command = "xclip -o",
display_limit = 6 display_limit = 6,
cursor_icon = "",
font_size = 24,
font_name = "JetBrains Mono",
} }
local colors = {
error = "676EFF",
text = "BFBFBF",
selected_color = "F993BD",
cursor = "FDE98B",
}
mp.options.read_options(options, "mpv-youtube-queue") mp.options.read_options(options, "mpv-youtube-queue")
local display_limit = options.display_limit local display_limit = options.display_limit
@ -49,11 +62,19 @@ local display_offset = 0
-- run sleep shell command for n seconds -- run sleep shell command for n seconds
local function sleep(n) os.execute("sleep " .. tonumber(n)) end local function sleep(n) os.execute("sleep " .. tonumber(n)) end
local function print_osd_message(message, duration, color)
if not color then
color = colors.text
end
mp.osd_message(styleOn .. "{\\c&" .. color .. "&}" .. message .. "{\\c&" .. colors.text .. "&}" .. styleOff .. "\n",
duration)
end
-- print the name of the current video to the OSD -- print the name of the current video to the OSD
local function print_video_name(video, duration) local function print_video_name(video, duration)
if not video then return end if not video then return end
if not duration then duration = 2 end if not duration then duration = 2 end
mp.osd_message('Currently playing: ' .. video.name, duration) print_osd_message('Currently playing: ' .. video.name, duration)
end end
-- Function to get the video name from a YouTube URL -- Function to get the video name from a YouTube URL
@ -96,13 +117,16 @@ function YouTubeQueue.get_current_index() return index end
function YouTubeQueue.get_video_queue() return video_queue end function YouTubeQueue.get_video_queue() return video_queue end
function YouTubeQueue.set_current_index(idx) index = idx end function YouTubeQueue.set_current_index(idx)
index = idx
current_video = video_queue[idx]
end
function YouTubeQueue.get_current_video() return current_video end function YouTubeQueue.get_current_video() return current_video end
function YouTubeQueue.get_video_at(idx) function YouTubeQueue.get_video_at(idx)
if idx <= 0 or idx > #video_queue then if idx <= 0 or idx > #video_queue then
mp.osd_message("Invalid video index") print_osd_message("Invalid video index", MSG_DURATION, colors.error)
return nil return nil
end end
return video_queue[idx] return video_queue[idx]
@ -136,18 +160,6 @@ function YouTubeQueue.prev_in_queue()
return current_video return current_video
end end
function YouTubeQueue.play_video_at(idx)
if idx <= 0 or idx > #video_queue then
mp.osd_message("Invalid video index")
return nil
end
index = idx
selected_index = index
current_video = video_queue[index]
mp.set_property_number("playlist-pos", index - 1) -- zero-based index
return current_video
end
function YouTubeQueue.is_in_queue(url) function YouTubeQueue.is_in_queue(url)
for _, v in ipairs(video_queue) do if v.url == url then return true end end for _, v in ipairs(video_queue) do if v.url == url then return true end end
return false return false
@ -156,6 +168,9 @@ end
-- Function to find the index of the currently playing video -- Function to find the index of the currently playing video
function YouTubeQueue.update_current_index() function YouTubeQueue.update_current_index()
local current_url = mp.get_property("path") local current_url = mp.get_property("path")
if #video_queue == 0 then
return
end
for i, v in ipairs(video_queue) do for i, v in ipairs(video_queue) do
if v.url == current_url then if v.url == current_url then
index = i index = i
@ -192,15 +207,33 @@ function YouTubeQueue.print_queue(duration)
display_offset = start_index - 1 display_offset = start_index - 1
for i = start_index, end_index do for i = start_index, end_index do
local prefix = (i == current_index and i == selected_index) and local prefix = (i == selected_index) and
"=>> " or (i == current_index) and "=> " or styleOn ..
(i == selected_index) and "> " or " " "{\\c&" ..
message = message .. prefix .. i .. ". " .. video_queue[i].name .. colors.cursor ..
"\n" "&}" .. options.cursor_icon .. " " .. "{\\c&" .. colors.text .. "&}" .. styleOff
or
" "
if i == current_index then
message = message ..
prefix ..
styleOn .. "{\b1\\c&" .. colors.selected_color .. "&}" .. i .. ". " .. video_queue[i].name ..
"{\\c&" .. colors.text .. "&\b0}" .. styleOff .. "\n"
elseif i == 2 then
message = message ..
prefix ..
styleOn .. "{\\c&" .. colors.text .. "&\b0}" .. styleOff .. i .. ". " .. video_queue[i].name ..
"\n"
else
message = message ..
prefix ..
styleOn .. "{\\c&" .. colors.text .. "&\b0}" .. styleOff .. i .. ". " .. video_queue[i].name ..
"\n"
end
end end
mp.osd_message(message, duration) mp.osd_message(message, duration)
else else
mp.osd_message("No videos in the queue or history.") print_osd_message("No videos in the queue or history.", duration, colors.error)
end end
end end
@ -212,7 +245,7 @@ end
local function get_clipboard_content() local function get_clipboard_content()
local handle = io.popen(options.clipboard_command) local handle = io.popen(options.clipboard_command)
if not handle then if not handle then
mp.osd_message("Error getting clipboard content") print_osd_message("Error getting clipboard content", MSG_DURATION, colors.error)
return nil return nil
end end
local result = handle:read("*a") local result = handle:read("*a")
@ -221,7 +254,6 @@ local function get_clipboard_content()
end end
local function move_selection_up() local function move_selection_up()
-- selected_index = YouTubeQueue.get_current_index()
if selected_index > 1 then if selected_index > 1 then
selected_index = selected_index - 1 selected_index = selected_index - 1
if selected_index < display_offset + 1 then if selected_index < display_offset + 1 then
@ -232,10 +264,8 @@ local function move_selection_up()
end end
local function move_selection_down() local function move_selection_down()
-- selected_index = YouTubeQueue.get_current_index()
if selected_index < YouTubeQueue.size() then if selected_index < YouTubeQueue.size() then
selected_index = selected_index + 1 selected_index = selected_index + 1
-- YouTubeQueue.set_current_index(current_index)
if selected_index > display_offset + display_limit then if selected_index > display_offset + display_limit then
display_offset = display_offset + 1 display_offset = display_offset + 1
end end
@ -243,9 +273,22 @@ local function move_selection_down()
end end
end end
local function play_video_at(idx)
local queue = YouTubeQueue.get_video_queue()
if idx <= 0 or idx > #queue then
print_osd_message("Invalid video index", MSG_DURATION, colors.error)
return nil
end
YouTubeQueue.set_current_index(idx)
selected_index = index
mp.set_property_number("playlist-pos", index - 1) -- zero-based index
return current_video
end
local function play_selected_video() local function play_selected_video()
-- local current_index = YouTubeQueue.get_current_index() -- local current_index = YouTubeQueue.get_current_index()
local video = YouTubeQueue.play_video_at(selected_index) local video = play_video_at(selected_index)
YouTubeQueue.print_queue(MSG_DURATION - 0.5) YouTubeQueue.print_queue(MSG_DURATION - 0.5)
sleep(MSG_DURATION) sleep(MSG_DURATION)
print_video_name(video, MSG_DURATION) print_video_name(video, MSG_DURATION)
@ -270,22 +313,27 @@ end
local function add_to_queue() local function add_to_queue()
local url = get_clipboard_content() local url = get_clipboard_content()
if not url then if not url then
mp.osd_message("Nothing found in the clipboard.") print_osd_message("Nothing found in the clipboard.", MSG_DURATION, colors.error)
return
end
if not string.match(url, "^https://www.youtube.com") then
mp.osd_message("Not a YouTube URL.")
return return
end end
if YouTubeQueue.is_in_queue(url) then if YouTubeQueue.is_in_queue(url) then
mp.osd_message("Video already in queue.") print_osd_message("Video already in queue.", MSG_DURATION, colors.error)
return
elseif not is_valid_ytdlp_url(url) then
mp.osd_message("Invalid URL.")
return return
-- elseif not is_valid_ytdlp_url(url) then
-- mp.osd_message("Invalid URL.")
-- return
end end
local name = get_video_name(url) local name = get_video_name(url)
if not name then
print_osd_message("Error getting video name.", MSG_DURATION, colors.error)
return
end
local channel_url = get_channel_url(url) local channel_url = get_channel_url(url)
if not channel_url then
print_osd_message("Error getting channel URL.", MSG_DURATION, colors.error)
return
end
YouTubeQueue.add_to_queue({ YouTubeQueue.add_to_queue({
url = url, url = url,
name = name, name = name,
@ -295,7 +343,7 @@ local function add_to_queue()
play_next_in_queue() play_next_in_queue()
else else
mp.commandv("loadfile", url, "append-play") mp.commandv("loadfile", url, "append-play")
mp.osd_message("Added " .. name .. " to queue.") print_osd_message("Added " .. name .. " to queue.", MSG_DURATION)
end end
end end
@ -303,7 +351,7 @@ end
local function play_previous_video() local function play_previous_video()
local previous_video = YouTubeQueue.prev_in_queue() local previous_video = YouTubeQueue.prev_in_queue()
if not previous_video then if not previous_video then
mp.osd_message("No previous video available.") print_osd_message("No previous video available.", MSG_DURATION, colors.error)
return return
end end
mp.set_property_number("playlist-pos", YouTubeQueue.get_current_index() - 1) mp.set_property_number("playlist-pos", YouTubeQueue.get_current_index() - 1)
@ -323,7 +371,7 @@ local function open_channel_in_browser()
end end
local function print_current_video() local function print_current_video()
mp.osd_message("Currently playing " .. current_video.name, 3) print_osd_message("Currently playing " .. current_video.name, 3)
end end
-- }}} -- }}}