From 41080ccb13eb99329348b2c04cb51c35411cd612 Mon Sep 17 00:00:00 2001
From: ayakael <antoine.martin@protonmail.com>
Date: Thu, 27 Dec 2018 15:20:47 -0500
Subject: [PATCH] [import_images][import_src][import_strack] Now puts "img" in
 front of file extensions (i.e flac now img.flac) in .import folder

---
 src/import_images |  4 ++--
 src/import_src    | 22 +++++++++++-----------
 src/import_track  |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/import_images b/src/import_images
index 985bcc8..e3d9932 100644
--- a/src/import_images
+++ b/src/import_images
@@ -60,8 +60,8 @@ import_images() {
     mkdir -p "${GIT_DIR}/.import/${SOURCE}/${discidList}"
     for path in ${pathList[@]}; do
         case $(sed 's|.*\.||' <<< ${path}) in
-            (jpg) echo "Copying cover image"; convert "${path}" "${GIT_DIR}/.import/${SOURCE}/${discidList}/png" ;;
-            (*) local DEST="${GIT_DIR}/.import/${SOURCE}/${discidList}/$(sed 's|.*\.||' <<< ${path})"; echo "Copying ${path} to ${DEST}"; cp --no-preserve=mode "${path}"  "${DEST}" ;;
+            (jpg) echo "Copying cover image"; convert "${path}" "${GIT_DIR}/.import/${SOURCE}/${discidList}/img.png" ;;
+            (*) local DEST="${GIT_DIR}/.import/${SOURCE}/${discidList}/img.$(sed 's|.*\.||' <<< ${path})"; echo "Copying ${path} to ${DEST}"; cp --no-preserve=mode "${path}"  "${DEST}" ;;
         esac    
     done
 }
diff --git a/src/import_src b/src/import_src
index 7ad5bea..0847f44 100644
--- a/src/import_src
+++ b/src/import_src
@@ -32,12 +32,12 @@ import_src() {
         FLAC)
             med_integrity ${fileList[@]} >${STDERR} 2>&1
             [[ $? -eq 0 ]] || return 4
-            gen_image "${TRACK_DIR}/flac" $(printf "%s\t" ${fileList[@]})
+            gen_image "${TRACK_DIR}/img.flac" $(printf "%s\t" ${fileList[@]})
             local EXIT="$?"
             [[ $? -eq 0 ]] || return 3
         ;;
         CUETOOLS|EAC)
-            med_integrity "${TRACK_DIR}/flac" >${STDERR} 2>&1 
+            med_integrity "${TRACK_DIR}/img.flac" >${STDERR} 2>&1 
             [[ $? -eq 0 ]] || return 4
         ;;
     esac
@@ -46,9 +46,9 @@ import_src() {
     # Generates IMAGEID
     echo "Generating IMAGEID"
     local DISCID="${SOURCE}"
-    [[ "${SOURCE}" == "CUETOOLS" ]] && local DISCID=$(grep "CTDB TOCID:" ${TRACK_DIR}/accurip | cut -d' ' -f3 | sed 's|-]||')
-    [[ "${SOURCE}" == "EAC" ]] && local DISCID="$(grep "REM DISCID" ${TRACK_DIR}/cue | cut -d' ' -f3)"
-    local IMAGEID="SHA256-${DISCID}--$(sha256sum "${TRACK_DIR}/flac" | cut -d' ' -f1)"
+    [[ "${SOURCE}" == "CUETOOLS" ]] && local DISCID=$(grep "CTDB TOCID:" ${TRACK_DIR}/img.accurip | cut -d' ' -f3 | sed 's|-]||')
+    [[ "${SOURCE}" == "EAC" ]] && local DISCID="$(grep "REM DISCID" ${TRACK_DIR}/img.cue | cut -d' ' -f3)"
+    local IMAGEID="SHA256-${DISCID}--$(sha256sum "${TRACK_DIR}/img.flac" | cut -d' ' -f1)"
 
     # Generate addmetaList and trackmetaList
     echo "Generating metadata"
@@ -60,8 +60,8 @@ import_src() {
         ;;
         CUETOOLS|EAC) 
             local trackList=($(grep -o TRACK ${TRACK_DIR}/cue ))
-            local addmetaList=($(gen_metatrack -c "${TRACK_DIR}/cue" "${TRACK_DIR}/flac" ))
-            local trackmetaList=($(print_meta_cue ${TRACK_DIR}/cue))
+            local addmetaList=($(gen_metatrack -c "${TRACK_DIR}/img.cue" "${TRACK_DIR}/img.flac" ))
+            local trackmetaList=($(print_meta_cue ${TRACK_DIR}/img.cue))
         ;;
     esac
     local COUNT=0
@@ -81,7 +81,7 @@ import_src() {
             local EXIT=$?
         ;;
         EAC|CUETOOLS)
-            awk "!/FILE/{print} /FILE/{print \"FILE ${IMAGEID}.flac WAVE\"}" "${TRACK_DIR}/cue" > "${GIT_DIR}/${IMAGEID}.cue"
+            awk "!/FILE/{print} /FILE/{print \"FILE ${IMAGEID}.flac WAVE\"}" "${TRACK_DIR}/img.cue" > "${GIT_DIR}/${IMAGEID}.cue"
             local EXIT=$?
         ;;
     esac
@@ -96,10 +96,10 @@ import_src() {
 
 
     # Move joined.flac to GIT_DIR
-    cp "${TRACK_DIR}/flac" "${GIT_DIR}/${IMAGEID}.flac"
+    cp "${TRACK_DIR}/img.flac" "${GIT_DIR}/${IMAGEID}.flac"
 
     # Generate cover images
-    gen_cover "${TRACK_DIR}/png" > ${GIT_DIR}/${IMAGEID}.png
-    gen_small_cover "${TRACK_DIR}/png" > ${GIT_DIR}/${IMAGEID}.jpg
+    gen_cover "${TRACK_DIR}/img.png" > ${GIT_DIR}/${IMAGEID}.png
+    gen_small_cover "${TRACK_DIR}/img.png" > ${GIT_DIR}/${IMAGEID}.jpg
     return 0
 }
diff --git a/src/import_track b/src/import_track
index 5e3ca93..7d1dad6 100644
--- a/src/import_track
+++ b/src/import_track
@@ -39,8 +39,8 @@ import_track() {
 
 
     # Moving cover to TRACK_DIR
-    if [[ ${#coverList[@]} -eq 1 ]] && [[ ! -f "${TRACK_DIR}/png" ]]; then
-        convert ${coverList[@]} "${TRACK_DIR}/png"
+    if [[ ${#coverList[@]} -eq 1 ]] && [[ ! -f "${TRACK_DIR}/img.png" ]]; then
+        convert ${coverList[@]} "${TRACK_DIR}/img.png"
     fi
 
     # Converting to FLAC if need me