0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1484 remote empty thumbnail directories

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-02-08 21:18:23 +09:00
parent ba0abab4bb
commit 2d77a1cd26
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
View file

@ -372,7 +372,7 @@ public class ThumbnailManager {
}
}
});
;
deleteFileMap.values().forEach(v -> deleteFile(v));
count += deleteFileMap.size();
}
@ -384,6 +384,11 @@ public class ThumbnailManager {
if (logger.isDebugEnabled()) {
logger.debug("Delete " + path);
}
Path parent = path.getParent();
while (deleteEmptyDirectory(parent)) {
parent = parent.getParent();
}
} catch (final IOException e) {
logger.warn("Failed to delete " + path, e);
}
@ -435,10 +440,19 @@ public class ThumbnailManager {
if (e != null) {
logger.warn("I/O exception on " + dir, e);
}
deleteEmptyDirectory(dir);
return FileVisitResult.CONTINUE;
}
private boolean deleteEmptyDirectory(final Path dir) throws IOException {
if (dir.toFile().list().length == 0 && !dir.toFile().getName().equals(THUMBNAILS_DIR_NAME)) {
Files.delete(dir);
if (logger.isDebugEnabled()) {
logger.debug("Delete " + dir);
}
return true;
}
return FileVisitResult.CONTINUE;
return false;
}
}