Merge pull request duracloud#202 from mikejritter/dc-1351

DC-1351: Support for extended manifest attributes

Author: Surfrdan

common/src/main/java/org/duracloud/common/constant/ManifestFormat.java

@@ -15,6 +15,7 @@
  */
 public enum ManifestFormat {
     TSV("text/tab-separated-values"),
+    EXTENDED_TSV("text/tab-separated-values"),
     BAGIT("text/bagit");
 
     private String mimeType;

duradmin/src/main/java/org/duracloud/duradmin/spaces/controller/ManifestController.java

@@ -59,7 +59,7 @@ public String get(@PathVariable("storeId") String storeId,
             ManifestFormat format = ManifestFormat.valueOf(manifestFormat.toUpperCase());
             InputStream is = contentStore.getManifest(spaceId, format);
             String extension = "txt";
-            if (format.equals(ManifestFormat.TSV)) {
+            if (format.equals(ManifestFormat.TSV) || format.equals(ManifestFormat.EXTENDED_TSV)) {
                 extension = "tsv";
             }
             StringBuffer contentDisposition = new StringBuffer();

duradmin/src/main/webapp/WEB-INF/jsp/spaces/spaces-manager.jsp

@@ -806,6 +806,7 @@
                 class="dropdown dropdown-tip">
                 <ul class="dropdown-menu">
                   <li><a id="manifest-tsv" href="">Tab Separated (TSV)</a></li>
+                  <li><a id="manifest-tsv-extended" href="">Tab Separated (TSV) - All Attributes</a></li>
                   <li><a id="manifest-bagit" href="">Bagit</a></li>
                 </ul>
               </div>

duradmin/src/main/webapp/js/spaces-manager.js

@@ -3258,6 +3258,7 @@ $(function() {
         // attach delete button listener
         var manifestUrl = "/duradmin/manifest/"+this._storeId+"/"+this._spaceId + "?format="
         $("#manifest-tsv").attr("href", manifestUrl+"tsv");
+        $("#manifest-tsv-extended").attr("href", manifestUrl+"extended_tsv");
         $("#manifest-bagit").attr("href", manifestUrl+"bagit");
       }
 

manifest/src/main/java/org/duracloud/manifest/ContentMessage.java

@@ -9,7 +9,6 @@
 
 import java.io.OutputStream;
 import java.text.ParseException;
-import java.util.Collection;
 
 import org.duracloud.mill.db.model.ManifestItem;
 
@@ -21,15 +20,6 @@
  */
 public interface ManifestFormatter {
 
-    /**
-     * This method writes the arg events to the arg output stream.
-     *
-     * @param events to write
-     * @param output destination of formatted events
-     */
-    public void writeEventsToOutput(Collection<ContentMessage> events,
-                                    OutputStream output);
-
     /**
      * @param item         to write
      * @param outputStream destination of formatted items.  Null manifest items are ignored.

manifest/src/main/java/org/duracloud/manifest/ManifestFormatter.java

@@ -24,8 +24,7 @@
 public class BagitManifestFormatter extends ManifestFormatterBase {
     private static Pattern LINE_PATTERN = Pattern.compile("(\\w+)\\s+(.*)/(.*)");
 
-    private final Logger log =
-        LoggerFactory.getLogger(BagitManifestFormatter.class);
+    private final Logger log = LoggerFactory.getLogger(BagitManifestFormatter.class);
 
     @Override
     protected Logger log() {
@@ -38,13 +37,13 @@ public String getHeader() {
     }
 
     @Override
-    protected String formatLine(String contentChecksum, String spaceId, String contentId) {
+    public String formatLine(ManifestItem item) {
         StringBuilder line = new StringBuilder();
-        line.append(contentChecksum);
+        line.append(item.getContentChecksum());
         line.append("  ");
-        line.append(spaceId);
+        line.append(item.getSpaceId());
         line.append("/");
-        line.append(contentId);
+        line.append(item.getContentId());
 
         return line.toString();
     }

manifest/src/main/java/org/duracloud/manifest/impl/BagitManifestFormatter.java

@@ -0,0 +1,55 @@
+package org.duracloud.manifest.impl;
+
+import static org.duracloud.common.util.bulk.ManifestVerifier.DELIM;
+
+import java.text.ParseException;
+
+import org.duracloud.mill.db.model.ManifestItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Class which formats manifests with additional headers (content-size, mime-type) as tab separated values
+ *
+ * @author mikejritter
+ */
+public class ExtendedTsvManifestFormatter extends ManifestFormatterBase {
+    private static final Logger logger = LoggerFactory.getLogger(ExtendedTsvManifestFormatter.class);
+
+    private static final String HEADER =
+        "space-id" + DELIM + "content-id" + DELIM + "MD5" + DELIM + "content-size" + DELIM + "mime-type";
+
+    @Override
+    protected Logger log() {
+        return logger;
+    }
+
+    @Override
+    public String formatLine(ManifestItem item) {
+        return item.getSpaceId() + DELIM + item.getContentId() + DELIM +
+               item.getContentChecksum() + DELIM + item.getContentSize() + DELIM +
+               item.getContentMimetype();
+    }
+
+    @Override
+    public String getHeader() {
+        return HEADER;
+    }
+
+    @Override
+    public ManifestItem parseLine(String line) throws ParseException {
+        String[] parse = line.split("\t");
+        if (parse.length != 5) {
+            throw new ParseException("Line doesn't match tsv format: unable to parse line: ->" + line + "<-", 0);
+        }
+
+        ManifestItem item = new ManifestItem();
+        item.setSpaceId(parse[0]);
+        item.setContentId(parse[1]);
+        item.setContentChecksum(parse[2]);
+        item.setContentSize(parse[3]);
+        item.setContentMimetype(parse[4]);
+
+        return item;
+    }
+}