Changeset 35945 for main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/PREPARE-ALL-SMALL.sh

Timestamp:

2022-01-10T21:00:59+13:00 (2 years ago)

Author:

davidb

Message:

Further improvements and flexibility

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/PREPARE-ALL-SMALL.sh (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/PREPARE-ALL-SMALL.sh

@@ -1 +1 @@
 #!/bin/bash
 
+tracks_to_run=${1:-track-a|track-b}
 
-track_choice=${1:-track-b}
+run_track_a=`echo $tracks_to_run | grep track-a | wc -l`
+run_track_b=`echo $tracks_to_run | grep track-b | wc -l`
+
+echo ""
+echo "Running with stages:"
+echo "  track-a        : $run_track_a"
+echo "  track-b        : $run_track_b"
+
+echo "Sleeping for 5 seconds, to give time to press ^C to stop"
+echo "..."
+sleep 5
+echo  "... continuing"
+echo ""
 
 ./01-DOWNLOAD-ESC-LOD-DATA--SMALL.sh \
@@ -16 +29 @@
 ./06-COPY-PARSED-ADDITIONAL-METADATA-TO-IMPORT.sh
 
-if [ $? = 0 ] ; then
+if [ $? = 0 ] && [ $run_track_a = "1" ] ; then
 
-    if [ $track_choice = "track-a" ] ; then
-    ./07a-DOWNLOAD-SPOTIFY-LOD-DATA--SMALL.sh \
-        && \
-    ./08a-EXPLODE-SPOTIFY-SPARQLRESULTS-TO-IMPORT.sh
-    elif [ $track_choice = "track-b" ] ; then
-    ./07b-GENERATE-ESSENTIA-FEATURES-DATA--SMALL.sh \
-        && \
-    ./08b-COPY-AUDIO-FEATURES-TO-IMPORT--SMALL.sh
-    else
-    echo "Did not recognize track choice: $track_choice" >&2
-    echo "Valid choices are 'track-a' or 'track-b'" >&2
-    exit 1
-    fi
-    
-    if [ $? = 0 ] ; then
-    ./09-GEN-PROBLEM-LOD-LISTS.sh
-    fi
+    ./07a-DOWNLOAD-SPOTIFY-LOD-DATA--SMALL.sh \
+    && \
+    ./08a-EXPLODE-SPOTIFY-SPARQLRESULTS-TO-IMPORT.sh
 fi
 
+if [ $? = 0 ] && [ $run_track_b = "1" ] ; then
+
+    ./07b-GENERATE-ESSENTIA-FEATURES-DATA--SMALL.sh \
+    && \
+    ./08b-COPY-AUDIO-FEATURES-TO-IMPORT--SMALL.sh
+fi
+
+if [ $? = 0 ] ; then
+    ./09-GEN-PROBLEM-LOD-LISTS.sh
+fi
+
+