Skip to content

Add lb search support #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holta merged 8 commits into from
May 29, 2024
Merged

Add lb search support #140

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52b2f86
Add lb search support
deldesir Mar 22, 2024
7cbc16e
Support searching through subtitles
deldesir Mar 22, 2024
b5c72ca
revert search.py changes
deldesir Mar 22, 2024
1e257e8
Align with the "Top 100" feature
deldesir Mar 28, 2024
9506372
Use if statement to handle exit code
deldesir May 2, 2024
e02b552
Merge branch 'master' into deldesir-patch-1
deldesir May 2, 2024
e28f600
Remove XKLB_EXECUTABLE variable
deldesir May 4, 2024
b10d99c
Remove temporary code
deldesir May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions scripts/lb-wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

XKLB_INTERNAL_CMD="$1" # e.g. "tubeadd" or "dl"
URL="$2"
URL_OR_SEARCH_TERM="$2"

LOG_FILE="/var/log/xklb.log"
XKLB_DB_FILE="/library/calibre-web/xklb-metadata.db"
Expand All @@ -23,7 +23,7 @@ log() {
}

if [ $# -ne 2 ]; then
log "Error" "Two arguments are required. Please provide a command (tubeadd/dl) and a URL."
log "Error" "Two arguments are required. Please provide a command (tubeadd/dl/search) and a URL or search term."
exit 1
fi

Expand Down Expand Up @@ -53,9 +53,11 @@ log "Info" "Using yt-dlp $(yt-dlp --version)"
# fetching metadata. This will prevent hanging for playlist URLs or short URLs.
# "...to be able to list videos that are not downloaded yet"
if [[ $XKLB_INTERNAL_CMD == "tubeadd" ]]; then
xklb_full_cmd="lb tubeadd ${XKLB_DB_FILE} ${URL} --force ${VERBOSITY}"
xklb_full_cmd="lb tubeadd ${XKLB_DB_FILE} ${URL_OR_SEARCH_TERM} --force ${VERBOSITY}"
elif [[ $XKLB_INTERNAL_CMD == "dl" ]]; then
xklb_full_cmd="lb dl ${XKLB_DB_FILE} --prefix ${TMP_DOWNLOADS_DIR} --video --search ${URL} ${FORMAT_OPTIONS} --write-thumbnail ${VERBOSITY}"
xklb_full_cmd="lb dl ${XKLB_DB_FILE} --prefix ${TMP_DOWNLOADS_DIR} --video --search ${URL_OR_SEARCH_TERM} ${FORMAT_OPTIONS} --write-thumbnail --subs ${VERBOSITY}"
elif [[ $XKLB_INTERNAL_CMD == "search" ]]; then
xklb_full_cmd="lb search ${XKLB_DB_FILE} ${URL_OR_SEARCH_TERM}"
else
log "Error" "Invalid xklb command. Please choose 'tubeadd' or 'dl'."
exit 1
Expand Down Expand Up @@ -87,5 +89,5 @@ if [ $rc -eq 0 ]; then
log "Info" "lb-wrapper's xklb command (${XKLB_INTERNAL_CMD}) completed successfully."
else
log "Error" "Error $rc occurred while running lb-wrapper's xklb commands."
exit 1
exit $rc
fi