Anonymous interface

.gitignore

@@ -0,0 +1,19 @@
+*.class
+*.iml
+*.sh
+*.raw
+.idea
+.classpath
+.project
+target
+macros.el
+bin
+_build
+.classpath
+.project
+.settings
+.metadata
+*/.classpath
+*/.project
+*/.settings
+

README

@@ -33,3 +33,22 @@ To compile as needed and run on a local Jetty server first run mvn:package and t
 To remove all build files:
 
 	mvn clean
+
+
+Differ Documentation
+====================
+
+You can read documentation https://differ.readthedocs.org/en/latest/ .
+
+You can read documentation docs/_build/dirhtml/index.html .
+
+You can build documentation:
+
+    cd docs
+    make html  
+
+ or:
+
+    cd docs
+    make.bat
+

differ-cmdline/pom.xml

@@ -46,8 +46,41 @@
 	    <artifactId>differ-common</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
 	</dependency>
+	<dependency>
+	  <groupId>com.beust</groupId>
+	  <artifactId>jcommander</artifactId>
+	  <version>1.30</version>
+	</dependency>
+
+	<dependency>
+	  <groupId>org.apache.httpcomponents</groupId>
+	  <artifactId>httpclient</artifactId>
+	  <version>4.2.3</version>
+	  <scope>compile</scope>
+	</dependency>	
+
+	<dependency>
+	  <groupId>org.apache.httpcomponents</groupId>
+	  <artifactId>httpmime</artifactId>
+	  <version>4.2.3</version>
+	  <scope>compile</scope>
+	</dependency>
+
+	<dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjrt</artifactId>
+          <version>1.5.4</version>
+	</dependency>
+
+	<dependency>
+          <groupId>org.aspectj</groupId>
+          <artifactId>aspectjweaver</artifactId>
+          <version>1.5.4</version>
+	</dependency>
+
+
     </dependencies>
-
+    
     <build>
 	<plugins>
 	    <plugin>
@@ -91,6 +124,13 @@
 		    </execution>
 		</executions>
 	    </plugin>
+	    <plugin>
+	      <groupId>org.codehaus.mojo</groupId>
+	      <artifactId>exec-maven-plugin</artifactId>
+	      <configuration>
+		<mainClass>cz.nkp.differ.cmdline.Main</mainClass>
+	      </configuration>
+	    </plugin>
 	</plugins>
     </build>
 </project>

differ-cmdline/run-dirs.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties ../docs/examples/images_01  ../docs/examples/images_02
+
+#/usr/lib/jvm/java-6-sun-1.6.0.26/bin/java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar -Didea.launcher.bin.path=/opt/idea-IC-123.72/bin -Dfile.encoding=UTF-8 -classpath /usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/javaws.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/management-agent.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/plugin.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/deploy.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/sunpkcs11.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/dnsns.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/localedata.jar:/usr/lib/jvm/java-6-sun-1.6.0.26/jre/lib/ext/sunjce_provider.jar:/opt/differ/differ-cmdline/target/classes:/home/stavel/.m2/repository/org/springframework/spring-beans/3.1.2.RELEASE/spring-beans-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/org/springframework/spring-core/3.1.2.RELEASE/spring-core-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/org/springframework/spring-asm/3.1.2.RELEASE/spring-asm-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/home/stavel/.m2/repository/org/springframework/spring-context/3.1.2.RELEASE/spring-context-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/org/springframework/spring-aop/3.1.2.RELEASE/spring-aop-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/home/stavel/.m2/repository/org/springframework/spring-expression/3.1.2.RELEASE/spring-expression-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/org/springframework/spring-oxm/3.1.2.RELEASE/spring-oxm-3.1.2.RELEASE.jar:/home/stavel/.m2/repository/commons-lang/commons-lang/2.5/commons-lang-2.5.jar:/opt/differ/differ-common/target/classes:/home/stavel/.m2/repository/com/lizardtech/javadjvu-lib/0.8.9-RELEASE/javadjvu-lib-0.8.9-RELEASE.jar:/home/stavel/.m2/repository/javax/media/jai/com.springsource.javax.media.jai.core/1.1.3/com.springsource.javax.media.jai.core-1.1.3.jar:/home/stavel/.m2/repository/javax/media/jai/com.springsource.javax.media.jai.codec/1.1.3/com.springsource.javax.media.jai.codec-1.1.3.jar:/home/stavel/.m2/repository/org/jpedal/jpedalSTD/2.80b11/jpedalSTD-2.80b11.jar:/home/stavel/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16.jar:/home/stavel/.m2/repository/commons-io/commons-io/2.3/commons-io-2.3.jar:/home/stavel/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar:/home/stavel/.m2/repository/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar:/home/stavel/.m2/repository/com/beust/jcommander/1.30/jcommander-1.30.jar:/opt/idea-IC-123.72/lib/idea_rt.jar com.intellij.rt.execution.application.AppMain cz.nkp.differ.cmdline.Main --save-raw-outputs --save-report --save-properties ../docs/examples/images_01 ../docs/examples/images_02

differ-cmdline/run-tif.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties image.tif
+

differ-cmdline/run-two.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties ../docs/examples/images_01/05.png ../docs/examples/images_02/05.jpg

differ-cmdline/run.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+#java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs image.jpf
+#java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties image.jp2
+#java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties image.jpg
+#java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties image.tif
+#java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties ../docs/examples/images_01/01.jpg
+java -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties ../docs/examples/images_01/14.jpf
+#java -javaagent:/home/klas/lib/jip/profile/profile.jar -Dapplication.properties=file:./application.properties -jar target/differ-cmdline-0.0.1-SNAPSHOT.jar --save-raw-outputs --save-report --save-properties ../docs/examples/images_01/14.jpf

differ-cmdline/src/main/java/cz/nkp/differ/cmdline/CommandArgs.java

@@ -0,0 +1,36 @@
+package cz.nkp.differ.cmdline;
+
+import com.beust.jcommander.Parameter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stavel
+ * Date: 1.1.13
+ * Time: 15:37
+ * To change this template use File | Settings | File Templates.
+ */
+
+public class CommandArgs {
+    @Parameter(description = "Files to validate.")
+    public List<String> files = new ArrayList<String>();
+
+    @Parameter(names = {"-s","--save-report"}, description = "Report will be stored in a file named the same as input file. With extension: *.drep")
+    public boolean saveReport=false;
+
+    @Parameter(names = {"-l","--load-report"}, description = "Report will loaded from a given file named the same as input file. With extension: *.drep")
+    public boolean loadReport=false;
+
+    @Parameter(names = {"--save-properties"}, description = "A review of used significant properties will be saved.")
+    public boolean saveProperties=false;
+
+    @Parameter(names = {"--load-properties"}, description = "A review of significant properties to be used is loaded from a file.")
+    public boolean loadProperties=false;
+
+    @Parameter(names = {"-r","--save-raw-outputs"}, description = "Raw outputs of extractors will be saved too.")
+    public boolean saveOutputs=false;
+
+    @Parameter(names = {"-w","--send-report-to-web"}, description = "Report will be sent to web.")
+    public boolean sendReportToWeb=false;
+};

differ-cmdline/src/main/java/cz/nkp/differ/cmdline/CompareResultTransformer.java

@@ -0,0 +1,20 @@
+package cz.nkp.differ.cmdline;
+
+import cz.nkp.differ.compare.io.ImageProcessorResult;
+
+import java.io.File;
+
+/**
+ * User: stavel
+ * Date: 2.1.13
+ * Time: 18:39
+ */
+public interface CompareResultTransformer {
+    public Boolean includeOutputs = false;
+    public Boolean includeImage = false;
+    public OutputNamer outputNamer = null;
+    public Boolean saveProperties = false;
+    public Boolean saveReport = false;
+
+    public String transform(File files[], ImageProcessorResult results[]) throws Exception;
+}

differ-cmdline/src/main/java/cz/nkp/differ/cmdline/Main.java

@@ -1,33 +1,188 @@
 package cz.nkp.differ.cmdline;
 
+import com.beust.jcommander.JCommander;
+import cz.nkp.differ.compare.metadata.external.ImagemagickInChainTransformer;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 import cz.nkp.differ.compare.io.ImageProcessor;
 import cz.nkp.differ.compare.io.ImageProcessorResult;
 import cz.nkp.differ.compare.io.SerializableImageProcessorResult;
 import cz.nkp.differ.compare.io.SerializableImageProcessorResults;
 import java.io.File;
+import java.io.FileFilter;
+import java.io.FileWriter;
+import java.util.*;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.transform.stream.StreamResult;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 
+/**
+  mvn -fn -o -Dmaven.compiler.showWarnings=true -f pom.xml compile test-compile
+*/
 public class Main {
+	private static CommandArgs commandArgs = new CommandArgs();
+
+	/**
+	 *
+	 * This function validates an image and writes all reports regarding to arguments.
+	 * @throws Exception
+	 */
+	public static String processFile(ApplicationContext context, File file, ImageProcessorResult result, Boolean isComparison) throws Exception {
+		Jaxb2Marshaller marshaller = (Jaxb2Marshaller) context.getBean("jaxb2Marshaller");
+		TextResultTransformer textResultTransformer = new TextResultTransformer(
+                context,
+                new TheSameNameOutputNamer(),
+				commandArgs.saveOutputs,
+				commandArgs.saveReport,
+				commandArgs.saveProperties,
+				false
+		);
+		String output = textResultTransformer.transform(file, result);
+		if ( commandArgs.saveReport ) {
+			FileWriter writer = new FileWriter(textResultTransformer.outputNamer.textName(file,result).toString());
+			writer.write(output);
+			writer.close();
+
+			writer = new FileWriter(textResultTransformer.outputNamer.reportName(file,result));
+			SerializableImageProcessorResult resultForSerialization = SerializableImageProcessorResult.create(result, false);
+			StreamResult streamResult = new StreamResult(writer);
+			marshaller.marshal(resultForSerialization, streamResult);
+			writer.close();
+            if( !isComparison && commandArgs.sendReportToWeb) {
+                ReportHTTPSender httpSender = (ReportHTTPSender) context.getBean("reportHTTPSender");
+                httpSender.sendReport(textResultTransformer.outputNamer.reportName(file,result));
+            }
+    	}
+		return output;
+	}
+
+	/**
+	 * This function calls validator and comparator on two files.
+	 * And will report averything it did.
+	 */
+	public static String processFiles(ApplicationContext context, File file[], ImageProcessorResult results[]) throws Exception {
+		String output = "";
+		Jaxb2Marshaller marshaller = (Jaxb2Marshaller) context.getBean("jaxb2Marshaller");
+		TextCompareResultTransformer textCompareResultTransformer =	new TextCompareResultTransformer(context,
+                new TheSameNameOutputNamer(),
+																									  commandArgs.saveOutputs,
+																									  commandArgs.saveReport,
+																									  commandArgs.saveProperties,
+																									  false
+																									  );
+		output += textCompareResultTransformer.transform(file, results);
+		if ( commandArgs.saveReport ) {
+			FileWriter writer = new FileWriter(textCompareResultTransformer.outputNamer.textCompareName(file[0], file[1], results).toString());
+			writer.write(output);
+			writer.close();
+
+			writer = new FileWriter(textCompareResultTransformer.outputNamer.reportCompareName(file[0], file[1],
+                            results));
+
+            List<SerializableImageProcessorResult> resultsForSerialization = new ArrayList<SerializableImageProcessorResult>();
+            for (ImageProcessorResult result : results) {
+                if( result != null ){
+                    resultsForSerialization.add(SerializableImageProcessorResult.create(result, false));
+                };
+            }
+            SerializableImageProcessorResults serializableResults = new SerializableImageProcessorResults(resultsForSerialization);
+            StreamResult streamResult = new StreamResult(writer);
+            marshaller.marshal(serializableResults, streamResult);
+            writer.close();
+            if( commandArgs.sendReportToWeb ) {
+                ReportHTTPSender sender = (ReportHTTPSender) context.getBean("reportHTTPSender");
+                sender.sendReport(textCompareResultTransformer.outputNamer.reportCompareName(file[0], file[1], results));
+            }
+		}
+		return output;
+	}
+
+	/**
+	 * Iterates through directories.
+	 * It finds file pairs to compare.
+	 * @param files
+	 * @return
+	 */
+	public static ArrayList<File[]> getPairsToCompare(File [] files){
+		ArrayList<File[]> pairs = new ArrayList<File[]> ();
+		HashMap<String,File[]> pairsByName = new HashMap<String,File[]>();
+		for( File file: files[0].listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File file) {
+				return !file.isDirectory();
+			}
+		})){
+			String name = file.getName();
+			String nameWithoutExtension = name.replaceFirst("[.][^.]+$", "");
+			File [] pair = new File[2];
+			pair[0] = file;
+			pair[1] = null;
+			pairsByName.put(nameWithoutExtension,pair);
+		}
+		for( File file: files[1].listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File file) {
+				return !file.isDirectory();
+			}
+		})){
+			String name = file.getName().replaceFirst("[.][^.]+$", "");
+			if( pairsByName.containsKey(name)){
+				pairsByName.get(name)[1] = file;
+			};
+		}
+		// use just pairs that do have all elemenents filled.
+		for(String name: pairsByName.keySet()){
+			File[] pair = pairsByName.get(name);
+			if( pair[0] != null && pair[1] != null){
+				pairs.add(pair);
+			}
+		}
+		Collections.sort(pairs, new Comparator<File[]>() {
+			@Override
+			public int compare(File[] files, File[] files2) {
+				return files[0].toString().compareToIgnoreCase(files2[0].toString());
+			}
+		});
+		return pairs;
+	}
+
+	public static void main(String[] args) throws Exception {
+
+		ApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"appCtx-differ-cmdline.xml", "classpath:appCtx-differ-common.xml"});
+        ImageProcessor processor = (ImageProcessor) context.getBean("imageProcessor");
 
-    public static void main(String[] args) throws Exception {
-	ApplicationContext context =
-		new ClassPathXmlApplicationContext(new String[]{"appCtx-differ-cmdline.xml"});
-	ImageProcessor processor = (ImageProcessor) context.getBean("imageProcessor");
-	Jaxb2Marshaller marshaller = (Jaxb2Marshaller) context.getBean("jaxb2Marshaller");
-	File file1 = new File(args[0]);
-	File file2 = new File(args[1]);
-	ImageProcessorResult[] results = processor.processImages(file1, file2);
-        List<SerializableImageProcessorResult> resultsForSerialization = new ArrayList<SerializableImageProcessorResult>();
-        for (ImageProcessorResult result : results) {
-            resultsForSerialization.add(SerializableImageProcessorResult.create(result, false));
-        }
-        SerializableImageProcessorResults serializableResults = new SerializableImageProcessorResults(resultsForSerialization);
-	StreamResult streamResult = new StreamResult(System.out);
-	marshaller.marshal(serializableResults, streamResult);
-    }
+        JCommander jcommander = new JCommander(commandArgs,args);
+		jcommander.setAcceptUnknownOptions(true);
+		if( commandArgs.files.size() > 1){
+			File files[] = new File[2];
+			files[0] = new File(commandArgs.files.get(0));
+			files[1] = new File(commandArgs.files.get(1));
+			if( files[0].isDirectory() && files[1].isDirectory()){
+				ArrayList<File[]> pairs = getPairsToCompare(files);
+				for( File[] fpair: pairs){
+                    System.out.println(String.format("processing: \t%s\n\t\t%s", fpair[0], fpair[1]));
+                    ImageProcessorResult[] results = processor.processImages(fpair[0], fpair[1]);
+					System.out.println(String.format("   process results: \t%s",fpair[0]));
+                    processFile(context, fpair[0], results[0], true);
+                    System.out.println(String.format("   process results: \t%s",fpair[1]));
+                    processFile(context, fpair[1], results[1], true);
+                    System.out.println(String.format("   process compare results"));
+                    processFiles(context, fpair, results);
+ 				}
+				System.out.println("Done\n");
+			} else {
+                ImageProcessorResult[] results = processor.processImages(files[0], files[1]);
+                System.out.println(processFiles(context, files, results));
+			}
+		} else {
+			File file = new File(commandArgs.files.get(0));
+			if( file.isDirectory()){
+                System.out.println("argument is the only directory. I do not know what to do with it.");
+			} else {
+                ImageProcessorResult result = processor.processImage(file);
+                System.out.println(processFile(context, file, result, false));
+			}
+		}
+   }
 }