Changeset 35887 for main/trunk

Timestamp:

2022-01-06T09:31:45+13:00 (2 years ago)

Author:

davidb

Message:

Changed so different stages can be run; small version that targets just 2015

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare

Files:

• 07b-GENERATE-ESSENTIA-FEATURES-DATA--SMALL.sh (added)
• 07b-GENERATE-ESSENTIA-FEATURES-DATA.sh (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/07b-GENERATE-ESSENTIA-FEATURES-DATA.sh

@@ -4 +4 @@
 
 prep_dir=essentia-audio-features
+
+
+stages_to_run="scrape_contestants|download_audio|compute_audio_features"
+
+if [ $# -ge 1 ] ; then
+    stages_to_run=$1; shift
+fi
+
+run_scrape=`echo $stages_to_run   | grep scrape_contestants     | wc -l`
+run_download=`echo $stages_to_run | grep download_audio         | wc -l`
+run_compute=`echo $stages_to_run  | grep compute_audio_features | wc -l`
 
 
@@ -72 +83 @@
 
 
-#echo ""
-#echo "*** Patching $prep_dir/audio_features.py"
-#echo "***    streaming_extractor_music => essentia_streaming_extractor_music"
-#sed -i "s/'streaming_extractor_music'/'essentia_streaming_extractor_music'/g" $prep_dir/audio_features.py
-#
-#sed -i "s/ streaming_extractor_music / essentia_streaming_extractor_music /g" $prep_dir/audio_features.py
-#
-#echo ""
+# Get geckodriver on PATH
+export PATH=$PWD:$PATH
+       
+if [ $run_scrape = "1" ] ; then
+    cd "$prep_dir" \
+    && python3 ./main.py $* \
+    && cd ..
+fi
 
+if [ $? = 0 ] && [ $run_download = "1" ] ; then
+    wget --no-check-certificate -nc -O "$prep_dir/contestants.csv" \
+     https://github.com/Spijkervet/eurovision_dataset/releases/download/2020.0/contestants.csv \
 
-echo "***"
-echo "* To download from YouTube and convert entries to MP3 files:"
-echo "*"
-echo "*     sh ./run.sh audio"
+    cd "$prep_dir" \
+    && python3 ./audio.py $* \
+    && cd ..
+fi
 
-echo "*"
-
-echo "* To generate Essentia audio features from MP3 files:"
-echo "*"
-echo "*     python3 ./audio_features26.py"
-echo "***"
+if [ $? = 0 ] && [ $run_compute = "1" ] ; then
+    cd "$prep_dir" \
+    && python3 ./audio_features26.py \
+    && cd ..
+fi
 
 
 
+