Coordinate per anno 2025_NEW (PDF 2026 con settembre, ottobre e novembre 2025) e modifiche al codice necessarie

Author: denismaggior8

PDFs/2025/CHIERI3B_2025.pdf

@@ -0,0 +1,4 @@
+#left,top,with,height,label,id,regexp,collection_time,all_day_event,days_offest,hours_offset,mins_offset
+21.07,162.48,155.27,311.49,ottobre,10,(^\d*) (\S*) (.*$),07:00,true,0,0,0
+181.81,162.48,155.27,311.49,novembre,11,(^\d*) (\S*) (.*$),07:00,true,0,0,0
+344.91,162.48,155.27,311.49,dicembre,12,(^\d*) (\S*) (.*$),07:00,true,0,0,0

coordinates/coordinates_template_2025_NEW.csv

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 declare -a zones=($(cat comuni.txt | tr  '[a-z]' '[A-Z]' | sed 's/ //g'))
 
 # Mantenere gli ultimi due anni (quello nuovo e quello precedente)
 declare -a years=(
-"2024"
-"2025"
+["2025"]="2025"
+["2025_NEW"]="2026"
 )
 
 for year in "${years[@]}"
@@ -23,12 +23,12 @@ do
   do
     mkdir -p PDFs/$year
     if [ ! -s "PDFs/${year}/${zone}_${year}.*" ]; then
-      echo "Downloading from https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${year}&f=${zone}.pdf&t=raccolta"
+      echo "Downloading from https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${years["$year"]}&f=${zone}.pdf&t=raccolta"
       curl -lsk --retry 5 --retry-max-time 120 --max-time 30 -o PDFs/${year}/${zone}_${year}.pdf "https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${year}&f=${zone}.pdf&t=raccolta"
       if [ -s PDFs/${year}/${zone}_${year}.pdf ]; then
         echo "PDF file PDFs/${year}/${zone}_${year}.pdf downloaded"
       else
-        echo "Downloading from https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${year}&f=${zone}.PDF&t=raccolta"
+        echo "Downloading from https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${years["$year"]}&f=${zone}.PDF&t=raccolta"
         curl -lsk --retry 5 --retry-max-time 120 --max-time 30 -o PDFs/${year}/${zone}_${year}.pdf "https://www.ccs.to.it/flex/Extensions/appCCSCalendario/pages/serveDownload.php?a=${year}&f=${zone}.PDF&t=raccolta"
         if [ -f PDFs/${year}/${zone}_${year}.pdf ]; then
           echo "PDF file PDFs/${year}/${zone}_${year}.PDF downloaded"
@@ -37,7 +37,7 @@ do
     fi
     if test -s "PDFs/${year}/${zone}_${year}.pdf" && test -f "coordinates/${year}/${zone}_${year}_coordinates.csv"; then
       echo "Processing file PDFs/${year}/${zone}_${year}.pdf using coordinates from coordinates/${year}/${zone}_${year}.csv"
-      java -jar target/chieri-calendari-raccolta-rifiuti-1.0-SNAPSHOT-jar-with-dependencies.jar ${zone} PDFs/${year}/${zone}_${year}.pdf coordinates/${year}/${zone}_${year}_coordinates.csv ${year} CSVs/${year} ICSs/${year}
+      java -jar target/chieri-calendari-raccolta-rifiuti-1.0-SNAPSHOT-jar-with-dependencies.jar ${zone} PDFs/${year}/${zone}_${year}.pdf coordinates/${year}/${zone}_${year}_coordinates.csv ${year//[^0-9]/} CSVs/${year} ICSs/${year}
     fi
   done
-done
+done

run_me.sh

@@ -45,10 +45,7 @@ public static void main(String[] args) {
         ICSUtils icsUtils = new ICSUtils(zone,year);
 
         try {
-
             for (Coordinates coordinates : coordinatesArray) {
-
-
                 FileInputStream inputStream = new FileInputStream(inputPDFFilePath);
                 byte[] pdfBytes = IOUtils.toByteArray(inputStream);
                 PDDocument pddDoc = PDDocument.load(pdfBytes);
@@ -90,8 +87,8 @@ public static void main(String[] args) {
                 pddDoc.close();
 
             }
-            csvUtils.toFile(outputCSVPath + System.getProperty("file.separator") + zone + "_" + year + ".csv");
-            icsUtils.toFile(outputICSPath + System.getProperty("file.separator") + zone + "_" + year + ".ics");
+            csvUtils.toFile(outputCSVPath + System.getProperty("file.separator") + zone + "_" + outputCSVPath.split("/")[1] + ".csv");
+            icsUtils.toFile(outputICSPath + System.getProperty("file.separator") + zone + "_" + outputICSPath.split("/")[1] + ".ics");
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/it/sunnyvale/chieriraccoltarifiuti/Main.java

@@ -9,11 +9,12 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalTime;
+import java.util.ArrayList;
 
 public class CoordinatesUtils {
 
     public static Coordinates[] readCoordinatesFromCSV(String fileName) {
-        Coordinates[] coordinatesArray = new Coordinates[12];
+        ArrayList<Coordinates> coordinatesArrayList = new ArrayList<>();
          Path pathToFile = Paths.get(fileName);
          try (BufferedReader br = Files.newBufferedReader(pathToFile, StandardCharsets.US_ASCII)) {
              String line = br.readLine();
@@ -25,14 +26,14 @@ public static Coordinates[] readCoordinatesFromCSV(String fileName) {
                  }
                  String[] attributes = line.split(",");
                  Coordinates coordinates = createCoordinates(attributes);
-                 coordinatesArray[i]=coordinates;
+                 coordinatesArrayList.add(coordinates);
                  i++;
                  line = br.readLine();
              }
          } catch (IOException ioe) {
              ioe.printStackTrace();
          }
-         return coordinatesArray;
+         return coordinatesArrayList.toArray(new Coordinates[0]);
     }
 
     public static Coordinates createCoordinates(String[] line) {