davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix bug in Move pp

This commit is contained in:
0xb00bface 2020-09-26 15:14:54 +02:00
parent 13783140e9
commit 9806badf57
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/ctbrec/recorder/postprocessing/Move.java
View File

@ -29,6 +29,7 @@ public class Move extends AbstractPlaceholderAwarePostProcessor {
String pathTemplate = getConfig().getOrDefault(PATH_TEMPLATE, DEFAULT); String pathTemplate = getConfig().getOrDefault(PATH_TEMPLATE, DEFAULT);
String path = fillInPlaceHolders(pathTemplate, rec, config); String path = fillInPlaceHolders(pathTemplate, rec, config);
File src = rec.getPostProcessedFile(); File src = rec.getPostProcessedFile();
boolean isFile = src.isFile();
File target = new File(path, src.getName()); File target = new File(path, src.getName());
if (Objects.equals(src, target)) { if (Objects.equals(src, target)) {
return; return;
@ -42,7 +43,7 @@ public class Move extends AbstractPlaceholderAwarePostProcessor {
} }
rec.getAssociatedFiles().remove(src.getCanonicalPath()); rec.getAssociatedFiles().remove(src.getCanonicalPath());
rec.getAssociatedFiles().add(target.getCanonicalPath()); rec.getAssociatedFiles().add(target.getCanonicalPath());
if (src.isFile()) { if (isFile) {
deleteEmptyParents(src.getParentFile()); deleteEmptyParents(src.getParentFile());
} else { } else {
deleteEmptyParents(src); deleteEmptyParents(src);

1
common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java
View File

@ -25,6 +25,7 @@ public class MoveSingleFileTest extends AbstractPpTest {
rec.setAbsoluteFile(original); rec.setAbsoluteFile(original);
rec.setStartDate(now); rec.setStartDate(now);
rec.setSingleFile(true); rec.setSingleFile(true);
Move pp = new Move(); Move pp = new Move();
pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath()); pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath());
pp.postprocess(rec, recordingManager, config); pp.postprocess(rec, recordingManager, config);