Skip to content

Commit b7c3f0c

Browse files
committed
refs #101 - make sure we test using the dos property for a file being hidden on windows
1 parent 75cec6e commit b7c3f0c

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.IOException;
44
import java.nio.file.FileVisitResult;
5-
import java.nio.file.Files;
65
import java.nio.file.Path;
76
import java.nio.file.Paths;
87
import java.nio.file.SimpleFileVisitor;
@@ -49,7 +48,7 @@ public FileVisitResult abstractPreVisitDirectory(final Path dir, final String di
4948

5049
@Override
5150
public FileVisitResult visitFile(final Path path, final BasicFileAttributes attrs)throws IOException{
52-
if(!includeHiddenFiles && Files.isHidden(path) && !path.endsWith(".keep")){
51+
if(!includeHiddenFiles && PathUtils.isHidden(path) && !path.endsWith(".keep")){
5352
logger.debug(messages.getString("skipping_hidden_file"), path);
5453
}
5554
else{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private static void moveDataFilesIfNeeded(final Bag bag, final boolean includeHi
159159
final Path dataDir = PathUtils.getDataDir(bag);
160160
try(final DirectoryStream<Path> directoryStream = Files.newDirectoryStream(bag.getRootDir())){
161161
for(final Path path : directoryStream){
162-
if(!path.equals(dataDir) && (!Files.isHidden(path) || includeHidden)){
162+
if(!path.equals(dataDir) && (!PathUtils.isHidden(path) || includeHidden)){
163163
Files.move(path, dataDir.resolve(path.getFileName()));
164164
}
165165
}

src/main/java/gov/loc/repository/bagit/verify/AbstractPayloadFileExistsInManifestsVistor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.IOException;
44
import java.nio.file.FileVisitResult;
5-
import java.nio.file.Files;
65
import java.nio.file.Path;
76
import java.nio.file.Paths;
87
import java.nio.file.SimpleFileVisitor;
@@ -12,6 +11,8 @@
1211
import org.slf4j.Logger;
1312
import org.slf4j.LoggerFactory;
1413

14+
import gov.loc.repository.bagit.util.PathUtils;
15+
1516
/**
1617
* Implements {@link SimpleFileVisitor} to ensure that the encountered file is in one of the manifests.
1718
*/
@@ -26,7 +27,7 @@ public AbstractPayloadFileExistsInManifestsVistor(final boolean ignoreHiddenFile
2627

2728
@Override
2829
public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttributes attrs) throws IOException {
29-
if(ignoreHiddenFiles && Files.isHidden(dir) || dir.endsWith(Paths.get(".bagit"))){
30+
if(ignoreHiddenFiles && PathUtils.isHidden(dir) || dir.endsWith(Paths.get(".bagit"))){
3031
logger.debug(messages.getString("skipping_hidden_file"), dir);
3132
return FileVisitResult.SKIP_SUBTREE;
3233
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ public void testBagInPlace() throws IOException, NoSuchAlgorithmException{
4242
File bagitFile = new File(folder.getRoot(), "bagit.txt");
4343
assertTrue(bagitFile.exists());
4444

45+
//make sure the hidden folder was not included in the data directory
46+
File hiddenFolder = new File(bag.getRootDir().resolve("data").toFile(), ".hiddenFolder");
47+
assertFalse(hiddenFolder.exists());
48+
4549
for(Manifest manifest : bag.getPayLoadManifests()){
4650
for(Path expectedPayloadFile : manifest.getFileToChecksumMap().keySet()){
4751
assertTrue(structure.regularPayloadFiles.contains(expectedPayloadFile));

0 commit comments

Comments
 (0)