[Openutils-svn] SF.net SVN: openutils:[3564] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

[<fg...@us...>]

Revision: 3564
          http://openutils.svn.sourceforge.net/openutils/?rev=3564&view=rev
Author:   fgiust
Date:     2011-06-25 11:42:08 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
better logging

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-06-23 12:22:43 UTC (rev 3563)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-06-25 11:42:08 UTC (rev 3564)
@@ -505,7 +505,7 @@
             final PipedInputStream stream = new PipedInputStream();
             PipedOutputStream outputstream = new PipedOutputStream(stream);
 
-            log.info("setting value to {}", nd.getHandle());
+            log.debug("setting value to {}", nd.getHandle());
 
             Thread t = new Thread(new Runnable()
             {
@@ -782,7 +782,7 @@
             log.warn(e2.getMessage(), e2);
         }
 
-        final String finalNodeDataName = nodeDataName;
+        final String originalNodeDataName = nodeDataName;
 
         try
         {
@@ -794,18 +794,26 @@
                  */
                 public void exec()
                 {
+                    long timestart = System.currentTimeMillis();
+
                     HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
-                    String resolution = resolutionTarget;
+                    String resolutionstring = resolutionTarget;
 
-                    if (RESOLUTION_THUMBNAIL.equals(resolution))
+                    if (RESOLUTION_THUMBNAIL.equals(resolutionstring))
                     {
-                        resolution = RESOLUTION_THUMBNAIL_SIZE;
+                        resolutionstring = RESOLUTION_THUMBNAIL_SIZE;
                     }
-                    if (RESOLUTION_PREVIEW.equals(resolution))
+                    if (RESOLUTION_PREVIEW.equals(resolutionstring))
                     {
-                        resolution = RESOLUTION_PREVIEW_SIZE;
+                        resolutionstring = RESOLUTION_PREVIEW_SIZE;
                     }
 
+                    String resolutioNodeName = "res-" + resolutionstring;
+                    if (RESOLUTION_THUMBNAIL.equals(resolutionTarget) || RESOLUTION_PREVIEW.equals(resolutionTarget))
+                    {
+                        resolutioNodeName = resolutionTarget;
+                    }
+
                     Content node;
                     try
                     {
@@ -816,7 +824,7 @@
                         throw new RuntimeException(e);
                     }
 
-                    NodeData image = node.getNodeData(finalNodeDataName);
+                    NodeData image = node.getNodeData(originalNodeDataName);
 
                     if (image.getContentLength() == 0)
                     {
@@ -842,16 +850,12 @@
 
                     BufferedImage original = createBufferedImage(image);
 
-                    String resolutionName = "res-" + resolution;
+                    Map<String, String> params = parseParameters(resolutionstring);
 
-                    Map<String, String> params = parseParameters(resolution);
-
-                    long t = System.currentTimeMillis();
-
                     BufferedImage img;
                     try
                     {
-                        img = ImageUtils.getImageForResolution(original, resolution, params);
+                        img = ImageUtils.getImageForResolution(original, resolutionstring, params);
                     }
                     catch (IllegalArgumentException e)
                     {
@@ -881,16 +885,8 @@
                         {
                             forceProgressive = true;
                         }
-                        if (RESOLUTION_THUMBNAIL.equals(resolutionTarget)
-                            || RESOLUTION_PREVIEW.equals(resolutionTarget))
-                        {
-                            ImageUtils
-                                .saveResolution(img, node, resolutionTarget, extension, quality, forceProgressive);
-                        }
-                        else
-                        {
-                            ImageUtils.saveResolution(img, node, resolutionName, extension, quality, forceProgressive);
-                        }
+
+                        ImageUtils.saveResolution(img, node, resolutioNodeName, extension, quality, forceProgressive);
                     }
                     catch (RepositoryException e)
                     {
@@ -910,8 +906,10 @@
                         throw new RuntimeException(e);
                     }
 
-                    log.debug("Resized {} in: {}ms", finalNodeDataName, System.currentTimeMillis() - t);
-
+                    log.info("Generated {} for {} in {} milliseconds", new Object[]{
+                        resolutioNodeName,
+                        node.getHandle(),
+                        System.currentTimeMillis() - timestart });
                 }
 
             });
@@ -926,6 +924,16 @@
             {
                 log.warn("Unable to extract a valid image from " + media.getHandle() + " (no message)");
             }
+
+            try
+            {
+                media.setNodeData("bad_image_marker", media.getNodeData("bad_image_marker").getLong() + 1);
+                media.save();
+            }
+            catch (RepositoryException e1)
+            {
+                // ignore
+            }
             return false;
         }
         catch (RuntimeException ex)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.