mirror of
https://github.com/ksyasuda/aniwrapper.git
synced 2024-10-28 04:44:11 -07:00
make queries not distinct since uniqueness is enforced at table level
This commit is contained in:
parent
7a3a61bb58
commit
4d704d4b32
20
ani-cli
20
ani-cli
@ -174,19 +174,19 @@ run_stmt() {
|
|||||||
check_db() {
|
check_db() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
directory)
|
directory)
|
||||||
stmt="SELECT DISTINCT COUNT(*) FROM file_history WHERE directory = '$2';"
|
stmt="SELECT COUNT(*) FROM file_history WHERE directory = '$2';"
|
||||||
;;
|
;;
|
||||||
file)
|
file)
|
||||||
stmt="SELECT DISTINCT COUNT(*) FROM file_history WHERE directory = '$2' AND filename = '$3';"
|
stmt="SELECT COUNT(*) FROM file_history WHERE directory = '$2' AND filename = '$3';"
|
||||||
;;
|
;;
|
||||||
search)
|
search)
|
||||||
stmt="SELECT DISTINCT COUNT(*) FROM search_history WHERE anime_name = '$2';"
|
stmt="SELECT COUNT(*) FROM search_history WHERE anime_name = '$2';"
|
||||||
;;
|
;;
|
||||||
watch | sync)
|
watch | sync)
|
||||||
stmt="SELECT DISTINCT COUNT(*) FROM watch_history WHERE anime_name = '$2' AND episode_number = '$3';"
|
stmt="SELECT COUNT(*) FROM watch_history WHERE anime_name = '$2' AND episode_number = '$3';"
|
||||||
;;
|
;;
|
||||||
anime)
|
anime)
|
||||||
stmt="SELECT DISTINCT COUNT(*) FROM anime WHERE anime_name = '$2';"
|
stmt="SELECT COUNT(*) FROM anime WHERE anime_name = '$2';"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
res=$(run_stmt "$stmt")
|
res=$(run_stmt "$stmt")
|
||||||
@ -291,7 +291,7 @@ sync_search_history() {
|
|||||||
fi
|
fi
|
||||||
((++cnt))
|
((++cnt))
|
||||||
fi
|
fi
|
||||||
done < <(sqlite3 -list -noheader "$temp_db" "SELECT DISTINCT * FROM search_history")
|
done < <(sqlite3 -list -noheader "$temp_db" "SELECT * FROM search_history")
|
||||||
lg "$cnt rows inserted into search_history table"
|
lg "$cnt rows inserted into search_history table"
|
||||||
lg "$errs errors on insert"
|
lg "$errs errors on insert"
|
||||||
}
|
}
|
||||||
@ -310,7 +310,7 @@ sync_watch_history() {
|
|||||||
fi
|
fi
|
||||||
((++cnt))
|
((++cnt))
|
||||||
done < <(sqlite3 -list -noheader "$temp_db" "SELECT episode_number, watch_date FROM watch_history WHERE anime_name = '$anime_name'")
|
done < <(sqlite3 -list -noheader "$temp_db" "SELECT episode_number, watch_date FROM watch_history WHERE anime_name = '$anime_name'")
|
||||||
done < <(sqlite3 -list -noheader "$temp_db" "SELECT DISTINCT anime_name FROM watch_history")
|
done < <(sqlite3 -list -noheader "$temp_db" "SELECT anime_name FROM watch_history")
|
||||||
lg "$cnt rows inserted into watch_history table"
|
lg "$cnt rows inserted into watch_history table"
|
||||||
lg "$errs rows skipped on insert"
|
lg "$errs rows skipped on insert"
|
||||||
}
|
}
|
||||||
@ -436,7 +436,7 @@ get_search_query() {
|
|||||||
if [ $# -gt 0 ]; then
|
if [ $# -gt 0 ]; then
|
||||||
query="${*// /-}"
|
query="${*// /-}"
|
||||||
elif [ "$IS_ROFI" -eq 1 ]; then
|
elif [ "$IS_ROFI" -eq 1 ]; then
|
||||||
stmt="SELECT DISTINCT id || '. ' || anime_name FROM search_history ORDER BY search_date DESC;"
|
stmt="SELECT id || '. ' || anime_name FROM search_history ORDER BY search_date DESC;"
|
||||||
msg="Choose from list of searched anime below, or enter a unique name of an anime to search for"
|
msg="Choose from list of searched anime below, or enter a unique name of an anime to search for"
|
||||||
query=$(rofi -dpi "$DPI" -dmenu -l 15 -p "Search Anime:" \
|
query=$(rofi -dpi "$DPI" -dmenu -l 15 -p "Search Anime:" \
|
||||||
-mesg "$(generate_span "$msg")" \
|
-mesg "$(generate_span "$msg")" \
|
||||||
@ -549,7 +549,7 @@ episode_selection() {
|
|||||||
ep_choice_start=1
|
ep_choice_start=1
|
||||||
if ((IS_ROFI == 1)); then
|
if ((IS_ROFI == 1)); then
|
||||||
lg "Anime ID: $anime_id"
|
lg "Anime ID: $anime_id"
|
||||||
stmt="SELECT DISTINCT episode_number FROM watch_history WHERE anime_name = '$anime_id';"
|
stmt="SELECT episode_number FROM watch_history WHERE anime_name = '$anime_id';"
|
||||||
|
|
||||||
# Get Watch History for $anime_id as comma separated list
|
# Get Watch History for $anime_id as comma separated list
|
||||||
watch_history=""
|
watch_history=""
|
||||||
@ -793,7 +793,7 @@ main() {
|
|||||||
;;
|
;;
|
||||||
history)
|
history)
|
||||||
BASE_URL="$(curl -s -L -o /dev/null -w "%{url_effective}\n" https://gogoanime.fi)"
|
BASE_URL="$(curl -s -L -o /dev/null -w "%{url_effective}\n" https://gogoanime.fi)"
|
||||||
stmt="SELECT DISTINCT anime_name FROM search_history ORDER BY search_date DESC"
|
stmt="SELECT anime_name FROM search_history ORDER BY search_date DESC"
|
||||||
search_results="$(run_stmt "$stmt")"
|
search_results="$(run_stmt "$stmt")"
|
||||||
[ -z "$search_results" ] && die "History is empty"
|
[ -z "$search_results" ] && die "History is empty"
|
||||||
if ! anime_selection "${search_results[@]}"; then
|
if ! anime_selection "${search_results[@]}"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user