mirror of
https://github.com/ksyasuda/mpv-youtube-queue.git
synced 2024-11-22 03:19:54 -08:00
cleanup code
- reorder variables - set show_errors to true by default - remove old variable from config file
This commit is contained in:
parent
a39a7c6a95
commit
fc7c5d44e8
@ -17,7 +17,6 @@ clipboard_command=xclip -o
|
|||||||
cursor_icon=➤
|
cursor_icon=➤
|
||||||
display_limit=6
|
display_limit=6
|
||||||
download_directory=~/videos/YouTube
|
download_directory=~/videos/YouTube
|
||||||
download_format_str=%(uploader)s/%(title)s.%(ext)s
|
|
||||||
download_quality=720p
|
download_quality=720p
|
||||||
downloader=curl
|
downloader=curl
|
||||||
font_name=JetBrains Mono
|
font_name=JetBrains Mono
|
||||||
|
@ -15,13 +15,6 @@
|
|||||||
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
local mp = require 'mp'
|
local mp = require 'mp'
|
||||||
mp.options = require 'mp.options'
|
mp.options = require 'mp.options'
|
||||||
local YouTubeQueue = {}
|
|
||||||
local video_queue = {}
|
|
||||||
local current_video = nil
|
|
||||||
local index = 0
|
|
||||||
local selected_index = 1
|
|
||||||
local MSG_DURATION = 1.5
|
|
||||||
local marked_index = nil
|
|
||||||
local styleOn = mp.get_property("osd-ass-cc/0")
|
local styleOn = mp.get_property("osd-ass-cc/0")
|
||||||
local styleOff = mp.get_property("osd-ass-cc/1")
|
local styleOff = mp.get_property("osd-ass-cc/1")
|
||||||
|
|
||||||
@ -50,7 +43,7 @@ local options = {
|
|||||||
font_name = "JetBrains Mono",
|
font_name = "JetBrains Mono",
|
||||||
font_size = 12,
|
font_size = 12,
|
||||||
marked_icon = "⇅",
|
marked_icon = "⇅",
|
||||||
show_errors = false,
|
show_errors = true,
|
||||||
ytdlp_output_template = "%(uploader)s/%(title)s.%(ext)s"
|
ytdlp_output_template = "%(uploader)s/%(title)s.%(ext)s"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,8 +78,15 @@ local style = {
|
|||||||
sortoftransparent .. "}"
|
sortoftransparent .. "}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local YouTubeQueue = {}
|
||||||
|
local video_queue = {}
|
||||||
|
local MSG_DURATION = 1.5
|
||||||
local display_limit = options.display_limit
|
local display_limit = options.display_limit
|
||||||
|
local index = 0
|
||||||
|
local selected_index = 1
|
||||||
local display_offset = 0
|
local display_offset = 0
|
||||||
|
local marked_index = nil
|
||||||
|
local current_video = nil
|
||||||
|
|
||||||
-- HELPERS {{{
|
-- HELPERS {{{
|
||||||
|
|
||||||
@ -388,6 +388,8 @@ function YouTubeQueue.play_next_in_queue()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
local current_index = YouTubeQueue.get_current_index()
|
local current_index = YouTubeQueue.get_current_index()
|
||||||
|
-- if the current video is not the first in the queue, then play the video
|
||||||
|
-- else, check if the video is playing and if not play the video with replace
|
||||||
if YouTubeQueue.size() > 1 then
|
if YouTubeQueue.size() > 1 then
|
||||||
mp.set_property_number("playlist-pos", current_index - 1)
|
mp.set_property_number("playlist-pos", current_index - 1)
|
||||||
else
|
else
|
||||||
@ -430,6 +432,8 @@ function YouTubeQueue.add_to_queue(url)
|
|||||||
channel_name = channel_name
|
channel_name = channel_name
|
||||||
}
|
}
|
||||||
table.insert(video_queue, video)
|
table.insert(video_queue, video)
|
||||||
|
-- if the queue was empty, start playing the video
|
||||||
|
-- otherwise, add the video to the playlist
|
||||||
if not YouTubeQueue.get_current_video() then
|
if not YouTubeQueue.get_current_video() then
|
||||||
YouTubeQueue.play_next_in_queue()
|
YouTubeQueue.play_next_in_queue()
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user