Changeset 6831 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java

Timestamp:

Sep 1, 2010, 6:48:53 PM (14 years ago)

Author:

mlg

Message:

Bug correction :
bug:0001837 : there is now a default translation file (in english), so the application won't crash when a translation is not found
bug:0001833 : the accents are manage when creating a new category
bug:0001832 : on a right click on the categories list, the selection is now visible
bug:0001830 : there is no bug on refreshing the categories tree

Features :
feature:001828 : exif and iptc tags are kept after resizing an image
feature:001827 : pwg.images.addChunk is now fully used : images are split into chunks before being sent

Other features :

• The user can manage his preferences :

-The web images size
-The chunks size

• The user can save the login informations (url, login, password) /!\ in a plain text file !

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java (modified) (3 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -5 +5 @@
 import java.util.List;
 
-import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.dao.ImageDao;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
-import fr.mael.jiwigo.transverse.util.MetadataExtractor;
+import fr.mael.jiwigo.transverse.util.Outil;
 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 
@@ -67 +66 @@
     }
 
+    /**
+     * Method called to send an image to the server.
+     
+     * @param filePath
+     * @param idCategory
+     * @return
+     * @throws Exception
+     */
     public boolean creer(String filePath, Integer idCategory) throws Exception {
+        //get the byte array of the original file, to keep metadata
+        byte[] bytesFichierOriginal = Outil.getBytesFromFile(new File(filePath));
+
+        //size taken from the user's preferences
         int widthOriginale = Integer
                 .valueOf(PreferencesManagement.getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel()));
         int heightOriginale = Integer.valueOf(PreferencesManagement
                 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel()));
+        //resize the picture (or not)
         boolean originaleRedimensionnee = ImagesUtil.scale(filePath, "originale.jpg", widthOriginale, heightOriginale);
+        //create the thumbnail
         ImagesUtil.scale(filePath, "thumb.jpg", 120, 90);
+        //get the thumbnail
         File thumbnail = new File(System.getProperty("java.io.tmpdir") + "/thumb.jpg");
         File originale = null;
         if (originaleRedimensionnee) {
             originale = new File(System.getProperty("java.io.tmpdir") + "/originale.jpg");
+            //if the original file has been resized, we put the metadata in the resized file
+            //I use here a try catch because if the original file isn't a jpeg
+            //the methode Outil.enrich will fail, but the procedure has to continue
+            try {
+                byte[] fichierEnrichi = Outil.enrich(bytesFichierOriginal, Outil.getBytesFromFile(new File(System
+                        .getProperty("java.io.tmpdir")
+                        + "/originale.jpg")));
+                Outil.byteToFile(System.getProperty("java.io.tmpdir") + "/originale.jpg", fichierEnrichi);
+            } catch (Exception e) {
+            }
         } else {
             originale = new File(filePath);
-        }
-        MetadataExtractor medataExtractor = new MetadataExtractor(originale.getAbsolutePath());
-        String auteur = medataExtractor.getAuteur();
-        if (auteur == null) {
-            auteur = Main.sessionManager.getLogin();
+
         }
         Image image = new Image();
@@ -90 +110 @@
         image.setThumbnail(thumbnail);
         image.setOriginale(originale);
-        image.setAuteur(auteur);
         image.setIdCategory(idCategory);
+        //now we call the dao to send the image to the webservice
         return ImageDao.getInstance().creer(image);
     }
 
+    /**
+     * Deletes the file extension
+     * @param path
+     * @return
+     */
     private String getImageName(String path) {
         File fichier = new File(path);