refs #108 - fixed error when bagging in place and data file was named 'data'

Author: johnscancella

src/main/java/gov/loc/repository/bagit/creator/BagCreator.java

@@ -122,7 +122,6 @@ private static Bag bagInPlace(final Version version, final Path root, final Coll
     logger.info(messages.getString("creating_bag"), bag.getVersion(), root);
     bag.setRootDir(root);
 
-    createDirectories(bag);
     moveDataFilesIfNeeded(bag, includeHidden);
 
     createBagitFile(bag);
@@ -136,32 +135,28 @@ private static Bag bagInPlace(final Version version, final Path root, final Coll
     return bag;
   }
 
-  //create the data or .bagit directory
-  private static void createDirectories(final Bag bag) throws IOException{
-    if(bag.getVersion().isSameOrNewer(DOT_BAGIT_VERSION)){
-      //create .bagit directory
+  private static void moveDataFilesIfNeeded(final Bag bag, final boolean includeHidden) throws IOException {
+    if(bag.getVersion().isOlder(DOT_BAGIT_VERSION)) {
+      Path tempDir = bag.getRootDir().resolve(System.currentTimeMillis() + ".temp");
+      Files.createDirectory(tempDir);
+      moveDataFiles(bag.getRootDir(), tempDir, includeHidden);
+      Files.move(tempDir, PathUtils.getDataDir(bag));
+    }
+    else {
       final Path dotbagitDir = bag.getRootDir().resolve(".bagit");
       Files.createDirectories(dotbagitDir);
     }
-    else{
-      //create data directory
-      final Path dataDir = bag.getRootDir().resolve("data");
-      Files.createDirectories(dataDir);
-    }
   }
 
   private static void createBagitFile(final Bag bag) throws IOException{
     BagitFileWriter.writeBagitFile(bag.getVersion(), bag.getFileEncoding(), PathUtils.getBagitDir(bag));
   }
 
-  private static void moveDataFilesIfNeeded(final Bag bag, final boolean includeHidden) throws IOException{
-    if(bag.getVersion().isOlder(DOT_BAGIT_VERSION)){
-      final Path dataDir = PathUtils.getDataDir(bag);
-      try(final DirectoryStream<Path> directoryStream = Files.newDirectoryStream(bag.getRootDir())){
-        for(final Path path : directoryStream){
-          if(!path.equals(dataDir) && (!PathUtils.isHidden(path) || includeHidden)){
-            Files.move(path, dataDir.resolve(path.getFileName()));
-          }
+  private static void moveDataFiles(final Path rootDir, final Path dataDir, final boolean includeHidden) throws IOException{
+    try(final DirectoryStream<Path> directoryStream = Files.newDirectoryStream(rootDir)){
+      for(final Path path : directoryStream){
+        if(!path.equals(dataDir) && (!PathUtils.isHidden(path) || includeHidden)){
+          Files.move(path, dataDir.resolve(path.getFileName()));
         }
       }
     }

src/test/java/gov/loc/repository/bagit/creator/BagCreatorTest.java

@@ -25,6 +25,16 @@ public class BagCreatorTest extends Assert {
   @Rule
   public TemporaryFolder folder= new TemporaryFolder();
 
+  @Test
+  public void testBagInPlaceWithFileNamedData() throws IOException, NoSuchAlgorithmException{
+    File testFolder = folder.newFolder();
+    File dataFile = new File(testFolder, "data");
+    Files.createFile(dataFile.toPath());
+    
+    BagCreator.bagInPlace(Paths.get(testFolder.toURI()), Arrays.asList(StandardSupportedAlgorithms.MD5), false);
+    assertTrue(Files.exists(testFolder.toPath().resolve("data").resolve("data")));
+  }
+  
   @Test
   public void testBagInPlace() throws IOException, NoSuchAlgorithmException{
     TestStructure structure = createTestStructure();