From 1b67ea76f0b9fef26fbb9cb22c42b693c8d81d6d Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Thu, 21 Oct 2021 19:43:13 +0200 Subject: [PATCH] Minor fixes --- FFMpegCore/Extend/KeyValuePairExtensions.cs | 2 +- FFMpegCore/Extend/StringExtensions.cs | 6 +++--- FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/FFMpegCore/Extend/KeyValuePairExtensions.cs b/FFMpegCore/Extend/KeyValuePairExtensions.cs index 28cc087..c2c6813 100644 --- a/FFMpegCore/Extend/KeyValuePairExtensions.cs +++ b/FFMpegCore/Extend/KeyValuePairExtensions.cs @@ -16,7 +16,7 @@ internal static class KeyValuePairExtensions public static string FormatArgumentPair(this KeyValuePair pair, bool enclose) { var key = pair.Key; - var value = enclose ? pair.Value.EncloseIfContainsSpace() : pair.Value; + var value = enclose ? StringExtensions.EncloseIfContainsSpace(pair.Value) : pair.Value; return $"{key}={value}"; } diff --git a/FFMpegCore/Extend/StringExtensions.cs b/FFMpegCore/Extend/StringExtensions.cs index 2c33681..29c8d42 100644 --- a/FFMpegCore/Extend/StringExtensions.cs +++ b/FFMpegCore/Extend/StringExtensions.cs @@ -19,7 +19,7 @@ internal static class StringExtensions /// /// The input /// The enclosed string - public static string EncloseIfContainsSpace(this string input) + public static string EncloseIfContainsSpace(string input) { return input.Contains(" ") ? $"'{input}'" : input; } @@ -29,7 +29,7 @@ public static string EncloseIfContainsSpace(this string input) /// /// /// - public static string EncloseInQuotes(this string input) + public static string EncloseInQuotes(string input) { return $"'{input}'"; } @@ -43,7 +43,7 @@ public static string EncloseInQuotes(this string input) /// /// /// Scaped path - public static string ToFFmpegLibavfilterPath(this string source) + public static string ToFFmpegLibavfilterPath(string source) { return source.Replace(CharactersSubstitution); } diff --git a/FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs b/FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs index d7ec3aa..2acd7ca 100644 --- a/FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs +++ b/FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs @@ -103,7 +103,9 @@ public SubtitleHardBurnOptions WithParameter(string key, string value) return this; } - internal string TextInternal => string.Join(":", new[] { _subtitle.ToFFmpegLibavfilterPath().EncloseInQuotes() }.Concat(Parameters.Select(parameter => parameter.FormatArgumentPair(enclose: true)))); + internal string TextInternal => string + .Join(":", new[] { StringExtensions.EncloseInQuotes(StringExtensions.ToFFmpegLibavfilterPath(_subtitle)) } + .Concat(Parameters.Select(parameter => parameter.FormatArgumentPair(enclose: true)))); } public class StyleOptions