From 44e834c3dea9a357d9d5381bb0de98b312dc365c Mon Sep 17 00:00:00 2001
From: ksyasuda <ksyasuda@umich.edu>
Date: Thu, 4 Nov 2021 23:22:34 -0700
Subject: [PATCH] change ordering of watched anime to order by id

update name from queue to playlist
---
 ani-cli    | 10 +++++-----
 aniwrapper | 15 +++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ani-cli b/ani-cli
index 9b4b3b4..f4f1494 100755
--- a/ani-cli
+++ b/ani-cli
@@ -197,7 +197,7 @@ get_search_query() {
 	# Construct string "<id>. <anime_name>"
 	stmt="SELECT DISTINCT id || '. ' || anime_name \
 		  FROM search_history \
-		  ORDER BY search_date DESC;"
+		  ORDER BY id DESC;"
 	# hist=$(echo "$stmt" | sqlite3 -noheader "$HISTORY_DB")
 	hist=$(run_stmt "$stmt")
 
@@ -509,6 +509,7 @@ while getopts 'hd:HlpadP:' OPT; do
 			[ -z "$playlist_file" ] && die "Eneter in path to playlist"
 			mpv "$playlist_file"
 			exit 0
+			;;
 	esac
 done
 shift $((OPTIND - 1))
@@ -584,8 +585,8 @@ case $scrape in
 		[ $? -ne 0 ] && die "No anime selection found"
 		episode_selection
 		;;
-	delete)
-		;;
+	delete) ;;
+
 esac
 
 { # checking input
@@ -603,12 +604,11 @@ esac
 grep -q -w "${selection_id}" "$logfile" ||
 	printf "%s\t%d\n" "$selection_id" $((episode + 1)) >>"$logfile"
 
-
 for ep in $episodes; do
 	if [[ "$is_add" -eq 1 ]]; then
 		echo "ID: $selection_id"
 		echo "EPISODES: $episodes"
-		printf "%s\n" "$selection_id $ep" >> "$playlist_file"
+		printf "%s\n" "$selection_id $ep" >>"$playlist_file"
 		echo "Added to playlist file"
 		exit 0
 	else
diff --git a/aniwrapper b/aniwrapper
index e29ac88..36b960b 100755
--- a/aniwrapper
+++ b/aniwrapper
@@ -12,7 +12,7 @@ CFG_FILE="meh.rasi"
 
 # not a wrapper around the ani-cli-rofi
 
-options="1. Stream|2. Download|3. Continue|4. Queue|5. Quit"
+options="1. Stream|2. Download|3. Continue|4. Playlist|5. Quit"
 
 choice=$(echo "${options[@]}" | rofi -dmenu -sep '|' -config "$CFG_DIR/$CFG_FILE" -l 5 -i -p "Enter choice:")
 
@@ -43,7 +43,7 @@ elif [[ "$selection" == "4." ]]; then
 	)
 	selection=$(printf "%s\n" "$choice" | awk '{ print $1 }')
 	if [[ "$selection" == "1." ]]; then
-		options="1. Streaming|2. From file|3. Quit"
+		options="1. From file|2. Streaming|3. Quit"
 		choice=$(echo "${options[@]}" | rofi -dmenu -sep '|' -config "$CFG_DIR/$CFG_FILE" -l 4 -i -p "Enter choice:")
 		[ "$choice" == "4. Quit" ] && (
 			echo 'Quitting...'
@@ -51,11 +51,14 @@ elif [[ "$selection" == "4." ]]; then
 		)
 		selection=$(printf "%s\n" "$choice" | awk '{ print $1 }')
 		if [[ "$selection" == "1." ]]; then
-			"$CMD" -p
+			# TODO: Change directory to variable set at install
+			PLAYLIST_DIR="$HOME/Videos/sauce"
+			choice=$(ls "$PLAYLIST_DIR" | rofi -dmenu -config "$CFG_DIR/$CFG_FILE" -l 5 -i -p "Choose playlist:")
+			# choice=$(rofi -dmenu -config "$CFG_DIR/$CFG_FILE" -l 1 -i -p "Enter path to playlist")
+			# [ -z "$choice" ] && choice="$HOME/Videos/sauce/"
+			"$CMD" -P "$PLAYLIST_DIR/$choice"
 		elif [[ "$selection" == "2." ]]; then
-			choice=$(rofi -dmenu -config "$CFG_DIR/$CFG_FILE" -l 1 -i -p "Enter path to playlist")
-			[ -z "$choice" ] && choice="$HOME/Videos/sauce/"
-			"$CMD" -P "$choice"
+			"$CMD" -p
 		fi
 	# selection=$(printf "%s\n" "$choice" | awk '{ print $1 }')
 	elif [[ "$selection" == "2." ]]; then