From fbf1c8ac1649c4c96739e74498cec1a9cadba5a8 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sun, 20 Sep 2020 18:27:26 +0200 Subject: [PATCH] Add check, if source and target are the same --- common/src/main/java/ctbrec/recorder/postprocessing/Move.java | 4 +++- .../src/main/java/ctbrec/recorder/postprocessing/Rename.java | 3 +++ 2 files changed, 6 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 498922d3..36dbcbcf 100644 --- a/common/src/main/java/ctbrec/recorder/postprocessing/Move.java +++ b/common/src/main/java/ctbrec/recorder/postprocessing/Move.java @@ -29,6 +29,9 @@ public class Move extends AbstractPlaceholderAwarePostProcessor { String path = fillInPlaceHolders(pathTemplate, rec); File src = rec.getPostProcessedFile(); File target = new File(path, src.getName()); + if (Objects.equals(src, target)) { + return; + } LOG.info("Moving {} to {}", src.getName(), target.getParentFile().getCanonicalPath()); Files.createParentDirs(target); Files.move(rec.getPostProcessedFile(), target); @@ -38,7 +41,6 @@ public class Move extends AbstractPlaceholderAwarePostProcessor { } rec.getAssociatedFiles().remove(src.getCanonicalPath()); rec.getAssociatedFiles().add(target.getCanonicalPath()); - if (src.isFile()) { deleteEmptyParents(src.getParentFile()); } else { diff --git a/common/src/main/java/ctbrec/recorder/postprocessing/Rename.java b/common/src/main/java/ctbrec/recorder/postprocessing/Rename.java index a785be23..441121e9 100644 --- a/common/src/main/java/ctbrec/recorder/postprocessing/Rename.java +++ b/common/src/main/java/ctbrec/recorder/postprocessing/Rename.java @@ -27,6 +27,9 @@ public class Rename extends AbstractPlaceholderAwarePostProcessor { String filename = fillInPlaceHolders(filenameTemplate, rec); File src = rec.getPostProcessedFile(); File target = new File(src.getParentFile(), filename); + if (Objects.equals(src, target)) { + return; + } LOG.info("Renaming {} to {}", src.getName(), target.getName()); Files.move(rec.getPostProcessedFile(), target); rec.setPostProcessedFile(target);