Call mark_event_incomplete when validate_download fails

cli_meter/meters/sel735/cleanup_incomplete.sh

@@ -25,12 +25,7 @@ log "Starting cleanup process in directory: $base_directory"
 
 # Find and delete all directories matching the pattern *.incomplete_<digit>
 find "$base_directory" -type d -regex '.*/.*\.incomplete_[0-9]+' -print0 | while IFS= read -r -d '' dir; do
-  rm -rf "$dir"
-  if [ ! -d "$dir" ]; then
-    log "Successfully deleted $dir"
-  else
-    log "Failed to delete $dir"
-  fi
+  rm -rf "$dir" && log "Successfully deleted $dir" || log "Failed to delete $dir"
 done
 
 echo "Cleanup process completed."

cli_meter/meters/sel735/commons.sh

@@ -21,7 +21,7 @@ handle_sigint() {
     else
         log "current_event_id is not set, no event to move to .incomplete."
     fi
-    
+
     source "$current_dir/cleanup_incomplete.sh" "$base_output_dir"
 }
 
@@ -35,11 +35,10 @@ mark_event_incomplete() {
 
   # Check if the original directory exists
   if [ -d "$original_dir" ]; then
-    # Find an available suffix or the one to rotate
     local suffix=1
     while [ -d "${base_incomplete_dir}_${suffix}" ]; do
-      let suffix++
-      # If reaching the 6th iteration, start rotation from 1
+      ((suffix++))
+      # If we reach 5, we need to rotate the directories
       if [ "$suffix" -gt 5 ]; then
         suffix=5
         break
@@ -71,9 +70,7 @@ validate_download() {
     # Files expect to have downloaded
     local expected_files=("CEV_${event_id}.CEV" "HR_${event_id}.CFG" "HR_${event_id}.DAT" "HR_${event_id}.HDR" "HR_${event_id}.ZDAT")
     for file in "${expected_files[@]}"; do
-        if [ ! -f "${event_dir}/${file}" ]; then
-            return 0 # File is missing
-        fi
+        [ ! -f "${event_dir}/${file}" ] && return 0 # File is missing
     done
     return 1 # All files are present
 }

cli_meter/meters/sel735/download.sh

@@ -85,7 +85,7 @@ for event_info in $($current_dir/get_events.sh "$meter_ip" "$meter_id" "$base_ou
     else
       #TODO: handle this case
       log "Not all files downloaded for event: $event_id"
-      #mark_event_incomplete "$event_id" "$output_dir"
+      mark_event_incomplete "$event_id" "$output_dir"
     fi
   else
     log "Download failed for event_id: $event_id, skipping metadata creation."