diff --git a/backend/src/main/java/pdl/backend/ImageDao.java b/backend/src/main/java/pdl/backend/ImageDao.java index 047a881..2531c9d 100644 --- a/backend/src/main/java/pdl/backend/ImageDao.java +++ b/backend/src/main/java/pdl/backend/ImageDao.java @@ -25,33 +25,26 @@ public class ImageDao implements Dao { } catch (final Exception e) { e.printStackTrace(); } - System.out.println("IMAGEEEEEEEEEEEEEEs"); - for (Image img : retrieveAll()) { - System.out.println(img.getName()); - } - System.out.println("ENNNNNNNNNNNNNNd"); - } public void getAllImages(final File folder) { - for (final File fileEntry : folder.listFiles()) { - if (fileEntry.isDirectory()) { - getAllImages(fileEntry); + for (final File file : folder.listFiles()) { + if (file.isDirectory()) { + getAllImages(file); } else { - final ClassPathResource imgFile = new ClassPathResource(fileEntry.getName()); String extension = ""; - int i = fileEntry.getName().lastIndexOf('.'); + int i = file.getName().lastIndexOf('.'); if (i > 0) { - extension = fileEntry.getName().substring(i + 1); + extension = file.getName().substring(i + 1); } - if (!extension.equals("jpg") && !extension.equals("pgn")) { + if (!extension.equals("jpg") && !extension.equals("png")) { continue; } byte[] fileContent; try { - fileContent = Files.readAllBytes(imgFile.getFile().toPath()); - Image img = new Image(imgFile.getFilename(), fileContent); + fileContent = Files.readAllBytes(file.toPath()); + Image img = new Image(file.getName(), fileContent); images.put(img.getId(), img); } catch (final IOException e) { e.printStackTrace(); diff --git a/backend/src/main/resources/images/aube.jpg b/backend/src/main/resources/images/aube.jpg new file mode 100644 index 0000000..dd38f75 Binary files /dev/null and b/backend/src/main/resources/images/aube.jpg differ diff --git a/backend/src/main/resources/images/imagesAnimals/birds.jpg b/backend/src/main/resources/images/imagesAnimals/birds.jpg new file mode 100644 index 0000000..38bae8d Binary files /dev/null and b/backend/src/main/resources/images/imagesAnimals/birds.jpg differ diff --git a/backend/src/main/resources/images/mountains.jpg b/backend/src/main/resources/images/mountains.jpg new file mode 100644 index 0000000..afa645d Binary files /dev/null and b/backend/src/main/resources/images/mountains.jpg differ diff --git a/backend/src/main/resources/images/poppy.jpg b/backend/src/main/resources/images/poppy.jpg new file mode 100644 index 0000000..6ad663a Binary files /dev/null and b/backend/src/main/resources/images/poppy.jpg differ