KnarCraft/FFmpegConvert
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fixes conversion of files containing semicolons
All checks were successful
KnarCraft/FFmpegConvert/master This commit looks good
Details

Browse Source
This commit is contained in:
Kristian Knarvik
2020-03-01 03:14:52 +01:00
parent 4e1cebd95d
commit 80a62cad23
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/knarcraft/ffmpegconverter/converter/AnimeConverter.java
View File

@@ -113,7 +113,7 @@ public class AnimeConverter extends Converter {
command.add("-map"); command.add("-map");
command.add("0:" + videoStream.getAbsoluteIndex()); command.add("0:" + videoStream.getAbsoluteIndex());
command.add("-vf"); command.add("-vf");
String safeFileName = fileName.replace("'", "\\\\\\'").replace("]", "\\]").replace("[", "\\["); String safeFileName = escapeSpecialCharactersInFileName(fileName);
String subtitleCommand = String.format("subtitles=\"%s\"", safeFileName); String subtitleCommand = String.format("subtitles=\"%s\"", safeFileName);
command.add(subtitleCommand); command.add(subtitleCommand);
} else { } else {

8
src/main/java/net/knarcraft/ffmpegconverter/converter/Converter.java
View File

@@ -423,6 +423,14 @@ public abstract class Converter {
} }
return new SubtitleStream(codecName, absoluteIndex, relativeIndex, language, title); return new SubtitleStream(codecName, absoluteIndex, relativeIndex, language, title);
} }
static String escapeSpecialCharactersInFileName(String fileName) {
return fileName.replace("'", "\\\\\\'")
.replace(",", "\\\\\\,")
.replace(";", "\\\\\\;")
.replace("]", "\\]")
.replace("[", "\\[");
}
static void print(String input) throws IOException { static void print(String input) throws IOException {
if (!input.equals("")) { if (!input.equals("")) {