Changeset 6831 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.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/dao/ImageDao.java (modified) (4 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.java

@@ -14 +14 @@
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 
 /**
@@ -157 +159 @@
         //on convertit la miniature en string base64
         BASE64Encoder base64 = new BASE64Encoder();
+
         String thumbnailBase64 = base64.encode(Outil.getBytesFromFile(image.getThumbnail()));
         //on envoie la miniature et on recupere la reponse
@@ -162 +165 @@
                 thumbnailBase64, "type", "thumb", "position", "1", "original_sum", Outil.getMD5Checksum(image
                         .getOriginale().getAbsolutePath())));
-        //on convertit le fichier original en string base64
-        String originaleBase64 = base64.encode(Outil.getBytesFromFile(image.getOriginale()));
-        //on envoie l'image originale et on recupere la reponse
-        Document reponseOriginale = (Main.sessionManager.executerReturnDocument("pwg.images.addChunk", "data",
-                originaleBase64, "type", "file", "position", "1", "original_sum", Outil.getMD5Checksum(image
-                        .getOriginale().getAbsolutePath())));
+
+        //begin feature:0001827
+        Double doubleChunk = Double.parseDouble(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE.getLabel())) * 1000 * 1024;
+        int chunk = doubleChunk.intValue();
+        ArrayList<File> fichiersAEnvoyer = Outil.splitFile(image.getOriginale(), chunk);
+        boolean echec = false;
+        for (int i = 0; i < fichiersAEnvoyer.size(); i++) {
+            File fichierAEnvoyer = fichiersAEnvoyer.get(i);
+            String originaleBase64 = base64.encode(Outil.getBytesFromFile(fichierAEnvoyer));
+            Document reponseOriginale = (Main.sessionManager.executerReturnDocument("pwg.images.addChunk", "data",
+                    originaleBase64, "type", "file", "position", String.valueOf(i), "original_sum", Outil
+                            .getMD5Checksum(image.getOriginale().getAbsolutePath())));
+            if (!Outil.checkOk(reponseOriginale)) {
+                echec = true;
+                break;
+            }
+        }
+        //end
+
         //on ajoute l'image en base et on recupere la reponse
         Document reponseAjout = (Main.sessionManager.executerReturnDocument("pwg.images.add", "file_sum", Outil
@@ -173 +189 @@
                 .getThumbnail().getCanonicalPath()), "position", "1", "original_sum", Outil.getMD5Checksum(image
                 .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image
-                .getName(), "author", image.getAuteur()));
-
+                .getName(), "author", Main.sessionManager.getLogin()));
+        //      System.out.println(Main.sessionManager.executerReturnString("pwg.images.add", "file_sum", Outil
+        //              .getMD5Checksum(image.getOriginale().getAbsolutePath()), "thumbnail_sum", Outil.getMD5Checksum(image
+        //              .getThumbnail().getCanonicalPath()), "position", "1", "original_sum", Outil.getMD5Checksum(image
+        //              .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image
+        //              .getName(), "author", Main.sessionManager.getLogin()));
         boolean reussite = true;
-        if (!Outil.checkOk(reponseThumb) || !Outil.checkOk(reponseOriginale) || !Outil.checkOk(reponseAjout)) {
+        if (!Outil.checkOk(reponseThumb) || echec || !Outil.checkOk(reponseAjout)) {
             reussite = false;
         }