fixed error where data dir was being duplicated when writing it out to a new place

Author: jscancella

src/main/java/gov/loc/repository/bagit/writer/BagWriter.java

@@ -22,14 +22,13 @@
 import gov.loc.repository.bagit.domain.Manifest;
 import gov.loc.repository.bagit.domain.Version;
 import gov.loc.repository.bagit.hash.Hasher;
-import gov.loc.repository.bagit.verify.BagVerifier;
 import javafx.util.Pair;
 
 /**
  * responsible for writing out a bag.
  */
 public class BagWriter {
-  private static final Logger logger = LoggerFactory.getLogger(BagVerifier.class);
+  private static final Logger logger = LoggerFactory.getLogger(BagWriter.class);
 
   private BagWriter(){}
 
@@ -71,7 +70,7 @@ protected static Path writeVersionDependentPayloadFiles(Bag bag, Path outputDir)
     else{
       Path dataDir = outputDir.resolve("data");
       Files.createDirectories(dataDir);
-      writePayloadFiles(bag.getPayLoadManifests(), dataDir, bag.getRootDir());
+      writePayloadFiles(bag.getPayLoadManifests(), dataDir, bag.getRootDir().resolve("data"));
     }
 
     return bagitDir;
@@ -102,14 +101,14 @@ public static void writeBagitFile(Version version, String encoding, Path outputD
    * Write the payload <b>file(s)</b> to the output directory
    * @param payloadManifests the set of objects representing the payload manifests
    * @param outputDir the data directory of the bag
-   * @param bagRootDir the root directory of the bag
+   * @param bagDataDir the data directory of the bag
    * @throws IOException if there was a problem writing a file
    */
-  public static void writePayloadFiles(Set<Manifest> payloadManifests, Path outputDir, Path bagRootDir) throws IOException{
+  public static void writePayloadFiles(Set<Manifest> payloadManifests, Path outputDir, Path bagDataDir) throws IOException{
     logger.info("Writing payload files");
     for(Manifest payloadManifest : payloadManifests){
       for(Path payloadFile : payloadManifest.getFileToChecksumMap().keySet()){
-        Path relativePayloadPath = bagRootDir.relativize(payloadFile); 
+        Path relativePayloadPath = bagDataDir.relativize(payloadFile); 
 
         Path writeToPath = outputDir.resolve(relativePayloadPath);
         logger.debug("Writing payload file [{}] to [{}]", payloadFile, writeToPath);

src/test/java/gov/loc/repository/bagit/writer/BagWriterTest.java

@@ -19,6 +19,7 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import gov.loc.repository.bagit.creator.BagCreator;
 import gov.loc.repository.bagit.domain.Bag;
 import gov.loc.repository.bagit.domain.FetchItem;
 import gov.loc.repository.bagit.domain.Manifest;
@@ -33,6 +34,22 @@ public class BagWriterTest extends Assert {
 
   private BagReader reader = new BagReader();
 
+  @Test
+  public void testGetCorrectRelativeOuputPath() throws Exception{
+    Path root = Paths.get(folder.newFolder().toURI());
+    Bag bag = BagCreator.bagInPlace(root, StandardSupportedAlgorithms.MD5, false);
+    
+    Path testFile = root.resolve("data").resolve("fooFile.txt");
+    Files.createFile(testFile);
+    Manifest manifest = (Manifest) bag.getPayLoadManifests().toArray()[0];
+    manifest.getFileToChecksumMap().put(testFile, "CHECKSUM");
+    bag.getPayLoadManifests().add(manifest);
+    
+    Path newRoot = Paths.get(folder.newFolder().toURI());
+    BagWriter.write(bag, newRoot);
+    assertTrue(Files.exists(newRoot.resolve("data").resolve("fooFile.txt")));
+  }
+  
   @Test
   public void testWriteVersion97() throws Exception{
     Path rootDir = Paths.get(getClass().getClassLoader().getResource("bags/v0_97/bag").toURI());
@@ -153,10 +170,10 @@ public void testWritePayloadFiles() throws IOException, URISyntaxException{
   @Test
   public void testWriteEmptyBagStillCreatesDataDir() throws Exception{
     Bag bag = new Bag();
-    Path output = Paths.get(folder.newFolder().toURI());
-    Path dataDir = output.resolve("data");
+    bag.setRootDir(Paths.get(folder.newFolder().toURI()));
+    Path dataDir = bag.getRootDir().resolve("data");
 
-    BagWriter.write(bag, output);
+    BagWriter.write(bag, bag.getRootDir());
     assertTrue(Files.exists(dataDir));
   }
 }