mirror of
https://github.com/ksyasuda/aniwrapper.git
synced 2024-10-28 04:44:11 -07:00
change rofi menu to have 12 lines by default
no longer run count query on database and set lines based off the count
This commit is contained in:
ksyasuda
parent
1745810ade
commit
a40e673ed3
69
ani-cli
69
ani-cli
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# dependencies: grep sed curl video_player
|
||||
# video_player ( needs to be able to play urls )
|
||||
@ -8,6 +8,9 @@ prog="ani-cli"
|
||||
logfile="${XDG_CACHE_HOME:-$HOME/.cache}/ani-hsts"
|
||||
history_db="${XDG_CONFIG_HOME:-$HOME/.ani-cli}/history.sqlite3"
|
||||
|
||||
[ -z "$XDG_CONFIG_HOME" ] && config_dir="$HOME/.ani-cli/" ||
|
||||
config_dir="$XDG_CONFIG_HOME"
|
||||
|
||||
# sql=$(sqlite3 -noheader "$history_db")
|
||||
|
||||
c_red="\033[1;31m"
|
||||
@ -99,6 +102,7 @@ dep_ch() {
|
||||
}
|
||||
|
||||
check_anime_name() {
|
||||
# Check to make sure passed in name is not empty
|
||||
printf "%s\n" "VAR: $1"
|
||||
if [[ "$1" == "" ]]; then
|
||||
printf "%s\n" "Passed in name is null"
|
||||
@ -108,6 +112,7 @@ check_anime_name() {
|
||||
}
|
||||
|
||||
check_db() {
|
||||
# Return number of matches for anime/episode in db
|
||||
# echo "$1 $2"
|
||||
if [[ "$2" == "search" ]]; then
|
||||
stmt="SELECT DISTINCT COUNT(*) FROM search_history \
|
||||
@ -125,6 +130,7 @@ check_db() {
|
||||
}
|
||||
|
||||
update_date() {
|
||||
# updates search/watch date for passed in anime
|
||||
if [[ "$2" == "search" ]]; then
|
||||
curdate=$(date +'%Y-%m-%d')
|
||||
stmt="UPDATE search_history SET search_date = '$curdate' \
|
||||
@ -140,9 +146,11 @@ update_date() {
|
||||
}
|
||||
|
||||
insert_history() {
|
||||
# check_anime_name "$1"
|
||||
# inserts into search/watch history db
|
||||
|
||||
# check the anime_name/id
|
||||
if [[ "$?" -ne 0 ]]; then
|
||||
if [[ $(check_anime_name "$1") -ne 0 ]]; then
|
||||
printf "%s\n" "ERROR: Anime name is none"
|
||||
return 1
|
||||
fi
|
||||
curdate=$(date +'%Y-%m-%d')
|
||||
@ -172,27 +180,24 @@ insert_history() {
|
||||
|
||||
# get query
|
||||
get_search_query() {
|
||||
# Query the anime to stream/download
|
||||
|
||||
# Get search history
|
||||
stmt="SELECT DISTINCT name FROM search_history"
|
||||
cnt_stmt="SELECT DISTINCT COUNT(*) FROM search_history"
|
||||
# hist=$(echo "$stmt" | sqlite3 -noheader "$history_db" | awk '{ if ( NR > 2 ) { print } }')
|
||||
# cnt_stmt="SELECT DISTINCT COUNT(*) FROM search_history"
|
||||
hist=$(echo "$stmt" | sqlite3 -noheader "$history_db")
|
||||
# hist=$(echo "$stmt" | sqlite3 "$history_db")
|
||||
cnt=$(printf "%s\n" "$cnt_stmt" | sqlite3 -noheader "$history_db" | tail -1)
|
||||
# hist=$(echo "$stmt" | sqlite3 -noheader "$history_db" | awk '{ if ( NR > 2 ) { print } }')
|
||||
|
||||
# cnt=$(printf "%s\n" "$cnt_stmt" | sqlite3 -noheader "$history_db" | tail -1)
|
||||
if [[ "$VERBOSE" -eq 1 ]]; then
|
||||
echo "HISTORY: ${hist[@]}"
|
||||
echo "HISTORY:" "${hist[@]}"
|
||||
fi
|
||||
# echo "HISTORY: $hist"
|
||||
# echo "COUNT: $cnt"
|
||||
if [ -z "$*" ]; then
|
||||
# echo "QUERYING"
|
||||
query=$(printf "%s\n" "${hist[@]}" |
|
||||
rofi -dmenu -l "$cnt" -p "Search Anime:" \
|
||||
-config ${XDG_CONFIG_HOME:-$HOME/.ani-cli}/meh.rasi)
|
||||
# if [[ "$query" != "" ]]; then
|
||||
# insert_history "$query" "search"
|
||||
# else
|
||||
# echo 'Query empty... Skipping insert'
|
||||
# fi
|
||||
rofi -dmenu -l 12 -p "Search Anime:" \
|
||||
-config "$config_dir"/meh.rasi)
|
||||
# printf "Search Anime: "
|
||||
# read -r query
|
||||
else
|
||||
@ -208,6 +213,7 @@ get_search_query() {
|
||||
#####################
|
||||
|
||||
anime_selection() {
|
||||
# Select anime from query results
|
||||
search_results=$*
|
||||
menu_format_string='[%d] %s\n'
|
||||
menu_format_string_c1="$c_blue[$c_cyan%d$c_blue] $c_reset%s\n"
|
||||
@ -233,23 +239,23 @@ anime_selection() {
|
||||
|
||||
searched=()
|
||||
cnt=0
|
||||
# Get the comma separated list of indexes of anime that has been searched before
|
||||
for anime in "${res[@]}"; do
|
||||
# printf "ANIME: $anime"
|
||||
check_db "$anime" "search"
|
||||
if [[ $? -gt 0 ]]; then
|
||||
# printf "%s\n" "SEARCHED BEFORE"
|
||||
searched+="$cnt, "
|
||||
searched+=("$((cnt++)), ")
|
||||
fi
|
||||
((cnt++))
|
||||
done
|
||||
|
||||
# printf "%s\n" "SEARCHED: $searched"
|
||||
|
||||
# get the anime from indexed list
|
||||
user_input=$(printf "${menu[@]}" |
|
||||
rofi -dmenu -config ${XDG_CONFIG_HOME:-$HOME/.ani-cli}/meh.rasi \
|
||||
rofi -dmenu -config "$config_dir"/meh.rasi \
|
||||
-a "$searched" \
|
||||
-l 10 -i -p "Enter number:")
|
||||
-l 12 -i -p "Enter number:")
|
||||
|
||||
choice=$(printf '%s\n' "$user_input" | awk '{print $1}')
|
||||
name=$(printf '%s\n' "$user_input" | awk '{print $NF}')
|
||||
@ -290,6 +296,7 @@ anime_selection() {
|
||||
##################
|
||||
|
||||
episode_selection() {
|
||||
# select episode number for anime
|
||||
[ $is_download -eq 1 ] &&
|
||||
printf "Range of episodes can be specified: start_number end_number\n"
|
||||
printf "%s\n" "Anime ID: $anime_id"
|
||||
@ -316,13 +323,13 @@ episode_selection() {
|
||||
# printf "WATCH HISTORY: %s\n" "$watch_history"
|
||||
# cnt=$(printf "%s\n" "$cnt_stmt" | sqlite3 "$history_db" | tail -1)
|
||||
# printf "NUM EPISODES: $last_ep_number"
|
||||
# get user choice and set the start and end
|
||||
choice=$(
|
||||
seq 1 $last_ep_number |
|
||||
rofi -dmenu -l "$((last_ep_number / 2))" \
|
||||
seq 1 "$last_ep_number" |
|
||||
rofi -dmenu -l 12 \
|
||||
-a "$watch_history" \
|
||||
-p "Select Episode (1, $last_ep_number):" \
|
||||
-config ${XDG_CONFIG_HOME:-$HOME/.ani-cli}/meh.rasi
|
||||
|
||||
-config "$config_dir"/meh.rasi
|
||||
)
|
||||
ep_choice_start=$(printf '%s\n' "$choice" | awk '{print $1}')
|
||||
ep_choice_end=$(printf '%s\n' "$choice" | awk '{print $2}')
|
||||
@ -343,17 +350,14 @@ open_episode() {
|
||||
err "Episode out of range"
|
||||
stmt="SELECT DISTINCT episode_number \
|
||||
FROM watch_history WHERE anime_name = '$anime_id'"
|
||||
cnt_stmt="SELECT DISTINCT COUNT(*) \
|
||||
FROM watch_history WHERE anime_name = '$anime_id'"
|
||||
# hist=$(echo "$stmt" | sqlite3 "$history_db" | awk '{ if ( NR > 2 ) { print } }')
|
||||
hist=$(echo "$stmt" | sqlite3 -noheader "$history_db")
|
||||
if [[ "$VERBOSE" -eq 1 ]]; then
|
||||
echo "HISTORY: ${hist[@]}"
|
||||
fi
|
||||
cnt=$(printf "%s\n" "$cnt_stmt" | sqlite3 -noheader "$history_db" | tail -1)
|
||||
episode=$(printf "%s\n" "${hist[@]}" |
|
||||
rofi -dmenu -l "$cnt" -p "Choose Episode:" \
|
||||
-config ${XDG_CONFIG_HOME:-$HOME/.ani-cli}/meh.rasi)
|
||||
rofi -dmenu -l 12 -p "Choose Episode:" \
|
||||
-config "$config_dir"/meh.rasi)
|
||||
printf "$c_reset"
|
||||
fi
|
||||
|
||||
@ -392,7 +396,8 @@ open_episode() {
|
||||
episode=$(printf "%03d" $episode)
|
||||
{
|
||||
(
|
||||
cd "$download_dir" || return 1
|
||||
echo "$DDIR"
|
||||
cd "$ddir" || return 1
|
||||
mkdir -p "$anime_id" && cd "$anime_id" || return 1
|
||||
ffmpeg -headers "Referer: $dpage_url" -i "$video_url" \
|
||||
-codec copy "${anime_id}-${episode}.mkv" >/dev/null 2>&1 &&
|
||||
@ -453,7 +458,7 @@ if [[ "$list_history" -eq 1 ]]; then
|
||||
hist=$(echo "$stmt" | sqlite3 -noheader "$history_db")
|
||||
cnt=$(printf "%s\n" "$cnt_stmt" | sqlite3 -noheader "$history_db")
|
||||
printf "%s\n" "${hist[@]}" |
|
||||
rofi -config ${XDG_CONFIG_HOME:-$HOME/.ani-cli}/meh.rasi \
|
||||
rofi -config "$config_dir"/meh.rasi \
|
||||
-dmenu -l "$cnt" -i -p "Search History"
|
||||
exit 0
|
||||
fi
|
||||
@ -491,7 +496,7 @@ grep -q -w "${selection_id}" "$logfile" ||
|
||||
printf "%s\t%d\n" "$selection_id" $((episode + 1)) >>"$logfile"
|
||||
|
||||
for ep in $episodes; do
|
||||
open_episode "$selection_id" "$ep"
|
||||
open_episode "$selection_id" "$ep" "$download_dir"
|
||||
done
|
||||
episode=${ep_choice_end:-$ep_choice_start}
|
||||
|
||||
|
||||
10
aniwrapper
10
aniwrapper
@ -1,8 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
CMD=/usr/bin/ani-cli
|
||||
|
||||
# not a wrapper around the ani-cli-rofi
|
||||
|
||||
options="1. Stream|2. Download|3. Continue|4. Quit|"
|
||||
options="1. Stream|2. Download|3. Continue|4. Quit"
|
||||
|
||||
choice=$(echo "${options[@]}" | rofi -dmenu -sep '|' \
|
||||
-config ~/.ani-cli/meh.rasi -l 4 -i -p "Enter choice:")
|
||||
@ -16,13 +18,13 @@ selection=$(printf "%s\n" "$choice" | awk '{ print $1 }')
|
||||
|
||||
if [[ "$selection" == "1." ]]; then
|
||||
echo "STREAMING..."
|
||||
ani-cli
|
||||
$CMD
|
||||
elif [[ "$selection" == "2." ]]; then
|
||||
dl_dir=$(rofi -dmenu -config ~/.ani-cli/meh.rasi \
|
||||
-l 1 -p "Enter downlaod dir:")
|
||||
# if dl_dir is none set to current directory
|
||||
[ "$dl_dir" == "" ] && dl_dir="$HOME/Videos/sauce/"
|
||||
ani-cli -d "$dl_dir"
|
||||
$CMD -d "$dl_dir"
|
||||
elif [[ "$selection" == "3." ]]; then
|
||||
ani-cli -H
|
||||
$CMD -H
|
||||
fi
|
||||
|
||||
18
setup.sh
18
setup.sh
@ -4,15 +4,17 @@
|
||||
# As well as set up the history database
|
||||
# DO NOT RUN AS ROOT
|
||||
|
||||
log () {
|
||||
log() {
|
||||
printf "%s\n" "$1"
|
||||
}
|
||||
|
||||
# DIR="$HOME/.ani-cli/"
|
||||
DB="history.sqlite3"
|
||||
DIR="$XDG_CONFIG_HOME/ani-cli/"
|
||||
MPV_DIR="$XDG_CONFIG_HOME/mpv/"
|
||||
|
||||
[[ -z "$XDG_CONFIG_HOME" ]] && DIR="$HOME/.ani-cli"
|
||||
[[ -z "$XDG_CONFIG_HOME" ]] && MPV_DIR="$HOME/.config/.ani-cli"
|
||||
|
||||
printf "%s\n" "INSTALL DIR: $DIR"
|
||||
|
||||
@ -22,7 +24,7 @@ if [[ "$DIR" == "$HOME/.config" ]]; then
|
||||
fi
|
||||
|
||||
log "Deleting old directory..."
|
||||
# rm -rf "$DIR"
|
||||
rm -rf "$DIR"
|
||||
log "Directory deleted..."
|
||||
|
||||
log "Creating directory $DIR"
|
||||
@ -30,8 +32,8 @@ mkdir -p "$DIR"
|
||||
log "Directory created"
|
||||
|
||||
log "Creating history database..."
|
||||
sqlite3 "$DIR"/"$DB" < sql/watch_history_tbl.sql
|
||||
sqlite3 "$DIR"/"$DB" < sql/search_history_tbl.sql
|
||||
sqlite3 "$DIR"/"$DB" <sql/watch_history_tbl.sql
|
||||
sqlite3 "$DIR"/"$DB" <sql/search_history_tbl.sql
|
||||
log "History database created..."
|
||||
|
||||
log "Moving theme files..."
|
||||
@ -39,3 +41,11 @@ cp themes/meh.rasi "$DIR"/
|
||||
cp themes/arc_dark_transparent_colors.rasi "$DIR"/
|
||||
log "Theme files moved..."
|
||||
|
||||
log "Creating mpv/scripts/ directory if it doesn't exist..."
|
||||
mkdir -p "$MPV_DIR/scripts/"
|
||||
log "Created mpv scripts directory..."
|
||||
log "Moving skip-intro.lua into mpv scripts directory..."
|
||||
cp skip-intro.lua "$MPV_DIR/scripts/skip-intro.lua"
|
||||
log "Moved skip-intro.lua into scripts directory..."
|
||||
|
||||
log "Setup Complete...."
|
||||
|
||||
@ -5,10 +5,9 @@
|
||||
configuration {
|
||||
font: "mononoki Nerd Font 14";
|
||||
show-icons: true;
|
||||
icon-theme: "Arc-X-D";
|
||||
display-drun: "Dmenu";
|
||||
scroll-method: 0;
|
||||
disable-history: false;
|
||||
disable-history: false;
|
||||
sidebar-mode: true;
|
||||
}
|
||||
|
||||
@ -21,8 +20,8 @@ window {
|
||||
width: 69%;
|
||||
}
|
||||
listview {
|
||||
lines: 10;
|
||||
columns: 3;
|
||||
lines: 12;
|
||||
columns: 2;
|
||||
}
|
||||
mainbox {
|
||||
border: 0;
|
||||
@ -74,7 +73,7 @@ element.selected.urgent {
|
||||
}
|
||||
element.selected.active {
|
||||
background-color: @selected-active-background;
|
||||
text-color: @selected-active-foreground;
|
||||
text-color: @active-foreground;
|
||||
}
|
||||
element.alternate.normal {
|
||||
background-color: @alternate-normal-background;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user