From 9806badf57cf314a226e13c1e1feea43d4d16e5c Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 26 Sep 2020 15:14:54 +0200 Subject: [PATCH] Fix bug in Move pp --- common/src/main/java/ctbrec/recorder/postprocessing/Move.java | 3 ++- .../ctbrec/recorder/postprocessing/MoveSingleFileTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ctbrec/recorder/postprocessing/Move.java b/common/src/main/java/ctbrec/recorder/postprocessing/Move.java index 5079385c..894faee3 100644 --- a/common/src/main/java/ctbrec/recorder/postprocessing/Move.java +++ b/common/src/main/java/ctbrec/recorder/postprocessing/Move.java @@ -29,6 +29,7 @@ public class Move extends AbstractPlaceholderAwarePostProcessor { String pathTemplate = getConfig().getOrDefault(PATH_TEMPLATE, DEFAULT); String path = fillInPlaceHolders(pathTemplate, rec, config); File src = rec.getPostProcessedFile(); + boolean isFile = src.isFile(); File target = new File(path, src.getName()); if (Objects.equals(src, target)) { return; @@ -42,7 +43,7 @@ public class Move extends AbstractPlaceholderAwarePostProcessor { } rec.getAssociatedFiles().remove(src.getCanonicalPath()); rec.getAssociatedFiles().add(target.getCanonicalPath()); - if (src.isFile()) { + if (isFile) { deleteEmptyParents(src.getParentFile()); } else { deleteEmptyParents(src); diff --git a/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java b/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java index e11cde09..b2199b80 100644 --- a/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java +++ b/common/src/test/java/ctbrec/recorder/postprocessing/MoveSingleFileTest.java @@ -25,6 +25,7 @@ public class MoveSingleFileTest extends AbstractPpTest { rec.setAbsoluteFile(original); rec.setStartDate(now); rec.setSingleFile(true); + Move pp = new Move(); pp.getConfig().put(Move.PATH_TEMPLATE, new File(baseDir.toFile(), Move.DEFAULT).getAbsolutePath()); pp.postprocess(rec, recordingManager, config);