From 6d96f606a3689611e0a9e72d1055a16c3d8d4386 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Wed, 26 Oct 2022 09:39:24 +0200 Subject: [PATCH] added curl option added curl option "--insecure" #559 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 146432 -> 145920 bytes Crunchyroll Downloader/Main.vb | 30 ++++-- .../einstellungen.Designer.vb | 93 ++++++++++-------- Crunchyroll Downloader/einstellungen.resx | 3 + Crunchyroll Downloader/einstellungen.vb | 12 +++ 5 files changed, 92 insertions(+), 46 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 873102a1befe835fd4440c0c559424e371b40feb..608f2d9217060f4a49bc7cd0b8d644a93e4007c7 100644 GIT binary patch delta 5649 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 Xc26VUs}qG|d!p#l$cC74-y-v0osW}4 delta 6187 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 Q86qVE-eb#T?yJ@P6PKef5C8xG diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 49102f6..65c2f8e 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -149,6 +149,7 @@ Public Class Main Public DefaultSubCR As String = "Disabled" Public DubMode As Boolean = True Public CR_Chapters As Boolean = False + Public Curl_insecure As Boolean = False #Region "Sprachen Vairablen" Public URL_Invaild As String = "something is wrong here..." Dim DL_Path_String As String = "Please choose download directory." @@ -518,6 +519,12 @@ Public Class Main CR_Chapters = CBool(Integer.Parse(rkg.GetValue("CR_Chapters").ToString)) Catch ex As Exception End Try + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + Curl_insecure = CBool(Integer.Parse(rkg.GetValue("Curl_insecure").ToString)) + 'MsgBox(Curl_insecure.ToString) + Catch ex As Exception + End Try Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") @@ -1020,11 +1027,13 @@ Public Class Main Dim startinfo As New System.Diagnostics.ProcessStartInfo Dim sr As StreamReader Dim sr2 As StreamReader - - - Dim cmd As String = "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + " " + Chr(34) + Url + Chr(34) + Dim cmd As String = "" + If Curl_insecure = True Then + cmd = "--insecure " + End If + cmd = cmd + "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + " " + Chr(34) + Url + Chr(34) Dim Proc As New Process - 'MsgBox(cmd) + MsgBox(cmd) Dim CurlOutput As String = Nothing Dim CurlError As String = Nothing ' all parameters required to run the process @@ -1073,8 +1082,11 @@ Public Class Main Dim sr2 As StreamReader - - Dim cmd As String = "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + Cookies + Auth + Post + " " + Chr(34) + Url + Chr(34) + Dim cmd As String = "" + If Curl_insecure = True Then + cmd = "--insecure " + End If + cmd = cmd + "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + Cookies + Auth + Post + " " + Chr(34) + Url + Chr(34) Dim Proc As New Process 'MsgBox(cmd) Dim CurlOutput As String = Nothing @@ -1127,7 +1139,11 @@ Public Class Main - Dim cmd As String = "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + Cookies + Auth + " " + Chr(34) + Url + Chr(34) + Dim cmd As String = "" + If Curl_insecure = True Then + cmd = "--insecure " + End If + cmd = cmd + "--no-alpn -fsSLm 15 -A " + My.Resources.ffmpeg_user_agend.Replace("User-Agent: ", "") + Cookies + Auth + " " + Chr(34) + Url + Chr(34) Dim Proc As New Process 'MsgBox(cmd) Dim CurlOutput As String = Nothing diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index e773dd7..ce76a48 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -120,6 +120,8 @@ Partial Class Einstellungen Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox() Me.CR_Filename = New MetroFramework.Controls.MetroComboBox() Me.MetroTabPage1 = New MetroFramework.Controls.MetroTabPage() + Me.GroupBox20 = New System.Windows.Forms.GroupBox() + Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox19 = New System.Windows.Forms.GroupBox() Me.DubMode = New MetroFramework.Controls.MetroCheckBox() Me.TabPage6 = New MetroFramework.Controls.MetroTabPage() @@ -151,8 +153,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.GroupBox20 = New System.Windows.Forms.GroupBox() - Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox() + Me.Chb_Ign_tls = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -179,6 +180,7 @@ Partial Class Einstellungen Me.GB_Filename_Pre.SuspendLayout() Me.GroupBox12.SuspendLayout() Me.MetroTabPage1.SuspendLayout() + Me.GroupBox20.SuspendLayout() Me.GroupBox19.SuspendLayout() Me.TabPage6.SuspendLayout() Me.GroupBox15.SuspendLayout() @@ -190,7 +192,6 @@ Partial Class Einstellungen Me.GroupBox8.SuspendLayout() Me.TabPage7.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox20.SuspendLayout() Me.SuspendLayout() ' 'ToolTip1 @@ -866,10 +867,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 35) + Me.TabPage1.Location = New System.Drawing.Point(4, 44) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 528) + Me.TabPage1.Size = New System.Drawing.Size(501, 519) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main" Me.TabPage1.VerticalScrollbar = True @@ -886,9 +887,9 @@ Partial Class Einstellungen Me.GroupBox6.Controls.Add(Me.NumericUpDown2) Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox6.ForeColor = System.Drawing.Color.Black - Me.GroupBox6.Location = New System.Drawing.Point(3, 320) + Me.GroupBox6.Location = New System.Drawing.Point(3, 360) Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(490, 150) + Me.GroupBox6.Size = New System.Drawing.Size(490, 112) Me.GroupBox6.TabIndex = 80 Me.GroupBox6.TabStop = False Me.GroupBox6.Text = "Error Handling" @@ -906,7 +907,7 @@ Partial Class Einstellungen 'CheckBox2 ' Me.CheckBox2.AutoSize = True - Me.CheckBox2.Location = New System.Drawing.Point(182, 110) + Me.CheckBox2.Location = New System.Drawing.Point(4, 70) Me.CheckBox2.Name = "CheckBox2" Me.CheckBox2.Size = New System.Drawing.Size(125, 15) Me.CheckBox2.TabIndex = 44 @@ -935,13 +936,14 @@ Partial Class Einstellungen 'GroupBox5 ' Me.GroupBox5.BackColor = System.Drawing.Color.Transparent + Me.GroupBox5.Controls.Add(Me.Chb_Ign_tls) Me.GroupBox5.Controls.Add(Me.http_support) Me.GroupBox5.Controls.Add(Me.DarkMode) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.ForeColor = System.Drawing.Color.Black Me.GroupBox5.Location = New System.Drawing.Point(3, 240) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(490, 67) + Me.GroupBox5.Size = New System.Drawing.Size(490, 114) Me.GroupBox5.TabIndex = 70 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Other" @@ -964,9 +966,10 @@ Partial Class Einstellungen 'DarkMode ' Me.DarkMode.AutoSize = True + Me.DarkMode.FontSize = MetroFramework.MetroCheckBoxSize.Medium Me.DarkMode.Location = New System.Drawing.Point(41, 30) Me.DarkMode.Name = "DarkMode" - Me.DarkMode.Size = New System.Drawing.Size(118, 15) + Me.DarkMode.Size = New System.Drawing.Size(135, 19) Me.DarkMode.TabIndex = 5 Me.DarkMode.Text = "enable dark mode" Me.DarkMode.UseSelectable = True @@ -1109,7 +1112,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 3 + Me.TabControl1.SelectedIndex = 0 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1331,6 +1334,30 @@ Partial Class Einstellungen Me.MetroTabPage1.VerticalScrollbarHighlightOnWheel = False Me.MetroTabPage1.VerticalScrollbarSize = 10 ' + 'GroupBox20 + ' + Me.GroupBox20.BackColor = System.Drawing.Color.Transparent + Me.GroupBox20.Controls.Add(Me.ChB_Chapters) + Me.GroupBox20.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox20.ForeColor = System.Drawing.Color.Black + Me.GroupBox20.Location = New System.Drawing.Point(3, 385) + Me.GroupBox20.Name = "GroupBox20" + Me.GroupBox20.Size = New System.Drawing.Size(490, 62) + Me.GroupBox20.TabIndex = 34 + Me.GroupBox20.TabStop = False + Me.GroupBox20.Text = "Chapters" + ' + 'ChB_Chapters + ' + Me.ChB_Chapters.AutoSize = True + Me.ChB_Chapters.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.ChB_Chapters.Location = New System.Drawing.Point(158, 23) + Me.ChB_Chapters.Name = "ChB_Chapters" + Me.ChB_Chapters.Size = New System.Drawing.Size(145, 19) + Me.ChB_Chapters.TabIndex = 5 + Me.ChB_Chapters.Text = "enable CR Chapters" + Me.ChB_Chapters.UseSelectable = True + ' 'GroupBox19 ' Me.GroupBox19.BackColor = System.Drawing.Color.Transparent @@ -1365,10 +1392,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 35) + Me.TabPage6.Location = New System.Drawing.Point(4, 44) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(501, 528) + Me.TabPage6.Size = New System.Drawing.Size(501, 519) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = " Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1602,9 +1629,9 @@ Partial Class Einstellungen Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label5) - Me.TabPage7.Location = New System.Drawing.Point(4, 35) + Me.TabPage7.Location = New System.Drawing.Point(4, 44) Me.TabPage7.Name = "TabPage7" - Me.TabPage7.Size = New System.Drawing.Size(501, 528) + Me.TabPage7.Size = New System.Drawing.Size(501, 519) Me.TabPage7.TabIndex = 5 Me.TabPage7.Text = " About " ' @@ -1736,29 +1763,16 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'GroupBox20 + 'Chb_Ign_tls ' - Me.GroupBox20.BackColor = System.Drawing.Color.Transparent - Me.GroupBox20.Controls.Add(Me.ChB_Chapters) - Me.GroupBox20.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox20.ForeColor = System.Drawing.Color.Black - Me.GroupBox20.Location = New System.Drawing.Point(3, 385) - Me.GroupBox20.Name = "GroupBox20" - Me.GroupBox20.Size = New System.Drawing.Size(490, 62) - Me.GroupBox20.TabIndex = 34 - Me.GroupBox20.TabStop = False - Me.GroupBox20.Text = "Chapters" - ' - 'ChB_Chapters - ' - Me.ChB_Chapters.AutoSize = True - Me.ChB_Chapters.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.ChB_Chapters.Location = New System.Drawing.Point(158, 23) - Me.ChB_Chapters.Name = "ChB_Chapters" - Me.ChB_Chapters.Size = New System.Drawing.Size(145, 19) - Me.ChB_Chapters.TabIndex = 5 - Me.ChB_Chapters.Text = "enable CR Chapters" - Me.ChB_Chapters.UseSelectable = True + Me.Chb_Ign_tls.AutoSize = True + Me.Chb_Ign_tls.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.Chb_Ign_tls.Location = New System.Drawing.Point(135, 80) + Me.Chb_Ign_tls.Name = "Chb_Ign_tls" + Me.Chb_Ign_tls.Size = New System.Drawing.Size(223, 19) + Me.Chb_Ign_tls.TabIndex = 46 + Me.Chb_Ign_tls.Text = "add ""--insecure"" to curl requests" + Me.Chb_Ign_tls.UseSelectable = True ' 'Einstellungen ' @@ -1812,6 +1826,8 @@ Partial Class Einstellungen Me.GB_Filename_Pre.PerformLayout() Me.GroupBox12.ResumeLayout(False) Me.MetroTabPage1.ResumeLayout(False) + Me.GroupBox20.ResumeLayout(False) + Me.GroupBox20.PerformLayout() Me.GroupBox19.ResumeLayout(False) Me.GroupBox19.PerformLayout() Me.TabPage6.ResumeLayout(False) @@ -1826,8 +1842,6 @@ Partial Class Einstellungen Me.GroupBox8.PerformLayout() Me.TabPage7.ResumeLayout(False) CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox20.ResumeLayout(False) - Me.GroupBox20.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1963,4 +1977,5 @@ Partial Class Einstellungen Friend WithEvents CB_Merge As MetroFramework.Controls.MetroComboBox Friend WithEvents GroupBox20 As GroupBox Friend WithEvents ChB_Chapters As MetroFramework.Controls.MetroCheckBox + Friend WithEvents Chb_Ign_tls As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index e809bf5..f49b9b4 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,6 +126,9 @@ 118, 20 + + 118, 20 + 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 12850b3..0a132ea 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -65,6 +65,10 @@ Public Class Einstellungen ChB_Chapters.Checked = True End If + If Main.Curl_insecure = True Then + Chb_Ign_tls.Checked = True + End If + If Main.DarkModeValue = True Then DarkMode.Checked = True GroupBoxColor(Color.FromArgb(150, 150, 150)) @@ -404,6 +408,14 @@ Public Class Einstellungen rk.SetValue("CR_Chapters", 0, RegistryValueKind.String) End If + If Chb_Ign_tls.Checked = True Then + Main.Curl_insecure = True + rk.SetValue("Curl_insecure", 1, RegistryValueKind.String) + Else + Main.Curl_insecure = False + rk.SetValue("Curl_insecure", 0, RegistryValueKind.String) + End If + If KodiSupport.Checked = True Then Main.KodiNaming = True rk.SetValue("KodiSupport", 1, RegistryValueKind.String)