Changeset 6831 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.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/transverse/util/Outil.java (modified) (3 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.java

@@ -2 +2 @@
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14 +17 @@
 import java.net.URLClassLoader;
 import java.security.MessageDigest;
-
+import java.util.ArrayList;
+
+import org.apache.sanselan.Sanselan;
+import org.apache.sanselan.common.IImageMetadata;
+import org.apache.sanselan.formats.jpeg.JpegImageMetadata;
+import org.apache.sanselan.formats.jpeg.JpegPhotoshopMetadata;
+import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
+import org.apache.sanselan.formats.jpeg.iptc.JpegIptcRewriter;
+import org.apache.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
+import org.apache.sanselan.formats.tiff.write.TiffOutputSet;
 import org.jdom.Document;
 import org.jdom.JDOMException;
@@ -209 +221 @@
         return result.toString();
     }
+
+    /**
+     * Function that splits a file 
+     * @param fichier the file to split
+     * @param size the size of the resulting chunks
+     * @return the list of files
+     * @throws IOException
+     */
+    //feature:0001827
+    public static ArrayList<File> splitFile(File fichier, int size) throws IOException {
+        FileInputStream fis = new FileInputStream(fichier);
+        byte buffer[] = new byte[size];
+        ArrayList<File> listFichiers = new ArrayList<File>();
+        int count = 0;
+        while (true) {
+            int i = fis.read(buffer, 0, size);
+            if (i == -1)
+                break;
+            File file = new File(System.getProperty("java.io.tmpdir") + "/tempcut" + count);
+            listFichiers.add(file);
+            FileOutputStream fos = new FileOutputStream(file);
+            fos.write(buffer, 0, i);
+            fos.flush();
+            fos.close();
+
+            ++count;
+        }
+        return listFichiers;
+    }
+
+    /**
+     * Function used to put the exif and iptc metadata from one image to another
+     * @param enriched original image where the metadata comes from
+     * @param naked image where to put metadata
+     * @return enriched image
+     * @throws Exception
+     */
+    public static byte[] enrich(byte[] enriched, byte[] naked) throws Exception {
+
+        // read IPTC metadata from the original enriched image
+        IImageMetadata metadata = Sanselan.getMetadata(enriched);
+        JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
+        JpegPhotoshopMetadata photoshopMetadata = jpegMetadata.getPhotoshop();
+        if (photoshopMetadata == null) {
+            return naked;
+        }
+
+        PhotoshopApp13Data data = photoshopMetadata.photoshopApp13Data;
+
+        // read the EXIF metadata from the parsed JPEG metadata
+        TiffOutputSet outputSet = jpegMetadata.getExif().getOutputSet();
+
+        // enrich the naked byte[] with EXIF metadata
+        ExifRewriter writer = new ExifRewriter();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        writer.updateExifMetadataLossless(naked, outputStream, outputSet);
+
+        // enrich the partially clothed byte[] with IPTC metadata
+        InputStream src = new ByteArrayInputStream(outputStream.toByteArray());
+        ByteArrayOutputStream dest = new ByteArrayOutputStream();
+        new JpegIptcRewriter().writeIPTC(src, dest, data);
+
+        // return the fully clothed image as a byte[]
+        return dest.toByteArray();
+    }
+
+    public static void byteToFile(String fichier, byte[] bytes) throws IOException {
+        FileOutputStream fos = new FileOutputStream(fichier);
+        fos.write(bytes);
+        fos.flush();
+        fos.close();
+
+    }
 }