diff --git a/code/check_csv.sh b/code/check_csv.sh index 20d2ab2..489da8e 100755 --- a/code/check_csv.sh +++ b/code/check_csv.sh @@ -1,4 +1,37 @@ #!/bin/bash +# SPDX-FileCopyrightText: 2025 artlog@l0g.eu +# SPDX-License-Identifier: AGPL-3.0-or-later +# -csv_file="$1" -python3 convert_nextcloud_poll_csv.py "$csv_file" 'Très Bien' 'Bien' 'Assez Bien' 'Passable' 'Insuffisant' 'A Rejeter' +toolsdir=../lib +pushd $toolsdir >/dev/null +toolsdir=$(pwd) +source metascript.sh +popd >/dev/null + +while [[ $# > 0 ]] +do + case "$1" in + *) + if [[ -z $csv_file ]] + then + csv_file="$1" + else + parsemetaarg "$1" + fi + ;; + esac + shift +done + +metarun=metarun + +if [[ -z $csv_file ]] +then + log_error "Missing csv_file argument" + exit 1 +fi + +enforcefile "$csv_file" exists + +$metarun python3 convert_nextcloud_poll_csv.py "$csv_file" 'Très Bien' 'Bien' 'Assez Bien' 'Passable' 'Insuffisant' 'A Rejeter' diff --git a/lib b/lib new file mode 120000 index 0000000..1b5533d --- /dev/null +++ b/lib @@ -0,0 +1 @@ +nextcloud_devenv/lib \ No newline at end of file diff --git a/samples/check.sh b/samples/check.sh index cc8a58c..a8e77b7 100755 --- a/samples/check.sh +++ b/samples/check.sh @@ -1,25 +1,53 @@ #!/bin/bash +# SPDX-FileCopyrightText: 2025 artlog@l0g.eu +# SPDX-License-Identifier: AGPL-3.0-or-later +# -if [[ $# > 0 ]] -then - vote=$1 -fi +toolsdir=../lib +pushd $toolsdir >/dev/null +toolsdir=$(pwd) +source metascript.sh +popd >/dev/null -if [[ -z $vote ]] +while [[ $# > 0 ]] +do + case "$1" in + *.json) + json_file=$1 + ;; + *) + if [[ $1 =~ [0-9]+ ]] + then + vote=$1 + else + parsemetaarg "$1" + fi + ;; + esac + shift +done + +if [[ -z $vote ]] && [[ -z $json_file ]] then - echo "[ERROR] numéro de vote manquant ( ex 1 pour 1.json )" + log_error "numéro de vote manquant ( ex 1 pour 1.json )" exit 1 fi -json_file=$vote.json -json=~/clients/artlog/artisanlogiciel.code/artlog_jsontools/build/json - +if [[ -z $json_file ]] +then + json_file=$vote.json +fi + +enforcefile $json_file exists + +json=json if [[ -x $json ]] then json_indent_file=$vote.indent.json echo "generating $json_indent_file" $json indent=spaces:2 -- $json_file > $json_indent_file - json=$json_file + json_file=$json_indent_file + enforcefile $json_file exists fi code_dir=../code/