From 4516b8d787c382833fc8e56a8a2a9c916aa93045 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 9 Jan 2019 15:11:18 +0100 Subject: [PATCH] Fix parsing of model name for recordings --- common/src/main/java/ctbrec/recorder/LocalRecorder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java index 3a1e46e9..dfd501ec 100644 --- a/common/src/main/java/ctbrec/recorder/LocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/LocalRecorder.java @@ -468,10 +468,11 @@ public class LocalRecorder implements Recorder { for (File ts: possibleRecordings) { try { String filename = ts.getName(); - String dateString = filename.substring(filename.length() - 3 - DATE_FORMAT.length(), filename.length() - 3); + int extLength = filename.length() - filename.lastIndexOf('.'); + String dateString = filename.substring(filename.length() - extLength - DATE_FORMAT.length(), filename.length() - extLength); Date startDate = sdf.parse(dateString); Recording recording = new Recording(); - recording.setModelName(filename.substring(0, filename.length() - 4 - DATE_FORMAT.length())); + recording.setModelName(filename.substring(0, filename.length() - extLength - 1 - DATE_FORMAT.length())); recording.setStartDate(Instant.ofEpochMilli(startDate.getTime())); String path = ts.getAbsolutePath().replace(config.getSettings().recordingsDir, ""); if(!path.startsWith("/")) { @@ -775,6 +776,10 @@ public class LocalRecorder implements Recorder { try { LOG.debug("Determining video length for {}", download.getTarget()); File target = download.getTarget(); + if(!target.exists()) { + return true; + } + double duration = 0; if(target.isDirectory()) { File playlist = new File(target, "playlist.m3u8");