Changeset 35947 for main

Timestamp:

2022-01-11T10:11:37+13:00 (2 years ago)

Author:

davidb

Message:

Restructuring of how pythong command-line arguments are supplied; note: not thoroughly tested at this stage

Location:

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

Files:

• 07b-GENERATE-ESSENTIA-FEATURES-DATA--SMALL.sh (modified) (1 diff)
• 07b-GENERATE-ESSENTIA-FEATURES-DATA.sh (modified) (3 diffs)

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

@@ -2 +2 @@
 
 if [ $# = 0 ] ; then
-    ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "download_audio|compute_audio_features" --start 2015 --end 2015
-    # ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "scrape_contestants|download_audio|compute_audio_features" --start 2015 --end 2015
+    year=2015
+else
+    year=$1
+fi
 
-else    
-    ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "download_audio|compute_audio_features" $*
-    # ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "scrape_contestants|download_audio|compute_audio_features" $*
-fi
+/bin/rm -f "votes-$year.csv"
+/bin/rm -f "contestants-$year.csv"
+
+./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "scrape_contestants" --start $year --end $year
+# ./07b-GENERATE-ESSENTIA-FEATURES-DATA.sh "download_audio|compute_audio_features" --start $year --end $year contestants-$year.csv
+
+    

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

@@ -22 +22 @@
 echo "  compute_audio_features : $run_compute"
 
-echo "Sleeping for 5 seconds, to give time to press ^C to stop"
-echo "..."
+echo ""
+echo "Sleeping for 5 seconds, to give time to press ^C to stop ..."
 sleep 5
 echo  "... continuing"
@@ -100 +100 @@
     if [ $# = 0 ] ; then
     cd "$prep_dir" \
-        && python3 ./main.py --start 1956 --end 1956 \
-        && python3 ./main.py --start 1957 \
+        && /bin/rm -f "votes-1956.csv" \
+        && /bin/rm -f "contestants-1956.csv" \
+        && python3 -u ./main.py --start 1956 --end 1956 \
+               \
+        && /bin/rm -f "votes-1957-${esc_cutoff_endyear}.csv" \
+        && /bin/rm -f "contestants-1957-${esc_cutoff_endyear}.csv" \
+        && python3 -u ./main.py --start 1957 --end $esc_cutoff_endyear \
+               \
+        && /bin/rm -f "votes-1956-${esc_cutoff_endyear}.csv" \
+        && /bin/rm -f "contestants-1956-${esc_cutoff_endyear}.csv" \
+        && python3 -u ./main.py --start 1956 --end $esc_cutoff_endyear \
         && cd ..
     else
     cd "$prep_dir" \
-        && python3 ./main.py $* \
+        && python3 -u ./main.py $* \
         && cd ..
     fi
@@ -111 +120 @@
 
 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 \
+    #wget --no-check-certificate -nc -O "$prep_dir/contestants.csv" \
+    #   https://github.com/Spijkervet/eurovision_dataset/releases/download/2020.0/contestants.csv \
 
+    if [ $# = 0 ] ; then
+    # append CSV fileanme to $*
+    set -- "$@" "contestants-1956-${esc_cutoff_endyear}.csv"
+    fi
+    
     cd "$prep_dir" \
-    && python3 ./audio.py $* \
+    && python3 -u ./audio.py $* \
     && cd ..
 fi
 
 if [ $? = 0 ] && [ $run_compute = "1" ] ; then
+    if [ $# = 0 ] ; then
+    # append CSV fileanme to $*
+    set -- "$@" "contestants-1956-${esc_cutoff_endyear}.csv"
+    fi
+    
     cd "$prep_dir" \
-    && python3 ./audio_features.py $* \
+    && python3 -u ./audio_features.py $* \
     && cd ..
 fi