diff --git a/.gitignore b/.gitignore index 5ff6309..20927fa 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,6 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store + +results/* \ No newline at end of file diff --git a/results.json b/results.json deleted file mode 100644 index 57a673f..0000000 --- a/results.json +++ /dev/null @@ -1 +0,0 @@ -[{"cityName":"berlin","description":"overcast clouds","temperature":277.98,"pressure":999,"humidity":91},{"cityName":"tokyo","description":"clear sky","temperature":287.08,"pressure":1018,"humidity":60},{"cityName":"warsaw","description":"light snow","temperature":272.62,"pressure":1013,"humidity":89}] \ No newline at end of file diff --git a/results.pdf b/results.pdf deleted file mode 100644 index 91d31ed..0000000 --- a/results.pdf +++ /dev/null @@ -1,40 +0,0 @@ -%PDF-1.4 -% -2 0 obj -<>stream -xϽ -0=OqŤ3 -(d+!M+$|{Qg:7"GIvpZll X%-jՍk~٬1^;'v6S8$m0d -3.MY&W%%{lzաH<$'In -endstream -endobj -4 0 obj -<>>>/Contents 2 0 R/Parent 3 0 R>> -endobj -1 0 obj -<> -endobj -3 0 obj -<> -endobj -5 0 obj -<> -endobj -6 0 obj -<> -endobj -xref -0 7 -0000000000 65535 f -0000000354 00000 n -0000000015 00000 n -0000000442 00000 n -0000000242 00000 n -0000000493 00000 n -0000000538 00000 n -trailer -<]>> -%iText-5.5.13 -startxref -696 -%%EOF diff --git a/results.xml b/results.xml deleted file mode 100644 index cb647fa..0000000 --- a/results.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - vancouverovercast clouds275.68102692 - chicagomist285.39100192 - \ No newline at end of file diff --git a/results2023-12-09_234435.pdf b/results2023-12-09_234435.pdf deleted file mode 100644 index 122a8ef..0000000 --- a/results2023-12-09_234435.pdf +++ /dev/null @@ -1,38 +0,0 @@ -%PDF-1.4 -% -2 0 obj -<>stream -xmν -0=W-BI6vtqQVbi61?tSș9Tp\" %as~GEçI8/%$h!A3O5B2Q,jʉjOhMWl)gןE:8hnv$k~ -D -endstream -endobj -4 0 obj -<>>>/Contents 2 0 R/Parent 3 0 R>> -endobj -1 0 obj -<> -endobj -3 0 obj -<> -endobj -5 0 obj -<> -endobj -6 0 obj -<> -endobj -xref -0 7 -0000000000 65535 f -0000000349 00000 n -0000000015 00000 n -0000000437 00000 n -0000000237 00000 n -0000000488 00000 n -0000000533 00000 n -trailer -<<1a7833db80448a42cbb4cd49ff42f716>]>> -%iText-5.5.13 -startxref -691 -%%EOF diff --git a/results2023-12-09_234517.json b/results2023-12-09_234517.json deleted file mode 100644 index 9d52c74..0000000 --- a/results2023-12-09_234517.json +++ /dev/null @@ -1 +0,0 @@ -[{"cityName":"warsaw","description":"broken clouds","temperature":273.31,"pressure":1007,"humidity":89}] \ No newline at end of file diff --git a/results2023-12-09_234531.xml b/results2023-12-09_234531.xml deleted file mode 100644 index 86ba86d..0000000 --- a/results2023-12-09_234531.xml +++ /dev/null @@ -1 +0,0 @@ -chicagoclear sky279.1101262 \ No newline at end of file diff --git a/src/main/java/model/ConvertResultPdf.java b/src/main/java/model/ConvertResultPdf.java index 5c7b924..f370b30 100644 --- a/src/main/java/model/ConvertResultPdf.java +++ b/src/main/java/model/ConvertResultPdf.java @@ -1,41 +1,41 @@ -package model; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.itextpdf.text.Document; -import com.itextpdf.text.Paragraph; -import com.itextpdf.text.pdf.PdfWriter; - -import java.io.BufferedReader; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.util.List; - -public class ConvertResultPdf { - private String inputFile; - private String outputFile; - - - public ConvertResultPdf(String inputFile, String outputFile) { - this.inputFile = inputFile; - this.outputFile = outputFile; - } - - public void convertToPdf() { - try (BufferedReader br = new BufferedReader(new FileReader(inputFile))) { - Document document = new Document(); - PdfWriter.getInstance(document, new FileOutputStream(outputFile)); - document.open(); - - String line; - while ((line = br.readLine()) != null) { - document.add(new Paragraph(line)); - } - - document.close(); - } catch (IOException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - } -} \ No newline at end of file +//package model; +//import com.fasterxml.jackson.databind.ObjectMapper; +//import com.itextpdf.text.Document; +//import com.itextpdf.text.Paragraph; +//import com.itextpdf.text.pdf.PdfWriter; +// +//import java.io.BufferedReader; +//import java.io.FileOutputStream; +//import java.io.FileReader; +//import java.io.IOException; +//import java.util.List; +// +//public class ConvertResultPdf { +// private String inputFile; +// private String outputFile; +// +// +// public ConvertResultPdf(String inputFile, String outputFile) { +// this.inputFile = inputFile; +// this.outputFile = outputFile; +// } +// +// public void convertToPdf() { +// try (BufferedReader br = new BufferedReader(new FileReader(inputFile))) { +// Document document = new Document(); +// PdfWriter.getInstance(document, new FileOutputStream(outputFile)); +// document.open(); +// +// String line; +// while ((line = br.readLine()) != null) { +// document.add(new Paragraph(line)); +// } +// +// document.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +//} \ No newline at end of file diff --git a/src/main/java/model/weatherForecast.java b/src/main/java/model/weatherForecast.java index 7bf5eb9..67ebb97 100644 --- a/src/main/java/model/weatherForecast.java +++ b/src/main/java/model/weatherForecast.java @@ -54,7 +54,7 @@ public class weatherForecast { xmlMapper.writeValue(new File(outputFile), allEntries); } - public static void convertToPdf(String inputFile, String outputFile) { + public static void saveToPdf(String inputFile, String outputFile) { try (BufferedReader br = new BufferedReader(new FileReader(inputFile))) { Document document = new Document(); PdfWriter.getInstance(document, new FileOutputStream(outputFile)); diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java index 2ca950c..3fb584e 100644 --- a/src/main/java/org/example/Main.java +++ b/src/main/java/org/example/Main.java @@ -87,25 +87,26 @@ public class Main { } else if (Objects.equals(input, "z")) { System.out.println("W jakim formacie chcesz zapisac wyniki?\n pdf/json/xml"); String whichFormat = scanner.nextLine().toLowerCase(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); + String sformatowanyCzas = czas.format(formatter); if (Objects.equals(whichFormat, "pdf")) { // ConvertResultPdf convertResult = new ConvertResultPdf(temporaryFile.FILE_NAME, // "results.pdf"); // convertResult.convertToPdf(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); - String sformatowanyCzas = czas.format(formatter); - String outputFile = "results" + sformatowanyCzas + ".pdf" ; + + String outputFile = "results/results" + sformatowanyCzas + ".pdf" ; // System.out.println(sformatowanyCzas); // System.out.println(outputFile); - weatherForecast.convertToPdf(temporaryFile.FILE_NAME, outputFile); + weatherForecast.saveToPdf(temporaryFile.FILE_NAME, outputFile); } else if (Objects.equals(whichFormat, "json")) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); - String sformatowanyCzas = czas.format(formatter); - String outputFile = "results" + sformatowanyCzas + ".json"; +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); +// String sformatowanyCzas = czas.format(formatter); + String outputFile = "results/results" + sformatowanyCzas + ".json"; weatherForecast.saveToJson(outputFile); } else if (Objects.equals(whichFormat, "xml")) { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); - String sformatowanyCzas = czas.format(formatter); - String outputFile = "results" + sformatowanyCzas + ".xml"; +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HHmmss"); +// String sformatowanyCzas = czas.format(formatter); + String outputFile = "results/results" + sformatowanyCzas + ".xml"; weatherForecast.saveToXml(outputFile); } else { System.out.println("Wprowadz poprawna opcje."); diff --git a/temporary_file.txt b/temporary_file.txt index 75c379d..57b9aac 100644 --- a/temporary_file.txt +++ b/temporary_file.txt @@ -1,6 +1,6 @@ -city: chicago -description: clear sky -temperature[K]: 279,10 -pressure[hPa]: 1012 -humidity[%]: 62 +city: warsaw +description: broken clouds +temperature[K]: 272,49 +pressure[hPa]: 1006 +humidity[%]: 87 --------------------