From 8035f45e0b89d785a94e8086618907a07f033956 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:55:14 +0200 Subject: [PATCH] fix invalid ffmpeg command removed the http stuff from the local file call #926 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 227840 -> 223232 bytes Crunchyroll Downloader/CRD_List_Item.vb | 13 +++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index e7a81aa4fccd718e12b5180200462361e1c6ada3..57542d7ded55f96adfe42420de1646544621851d 100644 GIT binary patch delta 9904 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 delta 10093 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 diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 503bd78..05bcdb2 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -1343,13 +1343,14 @@ Public Class CRD_List_Item Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" Dim startinfo As New System.Diagnostics.ProcessStartInfo - Dim cmd As String = "-user_agent " + My.Settings.User_Agend.Replace("User-Agent: ", "") + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string - 'Dim cmd As String = "-headers " + My.Settings.User_Agend + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + 'Dim cmd As String = "-user_agent " + My.Settings.User_Agend.Replace("User-Agent: ", "") + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " " + DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string - If CBool(InStr(DLCommand, ":\")) And CBool(InStr(DLCommand, "-i " + Chr(34) + "https://")) Then - Dim Replacement As String = "-user_agent " + My.Settings.User_Agend.Replace("User-Agent: ", "") + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " -i " + Chr(34) + "https://" - cmd = DLCommand.Replace("-i " + Chr(34) + "https://", Replacement) + " " + DL_Pfad - End If + Dim cmd As String = DLCommand + " " + DL_Pfad 'start ffmpeg with command strFFCMD string + + 'If CBool(InStr(DLCommand, ":\")) And CBool(InStr(DLCommand, "-i " + Chr(34) + "https://")) Then + ' Dim Replacement As String = "-user_agent " + My.Settings.User_Agend.Replace("User-Agent: ", "") + " -headers " + Chr(34) + "ACCEPT-ENCODING: *" + Chr(34) + " -i " + Chr(34) + "https://" + ' cmd = DLCommand.Replace("-i " + Chr(34) + "https://", Replacement) + " " + DL_Pfad + 'End If LogText.Add(Date.Now.ToString + " " + cmd) If Debug2 = True Then