j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix moving of segmented downloads

This commit is contained in:
0xb00bface 2020-12-06 14:22:28 +01:00
parent d76ee3994b
commit dafde88721
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,9 +1,12 @@
3.10.7 3.10.7
======================== ========================
* Fixed streaming of recordings from the server (the file path was duplicated
if single file was used)
* Fixed credentials related bugs for Streamate and Stripchat * Fixed credentials related bugs for Streamate and Stripchat
They used the user name from Chaturbate for some requests. Whoopsie! They used the user name from Chaturbate for some requests. Whoopsie!
* Renamed settings for Chaturbate's user name and password * Renamed settings for Chaturbate's user name and password
* Add setting to split recordings by size * Add setting to split recordings by size
* Fixed moving of segment recordings on the server (post-processing)
3.10.6 3.10.6
======================== ========================

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

@ -6,6 +6,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.Objects; import java.util.Objects;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -15,7 +16,7 @@ import ctbrec.recorder.RecordingManager;
public class Move extends AbstractPlaceholderAwarePostProcessor { public class Move extends AbstractPlaceholderAwarePostProcessor {
private static final Logger LOG = LoggerFactory.getLogger(Rename.class); private static final Logger LOG = LoggerFactory.getLogger(Move.class);
public static final String PATH_TEMPLATE = "path.template"; public static final String PATH_TEMPLATE = "path.template";
public static final String DEFAULT = "${modelSanitizedName}" + File.separatorChar + "${localDateTime}"; public static final String DEFAULT = "${modelSanitizedName}" + File.separatorChar + "${localDateTime}";
@ -36,7 +37,11 @@ public class Move extends AbstractPlaceholderAwarePostProcessor {
} }
LOG.info("Moving {} to {}", src.getName(), target.getParentFile().getCanonicalPath()); LOG.info("Moving {} to {}", src.getName(), target.getParentFile().getCanonicalPath());
Files.createDirectories(target.getParentFile().toPath()); Files.createDirectories(target.getParentFile().toPath());
Files.move(rec.getPostProcessedFile().toPath(), target.toPath()); if (rec.getPostProcessedFile().isDirectory()) {
FileUtils.moveDirectory(rec.getPostProcessedFile(), target);
} else {
FileUtils.moveFile(rec.getPostProcessedFile(), target);
}
rec.setPostProcessedFile(target); rec.setPostProcessedFile(target);
if (Objects.equals(src, rec.getAbsoluteFile())) { if (Objects.equals(src, rec.getAbsoluteFile())) {
rec.setAbsoluteFile(target); rec.setAbsoluteFile(target);