I've split out the image scaling code into a separate class and returned this class...

[mir.git] / source / mircoders / media / MediaHandlerImagesExtern.java

diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index 9e7baa3..bb00c94 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -30,27 +30,28 @@
 package mircoders.media;
 
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
+import mir.media.image.ImageMagickImageProcessor;
+import mir.media.image.ImageProcessor;
 import mir.misc.StringUtil;
 
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
- * Image handler that stores images outside of the database. Will be replaced by the new
- *   media handling system.
+ * Image handler that stores images outside of the database.
+ * 
  * @author Zapata
  * @version 1.0
  */
 
-public class MediaHandlerImagesExtern extends MediaHandlerGeneric
-{
+public class MediaHandlerImagesExtern extends MediaHandlerGeneric {
   private int maxIconSize;
   private float minDescaleRatio;
   private int minDescaleReduction;
@@ -58,77 +59,77 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
   public MediaHandlerImagesExtern() {
 
     logger = new LoggerWrapper("Media.Images.Extern");
-    try {
-      MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();
-    }
-    catch (Throwable t) {
-      logger.fatal("MediaHandlerImagesExtern: can't get configuration");
-
-      throw new RuntimeException(t.toString());
-    }
 
     maxIconSize = configuration.getInt("Producer.Image.MaxIconSize");
     minDescaleRatio = configuration.getFloat("Producer.Image.MinDescalePercentage")/100;
     minDescaleReduction = configuration.getInt("Producer.Image.MinDescaleReduction");
   }
 
-  public void produce(Entity anImageEntity, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
-    try {
-      String date = anImageEntity.getValue("date");
+  public void produce(Entity anImageEntity, Entity aMediaTypeEntity) throws MediaExc, MediaFailure {
+      String date = anImageEntity.getFieldValue("date");
       String datePath = StringUtil.webdbDate2path(date);
-      String ext = "." + mediaTypeEnt.getValue("name");
+      String ext = "." + aMediaTypeEntity.getFieldValue("name");
       String fileBasePath = datePath + anImageEntity.getId();
       String filePath = fileBasePath + ext;
-      String iconPath = getIconStoragePath() + fileBasePath + ".jpg";
+      String iconPath = getBaseIconStoragePath() + fileBasePath + ".jpg";
       String iconStoragePath = configuration.getString("Producer.StorageRoot") + iconPath;
-      String imageFilePath = getStoragePath() + File.separator + filePath;
+      String imageFilePath = getBaseStoragePath() + File.separator + filePath;
 
       File imageFile = new File(imageFilePath);
       File iconFile = new File(iconStoragePath);
 
       if (!imageFile.exists()) {
-        throw new MediaExc("error in MediaHandlerImagesExtern.produce(): " + filePath + " does not exist!");
+        throw new MediaExc("error in MediaHandlerImagesExtern.execute(): " + filePath + " does not exist!");
       }
       else {
-        ImageProcessor processor = new ImageProcessor(imageFile);
+        ImageProcessor processor;
+        try {
+          processor = new ImageMagickImageProcessor(imageFile);
+        }
+        catch (IOException e) {
+          throw new MediaFailure(e);
+        }
 
         processor.descaleImage(maxIconSize, minDescaleRatio, minDescaleReduction);
         File dir = new File(iconFile.getParent());
-          if (dir!=null && !dir.exists()){
-            dir.mkdirs();
+        if (dir!=null && !dir.exists()){
+          dir.mkdirs();
         }
         processor.writeScaledData(iconFile, "JPEG");
 
-        anImageEntity.setValueForProperty("img_height", new Integer(processor.getHeight()).toString());
-        anImageEntity.setValueForProperty("img_width", new Integer(processor.getWidth()).toString());
+        anImageEntity.setFieldValue("img_height",
+            Integer.toString(processor.getHeight()));
+        anImageEntity.setFieldValue("img_width",
+            Integer.toString(processor.getWidth()));
 
-        anImageEntity.setValueForProperty("icon_height", new Integer(processor.getScaledHeight()).toString());
-        anImageEntity.setValueForProperty("icon_width", new Integer(processor.getScaledWidth()).toString());
+        anImageEntity.setFieldValue("icon_height",
+            Integer.toString(processor.getScaledHeight()));
+        anImageEntity.setFieldValue("icon_width",
+            Integer.toString(processor.getScaledWidth()));
 
-        anImageEntity.setValueForProperty("icon_path", iconPath);
-        anImageEntity.setValueForProperty("publish_path", filePath);
+        processor.cleanup();
+        anImageEntity.setFieldValue("icon_path", iconPath);
+        anImageEntity.setFieldValue("publish_path", filePath);
 
         anImageEntity.update();
-
-
+        reportChange(iconStoragePath);
+        reportChange(imageFilePath);
       }
-    }
-    catch(Throwable t) {
-      logger.error("MediaHandlerImagesExtern.produce: " + t.getMessage());
-      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-      throw new MediaFailure(t.getMessage(), t);
-    }
   }
 
 
-  public InputStream getIcon(Entity anImageEntity) throws MediaExc, MediaFailure {
+  /** {@inheritDoc} */
+  public InputStream getThumbnail(Entity anImageEntity) throws MediaExc, MediaFailure {
     try {
-      String filePath =
-          configuration.getString("Producer.StorageRoot") + anImageEntity.getValue("icon_path");
+      File file = new File(configuration.getString("Producer.StorageRoot") + anImageEntity.getFieldValue("icon_path"));
 
-      logger.info(filePath);
+      if (!file.exists()) {
+        // hackish
+        file = new File(configuration.getHome(), "../img/photo_big.gif");
+      }
 
-      return new FileInputStream(new File(filePath));
+      return new BufferedInputStream(
+        new FileInputStream(file),8192);
     }
     catch (Throwable t) {
       return null;
@@ -139,12 +140,12 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
     return "image/jpeg";
   }
 
-  public String getStoragePath()
+  public String getBaseStoragePath()
   {
     return configuration.getString("Producer.Image.Path");
   }
 
-  public String getIconStoragePath()
+  public String getBaseIconStoragePath()
   {
     return configuration.getString("Producer.Image.IconPath");
   }
@@ -169,21 +170,6 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
     return "Image";
   }
 
-  public boolean isVideo()
-  {
-    return false;
-  }
-
-  public boolean isAudio()
-  {
-    return false;
-  }
-
-  public boolean isImage ()
-  {
-    return true;
-  }
-
   public String getDescr(Entity mediaType)
   {
      return "image/jpeg";