Mirrors/Crunchyroll-Downloader-v3.0
2
0
Fork 0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git synced 2025-01-24 06:01:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix musik/convert; added user button

Browse Source 
fix musik api stream deletion #987
added button for users #988
added test for account details and premium (probably #982)
This commit is contained in:
hama3254 2024-06-17 15:15:27 +02:00
parent 588fc587f2
commit 773ac24679
17 changed files with 366 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Crunchyroll Downloader/v17/.suo
View File

Binary file not shown.

4
Crunchyroll Downloader/CRD_List_Item.vb
View File

@ -1714,7 +1714,7 @@ Public Class CRD_List_Item
'File.WriteAllText(logfile, HybrideLog) 'File.WriteAllText(logfile, HybrideLog)
WriteText(logfile, HybrideLog) WriteText(logfile, HybrideLog)
Catch ex As Exception Catch ex As Exception
Error_msg.ShowErrorDia(ex.ToString, "Unable to write Hybrid Mode logfile", False) Error_msg.ShowErrorDia(ex.ToString, "Unable to write Hybrid Mode logfile", "None")
'MsgBox(ex.ToString) 'MsgBox(ex.ToString)
End Try End Try
End If End If
@ -1738,7 +1738,7 @@ Public Class CRD_List_Item
Catch ex As Exception Catch ex As Exception
'MsgBox(ex.ToString) 'MsgBox(ex.ToString)
Error_msg.ShowErrorDia(ex.ToString, "Unable to write logfile", False) Error_msg.ShowErrorDia(ex.ToString, "Unable to write logfile", "None")
End Try End Try

16
Crunchyroll Downloader/Crunchyroll Downloader.vbproj
View File

@ -168,6 +168,11 @@
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="GetData.vb" /> <Compile Include="GetData.vb" />
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="queue.Designer.vb"> <Compile Include="queue.Designer.vb">
<DependentUpon>queue.vb</DependentUpon> <DependentUpon>queue.vb</DependentUpon>
</Compile> </Compile>
@ -182,11 +187,6 @@
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="GlobalSuppressions.vb" /> <Compile Include="GlobalSuppressions.vb" />
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Anime_Add.Designer.vb"> <Compile Include="Anime_Add.Designer.vb">
<DependentUpon>Anime_Add.vb</DependentUpon> <DependentUpon>Anime_Add.vb</DependentUpon>
</Compile> </Compile>
@ -384,6 +384,9 @@
<Content Include="bin\x86\Debug\Lib\swiftshader\libEGL.dll" /> <Content Include="bin\x86\Debug\Lib\swiftshader\libEGL.dll" />
<Content Include="bin\x86\Debug\Lib\swiftshader\libGLESv2.dll" /> <Content Include="bin\x86\Debug\Lib\swiftshader\libGLESv2.dll" />
<Content Include="icon.ico" /> <Content Include="icon.ico" />
<None Include="Resources\main_login_invert_dark.png" />
<None Include="Resources\main_login_invert.png" />
<None Include="Resources\main_login.png" />
<None Include="Resources\error_dis.png" /> <None Include="Resources\error_dis.png" />
<None Include="Resources\BG.png" /> <None Include="Resources\BG.png" />
<None Include="Resources\ffmpeg_OK_cL.png" /> <None Include="Resources\ffmpeg_OK_cL.png" />
@ -400,10 +403,8 @@
<None Include="Resources\main-mini.png" /> <None Include="Resources\main-mini.png" />
<None Include="Resources\main-setting_invert_dark.png" /> <None Include="Resources\main-setting_invert_dark.png" />
<None Include="Resources\main-close_dark.png" /> <None Include="Resources\main-close_dark.png" />
<None Include="Resources\main-browser_invert_dark.png" />
<None Include="Resources\main-add_invert_dark.png" /> <None Include="Resources\main-add_invert_dark.png" />
<None Include="Resources\main-setting_invert.png" /> <None Include="Resources\main-setting_invert.png" />
<None Include="Resources\main-browser_invert.png" />
<None Include="Resources\main-add_invert.png" /> <None Include="Resources\main-add_invert.png" />
<None Include="Resources\Main_top.png" /> <None Include="Resources\Main_top.png" />
<None Include="Resources\about_icon.png" /> <None Include="Resources\about_icon.png" />
@ -418,7 +419,6 @@
<None Include="Resources\add_mass_cancel_hover.png" /> <None Include="Resources\add_mass_cancel_hover.png" />
<None Include="Resources\add_mass_cancel.png" /> <None Include="Resources\add_mass_cancel.png" />
<None Include="Resources\main-settings.png" /> <None Include="Resources\main-settings.png" />
<None Include="Resources\main-browser.png" />
<None Include="Resources\main-add.png" /> <None Include="Resources\main-add.png" />
<None Include="Resources\main-close.png" /> <None Include="Resources\main-close.png" />
<None Include="Resources\main-background.png" /> <None Include="Resources\main-background.png" />

93
Crunchyroll Downloader/Error_msg.Designer.vb generated
View File

@ -24,10 +24,10 @@ Partial Class Error_msg
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.ErrorText = New MetroFramework.Controls.MetroTextBox()
Me.btn_cl = New System.Windows.Forms.Button() Me.btn_cl = New System.Windows.Forms.Button()
Me.btn_ign = New System.Windows.Forms.Button() Me.btn_option = New System.Windows.Forms.Button()
Me.btn_ok = New System.Windows.Forms.Button() Me.btn_ok = New System.Windows.Forms.Button()
Me.ErrorLabel = New MetroFramework.Controls.MetroLabel()
Me.Delay = New System.Windows.Forms.Timer(Me.components) Me.Delay = New System.Windows.Forms.Timer(Me.components)
Me.Btn_Close = New System.Windows.Forms.Button() Me.Btn_Close = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox()
@ -39,16 +39,51 @@ Partial Class Error_msg
'GroupBox3 'GroupBox3
' '
Me.GroupBox3.BackColor = System.Drawing.Color.Transparent Me.GroupBox3.BackColor = System.Drawing.Color.Transparent
Me.GroupBox3.Controls.Add(Me.ErrorText)
Me.GroupBox3.Controls.Add(Me.btn_cl) Me.GroupBox3.Controls.Add(Me.btn_cl)
Me.GroupBox3.Controls.Add(Me.btn_ign) Me.GroupBox3.Controls.Add(Me.btn_option)
Me.GroupBox3.Controls.Add(Me.btn_ok) Me.GroupBox3.Controls.Add(Me.btn_ok)
Me.GroupBox3.Controls.Add(Me.ErrorLabel)
Me.GroupBox3.Location = New System.Drawing.Point(13, 60) Me.GroupBox3.Location = New System.Drawing.Point(13, 60)
Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(613, 203) Me.GroupBox3.Size = New System.Drawing.Size(613, 203)
Me.GroupBox3.TabIndex = 38 Me.GroupBox3.TabIndex = 38
Me.GroupBox3.TabStop = False Me.GroupBox3.TabStop = False
' '
'ErrorText
'
'
'
'
Me.ErrorText.CustomButton.Image = Nothing
Me.ErrorText.CustomButton.Location = New System.Drawing.Point(526, 1)
Me.ErrorText.CustomButton.Name = ""
Me.ErrorText.CustomButton.Size = New System.Drawing.Size(73, 73)
Me.ErrorText.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.ErrorText.CustomButton.TabIndex = 1
Me.ErrorText.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.ErrorText.CustomButton.UseSelectable = True
Me.ErrorText.CustomButton.Visible = False
Me.ErrorText.Enabled = False
Me.ErrorText.FontSize = MetroFramework.MetroTextBoxSize.Tall
Me.ErrorText.Lines = New String() {"Status: Hier könnte Ihre Werbung stehen"}
Me.ErrorText.Location = New System.Drawing.Point(6, 16)
Me.ErrorText.MaxLength = 32767
Me.ErrorText.Multiline = True
Me.ErrorText.Name = "ErrorText"
Me.ErrorText.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.ErrorText.ReadOnly = True
Me.ErrorText.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.ErrorText.SelectedText = ""
Me.ErrorText.SelectionLength = 0
Me.ErrorText.SelectionStart = 0
Me.ErrorText.ShortcutsEnabled = True
Me.ErrorText.Size = New System.Drawing.Size(600, 75)
Me.ErrorText.TabIndex = 79
Me.ErrorText.Text = "Status: Hier könnte Ihre Werbung stehen"
Me.ErrorText.UseSelectable = True
Me.ErrorText.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.ErrorText.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
'
'btn_cl 'btn_cl
' '
Me.btn_cl.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL Me.btn_cl.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
@ -58,27 +93,27 @@ Partial Class Error_msg
Me.btn_cl.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_cl.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_cl.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btn_cl.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_cl.ForeColor = System.Drawing.SystemColors.Control Me.btn_cl.ForeColor = System.Drawing.SystemColors.Control
Me.btn_cl.Location = New System.Drawing.Point(28, 121) Me.btn_cl.Location = New System.Drawing.Point(27, 121)
Me.btn_cl.Name = "btn_cl" Me.btn_cl.Name = "btn_cl"
Me.btn_cl.Size = New System.Drawing.Size(150, 40) Me.btn_cl.Size = New System.Drawing.Size(150, 40)
Me.btn_cl.TabIndex = 77 Me.btn_cl.TabIndex = 77
Me.btn_cl.Text = "Details" Me.btn_cl.Text = "Details"
Me.btn_cl.UseVisualStyleBackColor = True Me.btn_cl.UseVisualStyleBackColor = True
' '
'btn_ign 'btn_option
' '
Me.btn_ign.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL Me.btn_option.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
Me.btn_ign.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btn_option.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.btn_ign.FlatAppearance.BorderSize = 0 Me.btn_option.FlatAppearance.BorderSize = 0
Me.btn_ign.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_ign.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btn_option.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_ign.ForeColor = System.Drawing.SystemColors.Control Me.btn_option.ForeColor = System.Drawing.SystemColors.Control
Me.btn_ign.Location = New System.Drawing.Point(235, 121) Me.btn_option.Location = New System.Drawing.Point(228, 121)
Me.btn_ign.Name = "btn_ign" Me.btn_option.Name = "btn_option"
Me.btn_ign.Size = New System.Drawing.Size(150, 40) Me.btn_option.Size = New System.Drawing.Size(150, 40)
Me.btn_ign.TabIndex = 78 Me.btn_option.TabIndex = 78
Me.btn_ign.Text = "Ignore" Me.btn_option.Text = "Ignore"
Me.btn_ign.UseVisualStyleBackColor = True Me.btn_option.UseVisualStyleBackColor = True
' '
'btn_ok 'btn_ok
' '
@ -88,29 +123,13 @@ Partial Class Error_msg
Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_ok.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btn_ok.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_ok.ForeColor = System.Drawing.SystemColors.Control Me.btn_ok.ForeColor = System.Drawing.SystemColors.Control
Me.btn_ok.Location = New System.Drawing.Point(424, 121) Me.btn_ok.Location = New System.Drawing.Point(430, 121)
Me.btn_ok.Name = "btn_ok" Me.btn_ok.Name = "btn_ok"
Me.btn_ok.Size = New System.Drawing.Size(150, 40) Me.btn_ok.Size = New System.Drawing.Size(150, 40)
Me.btn_ok.TabIndex = 78 Me.btn_ok.TabIndex = 78
Me.btn_ok.Text = "Ok" Me.btn_ok.Text = "Ok"
Me.btn_ok.UseVisualStyleBackColor = True Me.btn_ok.UseVisualStyleBackColor = True
' '
'ErrorLabel
'
Me.ErrorLabel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ErrorLabel.BackColor = System.Drawing.Color.Transparent
Me.ErrorLabel.FontSize = MetroFramework.MetroLabelSize.Tall
Me.ErrorLabel.FontWeight = MetroFramework.MetroLabelWeight.Bold
Me.ErrorLabel.ForeColor = System.Drawing.Color.Black
Me.ErrorLabel.Location = New System.Drawing.Point(6, 16)
Me.ErrorLabel.Name = "ErrorLabel"
Me.ErrorLabel.Size = New System.Drawing.Size(601, 53)
Me.ErrorLabel.TabIndex = 34
Me.ErrorLabel.Text = "Status: idle"
Me.ErrorLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
'
'Delay 'Delay
' '
Me.Delay.Interval = 2000 Me.Delay.Interval = 2000
@ -172,12 +191,12 @@ Partial Class Error_msg
End Sub End Sub
Private WithEvents GroupBox3 As GroupBox Private WithEvents GroupBox3 As GroupBox
Public WithEvents ErrorLabel As MetroFramework.Controls.MetroLabel
Friend WithEvents Delay As Timer Friend WithEvents Delay As Timer
Friend WithEvents Btn_Close As Button Friend WithEvents Btn_Close As Button
Friend WithEvents btn_cl As Button Friend WithEvents btn_cl As Button
Friend WithEvents btn_ok As Button Friend WithEvents btn_ok As Button
Private WithEvents GroupBox1 As GroupBox Private WithEvents GroupBox1 As GroupBox
Friend WithEvents ErrorBox As RichTextBox Friend WithEvents ErrorBox As RichTextBox
Friend WithEvents btn_ign As Button Friend WithEvents btn_option As Button
Friend WithEvents ErrorText As MetroFramework.Controls.MetroTextBox
End Class End Class

36
Crunchyroll Downloader/Error_msg.vb
View File

@ -49,18 +49,25 @@ Public Class Error_msg
End Try End Try
Me.Location = New Point(CInt(Main.Location.X + Main.Width / 2 - Me.Width / 2), CInt(Main.Location.Y + Main.Height / 2 - Me.Height / 2)) Me.Location = New Point(CInt(Main.Location.X + Main.Width / 2 - Me.Width / 2), CInt(Main.Location.Y + Main.Height / 2 - Me.Height / 2))
ErrorText.TextAlign = HorizontalAlignment.Center
End Sub End Sub
Public Sub ShowErrorDia(ByVal Details As String, ShortError As String, Optional ByVal IgnoreOption As Boolean = False) Public Sub ShowErrorDia(ByVal Details As String, ShortError As String, Optional ByVal ThirdOption As String = "None")
Me.Show() Me.Show()
ErrorBox.Text = Details ErrorBox.Text = Details
ErrorLabel.Text = ShortError ErrorText.Text = ShortError
If IgnoreOption = False Then
btn_ign.BackgroundImage = My.Resources.error_dis If ThirdOption = "None" Then
btn_ign.Cursor = Cursors.No btn_option.BackgroundImage = My.Resources.error_dis
btn_ign.Enabled = False btn_option.Cursor = Cursors.No
btn_option.Enabled = False
ElseIf ThirdOption = "Ignore" Then
AddHandler btn_option.Click, AddressOf Ignore
ElseIf ThirdOption = "Help" Then
AddHandler btn_option.Click, AddressOf MoreInfo
btn_option.Text = "More Info"
End If End If
End Sub End Sub
Private Sub btn_ok_Click(sender As Object, e As EventArgs) Handles btn_ok.Click Private Sub btn_ok_Click(sender As Object, e As EventArgs) Handles btn_ok.Click
@ -83,16 +90,21 @@ Public Class Error_msg
Private Sub Btn_cl_MouseLeave(sender As Object, e As EventArgs) Handles btn_cl.MouseLeave Private Sub Btn_cl_MouseLeave(sender As Object, e As EventArgs) Handles btn_cl.MouseLeave
btn_cl.BackgroundImage = My.Resources.ffmpeg_OK_cL btn_cl.BackgroundImage = My.Resources.ffmpeg_OK_cL
End Sub End Sub
Private Sub Btn_ign_MouseEnter(sender As Object, e As EventArgs) Handles btn_ign.MouseEnter Private Sub Btn_ign_MouseEnter(sender As Object, e As EventArgs) Handles btn_option.MouseEnter
btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover btn_option.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
End Sub End Sub
Private Sub Btn_ign_MouseLeave(sender As Object, e As EventArgs) Handles btn_ign.MouseLeave Private Sub Btn_ign_MouseLeave(sender As Object, e As EventArgs) Handles btn_option.MouseLeave
btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL btn_option.BackgroundImage = My.Resources.ffmpeg_OK_cL
End Sub End Sub
Private Sub btn_ign_Click(sender As Object, e As EventArgs) Handles btn_ign.Click Private Sub Ignore(sender As Object, e As EventArgs) 'Handles btn_ign.Click
Main.IgnoreErrorDia = True Main.IgnoreErrorDia = True
Me.Close() Me.Close()
End Sub End Sub
Private Sub MoreInfo(sender As Object, e As EventArgs) 'Handles btn_ign.Click
Process.Start("https://github.com/hama3254/Crunchyroll-Downloader-v3.0/issues/929")
'Main.IgnoreErrorDia = True
'Me.Close()
End Sub
End Class End Class

127
Crunchyroll Downloader/LoginForm.Designer.vb generated
View File

@ -24,21 +24,23 @@ Partial Class LoginForm
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.Btn_Save = New System.Windows.Forms.Button() Me.UserTest = New System.Windows.Forms.Button()
Me.btn_ok = New System.Windows.Forms.Button()
Me.DisplayTB = New MetroFramework.Controls.MetroTextBox()
Me.Save = New MetroFramework.Controls.MetroCheckBox() Me.Save = New MetroFramework.Controls.MetroCheckBox()
Me.IssueLink = New MetroFramework.Controls.MetroLink() Me.IssueLink = New MetroFramework.Controls.MetroLink()
Me.PW = New MetroFramework.Controls.MetroTextBox() Me.PW = New MetroFramework.Controls.MetroTextBox()
Me.Mail = New MetroFramework.Controls.MetroTextBox() Me.Mail = New MetroFramework.Controls.MetroTextBox()
Me.Delay = New System.Windows.Forms.Timer(Me.components) Me.Delay = New System.Windows.Forms.Timer(Me.components)
Me.DisplayTB = New MetroFramework.Controls.MetroTextBox()
Me.GroupBox3.SuspendLayout() Me.GroupBox3.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'GroupBox3 'GroupBox3
' '
Me.GroupBox3.BackColor = System.Drawing.Color.Transparent Me.GroupBox3.BackColor = System.Drawing.Color.Transparent
Me.GroupBox3.Controls.Add(Me.UserTest)
Me.GroupBox3.Controls.Add(Me.btn_ok)
Me.GroupBox3.Controls.Add(Me.DisplayTB) Me.GroupBox3.Controls.Add(Me.DisplayTB)
Me.GroupBox3.Controls.Add(Me.Btn_Save)
Me.GroupBox3.Controls.Add(Me.Save) Me.GroupBox3.Controls.Add(Me.Save)
Me.GroupBox3.Controls.Add(Me.IssueLink) Me.GroupBox3.Controls.Add(Me.IssueLink)
Me.GroupBox3.Controls.Add(Me.PW) Me.GroupBox3.Controls.Add(Me.PW)
@ -49,21 +51,72 @@ Partial Class LoginForm
Me.GroupBox3.TabIndex = 38 Me.GroupBox3.TabIndex = 38
Me.GroupBox3.TabStop = False Me.GroupBox3.TabStop = False
' '
'Btn_Save 'UserTest
' '
Me.Btn_Save.BackColor = System.Drawing.Color.Transparent Me.UserTest.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
Me.Btn_Save.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.UserTest.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.Btn_Save.Cursor = System.Windows.Forms.Cursors.Hand Me.UserTest.FlatAppearance.BorderSize = 0
Me.Btn_Save.FlatAppearance.BorderSize = 0 Me.UserTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Btn_Save.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent Me.UserTest.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Btn_Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.UserTest.ForeColor = System.Drawing.SystemColors.Control
Me.Btn_Save.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.DialogNotFound_Submit Me.UserTest.Location = New System.Drawing.Point(48, 256)
Me.Btn_Save.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.UserTest.Name = "UserTest"
Me.Btn_Save.Location = New System.Drawing.Point(165, 250) Me.UserTest.Size = New System.Drawing.Size(150, 40)
Me.Btn_Save.Name = "Btn_Save" Me.UserTest.TabIndex = 79
Me.Btn_Save.Size = New System.Drawing.Size(150, 40) Me.UserTest.Text = "Test Login"
Me.Btn_Save.TabIndex = 3 Me.UserTest.UseVisualStyleBackColor = True
Me.Btn_Save.UseVisualStyleBackColor = False '
'btn_ok
'
Me.btn_ok.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
Me.btn_ok.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.btn_ok.FlatAppearance.BorderSize = 0
Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_ok.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_ok.ForeColor = System.Drawing.SystemColors.Control
Me.btn_ok.Location = New System.Drawing.Point(280, 256)
Me.btn_ok.Name = "btn_ok"
Me.btn_ok.Size = New System.Drawing.Size(150, 40)
Me.btn_ok.TabIndex = 79
Me.btn_ok.Text = "Ok"
Me.btn_ok.UseVisualStyleBackColor = True
'
'DisplayTB
'
'
'
'
Me.DisplayTB.CustomButton.Image = Nothing
Me.DisplayTB.CustomButton.Location = New System.Drawing.Point(410, 1)
Me.DisplayTB.CustomButton.Name = ""
Me.DisplayTB.CustomButton.Size = New System.Drawing.Size(51, 51)
Me.DisplayTB.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.DisplayTB.CustomButton.TabIndex = 1
Me.DisplayTB.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.DisplayTB.CustomButton.UseSelectable = True
Me.DisplayTB.CustomButton.Visible = False
Me.DisplayTB.Enabled = False
Me.DisplayTB.FontSize = MetroFramework.MetroTextBoxSize.Medium
Me.DisplayTB.Lines = New String() {"Due to Crunchyroll changes, we now need to fake a Nintendo Switch app login using" &
" Crunchyroll account credentials"}
Me.DisplayTB.Location = New System.Drawing.Point(10, 19)
Me.DisplayTB.MaxLength = 32767
Me.DisplayTB.Multiline = True
Me.DisplayTB.Name = "DisplayTB"
Me.DisplayTB.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.DisplayTB.ReadOnly = True
Me.DisplayTB.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.DisplayTB.SelectedText = ""
Me.DisplayTB.SelectionLength = 0
Me.DisplayTB.SelectionStart = 0
Me.DisplayTB.ShortcutsEnabled = True
Me.DisplayTB.Size = New System.Drawing.Size(462, 53)
Me.DisplayTB.TabIndex = 39
Me.DisplayTB.Text = "Due to Crunchyroll changes, we now need to fake a Nintendo Switch app login using" &
" Crunchyroll account credentials"
Me.DisplayTB.UseSelectable = True
Me.DisplayTB.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.DisplayTB.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
' '
'Save 'Save
' '
@ -154,43 +207,6 @@ Partial Class LoginForm
' '
Me.Delay.Interval = 2000 Me.Delay.Interval = 2000
' '
'DisplayTB
'
'
'
'
Me.DisplayTB.CustomButton.Image = Nothing
Me.DisplayTB.CustomButton.Location = New System.Drawing.Point(416, 1)
Me.DisplayTB.CustomButton.Name = ""
Me.DisplayTB.CustomButton.Size = New System.Drawing.Size(51, 51)
Me.DisplayTB.CustomButton.Style = MetroFramework.MetroColorStyle.Blue
Me.DisplayTB.CustomButton.TabIndex = 1
Me.DisplayTB.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light
Me.DisplayTB.CustomButton.UseSelectable = True
Me.DisplayTB.CustomButton.Visible = False
Me.DisplayTB.Enabled = False
Me.DisplayTB.FontSize = MetroFramework.MetroTextBoxSize.Medium
Me.DisplayTB.Lines = New String() {"Due to Crunchyroll changes, we now need to fake a Nintendo Switch app login using" &
" Crunchyroll account credentials"}
Me.DisplayTB.Location = New System.Drawing.Point(10, 19)
Me.DisplayTB.MaxLength = 32767
Me.DisplayTB.Multiline = True
Me.DisplayTB.Name = "DisplayTB"
Me.DisplayTB.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0)
Me.DisplayTB.ReadOnly = True
Me.DisplayTB.ScrollBars = System.Windows.Forms.ScrollBars.None
Me.DisplayTB.SelectedText = ""
Me.DisplayTB.SelectionLength = 0
Me.DisplayTB.SelectionStart = 0
Me.DisplayTB.ShortcutsEnabled = True
Me.DisplayTB.Size = New System.Drawing.Size(462, 53)
Me.DisplayTB.TabIndex = 39
Me.DisplayTB.Text = "Due to Crunchyroll changes, we now need to fake a Nintendo Switch app login using" &
" Crunchyroll account credentials"
Me.DisplayTB.UseSelectable = True
Me.DisplayTB.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
Me.DisplayTB.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
'
'LoginForm 'LoginForm
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -211,6 +227,7 @@ Partial Class LoginForm
Friend WithEvents Mail As MetroFramework.Controls.MetroTextBox Friend WithEvents Mail As MetroFramework.Controls.MetroTextBox
Friend WithEvents IssueLink As MetroFramework.Controls.MetroLink Friend WithEvents IssueLink As MetroFramework.Controls.MetroLink
Friend WithEvents Save As MetroFramework.Controls.MetroCheckBox Friend WithEvents Save As MetroFramework.Controls.MetroCheckBox
Friend WithEvents Btn_Save As Button
Friend WithEvents DisplayTB As MetroFramework.Controls.MetroTextBox Friend WithEvents DisplayTB As MetroFramework.Controls.MetroTextBox
Friend WithEvents UserTest As Button
Friend WithEvents btn_ok As Button
End Class End Class

79
Crunchyroll Downloader/LoginForm.vb
View File

@ -1,6 +1,7 @@
Option Strict On Option Strict On
Imports Crunchyroll_Downloader.CRD_Classes Imports Crunchyroll_Downloader.CRD_Classes
Imports MetroFramework.Components Imports MetroFramework.Components
Imports System.Net.WebUtility
Public Class LoginForm Public Class LoginForm
@ -37,26 +38,15 @@ Public Class LoginForm
DisplayTB.TextAlign = HorizontalAlignment.Center DisplayTB.TextAlign = HorizontalAlignment.Center
End Sub End Sub
Private Sub Btn_Save_Click(sender As Object, e As EventArgs) Handles Btn_Save.Click
If PW.Text = "Password" Or Mail.Text = "E-Mail" Then
MsgBox("Invalid Input", MsgBoxStyle.Information)
Exit Sub
ElseIf Save.Checked = True Then
My.Settings.Mail = Mail.Text
My.Settings.PW = PW.Text
End If
Main.PW = PW.Text
Main.Mail = Mail.Text
Me.Close()
End Sub
Private Sub Submit_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Save.MouseEnter
Btn_Save.Image = My.Resources.DialogNotFound_Submit_hover
End Sub
Private Sub Submit_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Save.MouseLeave 'Private Sub Submit_MouseEnter(sender As Object, e As EventArgs)
Btn_Save.Image = My.Resources.DialogNotFound_Submit ' Btn_Save.Image = My.Resources.DialogNotFound_Submit_hover
End Sub 'End Sub
'Private Sub Submit_MouseLeave(sender As Object, e As EventArgs)
' Btn_Save.Image = My.Resources.DialogNotFound_Submit
'End Sub
Private Sub MetroLink1_Click(sender As Object, e As EventArgs) Handles IssueLink.Click Private Sub MetroLink1_Click(sender As Object, e As EventArgs) Handles IssueLink.Click
@ -75,5 +65,58 @@ Public Class LoginForm
End If End If
End Sub End Sub
Private Sub btn_ok_Click(sender As Object, e As EventArgs) Handles btn_ok.Click
If PW.Text = "Password" Or Mail.Text = "E-Mail" Then
MsgBox("Invalid Input", MsgBoxStyle.Information)
Exit Sub
ElseIf Save.Checked = True Then
My.Settings.Mail = Mail.Text
My.Settings.PW = PW.Text
End If
Main.PW = PW.Text
Main.Mail = Mail.Text
Me.Close()
End Sub
Private Sub UserTest_Click(sender As Object, e As EventArgs) Handles UserTest.Click
Dim Loc_CR_Cookies As String = "" ' do we need that? does not seem like it.
Dim Auth As String = " -H " + Chr(34) + "Authorization: " + Main.CrBetaBasic + Chr(34)
Dim Post As String = " -d " + Chr(34) + "username=" + UrlEncode(Mail.Text) + "&password=" + UrlEncode(PW.Text) + "&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 v1Token As String = CurlPost("https://beta-api.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494")
'MsgBox(v1Token)
If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then
MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401")
Exit Sub
End If
If CBool(InStr(v1Token, "HTTP Status: 400")) = True Then
MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 400")
Exit Sub
End If
Dim Token() As String = v1Token.Split(New String() {Chr(34) + "access_token" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Token2() As String = Token(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim CRBetaBearer As String = "Bearer "
CRBetaBearer = CRBetaBearer + Token2(0)
Dim Auth2 As String = " -H " + Chr(34) + "Authorization: " + CRBetaBearer + Chr(34)
Dim AccoutID() As String = v1Token.Split(New String() {Chr(34) + "account_id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim AccoutID2() As String = AccoutID(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SubsV3 As String = "https://www.crunchyroll.com/subs/v3/subscriptions/" + AccoutID2(0)
Try
Dim Test As String = CurlAuthNew(SubsV3, Loc_CR_Cookies, Auth2)
Error_msg.ShowErrorDia(Test, "Login Ok - Premium Ok", "None")
Catch ex As Exception
Error_msg.ShowErrorDia(ex.ToString, "Login Ok - Premium check failed", "None")
End Try
End Sub
End Class End Class

14
Crunchyroll Downloader/Main.designer.vb generated
View File

@ -53,6 +53,7 @@ Partial Class Main
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.BGW_Update = New System.ComponentModel.BackgroundWorker() Me.BGW_Update = New System.ComponentModel.BackgroundWorker()
Me.btn_User = New System.Windows.Forms.Button()
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()
@ -233,12 +234,24 @@ Partial Class Main
'BGW_Update 'BGW_Update
' '
' '
'btn_User
'
Me.btn_User.BackColor = System.Drawing.Color.Transparent
resources.ApplyResources(Me.btn_User, "btn_User")
Me.btn_User.Cursor = System.Windows.Forms.Cursors.Hand
Me.btn_User.FlatAppearance.BorderSize = 0
Me.btn_User.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent
Me.btn_User.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_login
Me.btn_User.Name = "btn_User"
Me.btn_User.UseVisualStyleBackColor = False
'
'Main 'Main
' '
Me.ApplyImageInvert = True Me.ApplyImageInvert = True
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle
resources.ApplyResources(Me, "$this") resources.ApplyResources(Me, "$this")
Me.Controls.Add(Me.btn_User)
Me.Controls.Add(Me.Btn_Queue) Me.Controls.Add(Me.Btn_Queue)
Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.Btn_Close)
@ -291,4 +304,5 @@ Partial Class Main
Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem
Friend WithEvents BGW_Update As System.ComponentModel.BackgroundWorker Friend WithEvents BGW_Update As System.ComponentModel.BackgroundWorker
Friend WithEvents btn_User As Button
End Class End Class

48
Crunchyroll Downloader/Main.resx
View File

@ -148,7 +148,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;PictureBox5.ZOrder" xml:space="preserve"> <data name="&gt;&gt;PictureBox5.ZOrder" xml:space="preserve">
<value>9</value> <value>10</value>
</data> </data>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>383, 18</value> <value>383, 18</value>
@ -187,7 +187,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;TheTextBox.ZOrder" xml:space="preserve"> <data name="&gt;&gt;TheTextBox.ZOrder" xml:space="preserve">
<value>7</value> <value>8</value>
</data> </data>
<data name="ConsoleBar.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="ConsoleBar.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Stretch</value> <value>Stretch</value>
@ -214,7 +214,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;ConsoleBar.ZOrder" xml:space="preserve"> <data name="&gt;&gt;ConsoleBar.ZOrder" xml:space="preserve">
<value>8</value> <value>9</value>
</data> </data>
<metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MetroStyleExtender1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
@ -231,6 +231,36 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>900, 630</value> <value>900, 630</value>
</data> </data>
<data name="btn_User.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value>
</data>
<data name="btn_User.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="btn_User.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btn_User.Location" type="System.Drawing.Point, System.Drawing">
<value>575, 18</value>
</data>
<data name="btn_User.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 35</value>
</data>
<data name="btn_User.TabIndex" type="System.Int32, mscorlib">
<value>71</value>
</data>
<data name="&gt;&gt;btn_User.Name" xml:space="preserve">
<value>btn_User</value>
</data>
<data name="&gt;&gt;btn_User.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btn_User.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btn_User.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="Btn_Queue.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_Queue.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
</data> </data>
@ -259,7 +289,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_Queue.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Queue.ZOrder" xml:space="preserve">
<value>1</value> <value>2</value>
</data> </data>
<data name="Panel1.AutoScroll" type="System.Boolean, mscorlib"> <data name="Panel1.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
@ -286,7 +316,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
<value>2</value> <value>3</value>
</data> </data>
<data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_Close.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value> <value>None</value>
@ -316,7 +346,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_Close.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Close.ZOrder" xml:space="preserve">
<value>3</value> <value>4</value>
</data> </data>
<data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>None</value> <value>None</value>
@ -346,7 +376,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve">
<value>4</value> <value>5</value>
</data> </data>
<data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_Settings.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
@ -376,7 +406,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_Settings.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_Settings.ZOrder" xml:space="preserve">
<value>5</value> <value>6</value>
</data> </data>
<data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms"> <data name="Btn_add.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Zoom</value> <value>Zoom</value>
@ -406,7 +436,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Btn_add.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Btn_add.ZOrder" xml:space="preserve">
<value>6</value> <value>7</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt</value> <value>Microsoft Sans Serif, 8.25pt</value>

53
Crunchyroll Downloader/Main.vb
View File

@ -235,12 +235,23 @@ Public Class Main
End If End If
End Sub End Sub
Private Sub Btn_User_MouseLeave(sender As Object, e As EventArgs) Handles btn_User.MouseLeave, btn_User.LostFocus
btn_User.Image = My.Resources.main_login
End Sub
Private Sub Btn_User_MouseEnter(sender As Object, e As EventArgs) Handles btn_User.MouseEnter, btn_User.GotFocus
If Manager.Theme = MetroThemeStyle.Dark Then
btn_User.Image = My.Resources.main_login_invert
Else
btn_User.Image = My.Resources.main_login_invert_dark
End If
End Sub
Private Sub Btn_Queue_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Queue.MouseLeave, Btn_Queue.LostFocus Private Sub Btn_Queue_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Queue.MouseLeave, Btn_Queue.LostFocus
Btn_Queue.Image = My.Resources.main_queue Btn_Queue.Image = My.Resources.main_queue
End Sub End Sub
Private Sub Btn_min_MouseEnter(sender As Object, e As EventArgs) Handles Btn_min.MouseEnter, Btn_min.GotFocus Private Sub Btn_min_MouseEnter(sender As Object, e As EventArgs) Handles Btn_min.MouseEnter, Btn_min.GotFocus
If Manager.Theme = MetroThemeStyle.Dark Then If Manager.Theme = MetroThemeStyle.Dark Then
Btn_min.Image = My.Resources.main_mini_dark_hover Btn_min.Image = My.Resources.main_mini_dark_hover
@ -301,8 +312,8 @@ Public Class Main
TheTextBox.Width = Me.Width - 2 TheTextBox.Width = Me.Width - 2
Btn_Close.Location = New Point(Me.Width - 36, 1) Btn_Close.Location = New Point(Me.Width - 36, 1)
Btn_min.Location = New Point(Me.Width - 67, 1) Btn_min.Location = New Point(Me.Width - 67, 1)
Btn_Settings.Location = New Point(Me.Width - 200, 17) Btn_Settings.Location = New Point(Me.Width - 180, 17)
'Btn_Queue.Location = New Point(Me.Width - 265, 17) btn_User.Location = New Point(Me.Width - 290, 17)
Try Try
Panel1.AutoScrollPosition = New Point(0, 0) Panel1.AutoScrollPosition = New Point(0, 0)
@ -1686,14 +1697,16 @@ Public Class Main
#Region "Cancel Token" #Region "Cancel Token"
'page_guid NewAPIData 'page_guid NewAPIData
Try
Dim ToCancel_0 As String() = NewAPIData.Split(New String() {Chr(34) + "token" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) ' Dim ToCancel_0 As String() = NewAPIData.Split(New String() {Chr(34) + "token" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '
Dim ToCancel_1 As String() = ToCancel_0(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) ' Dim ToCancel_1 As String() = ToCancel_0(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '
Dim ToCancel As String = ToCancel_1(0) Dim ToCancel As String = ToCancel_1(0)
CurlDeleteNew("https://cr-play-service.prd.crunchyrollsvc.com/v1/token/" + page_guid + "/" + ToCancel, Loc_AuthToken)
Debug.WriteLine("Delete Token: " + ToCancel + " for " + page_guid + " - " + CR_FilenName)
CurlDeleteNew("https://cr-play-service.prd.crunchyrollsvc.com/v1/token/" + page_guid.Replace("music/", "") + "/" + ToCancel, Loc_AuthToken)
Debug.WriteLine("Delete Token: " + ToCancel + " for " + page_guid.Replace("music/", "") + " - " + CR_FilenName)
Catch ex As Exception
Debug.WriteLine("Error deleting token" + ex.ToString)
End Try
#End Region #End Region
@ -1982,7 +1995,7 @@ Public Class Main
'MsgBox(ex.ToString) 'MsgBox(ex.ToString)
Else Else
Error_msg.ShowErrorDia(ex.ToString, "Unknown Error - See details", False) Error_msg.ShowErrorDia(ex.ToString, "Unknown Error - See details", "None")
'MsgBox(ex.ToString, MsgBoxStyle.Information) 'MsgBox(ex.ToString, MsgBoxStyle.Information)
End If End If
End Try ' End Try '
@ -2819,6 +2832,9 @@ Public Class Main
End Sub End Sub
Private Sub btn_User_Click(sender As Object, e As EventArgs) Handles btn_User.Click
LoginForm.ShowDialog()
End Sub
#End Region #End Region
@ -2922,14 +2938,20 @@ Public Class Main
If CBool(InStr(v1Token, "curl: (60)")) = True Then If CBool(InStr(v1Token, "curl: (60)")) = True Then
SetStatusLabel("Status: Critical error. #3043")
MsgBox("Please try the '--insecure' option found on the 'Main' page of the settings.") SetStatusLabel("Status: curl reported error (60).")
Error_msg.ShowErrorDia(v1Token, "Status: 'Curl reports error 60' this usually means your antivirus is interfering with curl.", "Help")
'Error_msg.ShowErrorDia(v1Token, "Status: curl reportet errorcode(60) ", "None")
'MsgBox("Please try the '--insecure' option found on the 'Main' page of the settings.")
Exit Sub Exit Sub
'ElseIf CBool(InStr(v1Token, "curl:")) Then 'ElseIf CBool(InStr(v1Token, "curl:")) Then
ElseIf CBool(InStr(v1Token, "curl:")) = True Then ElseIf CBool(InStr(v1Token, "curl:")) = True Then
' Browser.WebView2.CoreWebView2.Navigate(Url) ' Browser.WebView2.CoreWebView2.Navigate(Url)
SetStatusLabel("Status: Unknown error. #3050") Error_msg.ShowErrorDia(v1Token, "Status: Curl reported an error, see 'Details' for more Information.", "None")
SetStatusLabel("Status: Unknown error. #2939")
Exit Sub Exit Sub
End If End If
@ -3001,7 +3023,7 @@ Public Class Main
ObjectJson = CurlAuthNew(ObjectsUrl, Loc_CR_Cookies, Auth2) ObjectJson = CurlAuthNew(ObjectsUrl, Loc_CR_Cookies, Auth2)
Catch ex As Exception Catch ex As Exception
Error_msg.ShowErrorDia(ex.ToString, "Status: Error getting ObjectJson", True) Error_msg.ShowErrorDia(ex.ToString, "Status: Error getting ObjectJson", "None")
'MsgBox(ex.ToString) 'MsgBox(ex.ToString)
Exit Sub Exit Sub
@ -3010,7 +3032,7 @@ Public Class Main
If CBool(InStr(ObjectJson, "videos/")) = False Then If CBool(InStr(ObjectJson, "videos/")) = False Then
'MsgBox(ObjectJson) 'MsgBox(ObjectJson)
Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", True) Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", "Ignore")
SetStatusLabel("Status: Failed - no video, check CR login") SetStatusLabel("Status: Failed - no video, check CR login")
Me.Text = "Status: Failed - no video, check CR login" Me.Text = "Status: Failed - no video, check CR login"
@ -3036,7 +3058,7 @@ Public Class Main
' Debug.WriteLine(StreamsUrl) ' Debug.WriteLine(StreamsUrl)
Catch ex As Exception Catch ex As Exception
Error_msg.ShowErrorDia(ex.ToString, "Status: Processing Error", True) Error_msg.ShowErrorDia(ex.ToString, "Status: Processing Error", "None")
Exit Sub Exit Sub
End Try End Try
@ -3274,7 +3296,7 @@ Public Class Main
End Sub End Sub
Private Sub ErrorDiaTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ErrorDiaTestToolStripMenuItem.Click Private Sub ErrorDiaTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ErrorDiaTestToolStripMenuItem.Click
Error_msg.ShowErrorDia("Error-Error", "CR returnd : HTTP Status - " + "400") Error_msg.ShowErrorDia("Error-Error", "Status: 'Curl reports error 60' this usually means your antivirus is interfering with curl.", "Help")
End Sub End Sub
Private Sub BGW_Update_DoWork(sender As Object, e As DoWorkEventArgs) Handles BGW_Update.DoWork Private Sub BGW_Update_DoWork(sender As Object, e As DoWorkEventArgs) Handles BGW_Update.DoWork
@ -3441,6 +3463,7 @@ Public Class Main
End Sub End Sub
#End Region #End Region
End Class End Class

4
Crunchyroll Downloader/My Project/AssemblyInfo.vb
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.23.8")> <Assembly: AssemblyVersion("3.24.0")>
<Assembly: AssemblyFileVersion("3.23.8")> <Assembly: AssemblyFileVersion("3.24.0")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>

60
Crunchyroll Downloader/My Project/Resources.Designer.vb generated
View File

@ -473,36 +473,6 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_browser() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_browser", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_browser_invert() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_browser_invert", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_browser_invert_dark() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_browser_invert_dark", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>
@ -583,6 +553,36 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_login() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_login", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_login_invert() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_login_invert", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_login_invert_dark() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_login_invert_dark", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>

18
Crunchyroll Downloader/My Project/Resources.resx
View File

@ -298,9 +298,6 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
&lt;/body&gt; &lt;/body&gt;
&lt;/html&gt;</value> &lt;/html&gt;</value>
</data> </data>
<data name="main_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_button_download_hovert" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_button_download_hovert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main_button_download_hovert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main_button_download_hovert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -405,18 +402,12 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="main_add_invert" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_add_invert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-add_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main-add_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="main_browser_invert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-browser_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_setting_invert" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_setting_invert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-setting_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main-setting_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="main_add_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_add_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-add_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main-add_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="main_browser_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-browser_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_setting_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_setting_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-setting_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main-setting_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -493,4 +484,13 @@ title=Ending</value>
<data name="error_dis" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="error_dis" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\error_dis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\error_dis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="main_login" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main_login.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_login_invert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main_login_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_login_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main_login_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
Crunchyroll Downloader/Resources/main_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Crunchyroll Downloader/Resources/main_login_invert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
Crunchyroll Downloader/Resources/main_login_invert_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

6
Crunchyroll Downloader/queue.vb
View File

@ -88,10 +88,11 @@ Public Class Queue
Main.RunningDownloads = Main.Panel1.Controls.Count Main.RunningDownloads = Main.Panel1.Controls.Count
End Try End Try
Try
If Main.RunningDownloads < Main.MaxDL Then If Main.RunningDownloads < Main.MaxDL Then
If Main.ListBoxList.Count > 0 Then If Main.ListBoxList.Count > 0 Then
Dim UriUsed As String = ListBox1.GetItemText(Main.ListBoxList(0)) Dim UriUsed As String = ListBox1.GetItemText(Main.ListBoxList(0))
If Main.Grapp_RDY = True Then If Main.Grapp_RDY = True Then
@ -105,6 +106,9 @@ Public Class Queue
End If End If
Catch ex As Exception
Debug.WriteLine(ex.ToString)
End Try
End Sub End Sub