Merge pull request #48 from Georgetown-University-Libraries/sd-277

Sd 277: File Analyzer Property Validation and Merge Tuning

Author: terrywbrady

core/src/main/gov/nara/nwts/ftapp/FileTraversal.java

@@ -7,6 +7,7 @@
 
 import gov.nara.nwts.ftapp.FTDriver;
 import gov.nara.nwts.ftapp.filetest.FileTest;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 import gov.nara.nwts.ftapp.stats.Stats;
 
 /**
@@ -25,6 +26,7 @@ public class FileTraversal {
 	protected int max;
 	protected int numProcessed = 0;
 	protected boolean cancelled = false;
+	public InitializationStatus iStat;
 
 	public int getNumProcessed() {
 		return numProcessed;
@@ -138,7 +140,13 @@ public boolean traverseFile(FileTest fileTest, int max) {
 		fileFilter = driver.getFileFilter(fileTest); 
 		dirnameFilter = driver.getDirectoryFilter(fileTest);
 		traversalStart();
-    	fileTest.init();
+    	iStat = fileTest.init();
+    	if (iStat.hasFailTest()){
+            double duration = timer.getDuration();
+            String name = fileTest.getShortName()+(++driver.summaryCount);
+            traversalEnd(name, false, duration); 
+            return false;    	    
+    	}
 		countDirectories(driver.root);
 		completeDirectoryScan();
 		boolean completed = traverse(driver.root, fileTest, max);

core/src/main/gov/nara/nwts/ftapp/filetest/CounterValidation.java

@@ -15,6 +15,7 @@
 import gov.nara.nwts.ftapp.filter.TxtFilter;
 import gov.nara.nwts.ftapp.ftprop.FTPropEnum;
 import gov.nara.nwts.ftapp.ftprop.FTPropString;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 import gov.nara.nwts.ftapp.importer.DelimitedFileReader;
 import gov.nara.nwts.ftapp.importer.DelimitedFileWriter;
 import gov.nara.nwts.ftapp.importer.Importer;
@@ -233,9 +234,6 @@ public void refineResults() {
 		showValid = false;
 	}
 
-	public void init() {
-	}
-	
     public Stats createStats(String key){ 
     	return Generator.INSTANCE.create(key);
     }
@@ -267,6 +265,10 @@ public ActionResult importFile(File selectedFile) throws IOException {
 	public boolean allowForceKey() {
 		return false;
 	}
+    @Override
+    public InitializationStatus initValidate(File refFile) {
+        return init();
+    }
 
 
 }

core/src/main/gov/nara/nwts/ftapp/filetest/DefaultFileTest.java

@@ -14,6 +14,7 @@
 import gov.nara.nwts.ftapp.filter.JpegFileTestFilter;
 import gov.nara.nwts.ftapp.filter.TiffFileTestFilter;
 import gov.nara.nwts.ftapp.ftprop.FTProp;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 import gov.nara.nwts.ftapp.stats.Stats;
 import gov.nara.nwts.ftapp.stats.CountStats;
 import gov.nara.nwts.ftapp.stats.StatsItemConfig;
@@ -129,7 +130,12 @@ public boolean isTestFiles() {
     public Pattern getDirectoryPattern() {
     	return null;
     }
-    public void init() {
+    public InitializationStatus init() { 
+        InitializationStatus iStat = new InitializationStatus();
+        for(FTProp prop: ftprops) {
+            iStat.addMessage(prop.initValidation(getRoot()));
+        }
+        return iStat;
     }
     public void refineResults() {
     }

core/src/main/gov/nara/nwts/ftapp/filetest/DigitalDerivatives.java

@@ -4,6 +4,7 @@
 import gov.nara.nwts.ftapp.filetest.DefaultFileTest;
 import gov.nara.nwts.ftapp.filter.DefaultFileTestFilter;
 import gov.nara.nwts.ftapp.ftprop.FTPropString;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 import gov.nara.nwts.ftapp.stats.Stats;
 import gov.nara.nwts.ftapp.stats.StatsGenerator;
 import gov.nara.nwts.ftapp.stats.StatsItem;
@@ -93,8 +94,7 @@ public String toString() {
 	Vector<String>extensions;
 	Vector<String>extensionsReq;
 
-	public void init() {
-		
+	@Override public InitializationStatus init() {
 		match = getProperty(REGX_MATCH, DEF_MATCH).toString();
 		try {
 			pMatch = Pattern.compile(match);
@@ -121,6 +121,7 @@ public void init() {
 			extensions.add(s);
 			details.addStatsItem(s, StatsItem.makeEnumStatsItem(FOUND.class, s));
 		}
+        return super.init();
 	}
 
 	public String getExt(String test) {

core/src/main/gov/nara/nwts/ftapp/filetest/FileTest.java

@@ -9,6 +9,7 @@
 import gov.nara.nwts.ftapp.stats.StatsItemConfig;
 import gov.nara.nwts.ftapp.filter.FileTestFilter;
 import gov.nara.nwts.ftapp.ftprop.FTProp;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 
 /**
  * Contract defining the behavior of a File Analyzer custom rule.
@@ -46,7 +47,7 @@ public interface FileTest {
     public Pattern getDirectoryPattern();
 
     public void refineResults();
-    public void init();
+    public InitializationStatus init();
 
     public void progress(int count);
 	public FileTest resetOption();

core/src/main/gov/nara/nwts/ftapp/filetest/NameChecksum.java

@@ -3,6 +3,7 @@
 import gov.nara.nwts.ftapp.FTDriver;
 import gov.nara.nwts.ftapp.YN;
 import gov.nara.nwts.ftapp.ftprop.FTPropEnum;
+import gov.nara.nwts.ftapp.ftprop.InitializationStatus;
 import gov.nara.nwts.ftapp.stats.ChecksumStats;
 import gov.nara.nwts.ftapp.stats.ChecksumStats.ChecksumStatsItems;
 import gov.nara.nwts.ftapp.stats.Stats;
@@ -60,8 +61,9 @@ public String getKey(File f) {
 		return getRelPath(f);
 	}
 
-	@Override public void init() {
+	@Override public InitializationStatus init() {
 		keymap.clear();
+		return super.init();
 	}
 
 	public void setChecksumKey(String s, ChecksumStats stat) {

core/src/main/gov/nara/nwts/ftapp/filter/MrcFilter.java

@@ -0,0 +1,14 @@
+package gov.nara.nwts.ftapp.filter;
+
+/**
+ * Filter for text files
+ * @author TBrady
+ *
+ */
+public class MrcFilter extends DefaultFileTestFilter {
+	public String getSuffix() { 
+		return ".mrc";
+	}
+    public String getName(){return "MRC";}
+
+}

core/src/main/gov/nara/nwts/ftapp/ftprop/DefaultFTProp.java

@@ -1,5 +1,7 @@
 package gov.nara.nwts.ftapp.ftprop;
 
+import java.io.File;
+
 import gov.nara.nwts.ftapp.FTDriver;
 
 /**
@@ -14,7 +16,7 @@ public abstract class DefaultFTProp implements FTProp {
 	String description;
 	Object def;
 	FTDriver ft;
-	String prefix = "";
+	String prefix = ""; 
 
 	public enum RUNMODE {
 		TEST,
@@ -80,4 +82,9 @@ public String getShortNameFormatted() {
 		return buf.substring(0,20);
 	}
 
+    public InitializationStatus initValidation(File refFile){
+        InitializationStatus iStat = new InitializationStatus();
+        return iStat;
+    }
+
 }

core/src/main/gov/nara/nwts/ftapp/ftprop/FTProp.java

@@ -1,5 +1,7 @@
 package gov.nara.nwts.ftapp.ftprop;
 
+import java.io.File;
+
 import javax.swing.JComponent;
 
 /**
@@ -20,4 +22,6 @@ public interface FTProp {
     public String getShortNameFormatted();
     public String getShortNameNormalized();
     public String describeFormatted();
+    
+    public InitializationStatus initValidation(File refFile);
 }

core/src/main/gov/nara/nwts/ftapp/ftprop/FTPropFile.java

@@ -68,5 +68,4 @@ public Object validate(String s) {
 		return getValue();
 	}
 
-
 }