I've split out the image scaling code into a separate class and returned this class...
[mir.git] / source / mircoders / media / MediaHandlerImagesExtern.java
index 788d4fa..bb00c94 100755 (executable)
 package mircoders.media;
 
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
@@ -42,7 +37,12 @@ import mir.media.MediaFailure;
 import mir.media.image.ImageMagickImageProcessor;
 import mir.media.image.ImageProcessor;
 import mir.misc.StringUtil;
-import mir.util.FileRoutines;
+
+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.
@@ -51,130 +51,74 @@ import mir.util.FileRoutines;
  * @version 1.0
  */
 
-public class MediaHandlerImagesExtern extends MediaHandlerGeneric
-{
-  private int maxSize;
+public class MediaHandlerImagesExtern extends MediaHandlerGeneric {
   private int maxIconSize;
   private float minDescaleRatio;
   private int minDescaleReduction;
-  private boolean scaleImages;
-  
+
   public MediaHandlerImagesExtern() {
+
     logger = new LoggerWrapper("Media.Images.Extern");
-    maxSize = configuration.getInt("Producer.Image.MaxSize");
+
     maxIconSize = configuration.getInt("Producer.Image.MaxIconSize");
     minDescaleRatio = configuration.getFloat("Producer.Image.MinDescalePercentage")/100;
     minDescaleReduction = configuration.getInt("Producer.Image.MinDescaleReduction");
-    scaleImages = configuration.getBoolean("Producer.Image.ScaleImages");
   }
 
-  public void produce(Entity anImageEntity, Entity mediaTypeEnt) throws MediaExc, MediaFailure {
-       String imagesOriginalDir = configuration.getString("Producer.ImagesOriginalDir.Path"); ;
-       String imagesOriginalDirRelPath = configuration.getString("Producer.ImagesOriginalDir.RelPath");;
-       String imageOriginalFilePath;
-       String imageOriginalRelPath;
-    try {
+  public void produce(Entity anImageEntity, Entity aMediaTypeEntity) throws MediaExc, MediaFailure {
       String date = anImageEntity.getFieldValue("date");
       String datePath = StringUtil.webdbDate2path(date);
-      String ext = "." + mediaTypeEnt.getFieldValue("name");
+      String ext = "." + aMediaTypeEntity.getFieldValue("name");
       String fileBasePath = datePath + anImageEntity.getId();
       String filePath = fileBasePath + ext;
       String iconPath = getBaseIconStoragePath() + fileBasePath + ".jpg";
       String iconStoragePath = configuration.getString("Producer.StorageRoot") + iconPath;
       String imageFilePath = getBaseStoragePath() + File.separator + filePath;
-      
-      // yoss: get a file path where the the original image should be saved if image resizing is turned on
-      imageOriginalFilePath = imagesOriginalDir + filePath;
-      imageOriginalRelPath = imagesOriginalDirRelPath +  filePath;
-      
-      // yoss:make a new File object for the originalFile
-      File originalFile = new File(imageOriginalFilePath);   
-      logger.info("imageOriginalFilePath:" + imageOriginalFilePath);
+
       File imageFile = new File(imageFilePath);
-      logger.info("******************************************");
-      logger.info("imageFile exists: " + imageFile.exists());
-      logger.info("imageFile: " + imageFile.getAbsolutePath());
       File iconFile = new File(iconStoragePath);
-      logger.info("iconStoragePath:"+ iconStoragePath);
-      
-      
+
       if (!imageFile.exists()) {
-        throw new MediaExc("error in MediaHandlerImagesExtern.execute(): "
-            + filePath + " does not exist!");
-      } else {
-        ImageProcessor processor = new ImageMagickImageProcessor(imageFile);
-        processor.descaleImage(maxIconSize, minDescaleRatio,
-            minDescaleReduction);
+        throw new MediaExc("error in MediaHandlerImagesExtern.execute(): " + filePath + " does not exist!");
+      }
+      else {
+        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()) {
+        if (dir!=null && !dir.exists()){
           dir.mkdirs();
         }
         processor.writeScaledData(iconFile, "JPEG");
-        reportChange(iconStoragePath);
-        reportChange(imageFilePath);
 
-        // yoss: if the config is set so that images should be scaled, make the
-        // resized file.
-        if (scaleImages) {
-          logger.info("entered scaleImages");
-          ImageProcessor originalProcessor = new ImageMagickImageProcessor(
-              imageFile);
-          originalProcessor.descaleImage(maxSize, minDescaleRatio,
-              minDescaleReduction);
-          File originalDir = new File(originalFile.getParent());
-          if (originalDir != null && !originalDir.exists()) {
-            originalDir.mkdirs();
-          }
-          if (!originalFile.exists()) {
-            logger.debug("the original image file doesn't exist, copying to originalFile");
-            FileRoutines.copy(imageFile, originalFile);
-            reportChange(originalFile.getAbsolutePath());
-          }
-          // yoss: don't write the scaled data again if it's the same size as
-          // the file that's there right now. Image producer runs are 4 times
-          // faster this way.
-          logger.info("about to write scaled data, byte length: "
-              + originalProcessor.getScaledFileSize());
-          if (originalProcessor.getScaledFileSize() != imageFile.length()) {
-            originalProcessor.writeScaledData(imageFile, "JPEG");
-          }
-          anImageEntity.setFieldValue("original_file_path",
-              imageOriginalRelPath);
-          anImageEntity.setFieldValue("img_height", Integer
-              .toString(originalProcessor.getScaledHeight()));
-          anImageEntity.setFieldValue("img_width", Integer
-              .toString(originalProcessor.getScaledWidth()));
-
-          originalProcessor.cleanup();
-
-        } else {
-          anImageEntity.setFieldValue("img_height", new Integer(processor
-              .getHeight()).toString());
-          anImageEntity.setFieldValue("img_width", new Integer(processor
-              .getWidth()).toString());
-        }
+        anImageEntity.setFieldValue("img_height",
+            Integer.toString(processor.getHeight()));
+        anImageEntity.setFieldValue("img_width",
+            Integer.toString(processor.getWidth()));
 
-        anImageEntity.setFieldValue("icon_height", new Integer(processor
-            .getScaledHeight()).toString());
-        anImageEntity.setFieldValue("icon_width", new Integer(processor
-            .getScaledWidth()).toString());
+        anImageEntity.setFieldValue("icon_height",
+            Integer.toString(processor.getScaledHeight()));
+        anImageEntity.setFieldValue("icon_width",
+            Integer.toString(processor.getScaledWidth()));
 
         processor.cleanup();
-
         anImageEntity.setFieldValue("icon_path", iconPath);
         anImageEntity.setFieldValue("publish_path", filePath);
 
         anImageEntity.update();
-
+        reportChange(iconStoragePath);
+        reportChange(imageFilePath);
       }
-    }
-    catch(Throwable t) {
-      logger.error("MediaHandlerImagesExtern.execute: " + t.getMessage(), t);
-      throw new MediaFailure(t.getMessage(), t);
-    }
   }
 
-/** {@inheritDoc} */
+
+  /** {@inheritDoc} */
   public InputStream getThumbnail(Entity anImageEntity) throws MediaExc, MediaFailure {
     try {
       File file = new File(configuration.getString("Producer.StorageRoot") + anImageEntity.getFieldValue("icon_path"));