From fc7c5d44e83a6359ad4153bad0a4f86ad3df25e6 Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Mon, 7 Aug 2023 01:58:06 -0700
Subject: [PATCH] cleanup code

- reorder variables
- set show_errors to true by default
- remove old variable from config file
---
 mpv-youtube-queue.conf |  1 -
 mpv-youtube-queue.lua  | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mpv-youtube-queue.conf b/mpv-youtube-queue.conf
index 698d1f1..9f9e563 100644
--- a/mpv-youtube-queue.conf
+++ b/mpv-youtube-queue.conf
@@ -17,7 +17,6 @@ clipboard_command=xclip -o
 cursor_icon=➤
 display_limit=6
 download_directory=~/videos/YouTube
-download_format_str=%(uploader)s/%(title)s.%(ext)s
 download_quality=720p
 downloader=curl
 font_name=JetBrains Mono
diff --git a/mpv-youtube-queue.lua b/mpv-youtube-queue.lua
index 987c90f..7a5d742 100644
--- a/mpv-youtube-queue.lua
+++ b/mpv-youtube-queue.lua
@@ -15,13 +15,6 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 local mp = require 'mp'
 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 styleOff = mp.get_property("osd-ass-cc/1")
 
@@ -50,7 +43,7 @@ local options = {
     font_name = "JetBrains Mono",
     font_size = 12,
     marked_icon = "⇅",
-    show_errors = false,
+    show_errors = true,
     ytdlp_output_template = "%(uploader)s/%(title)s.%(ext)s"
 }
 
@@ -85,8 +78,15 @@ local style = {
         sortoftransparent .. "}"
 }
 
+local YouTubeQueue = {}
+local video_queue = {}
+local MSG_DURATION = 1.5
 local display_limit = options.display_limit
+local index = 0
+local selected_index = 1
 local display_offset = 0
+local marked_index = nil
+local current_video = nil
 
 -- HELPERS {{{
 
@@ -388,6 +388,8 @@ function YouTubeQueue.play_next_in_queue()
         return
     end
     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
         mp.set_property_number("playlist-pos", current_index - 1)
     else
@@ -430,6 +432,8 @@ function YouTubeQueue.add_to_queue(url)
         channel_name = channel_name
     }
     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
         YouTubeQueue.play_next_in_queue()
     else