From 6e0368d4d5d3f314bdb3d2d541a4e06b91557573 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 5 Feb 2011 22:12:59 -0800
Subject: [PATCH 1/2] new versions of a couple of third-party libs

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b101d7..fcd8337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.drewnoakes</groupId>
       <artifactId>metadata-extractor</artifactId>
-      <version>2.3.1</version>
+      <version>2.4.0-beta-1</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -129,7 +129,7 @@
     <dependency>
       <groupId>com.sleepycat</groupId>
       <artifactId>je</artifactId>
-      <version>4.0.92</version>
+      <version>4.0.103</version>
     </dependency>
     <!--
     <dependency><groupId>com.caucho</groupId><artifactId>resin</artifactId><version>3.1.8</version></dependency>

From e13c8f822d8d97a72a1008ad876c7502cca24487 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Sat, 12 Mar 2011 17:04:27 -0800
Subject: [PATCH 2/2] created method to read metadata from video files

---
 pom.xml                                       |  7 ++++
 .../org/forkalsrud/album/exif/Dimension.java  |  4 ++
 .../exif/DirectoryMetadataGenerator.java      | 40 +++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/pom.xml b/pom.xml
index e94fa1a..6edc349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,6 +192,13 @@
       <artifactId>jcl-over-slf4j</artifactId>
       <version>1.5.10</version>
     </dependency>
+    <dependency>
+    	<groupId>commons-io</groupId>
+    	<artifactId>commons-io</artifactId>
+    	<version>1.4</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
diff --git a/src/main/java/org/forkalsrud/album/exif/Dimension.java b/src/main/java/org/forkalsrud/album/exif/Dimension.java
index 2b9e83e..511da78 100644
--- a/src/main/java/org/forkalsrud/album/exif/Dimension.java
+++ b/src/main/java/org/forkalsrud/album/exif/Dimension.java
@@ -32,6 +32,10 @@ public class Dimension {
     }
 
 
+    public Dimension(String width, String height) {
+        this(Integer.parseInt(width), Integer.parseInt(height));
+    }
+
     public Dimension doubled() {
 
     	return new Dimension(w * 2, h * 2);
diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java b/src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java
index fa77b8d..5173e5c 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java
@@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -17,6 +18,7 @@ import javax.imageio.ImageReadParam;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
+import org.apache.commons.io.IOUtils;
 import org.forkalsrud.album.db.DirectoryProps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,6 +96,12 @@ public class DirectoryMetadataGenerator {
         props.setProperty("dir." + name, "present");
     }
 
+    /**
+     * 
+     * @param f the jpeg file
+     * @return a map with the following keys: orientation dimensions captureDate comment etag
+     * @throws IOException
+     */
     private Map<String, String> generateThumbnailProperties(File f) throws IOException {
         
         HashMap<String, String> props = new HashMap<String, String>();
@@ -159,6 +167,38 @@ public class DirectoryMetadataGenerator {
         return props;
     }
 
+    /**
+     * 
+     * @param f the jpeg file
+     * @return a map with the following keys: orientation dimensions captureDate comment etag
+     * @throws IOException
+     */
+    private Map<String, String> generateVideoProperties(File f) throws IOException {
+        Map<String, String> props = new HashMap<String, String>();
+        ProcessBuilder pb = new ProcessBuilder().command(
+                "mplayer", "-vo", "null", "-ao", "null", "-frames", "0", "-identify", f.getAbsolutePath());
+        pb.redirectErrorStream(false);
+        Process p = pb.start();
+        p.getOutputStream().close();
+        List<String> lines = IOUtils.readLines(p.getInputStream());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd-HHmmss");
+        String width = "", height = "";
+        for (String line : lines) {
+            int pos = line.indexOf('=');
+            if (pos >= 0) {
+                String name = line.substring(0, pos);
+                String value = line.substring(pos + 1);
+                if (name.equals("ID_VIDEO_WIDTH")) width = value;
+                if (name.equals("ID_VIDEO_HEIGHT")) height = value;
+            }
+        }
+        props.put("orientation", "1");
+        props.put("dimensions", new Dimension(width, height).toString());
+        props.put("captureDate", sdf.format(new Date(f.lastModified())));
+        props.put("etag", Integer.toHexString(f.getName().hashCode() + Long.valueOf(f.lastModified()).hashCode()));
+        return props;
+    }
+
     private Date getExifDate(Directory exifDirectory, int tagName) throws MetadataException {
 
         String dateStr = (String)exifDirectory.getObject(tagName);