Skip to content
This repository has been archived by the owner on May 9, 2020. It is now read-only.

Support BSD sed and improvements to cuefile handling #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support BSD sed and improvements to cuefile handling #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73d180
Add support for BSD sed
dmlemos Jun 23, 2019
b2989a3
Improve temporary cuefile
dmlemos Jun 23, 2019
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
18 changes: 11 additions & 7 deletions split2flac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@ if [ ${SAVE} -eq 1 ]; then
$msg "${cP}Configuration saved$cZ\n"
fi

case "$OSTYPE" in
darwin*|bsd*) esed='sed -E' ;;
*) esed='sed' ;;
esac

# use flake if possible
command -v flake >/dev/null && FLAC_ENCODER="flake" || FLAC_ENCODER="flac"

Expand Down Expand Up @@ -286,9 +291,11 @@ update_pattern () {

# splits a file
split_file () {
TMPCUE="${HOME}/.split2flac_XXXXX.cue"
TMPCUE="$(mktemp).cue"
FILE="$1"

trap 'rm -f $TMPCUE &>/dev/null' EXIT

if [ ! -r "${FILE}" ]; then
emsg "Can not read the file\n"
return 1
Expand Down Expand Up @@ -321,10 +328,8 @@ split_file () {

if [ -n "${CUESHEET}" ]; then
$msg "${cP}Found internal cue sheet$cZ\n"
TMPCUE=$(mktemp "${TMPCUE}")
CUE="${TMPCUE}"
echo "${CUESHEET}" > "${CUE}"
TMPCUE="${HOME}/.split2flac_XXXXX.cue"

if [ $? -ne 0 ]; then
emsg "Unable to save internal cue sheet\n"
Expand All @@ -343,6 +348,8 @@ split_file () {
return 1
fi

$msg "${cG}Cue sheet :$cZ ${CUE}\n"

# cue sheet charset
[ -z "${CHARSET}" ] && CHARSET="utf-8" || $msg "${cG}Cue charset : $cP${CHARSET} -> utf-8$cZ\n"

Expand Down Expand Up @@ -377,7 +384,6 @@ split_file () {
fi

# save converted cue sheet
TMPCUE=$(mktemp "${TMPCUE}")
CUE="${TMPCUE}"
echo "${CUESHEET}" > "${CUE}"

Expand Down Expand Up @@ -411,7 +417,6 @@ split_file () {
fi
fi

$msg "${cG}Cue sheet :$cZ ${CUE}\n"
$msg "${cG}Cover image :$cZ ${PIC:-not set}\n"

# file removal warning
Expand Down Expand Up @@ -453,7 +458,7 @@ split_file () {
return 1
fi

TAG_GENRE=$(grep 'REM[ \t]\+GENRE[ \t]\+' "${CUE}" | head -1 | sed 's/REM[ \t]\+GENRE[ \t]\+//;s/^"\(.*\)"$/\1/')
TAG_GENRE=$(grep 'REM[ \t]\+GENRE[ \t]\+' "${CUE}" | head -1 | $esed 's/REM[[:space:]]+GENRE[[:space:]]+//')

YEAR=$(awk '{ if (/REM[ \t]+DATE/) { printf "%i", $3; exit } }' < "${CUE}")
YEAR=$(echo ${YEAR} | tr -d -c '[:digit:]')
Expand Down Expand Up @@ -689,7 +694,6 @@ split_file () {
fi

rm -f "${TMPPIC}"
rm -f "${TMPCUE}"

if [ ${DRY} -ne 1 -a ${REMOVE} -eq 1 ]; then
YEP="n"
Expand Down