Actually that may not be a great idea

lay295 · Jun 10, 2024 · 8dd96ae · 8dd96ae
1 parent d040eb2
commit 8dd96ae
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/TwitchDownloaderCLI/Modes/DownloadChat.cs b/TwitchDownloaderCLI/Modes/DownloadChat.cs
@@ -55,10 +55,9 @@ private static ChatDownloadOptions GetDownloadOptions(ChatDownloadArgs inputOpti
                 TrimEnding = inputOptions.TrimEndingTime > TimeSpan.Zero,
                 TrimEndingTime = ((TimeSpan)inputOptions.TrimEndingTime).TotalSeconds,
                 EmbedData = inputOptions.EmbedData,
-                Filename = FilenameService.ReplaceInvalidFilenameChars(
-                    inputOptions.Compression is ChatCompression.Gzip
-                        ? inputOptions.OutputFile + ".gz"
-                        : inputOptions.OutputFile),
+                Filename = inputOptions.Compression is ChatCompression.Gzip
+                    ? inputOptions.OutputFile + ".gz"
+                    : inputOptions.OutputFile,
                 Compression = inputOptions.Compression,
                 TimeFormat = inputOptions.TimeFormat,
                 DownloadThreads = inputOptions.DownloadThreads,

diff --git a/TwitchDownloaderCLI/Modes/DownloadClip.cs b/TwitchDownloaderCLI/Modes/DownloadClip.cs
@@ -46,7 +46,7 @@ private static ClipDownloadOptions GetDownloadOptions(ClipDownloadArgs inputOpti
             ClipDownloadOptions downloadOptions = new()
             {
                 Id = clipIdMatch.Value,
-                Filename = FilenameService.ReplaceInvalidFilenameChars(inputOptions.OutputFile),
+                Filename = inputOptions.OutputFile,
                 Quality = inputOptions.Quality,
                 ThrottleKib = inputOptions.ThrottleKib,
                 FfmpegPath = string.IsNullOrWhiteSpace(inputOptions.FfmpegPath) ? FfmpegHandler.FfmpegExecutableName : Path.GetFullPath(inputOptions.FfmpegPath),

diff --git a/TwitchDownloaderCLI/Modes/DownloadVideo.cs b/TwitchDownloaderCLI/Modes/DownloadVideo.cs
@@ -57,7 +57,7 @@ private static VideoDownloadOptions GetDownloadOptions(VideoDownloadArgs inputOp
                 ThrottleKib = inputOptions.ThrottleKib,
                 Id = long.Parse(vodIdMatch.ValueSpan),
                 Oauth = inputOptions.Oauth,
-                Filename = FilenameService.ReplaceInvalidFilenameChars(inputOptions.OutputFile),
+                Filename = inputOptions.OutputFile,
                 Quality = Path.GetExtension(inputOptions.OutputFile)!.ToLower() switch
                 {
                     ".mp4" => inputOptions.Quality,

diff --git a/TwitchDownloaderCLI/Modes/MergeTs.cs b/TwitchDownloaderCLI/Modes/MergeTs.cs
@@ -3,7 +3,6 @@
 using TwitchDownloaderCLI.Tools;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
-using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes
 {
@@ -26,7 +25,7 @@ private static TsMergeOptions GetMergeOptions(TsMergeArgs inputOptions, FileColl
         {
             TsMergeOptions mergeOptions = new()
             {
-                OutputFile = FilenameService.ReplaceInvalidFilenameChars(inputOptions.OutputFile),
+                OutputFile = inputOptions.OutputFile,
                 InputFile = inputOptions.InputList,
                 FileCollisionCallback = collisionHandler.HandleCollisionCallback,
             };

diff --git a/TwitchDownloaderCLI/Modes/RenderChat.cs b/TwitchDownloaderCLI/Modes/RenderChat.cs
@@ -8,7 +8,6 @@
 using TwitchDownloaderCore.Chat;
 using TwitchDownloaderCore.Interfaces;
 using TwitchDownloaderCore.Options;
-using TwitchDownloaderCore.Tools;
 
 namespace TwitchDownloaderCLI.Modes
 {
@@ -33,7 +32,7 @@ private static ChatRenderOptions GetRenderOptions(ChatRenderArgs inputOptions, F
             ChatRenderOptions renderOptions = new()
             {
                 InputFile = inputOptions.InputFile,
-                OutputFile = FilenameService.ReplaceInvalidFilenameChars(inputOptions.OutputFile),
+                OutputFile = inputOptions.OutputFile,
                 BackgroundColor = SKColor.Parse(inputOptions.BackgroundColor),
                 AlternateBackgroundColor = SKColor.Parse(inputOptions.AlternateBackgroundColor),
                 MessageColor = SKColor.Parse(inputOptions.MessageColor),

diff --git a/TwitchDownloaderCLI/Modes/UpdateChat.cs b/TwitchDownloaderCLI/Modes/UpdateChat.cs
@@ -62,10 +62,9 @@ private static ChatUpdateOptions GetUpdateOptions(ChatUpdateArgs inputOptions, F
             ChatUpdateOptions updateOptions = new()
             {
                 InputFile = inputOptions.InputFile,
-                OutputFile = FilenameService.ReplaceInvalidFilenameChars(
-                    inputOptions.Compression is ChatCompression.Gzip
-                        ? inputOptions.OutputFile + ".gz"
-                        : inputOptions.OutputFile),
+                OutputFile = inputOptions.Compression is ChatCompression.Gzip
+                    ? inputOptions.OutputFile + ".gz"
+                    : inputOptions.OutputFile,
                 Compression = inputOptions.Compression,
                 OutputFormat = outFormat,
                 EmbedMissing = inputOptions.EmbedMissing,