refs #51 - percent encode \r and \n in manifest file names

Author: johnscancella

src/main/java/gov/loc/repository/bagit/impl/ManifestReaderImpl.java

@@ -71,7 +71,7 @@ private void setNext()
 					} else if (filepath.indexOf('\\') != -1) {
 						throw new UnsupportedOperationException(MessageFormat.format("This Library does not support \\ in filepaths: {0}. See README.txt.", filepath));
 					}
-					filepath = FilenameHelper.normalizePath(filepath);
+					filepath = decode(FilenameHelper.normalizePath(filepath));
 					log.trace("Filepath after normalization: " + filepath);
 					this.next = new FilenameFixity(filepath, splitString[0]);
 					log.debug("Read: " + this.next);
@@ -87,6 +87,11 @@ private void setNext()
 
 	}
 
+	//decode percent encoded \r and \n
+	protected String decode(String filepath){
+	  return filepath.replaceAll("%0A", "\n").replaceAll("%0D", "\r");
+	}
+	
 	public FilenameFixity next() {
 		if (this.next == null)
 		{

src/main/java/gov/loc/repository/bagit/impl/ManifestWriterImpl.java

@@ -30,10 +30,15 @@ public ManifestWriterImpl(OutputStream out, String separator) {
 	}
 
 	public void write(String file, String fixityValue) {
-		this.writer.println(fixityValue + separator + file);
+		this.writer.println(fixityValue + separator + encode(file));
 		log.debug(MessageFormat.format("Wrote to manifest:  Filename is {0}.  Fixity is {1}.", file, fixityValue));		
 	}
 
+	//percent encode \r and \n
+	protected String encode(String file){
+	  return file.replaceAll("\n", "%0A").replaceAll("\r", "%0D");
+	}
+	
 	public void write(String file, String fixityValue, String _separator) {
 		if(_separator != null){
 			this.separator = _separator;