From 2dd509614a6cbc99454ec030b102aaa85db95e2e Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sat, 15 Jul 2023 20:54:20 +0200 Subject: [PATCH] possible fix http 400, av1_amf option added possible fix http 400 #761 #786 #785 av1_amf option added #787 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 227840 -> 230400 bytes Crunchyroll Downloader/GetData.vb | 10 ++- Crunchyroll Downloader/Main.vb | 17 +++-- .../My Project/AssemblyInfo.vb | 4 +- .../einstellungen.Designer.vb | 61 ++++++++++-------- Crunchyroll Downloader/einstellungen.resx | 3 - Crunchyroll Downloader/einstellungen.vb | 2 +- 7 files changed, 55 insertions(+), 42 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 7a4b47c96c368f359c6e32cef8bb1970d0bcb490..c6f504a8c943c8caec70de30540950edc6fbfeb7 100644 GIT binary patch delta 9625 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 delta 8984 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 diff --git a/Crunchyroll Downloader/GetData.vb b/Crunchyroll Downloader/GetData.vb index 447d9aa..a405111 100644 --- a/Crunchyroll Downloader/GetData.vb +++ b/Crunchyroll Downloader/GetData.vb @@ -67,7 +67,7 @@ Module GetData End Function - Public Function CurlPost(ByVal Url As String, ByVal Cookies As String, ByVal Auth As String, ByVal Post As String) As String + Public Function CurlPost(ByVal Url As String, ByVal Cookies As String, ByVal Auth As String, ByVal Post As String, ByVal Sender As String) As String Dim exepath As String = Path.Combine(Application.StartupPath, "lib", "curl.exe") @@ -114,11 +114,15 @@ Module GetData Loop Until Proc.HasExited Or Microsoft.VisualBasic.DateAndTime.Timer < finish - - If CBool(InStr(CurlError, "curl:")) Then + If CBool(InStr(CurlOutput, "curl:")) = True And CBool(InStr(CurlOutput, "400")) = True Then + Return CurlOutput + ElseIf CBool(InStr(CurlError, "curl:")) = True And CBool(InStr(CurlError, "400")) = True Then + Return CurlError + ElseIf CBool(InStr(CurlError, "curl:")) Then Debug.WriteLine(CurlError) Throw New System.Exception("Error - Getting" + vbNewLine + CurlError) Return Nothing + ElseIf CBool(InStr(CurlOutput, "curl:")) Then Debug.WriteLine(CurlOutput) Throw New System.Exception("Error - Getting" + vbNewLine + CurlError) diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index d6e62df..379b7bf 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -4490,18 +4490,21 @@ Public Class Main Dim CRBetaBearer As String = "Bearer " - Dim v1Token As String = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post) + + Dim v1Token As String = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494") - If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then + If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then - v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post.Replace("etp_rt_cookie", "client_id")) + v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post.Replace("etp_rt_cookie", "client_id"), "add_main-4499") - End If + End If - 'MsgBox(v1Token) - If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then + + 'MsgBox(v1Token) + + If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then SetStatusLabel("Status: Failed - bad request, check CR login") Me.Text = "Status: Failed - bad request, check CR login" Debug.WriteLine("Status: Failed - bad request, check CR login") @@ -4510,7 +4513,7 @@ Public Class Main Exit Sub ElseIf CBool(InStr(v1Token, "curl:")) = True Then - v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post) + v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4516") End If 'MsgBox(v1Token) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 987f0b4..9618805 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index d336466..910d1c8 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -25,6 +25,7 @@ Partial Class Einstellungen Me.components = New System.ComponentModel.Container() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.CB_Mod1 = New MetroFramework.Controls.MetroCheckBox() + Me.CB_vttStyle = New MetroFramework.Controls.MetroCheckBox() Me.pictureBox1 = New System.Windows.Forms.PictureBox() Me.ToolTip2 = New System.Windows.Forms.ToolTip(Me.components) Me.GroupBox14 = New System.Windows.Forms.GroupBox() @@ -159,7 +160,7 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.CB_vttStyle = New MetroFramework.Controls.MetroCheckBox() + Me.AMD_AV1 = New System.Windows.Forms.ToolStripMenuItem() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -224,6 +225,20 @@ Partial Class Einstellungen "com/hama3254/Crunchyroll-Downloader-v3.0/issues/764") Me.CB_Mod1.UseSelectable = True ' + 'CB_vttStyle + ' + Me.CB_vttStyle.AutoSize = True + Me.CB_vttStyle.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_vttStyle.ForeColor = System.Drawing.Color.Black + Me.CB_vttStyle.Location = New System.Drawing.Point(349, 21) + Me.CB_vttStyle.Name = "CB_vttStyle" + Me.CB_vttStyle.Size = New System.Drawing.Size(126, 19) + Me.CB_vttStyle.TabIndex = 6 + Me.CB_vttStyle.Text = "remove CC Style" + Me.ToolTip1.SetToolTip(Me.CB_vttStyle, "fixing CRs mess of cc's https://github.com/hama3254/Crunchyroll-Downloader-v3.0/" & + "issues/769") + Me.CB_vttStyle.UseSelectable = True + ' 'pictureBox1 ' Me.pictureBox1.BackColor = System.Drawing.Color.Transparent @@ -541,7 +556,7 @@ Partial Class Einstellungen ' 'FFMPEG_CommandP1 ' - Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.copy, Me.CPU_h264, Me.CPU_h265, Me.CPU_AV1, Me.nv_h264, Me.nv_hevc, Me.nv_AV1, Me.AMD_h264, Me.AMD_hevc, Me.Intel_h264, Me.Intel_hevc, Me.Intel_AV1}) + Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.copy, Me.CPU_h264, Me.CPU_h265, Me.CPU_AV1, Me.nv_h264, Me.nv_hevc, Me.nv_AV1, Me.AMD_h264, Me.AMD_hevc, Me.AMD_AV1, Me.Intel_h264, Me.Intel_hevc, Me.Intel_AV1}) Me.FFMPEG_CommandP1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FFMPEG_CommandP1.Name = "FFMPEG_CommandP1" Me.FFMPEG_CommandP1.Size = New System.Drawing.Size(63, 20) @@ -550,84 +565,84 @@ Partial Class Einstellungen 'copy ' Me.copy.Name = "copy" - Me.copy.Size = New System.Drawing.Size(172, 22) + Me.copy.Size = New System.Drawing.Size(180, 22) Me.copy.Text = "-c copy" ' 'CPU_h264 ' Me.CPU_h264.BackColor = System.Drawing.Color.DarkGray Me.CPU_h264.Name = "CPU_h264" - Me.CPU_h264.Size = New System.Drawing.Size(172, 22) + Me.CPU_h264.Size = New System.Drawing.Size(180, 22) Me.CPU_h264.Text = "-c:v libx264" ' 'CPU_h265 ' Me.CPU_h265.BackColor = System.Drawing.Color.DarkGray Me.CPU_h265.Name = "CPU_h265" - Me.CPU_h265.Size = New System.Drawing.Size(172, 22) + Me.CPU_h265.Size = New System.Drawing.Size(180, 22) Me.CPU_h265.Text = "-c:v libx265" ' 'CPU_AV1 ' Me.CPU_AV1.BackColor = System.Drawing.Color.DarkGray Me.CPU_AV1.Name = "CPU_AV1" - Me.CPU_AV1.Size = New System.Drawing.Size(172, 22) + Me.CPU_AV1.Size = New System.Drawing.Size(180, 22) Me.CPU_AV1.Text = "-c:v libsvtav1" ' 'nv_h264 ' Me.nv_h264.BackColor = System.Drawing.Color.YellowGreen Me.nv_h264.Name = "nv_h264" - Me.nv_h264.Size = New System.Drawing.Size(172, 22) + Me.nv_h264.Size = New System.Drawing.Size(180, 22) Me.nv_h264.Text = "-c:v h264_nvenc " ' 'nv_hevc ' Me.nv_hevc.BackColor = System.Drawing.Color.YellowGreen Me.nv_hevc.Name = "nv_hevc" - Me.nv_hevc.Size = New System.Drawing.Size(172, 22) + Me.nv_hevc.Size = New System.Drawing.Size(180, 22) Me.nv_hevc.Text = "-c:v hevc_nvenc" ' 'nv_AV1 ' Me.nv_AV1.BackColor = System.Drawing.Color.YellowGreen Me.nv_AV1.Name = "nv_AV1" - Me.nv_AV1.Size = New System.Drawing.Size(172, 22) + Me.nv_AV1.Size = New System.Drawing.Size(180, 22) Me.nv_AV1.Text = "-c:v av1_nvenc" ' 'AMD_h264 ' Me.AMD_h264.BackColor = System.Drawing.Color.Tomato Me.AMD_h264.Name = "AMD_h264" - Me.AMD_h264.Size = New System.Drawing.Size(172, 22) + Me.AMD_h264.Size = New System.Drawing.Size(180, 22) Me.AMD_h264.Text = "-c:v h264_amf" ' 'AMD_hevc ' Me.AMD_hevc.BackColor = System.Drawing.Color.Tomato Me.AMD_hevc.Name = "AMD_hevc" - Me.AMD_hevc.Size = New System.Drawing.Size(172, 22) + Me.AMD_hevc.Size = New System.Drawing.Size(180, 22) Me.AMD_hevc.Text = "-c:v hevc_amf" ' 'Intel_h264 ' Me.Intel_h264.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_h264.Name = "Intel_h264" - Me.Intel_h264.Size = New System.Drawing.Size(172, 22) + Me.Intel_h264.Size = New System.Drawing.Size(180, 22) Me.Intel_h264.Text = "-c:v h264_qsv" ' 'Intel_hevc ' Me.Intel_hevc.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_hevc.Name = "Intel_hevc" - Me.Intel_hevc.Size = New System.Drawing.Size(172, 22) + Me.Intel_hevc.Size = New System.Drawing.Size(180, 22) Me.Intel_hevc.Text = "-c:v hevc_qsv" ' 'Intel_AV1 ' Me.Intel_AV1.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_AV1.Name = "Intel_AV1" - Me.Intel_AV1.Size = New System.Drawing.Size(172, 22) + Me.Intel_AV1.Size = New System.Drawing.Size(180, 22) Me.Intel_AV1.Text = "-c:v av1_qsv" ' 'FFMPEG_CommandP2 @@ -1881,19 +1896,12 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_vttStyle + 'AMD_AV1 ' - Me.CB_vttStyle.AutoSize = True - Me.CB_vttStyle.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_vttStyle.ForeColor = System.Drawing.Color.Black - Me.CB_vttStyle.Location = New System.Drawing.Point(349, 21) - Me.CB_vttStyle.Name = "CB_vttStyle" - Me.CB_vttStyle.Size = New System.Drawing.Size(126, 19) - Me.CB_vttStyle.TabIndex = 6 - Me.CB_vttStyle.Text = "remove CC Style" - Me.ToolTip1.SetToolTip(Me.CB_vttStyle, "fixing CRs mess of cc's https://github.com/hama3254/Crunchyroll-Downloader-v3.0/" & - "issues/769") - Me.CB_vttStyle.UseSelectable = True + Me.AMD_AV1.BackColor = System.Drawing.Color.Tomato + Me.AMD_AV1.Name = "AMD_AV1" + Me.AMD_AV1.Size = New System.Drawing.Size(180, 22) + Me.AMD_AV1.Text = "-c:v av1_amf" ' 'Einstellungen ' @@ -2108,4 +2116,5 @@ Partial Class Einstellungen Friend WithEvents GroupBox23 As GroupBox Friend WithEvents CB_Mod1 As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox + Friend WithEvents AMD_AV1 As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index f49b9b4..e809bf5 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,9 +126,6 @@ 118, 20 - - 118, 20 - 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 917d7f3..84cc634 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -850,7 +850,7 @@ Public Class Einstellungen - Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles copy.Click, nv_h264.Click, nv_hevc.Click, nv_AV1.Click, CPU_h264.Click, CPU_h265.Click, CPU_AV1.Click, AMD_h264.Click, AMD_hevc.Click, Intel_h264.Click, Intel_hevc.Click, Intel_AV1.Click + Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles copy.Click, nv_h264.Click, nv_hevc.Click, nv_AV1.Click, CPU_h264.Click, CPU_h265.Click, CPU_AV1.Click, AMD_h264.Click, AMD_hevc.Click, AMD_AV1.Click, Intel_h264.Click, Intel_hevc.Click, Intel_AV1.Click Dim Button As ToolStripMenuItem = CType(sender, ToolStripMenuItem) If CBool(InStr(Button.Text, "av1")) Then