fix gtfs deletion, gtfs file rename

noi-techpark · Dec 7, 2023 · 5e6105a · 5e6105a
1 parent 9f44fa1
commit 5e6105a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/execute.yml b/.github/workflows/execute.yml
@@ -100,7 +100,8 @@ jobs:
           X_DRT_HOST: "https://drt.otp.opendatahub.testingmachine.eu/"
           X_CHARGER_HOST: "https://charger.otp.opendatahub.testingmachine.eu/"
 
-          X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip"
+          #X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip"
+          X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit.zip"
           X_GTFS_URL_UPDATETIME: "0 2 * * *"
           X_GTFS_WORKFLOW_AUTH_TOKEN: ${{ secrets.GH_WORKFLOW_ACCESS_TOKEN }}
           X_GTFS_WORKFLOW_DISPATCH_URL: "https://api.github.com/repos/noi-techpark/odh-mentor-otp/actions/workflows/run_calculate.yml/dispatches"
@@ -212,7 +213,8 @@ jobs:
           X_DRT_HOST: "https://drt.otp.opendatahub.com/"
           X_CHARGER_HOST: "https://charger.otp.opendatahub.com/"
 
-          X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip"
+          #X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip"
+          X_GTFS_URL: "ftp://ftp.sta.bz.it/gtfs/google_transit.zip"
           X_GTFS_URL_UPDATETIME: "0 4 * * *"
           X_GTFS_WORKFLOW_AUTH_TOKEN: ${{ secrets.GH_WORKFLOW_ACCESS_TOKEN }}
           X_GTFS_WORKFLOW_DISPATCH_URL: "https://api.github.com/repos/noi-techpark/odh-mentor-otp/actions/workflows/run_calculate.yml/dispatches"

diff --git a/gtfs-import-task/gtfs-download.sh b/gtfs-import-task/gtfs-download.sh
@@ -33,7 +33,10 @@ if [ -f "${HASH_FILE}" ]; then
   OLD=$(cat $HASH_FILE)
 fi
 
-if [ "${SHA}" = "${OLD}" ]; then
+if [ ! -f /tmp/gtfs_$NEW_UUID.zip ]; then
+    echo "New gtfs file not found!" >> $LOGFILE
+
+elif [ "${SHA}" = "${OLD}" ]; then
 
   echo "${DATE} gtfs not changed!" >> $LOGFILE