amin/fuzic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MUSICDIR env not required anymore

Browse Source
This commit is contained in:
Ämin Baumeler
2025-08-26 20:42:54 +02:00
parent 30765b7347
commit 210cfd01f7
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.sh
View File

@@ -47,10 +47,10 @@ if [ "${1:-}" = "--decorate" ]; then
fi fi
if [ "${1:-}" = "--reload" ]; then if [ "${1:-}" = "--reload" ]; then
[ ! "${MUSICDIR:-}" ] && err "The environment variable MUSICDIR is not set." && exit 1 [ ! "${2:-}" ] && err "Path to decorated music is missing." && exit 1
[ ! -d "${MUSICDIR:-}" ] && err "The environment variable MUSICDIR does not point to a directory." && exit 1 [ ! -d "$2" ] && err "Path does not point to a directory." && exit 1
info "Reloading information of local music directory $MUSICDIR" info "Reloading information of local music directory $2"
load_local || err "Failed to load local data" load_local "$2" || err "Failed to load local data"
info "Done" info "Done"
exit 0 exit 0
fi fi
@@ -386,7 +386,7 @@ GENERAL OPTIONS:
MANAGE LOCAL MUSIC: MANAGE LOCAL MUSIC:
--decorate <path> Decorate directory containing a tagged release --decorate <path> Decorate directory containing a tagged release
--reload Populate database with decorated local music --reload <path> Populate database with decorated local music from <path>
EOF EOF
exit 0 exit 0
fi fi

3
src/sh/config.sh
View File

@@ -1,7 +1,4 @@
if [ "${CONFIGFILE:-}" ]; then if [ "${CONFIGFILE:-}" ]; then
[ ! -f "$CONFIGFILE" ] && err "Configuration $CONFIGFILE not found." && exit 1 [ ! -f "$CONFIGFILE" ] && err "Configuration $CONFIGFILE not found." && exit 1
. "$CONFIGFLIE" . "$CONFIGFLIE"
[ ! "${MUSICDIR:-}" ] && err "MUSICDIR configuration not set." && exit 1
fi fi
[ "${MUSICDIR:-}" ] && [ ! -d "${MUSICDIR:-}" ] && err "The specified path ${MUSICDIR:-} is not a directory." && exit 1
DECORATION_FILENAME=${DECORATION_FILENAME:-"mbid.json"}

4
src/sh/local.sh
View File

@@ -101,14 +101,16 @@ LOCALDATA_RELEASES="$LOCALDATADIR/releases"
LOCALDATA_ARTISTS_VIEW="$LOCALDATADIR/artists_view" LOCALDATA_ARTISTS_VIEW="$LOCALDATADIR/artists_view"
LOCALDATA_RELEASEGROUPS_VIEW="$LOCALDATADIR/releasegroups_view" LOCALDATA_RELEASEGROUPS_VIEW="$LOCALDATADIR/releasegroups_view"
LOCALDATA_RELEASES_VIEW="$LOCALDATADIR/releases_view" LOCALDATA_RELEASES_VIEW="$LOCALDATADIR/releases_view"
DECORATION_FILENAME=${DECORATION_FILENAME:-"mbid.json"}
# Load local music # Load local music
# argument $1: path to decorated music files
load_local() { load_local() {
[ -d "$LOCALDATADIR" ] || mkdir -p "$LOCALDATADIR" [ -d "$LOCALDATADIR" ] || mkdir -p "$LOCALDATADIR"
tmpreleases=$(mktemp) tmpreleases=$(mktemp)
[ -f "$tmpreleases" ] || exit 1 [ -f "$tmpreleases" ] || exit 1
info "Locating and parsing decoration files ($DECORATION_FILENAME)" info "Locating and parsing decoration files ($DECORATION_FILENAME)"
find "$MUSICDIR" -type f -name "$DECORATION_FILENAME" -print0 | find "$1" -type f -name "$DECORATION_FILENAME" -print0 |
xargs -0 -P 4 $JQ -r '.releaseid+"\t"+input_filename' | xargs -0 -P 4 $JQ -r '.releaseid+"\t"+input_filename' |
tee "$LOCALDATA_RELEASES" | tee "$LOCALDATA_RELEASES" |
cut -d "$(printf '\t')" -f 1 >"$tmpreleases" cut -d "$(printf '\t')" -f 1 >"$tmpreleases"