mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid auto-deleting empty structure root folders (e.g. Media, Staging, etc)

This commit is contained in:
Reinhard Pointner 2016-05-06 19:39:00 +08:00
parent 94c830c93a
commit d61695b426
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/filebot/ui/rename/RenameAction.java
View File

@ -164,15 +164,11 @@ class RenameAction extends AbstractAction {
return; return;
} }
// guess affected folder depth
int relativePathSize = 0;
try { try {
relativePathSize = listStructurePathTail(s).size(); // guess affected folder depth
} catch (Exception e) { int tailSize = listStructurePathTail(s).size();
debug.warning(e::toString);
}
for (int i = 0; i < relativePathSize && !isVolumeRoot(sourceFolder); sourceFolder = sourceFolder.getParentFile(), i++) { for (int i = 0; i < tailSize && !isStructureRoot(sourceFolder); sourceFolder = sourceFolder.getParentFile(), i++) {
File[] children = sourceFolder.listFiles(); File[] children = sourceFolder.listFiles();
if (children == null || !stream(children).allMatch(f -> empty.contains(f) || f.isHidden())) { if (children == null || !stream(children).allMatch(f -> empty.contains(f) || f.isHidden())) {
return; return;
@ -181,6 +177,9 @@ class RenameAction extends AbstractAction {
stream(children).forEach(empty::add); stream(children).forEach(empty::add);
empty.add(sourceFolder); empty.add(sourceFolder);
} }
} catch (Exception e) {
debug.warning(e::toString);
}
}); });
for (File f : empty) { for (File f : empty) {