diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo
index e19e6b8..691e8cf 100644
Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ
diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
index 8d89303..5ea0ad5 100644
--- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
+++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
@@ -152,6 +152,12 @@
+
+ Error_msg.vb
+
+
+ Form
+
LoginForm.vb
@@ -241,6 +247,10 @@
+
+ Error_msg.vb
+ Designer
+
LoginForm.vb
@@ -392,6 +402,7 @@
+
diff --git a/Crunchyroll Downloader/Error_msg.Designer.vb b/Crunchyroll Downloader/Error_msg.Designer.vb
new file mode 100644
index 0000000..2a5271b
--- /dev/null
+++ b/Crunchyroll Downloader/Error_msg.Designer.vb
@@ -0,0 +1,183 @@
+
+Partial Class Error_msg
+ Inherits MetroFramework.Forms.MetroForm
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As System.ComponentModel.IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.btn_cl = New System.Windows.Forms.Button()
+ Me.btn_ign = 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.Btn_Close = New System.Windows.Forms.Button()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.ErrorBox = New System.Windows.Forms.RichTextBox()
+ Me.GroupBox3.SuspendLayout()
+ Me.GroupBox1.SuspendLayout()
+ Me.SuspendLayout()
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox3.Controls.Add(Me.btn_cl)
+ Me.GroupBox3.Controls.Add(Me.btn_ign)
+ Me.GroupBox3.Controls.Add(Me.btn_ok)
+ Me.GroupBox3.Controls.Add(Me.ErrorLabel)
+ Me.GroupBox3.Location = New System.Drawing.Point(13, 60)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Size = New System.Drawing.Size(613, 203)
+ Me.GroupBox3.TabIndex = 38
+ Me.GroupBox3.TabStop = False
+ '
+ 'btn_cl
+ '
+ Me.btn_cl.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
+ Me.btn_cl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+ Me.btn_cl.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.btn_cl.FlatAppearance.BorderSize = 0
+ 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.ForeColor = System.Drawing.SystemColors.Control
+ Me.btn_cl.Location = New System.Drawing.Point(28, 121)
+ Me.btn_cl.Name = "btn_cl"
+ Me.btn_cl.Size = New System.Drawing.Size(150, 40)
+ Me.btn_cl.TabIndex = 77
+ Me.btn_cl.Text = "Details"
+ Me.btn_cl.UseVisualStyleBackColor = True
+ '
+ 'btn_ign
+ '
+ Me.btn_ign.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.ffmpeg_OK_cL
+ Me.btn_ign.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+ Me.btn_ign.FlatAppearance.BorderSize = 0
+ Me.btn_ign.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_ign.ForeColor = System.Drawing.SystemColors.Control
+ Me.btn_ign.Location = New System.Drawing.Point(235, 121)
+ Me.btn_ign.Name = "btn_ign"
+ Me.btn_ign.Size = New System.Drawing.Size(150, 40)
+ Me.btn_ign.TabIndex = 78
+ Me.btn_ign.Text = "Ignore"
+ Me.btn_ign.UseVisualStyleBackColor = True
+ '
+ '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(424, 121)
+ Me.btn_ok.Name = "btn_ok"
+ Me.btn_ok.Size = New System.Drawing.Size(150, 40)
+ Me.btn_ok.TabIndex = 78
+ Me.btn_ok.Text = "Ok"
+ 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
+ '
+ Me.Delay.Interval = 2000
+ '
+ 'Btn_Close
+ '
+ Me.Btn_Close.BackColor = System.Drawing.Color.Transparent
+ Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+ Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.Btn_Close.FlatAppearance.BorderSize = 0
+ Me.Btn_Close.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent
+ Me.Btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Btn_Close.ForeColor = System.Drawing.Color.Transparent
+ Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close
+ Me.Btn_Close.ImeMode = System.Windows.Forms.ImeMode.NoControl
+ Me.Btn_Close.Location = New System.Drawing.Point(581, 8)
+ Me.Btn_Close.Name = "Btn_Close"
+ Me.Btn_Close.Size = New System.Drawing.Size(35, 35)
+ Me.Btn_Close.TabIndex = 39
+ Me.Btn_Close.UseVisualStyleBackColor = False
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox1.Controls.Add(Me.ErrorBox)
+ Me.GroupBox1.Location = New System.Drawing.Point(13, 286)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(613, 203)
+ Me.GroupBox1.TabIndex = 79
+ Me.GroupBox1.TabStop = False
+ '
+ 'ErrorBox
+ '
+ Me.ErrorBox.BackColor = System.Drawing.SystemColors.ButtonHighlight
+ Me.ErrorBox.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.ErrorBox.Location = New System.Drawing.Point(10, 19)
+ Me.ErrorBox.Name = "ErrorBox"
+ Me.ErrorBox.ReadOnly = True
+ Me.ErrorBox.Size = New System.Drawing.Size(593, 170)
+ Me.ErrorBox.TabIndex = 0
+ Me.ErrorBox.Text = ""
+ '
+ 'Error_msg
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(640, 275)
+ Me.Controls.Add(Me.GroupBox1)
+ Me.Controls.Add(Me.Btn_Close)
+ Me.Controls.Add(Me.GroupBox3)
+ Me.MaximizeBox = False
+ Me.MinimizeBox = False
+ Me.Name = "Error_msg"
+ Me.Text = "CRD-Error"
+ Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center
+ Me.GroupBox3.ResumeLayout(False)
+ Me.GroupBox1.ResumeLayout(False)
+ Me.ResumeLayout(False)
+
+ End Sub
+ Private WithEvents GroupBox3 As GroupBox
+ Public WithEvents ErrorLabel As MetroFramework.Controls.MetroLabel
+ Friend WithEvents Delay As Timer
+ Friend WithEvents Btn_Close As Button
+ Friend WithEvents btn_cl As Button
+ Friend WithEvents btn_ok As Button
+ Private WithEvents GroupBox1 As GroupBox
+ Friend WithEvents ErrorBox As RichTextBox
+ Friend WithEvents btn_ign As Button
+End Class
diff --git a/Crunchyroll Downloader/Error_msg.resx b/Crunchyroll Downloader/Error_msg.resx
new file mode 100644
index 0000000..2c036a2
--- /dev/null
+++ b/Crunchyroll Downloader/Error_msg.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Error_msg.vb b/Crunchyroll Downloader/Error_msg.vb
new file mode 100644
index 0000000..c32d35d
--- /dev/null
+++ b/Crunchyroll Downloader/Error_msg.vb
@@ -0,0 +1,98 @@
+Option Strict On
+Imports Crunchyroll_Downloader.CRD_Classes
+Imports MetroFramework
+Imports MetroFramework.Components
+
+Public Class Error_msg
+
+ Dim Manager As MetroStyleManager = Main.Manager
+
+ Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Close.MouseEnter, Btn_Close.GotFocus
+ If Manager.Theme = MetroThemeStyle.Dark Then
+ Btn_Close.Image = My.Resources.main_close_dark_hover
+ Else
+ Btn_Close.Image = My.Resources.main_close_hover
+ End If
+ End Sub
+
+ Private Sub Btn_Close_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Close.MouseLeave, Btn_Close.LostFocus
+ Btn_Close.Image = Main.CloseImg
+ End Sub
+
+ Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click
+ Me.Close()
+ End Sub
+
+ Private Sub Error_msg_Resize(sender As Object, e As EventArgs) Handles Me.Resize
+ Btn_Close.Location = New Point(Me.Width - 36, 1)
+
+ End Sub
+
+ Private Sub btn_cl_Click(sender As Object, e As EventArgs) Handles btn_cl.Click
+ If Me.Height = 500 Then
+ Me.Height = 275
+ Else
+ Me.Height = 500
+ End If
+ End Sub
+ Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ Me.TopMost = True
+ Manager.Owner = Me
+ Me.StyleManager = Manager
+
+ Btn_Close.Image = Main.CloseImg
+
+ Try
+ Me.Icon = My.Resources.icon
+ Catch ex As Exception
+
+ 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))
+
+ End Sub
+
+ Public Sub ShowErrorDia(ByVal Details As String, ShortError As String, Optional ByVal IgnoreOption As Boolean = False)
+ Me.Show()
+ ErrorBox.Text = Details
+ ErrorLabel.Text = ShortError
+ If IgnoreOption = False Then
+ btn_ign.BackgroundImage = My.Resources.error_dis
+ btn_ign.Cursor = Cursors.No
+ btn_ign.Enabled = False
+ End If
+ End Sub
+
+ Private Sub btn_ok_Click(sender As Object, e As EventArgs) Handles btn_ok.Click
+ Me.Close()
+ End Sub
+
+
+ Private Sub Btn_ok_MouseEnter(sender As Object, e As EventArgs) Handles btn_ok.MouseEnter
+ btn_ok.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
+ End Sub
+
+ Private Sub Btn_ok_MouseLeave(sender As Object, e As EventArgs) Handles btn_ok.MouseLeave
+ btn_ok.BackgroundImage = My.Resources.ffmpeg_OK_cL
+ End Sub
+
+ Private Sub Btn_cl_MouseEnter(sender As Object, e As EventArgs) Handles btn_cl.MouseEnter
+ btn_cl.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
+ End Sub
+
+ Private Sub Btn_cl_MouseLeave(sender As Object, e As EventArgs) Handles btn_cl.MouseLeave
+ btn_cl.BackgroundImage = My.Resources.ffmpeg_OK_cL
+ End Sub
+ Private Sub Btn_ign_MouseEnter(sender As Object, e As EventArgs) Handles btn_ign.MouseEnter
+ btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
+ End Sub
+
+ Private Sub Btn_ign_MouseLeave(sender As Object, e As EventArgs) Handles btn_ign.MouseLeave
+ btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL
+ End Sub
+
+ Private Sub btn_ign_Click(sender As Object, e As EventArgs) Handles btn_ign.Click
+ Main.IgnoreErrorDia = True
+ Me.Close()
+ End Sub
+End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb
index 7eb97fd..6b3a830 100644
--- a/Crunchyroll Downloader/Main.designer.vb
+++ b/Crunchyroll Downloader/Main.designer.vb
@@ -52,6 +52,7 @@ Partial Class Main
Me.LoginFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Btn_Queue = New System.Windows.Forms.Button()
+ Me.ErrorDiaTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -160,7 +161,7 @@ Partial Class Main
'
'ContextMenuStrip1
'
- Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem, Me.LoginFormToolStripMenuItem})
+ Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem, Me.AudioOnlyQualityToolStripMenuItem, Me.LoginFormToolStripMenuItem, Me.ErrorDiaTestToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
'
@@ -235,6 +236,11 @@ Partial Class Main
Me.Btn_Queue.Name = "Btn_Queue"
Me.Btn_Queue.UseVisualStyleBackColor = False
'
+ 'ErrorDiaTestToolStripMenuItem
+ '
+ Me.ErrorDiaTestToolStripMenuItem.Name = "ErrorDiaTestToolStripMenuItem"
+ resources.ApplyResources(Me.ErrorDiaTestToolStripMenuItem, "ErrorDiaTestToolStripMenuItem")
+ '
'Main
'
Me.ApplyImageInvert = True
@@ -293,4 +299,5 @@ Partial Class Main
Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem
Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem
Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx
index a3e54c3..da0f931 100644
--- a/Crunchyroll Downloader/Main.resx
+++ b/Crunchyroll Downloader/Main.resx
@@ -549,6 +549,12 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ErrorDiaTestToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
Main
@@ -627,8 +633,14 @@
Login Form
+
+ 233, 22
+
+
+ ErrorDiaTest
+
- 234, 268
+ 234, 290
ContextMenuStrip1
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index 5125cf7..4c2604a 100644
--- a/Crunchyroll Downloader/Main.vb
+++ b/Crunchyroll Downloader/Main.vb
@@ -69,6 +69,7 @@ Public Class Main
Public MergeSubsFormat As String = "mov_text"
Public DlSoftSubsRDY As Boolean = True
Public DialogTaskString As String
+ Public IgnoreErrorDia As Boolean = False
'Dim NewAPIString1 As String
'Dim NewAPIString2 As String
@@ -1703,16 +1704,16 @@ Public Class Main
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 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)
+ Dim ToCancel_1 As String() = ToCancel_0(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '
+ 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)
#End Region
#Region "GetSoftsubs"
- Dim SoftSubsAvailable As New List(Of String)
+ Dim SoftSubsAvailable As New List(Of String)
'Dim CCAvailable As New List(Of String)
Dim SoftSubsList As New List(Of CR_Subtiles)
@@ -1989,38 +1990,12 @@ Public Class Main
MsgBox(ex.ToString, MsgBoxStyle.Information)
ElseIf CBool(InStr(ex.ToString, "Error - Getting")) Then
- MsgBox(ex.ToString)
- 'If RT_count = 0 Then
- ' If File.Exists("cookies.txt") = True Then
- ' MsgBox("Request refused, try a new cookies.txt", MsgBoxStyle.Exclamation)
- ' Exit Sub
- ' End If
- ' Me.Invoke(New Action(Function() As Object
- ' Anime_Add.StatusLabel.Text = "Browser reset..."
- ' Me.Text = "Browser reset..."
- ' ResoBackString = Nothing
- ' Me.Invalidate()
- ' Return Nothing
- ' End Function))
-
- ' If Application.OpenForms().OfType(Of Browser).Any = True Then
- ' Browser.Close()
- ' Startseite = WebsiteURL
- ' Pause(5)
- ' UserBowser = False
- ' Browser.Show()
- ' 'Anime_Add.btn_dl.Cursor = Cursors.Default
- ' 'Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default
- ' End If
-
- ' 'Navigate(WebsiteURL)
- ' 'Pause(5)
- ' 'LoadBrowser(WebsiteURL, 1)
- ' Exit Sub
- 'End If
- ' MsgBox(ex.ToString)
- ' b = False
- ' Navigate(WebsiteURL)
+ Dim OutputBody() As String = ex.ToString.Split(New String() {"HTTP Status:"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim Output As String = OutputBody(0)
+ Dim Status As String = OutputBody(1)
+ Error_msg.ShowErrorDia(Output, "CR returnd : HTTP Status - " + Status)
+ 'MsgBox(ex.ToString)
+
Else
MsgBox(ex.ToString, MsgBoxStyle.Information)
End If
@@ -3150,11 +3125,18 @@ Public Class Main
Exit Sub
ElseIf CBool(InStr(ObjectJson, "videos/")) = False Then
'MsgBox(ObjectJson)
+
+ Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", True)
+
SetStatusLabel("Status: Failed - no video, check CR login")
Me.Text = "Status: Failed - no video, check CR login"
- Debug.WriteLine("Status: Failed - no video, check CR login")
+ 'Debug.WriteLine("Status: Failed - no video, check CR login")
+ If IgnoreErrorDia = True Then
+ IgnoreErrorDia = False
+ Else
+ Exit Sub
+ End If
- Exit Sub
End If
Try
@@ -3407,6 +3389,10 @@ Public Class Main
LoginForm.ShowDialog()
End Sub
+ Private Sub ErrorDiaTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ErrorDiaTestToolStripMenuItem.Click
+ Error_msg.ShowErrorDia("Error-Error", "CR returnd : HTTP Status - " + "400")
+ End Sub
+
#End Region
diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb
index b55f751..37d14bb 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/My Project/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb
index 953bdec..81b4101 100644
--- a/Crunchyroll Downloader/My Project/Resources.Designer.vb
+++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb
@@ -210,6 +210,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property error_dis() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("error_dis", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Zeichenfolge, die ;FFMETADATA1
'''
diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx
index 8945c3b..637f1fb 100644
--- a/Crunchyroll Downloader/My Project/Resources.resx
+++ b/Crunchyroll Downloader/My Project/Resources.resx
@@ -490,4 +490,7 @@ title=Ending
..\Resources\ffmpeg_OK_cL_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\error_dis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Resources/error_dis.png b/Crunchyroll Downloader/Resources/error_dis.png
new file mode 100644
index 0000000..c8d4c48
Binary files /dev/null and b/Crunchyroll Downloader/Resources/error_dis.png differ