forge/dam
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

[cmd_import_tracks] Cleaned up interface

Browse source
This commit is contained in:
ayakael 2018-05-18 19:46:09 -07:00
parent f9ffdedb32
commit 651cd280c9
No known key found for this signature in database
GPG key ID: 575626A4AE5F4026
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cmd_import_tracks
View file

@ -18,19 +18,20 @@ cmd_import_tracks() {
for src in ${srcList}; do for src in ${srcList}; do
if iszip ${src}; then if iszip ${src}; then
_msg EXEC "Uncompressing ${archive}" _msg EXEC "Uncompressing ${src}"
7z x "${src}" -o"${_OPT_TMP}/$(basename ${src})/" -y >${STDERR} 2>&1 7z x "${src}" -o"${_OPT_TMP}/$(basename ${src})/" -y >${STDERR} 2>&1
local EXIT=$? local EXIT=$?
[[ ${EXIT} -eq 0 ]] && { _msg OK; local src="${_OPT_TMP}/$(basename ${src})"; } || _msg WARN [[ ${EXIT} -eq 0 ]] && { _msg OK; local src="${_OPT_TMP}/$(basename ${src})"; } || _msg WARN
fi fi
local fileList=($(find "${src}" -name '*.flac' -o -name '*.mp3')) local fileList=($(find "${src}" -name '*.flac' -o -name '*.mp3'))
_msg EXEC "Consolidating ${src}"
for file in ${fileList[@]}; do for file in ${fileList[@]}; do
_msg EXEC "Consolidating ${file}"
import_track "${GIT_DIR}" "${file}" >${STDERR} 2>&1 import_track "${GIT_DIR}" "${file}" >${STDERR} 2>&1
local EXIT=$? local EXIT=$?
[[ ${EXIT} -eq 0 ]] && _msg OK || { _msg WARN "Consolidation of ${file} failed, continuing"; continue; } [[ ${EXIT} -eq 0 ]] || { local CONSOLE_ERROR=true; _msg WARN "Consolidation of ${file} failed, continuing"; continue; }
done done
[[ "${CONSOLE_ERROR}" == "true" ]] || _msg OK
done done
local importList=($(find ${GIT_DIR}/.import/ -mindepth 1 -maxdepth 1 -type d -printf '%p\t')) local importList=($(find ${GIT_DIR}/.import/ -mindepth 1 -maxdepth 1 -type d -printf '%p\t'))