edit encoding

edit encoding #941
This commit is contained in:
hama3254 2024-04-21 18:03:13 +02:00
parent e818618f53
commit 1887c6ad49
6 changed files with 29 additions and 6 deletions

Binary file not shown.

View File

@ -80,7 +80,7 @@ Module GetData
Dim cmd As String = "" Dim cmd As String = ""
If Main.Curl_insecure = True Then If Main.Curl_insecure = True Then
cmd = "--insecure " cmd = "--insecure "
End If End If '-fsSLm
cmd = cmd + "--no-alpn -fsSLm 15 -A " + My.Settings.User_Agend.Replace("User-Agent: ", "") + Cookies + Auth + Post + " " + Chr(34) + Url + Chr(34) cmd = cmd + "--no-alpn -fsSLm 15 -A " + My.Settings.User_Agend.Replace("User-Agent: ", "") + Cookies + Auth + Post + " " + Chr(34) + Url + Chr(34)
Dim Proc As New Process Dim Proc As New Process
'Debug.WriteLine("CurlPost: " + cmd) 'Debug.WriteLine("CurlPost: " + cmd)

View File

@ -52,6 +52,7 @@ Partial Class Main
Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Btn_Queue = New System.Windows.Forms.Button() Me.Btn_Queue = New System.Windows.Forms.Button()
Me.LoginFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -160,7 +161,7 @@ Partial Class Main
' '
'ContextMenuStrip1 'ContextMenuStrip1
' '
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveModeToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem}) Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveModeToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem, Me.LoginFormToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
' '
@ -235,6 +236,11 @@ Partial Class Main
Me.Btn_Queue.Name = "Btn_Queue" Me.Btn_Queue.Name = "Btn_Queue"
Me.Btn_Queue.UseVisualStyleBackColor = False Me.Btn_Queue.UseVisualStyleBackColor = False
' '
'LoginFormToolStripMenuItem
'
Me.LoginFormToolStripMenuItem.Name = "LoginFormToolStripMenuItem"
resources.ApplyResources(Me.LoginFormToolStripMenuItem, "LoginFormToolStripMenuItem")
'
'Main 'Main
' '
Me.ApplyImageInvert = True Me.ApplyImageInvert = True
@ -293,4 +299,5 @@ Partial Class Main
Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SaveModeToolStripMenuItem As ToolStripMenuItem Friend WithEvents SaveModeToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem
Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem
End Class End Class

View File

@ -549,6 +549,12 @@
<data name="&gt;&gt;AudioOnlyQualityToolStripMenuItem.Type" xml:space="preserve"> <data name="&gt;&gt;AudioOnlyQualityToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;LoginFormToolStripMenuItem.Name" xml:space="preserve">
<value>LoginFormToolStripMenuItem</value>
</data>
<data name="&gt;&gt;LoginFormToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Main</value> <value>Main</value>
</data> </data>
@ -627,8 +633,14 @@
<data name="AudioOnlyQualityToolStripMenuItem.Text" xml:space="preserve"> <data name="AudioOnlyQualityToolStripMenuItem.Text" xml:space="preserve">
<value>audio only Quality</value> <value>audio only Quality</value>
</data> </data>
<data name="LoginFormToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 22</value>
</data>
<data name="LoginFormToolStripMenuItem.Text" xml:space="preserve">
<value>Login Form</value>
</data>
<data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>234, 268</value> <value>234, 290</value>
</data> </data>
<data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
<value>ContextMenuStrip1</value> <value>ContextMenuStrip1</value>

View File

@ -3099,7 +3099,7 @@ Public Class Main
#End Region #End Region
Dim Auth As String = " -H " + Chr(34) + "Authorization: " + CrBetaBasic + Chr(34) Dim Auth As String = " -H " + Chr(34) + "Authorization: " + CrBetaBasic + Chr(34)
'Dim Post As String = " -d " + Chr(34) + "grant_type=etp_rt_cookie" + Chr(34) + " -X POST" 'Dim Post As String = " -d " + Chr(34) + "grant_type=etp_rt_cookie" + Chr(34) + " -X POST"
Dim Post As String = " -d " + Chr(34) + "username=" + Mail + "&password=" + PW + "&grant_type=password&scope=offline_access" + Chr(34) + " -X POST" Dim Post As String = " -d " + Chr(34) + "username=" + HtmlEncode(Mail) + "&password=" + HtmlEncode(PW) + "&grant_type=password&scope=offline_access" + Chr(34) + " -X POST -H " + Chr(34) + "Content-Type: application/x-www-form-urlencoded; charset=utf-8" + Chr(34)
' '
Dim CRBetaBearer As String = "Bearer " Dim CRBetaBearer As String = "Bearer "
@ -3489,6 +3489,10 @@ Public Class Main
End Sub End Sub
Private Sub LoginFormToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LoginFormToolStripMenuItem.Click
LoginForm.ShowDialog()
End Sub
#End Region #End Region

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.22")> <Assembly: AssemblyVersion("3.22.1")>
<Assembly: AssemblyFileVersion("3.22")> <Assembly: AssemblyFileVersion("3.22.1")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>