From ce577053f448bf264d1c5a3b3e23eec50be1fa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emre=20AKY=C3=9CZ?= <emreakyuz_2@hotmail.com>
Date: Sat, 2 Dec 2023 18:59:04 +0300
Subject: [PATCH] Improve further.

---
 .local/bin/ybrowser | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.local/bin/ybrowser b/.local/bin/ybrowser
index 43538369..0ba6e331 100644
--- a/.local/bin/ybrowser
+++ b/.local/bin/ybrowser
@@ -87,7 +87,7 @@ custom_list_menu() {
 custom_list_video_menu() {
   list_name="$1"
   while true; do
-    video_info=$(cat "$CUSTOM_LIST_DIR/$list_name" | DMENU 20 "Choose a video")
+    video_info=$(DMENU 20 "Choose a video" < "$CUSTOM_LIST_DIR/$list_name")
     [ -z "$video_info" ] && return
     channel_name="${video_info%%: *}"
     video_title="${video_info##*: }"
@@ -154,28 +154,21 @@ get_all_videos() {
 }
 
 browse_all_channels() {
-  while true; do
-    video_title=$(get_all_videos | DMENU 20 "Choose a video or enter @@sv or @@sd")
-
-    [ -z "$video_title" ] && break || {
-      [ "$video_title" = "@@sv" -o "$video_title" = "@@sd" ] &&
-      sort_option="$video_title" && video_title=$(get_all_videos "$sort_option" | DMENU 20 "Choose a video")
-    }
-
-    [ -n "$video_title" -a "$video_title" != "@@sv" -a "$video_title" != "@@sd" ] && {
-      while read -r line; do
-        channel_name="${line%%=*}"
-        grep -qF "$video_title" "${DATA_DIR}/${channel_name}.tsv" && break
-      done < "$CHANNEL_LIST"
+  while video_title=$(get_all_videos | DMENU 20 "Choose a video or enter @@sv or @@sd"); do
+    [ -z "$video_title" ] && break
+    [ "$video_title" = "@@sv" -o "$video_title" = "@@sd" ] && video_title=$(get_all_videos "$video_title" | DMENU 20 "Choose a video")
 
+    grep -lF "$video_title" "${DATA_DIR}"/*.tsv | head -n 1 | while read -r video_file; do
+      channel_name=$(basename "$video_file" .tsv)
       video_action_menu "$video_title" "$channel_name"
-    }
+      break
+    done
   done
 }
 
 category_menu() {
   while true; do
-    category=$(echo "$(cut -d= -f1 "$CATEGORY_LIST")" | DMENU 12 "Choose a category")
+    category="$(cut -d= -f1 "$CATEGORY_LIST" | DMENU 12 "Choose a category")"
     [ -z "$category" ] && return
 
     channel_menu "$category"
@@ -187,7 +180,7 @@ channel_menu() {
   IFS="|"
 
   channels=$(sed -n "s/^${category}=\(.*\)$/\1/p" "$CATEGORY_LIST")
-  set -- $channels
+  set -- "$channels"
 
   while true; do
     channel_name=$(printf '%s\n' "$@" | DMENU 20 "Choose a channel")
@@ -203,7 +196,7 @@ video_menu() {
   while true; do
     video_title=$(get_videos "$channel_name" | DMENU 20 "Choose a video")
     [ -z "$video_title" ] && return
-    [ "$video_title" = "@@sv" -o "$video_title" = "@@sd" ] && {
+    [ "$video_title" = "@@sv" ] || [ "$video_title" = "@@sd" ] && {
       sort_option="$video_title"
       video_title=$(get_videos "$channel_name" "$sort_option" | DMENU 20 "Choose a video")
     }
@@ -229,7 +222,7 @@ video_action_menu() {
       "SEND TO A LIST")
         list_name=$(find "$CUSTOM_LIST_DIR" -maxdepth 1 -type f -exec basename {} \; | DMENU 10 "Choose a list")
         [ -n "$list_name" ] && add_to_list "$video_title" "$channel_name" "$list_name" &&
-		notify-send ""$video_title" is added to the list: "$list_name""
+		notify-send "$video_title is added to the list: $list_name"
         ;;
       *)
         return