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

Add possibility to define the contactsheet file name with variables

This commit is contained in:
0xb00bface 2020-10-07 21:14:15 +02:00
parent cd394c8e36
commit 2d3bb0c5c8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
* Fix: Stripchat models with @ in their name were not recorded * Fix: Stripchat models with @ in their name were not recorded
* Fix: Camsoda browsing, the "New" tab is gone though. The information * Fix: Camsoda browsing, the "New" tab is gone though. The information
is not available anymore is not available anymore
* You can now use variable to define the contactsheet file name
3.10.0 3.10.0
======================== ========================

5
common/src/main/java/ctbrec/recorder/postprocessing/CreateContactSheet.java
View File

@ -58,7 +58,7 @@ public class CreateContactSheet extends AbstractPlaceholderAwarePostProcessor {
color}, color},
new StringBuffer(), null).toString(); new StringBuffer(), null).toString();
File executionDir = rec.getPostProcessedFile().isDirectory() ? rec.getPostProcessedFile() : rec.getPostProcessedFile().getParentFile(); File executionDir = rec.getPostProcessedFile().isDirectory() ? rec.getPostProcessedFile() : rec.getPostProcessedFile().getParentFile();
File output = new File(executionDir, filename); File output = new File(executionDir, fillInPlaceHolders(filename, rec, config));
File input = getInputFile(rec); File input = getInputFile(rec);
String[] args = { String[] args = {
@ -80,9 +80,10 @@ public class CreateContactSheet extends AbstractPlaceholderAwarePostProcessor {
}; };
String[] cmdline = OS.getFFmpegCommand(args); String[] cmdline = OS.getFFmpegCommand(args);
LOG.info("Executing {} in working directory {}", Arrays.toString(cmdline), executionDir); LOG.info("Executing {} in working directory {}", Arrays.toString(cmdline), executionDir);
Process ffmpeg = Runtime.getRuntime().exec(cmdline, new String[0], executionDir); Process ffmpeg = Runtime.getRuntime().exec(cmdline, OS.getEnvironment(), executionDir);
int exitCode = 1; int exitCode = 1;
File ffmpegLog = File.createTempFile("create_contact_sheet_" + rec.getId() + '_', ".log"); File ffmpegLog = File.createTempFile("create_contact_sheet_" + rec.getId() + '_', ".log");
ffmpegLog.deleteOnExit();
try (FileOutputStream mergeLogStream = new FileOutputStream(ffmpegLog)) { try (FileOutputStream mergeLogStream = new FileOutputStream(ffmpegLog)) {
Thread stdout = new Thread(new StreamRedirectThread(ffmpeg.getInputStream(), mergeLogStream)); Thread stdout = new Thread(new StreamRedirectThread(ffmpeg.getInputStream(), mergeLogStream));
Thread stderr = new Thread(new StreamRedirectThread(ffmpeg.getErrorStream(), mergeLogStream)); Thread stderr = new Thread(new StreamRedirectThread(ffmpeg.getErrorStream(), mergeLogStream));