diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index c96cc84..cb6d591 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/ErrorBrowser.Designer.vb b/Crunchyroll Downloader/ErrorBrowser.Designer.vb deleted file mode 100644 index 91bac8b..0000000 --- a/Crunchyroll Downloader/ErrorBrowser.Designer.vb +++ /dev/null @@ -1,51 +0,0 @@ - _ -Partial Class ErrorBrowser - Inherits System.Windows.Forms.Form - - '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.ChromiumWebBrowser1 = New CefSharp.WinForms.ChromiumWebBrowser() - Me.SuspendLayout() - ' - 'ChromiumWebBrowser1 - ' - Me.ChromiumWebBrowser1.ActivateBrowserOnCreation = False - 'TODO: Ausnahme "Ungültiger primitiver Typ: System.IntPtr. Verwenden Sie CodeObjectCreateExpression." beim Generieren des Codes für "". - Me.ChromiumWebBrowser1.Dock = System.Windows.Forms.DockStyle.Fill - Me.ChromiumWebBrowser1.Location = New System.Drawing.Point(0, 0) - Me.ChromiumWebBrowser1.Name = "ChromiumWebBrowser1" - Me.ChromiumWebBrowser1.Size = New System.Drawing.Size(911, 569) - Me.ChromiumWebBrowser1.TabIndex = 0 - ' - 'ErrorBrowser - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(911, 569) - Me.Controls.Add(Me.ChromiumWebBrowser1) - Me.Name = "ErrorBrowser" - Me.Text = "ErrorBrowser" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ChromiumWebBrowser1 As CefSharp.WinForms.ChromiumWebBrowser -End Class diff --git a/Crunchyroll Downloader/ErrorBrowser.resx b/Crunchyroll Downloader/ErrorBrowser.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Crunchyroll Downloader/ErrorBrowser.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - \ No newline at end of file diff --git a/Crunchyroll Downloader/ErrorBrowser.vb b/Crunchyroll Downloader/ErrorBrowser.vb deleted file mode 100644 index faf4703..0000000 --- a/Crunchyroll Downloader/ErrorBrowser.vb +++ /dev/null @@ -1,57 +0,0 @@ -Imports CefSharp - -Public Class ErrorBrowser - - - Private Sub ChromiumWebBrowser1_FrameLoadEnd(sender As Object, e As FrameLoadEndEventArgs) Handles ChromiumWebBrowser1.FrameLoadEnd - If e.Frame.IsMain Then - - - - - GetHTML() - - End If - End Sub - - Async Sub GetHTML() - Try - - Dim HTML As String = Await ChromiumWebBrowser1.GetSourceAsync - Debug.WriteLine("got error browser html") - Me.Invoke(New Action(Function() As Object - - ProcessFallbackHTML(HTML, ChromiumWebBrowser1.Address) - 'If Main.UserBowser = False Then - ' Me.Close() - 'End If - Return Nothing - End Function)) - - Catch ex As Exception - - End Try - End Sub - - Public Sub ProcessFallbackHTML(ByVal document As String, ByVal Address As String) - Dim localHTML As String = document - Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString) - Debug.WriteLine(Address) - - If CBool(InStr(Address, "https://www.funimation.com/api/showexperience/")) Then - - Main.ErrorBrowserBackString = localHTML.Replace("", "").Replace("", "").Replace("
", "").Replace("
", "").Replace("", "").Replace("
", "") '
-
-            Me.Close()
-
-        End If
-
-    End Sub
-
-    Private Sub ErrorBrowser_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Me.Location = New Point(-10000, -10000)
-        If Main.ErrorBrowserString = "Funimation_showexperience" Then
-            ChromiumWebBrowser1.Load(Main.ErrorBrowserUrl)
-        End If
-    End Sub
-End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/ErrorDialog.vb b/Crunchyroll Downloader/ErrorDialog.vb
index f437e86..0436614 100644
--- a/Crunchyroll Downloader/ErrorDialog.vb	
+++ b/Crunchyroll Downloader/ErrorDialog.vb	
@@ -37,10 +37,15 @@ Public Class ErrorDialog
             Dim lang_avalibe As String() = Main.ResoNotFoundString.Split(New String() {"hardsub_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
 
             For i As Integer = 1 To lang_avalibe.Count - 1
+                If CBool(InStr(lang_avalibe(i), "https://")) Then
+                Else
+                    Continue For
+                End If
                 If lang_avalibe(i).Substring(0, 1) = Chr(34) Then
                     ComboBox1.Items.Add("No Hardsubs")
                     Continue For 'Chr(34) +
                 End If
+                'MsgBox(lang_avalibe(i))
                 Dim langsplit As String() = lang_avalibe(i).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries)
                 ComboBox1.Items.Add(Main.HardSubValuesToDisplay(langsplit(0)))
             Next
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index 2cd0cb2..e98dc0e 100644
--- a/Crunchyroll Downloader/Main.vb	
+++ b/Crunchyroll Downloader/Main.vb	
@@ -2069,11 +2069,17 @@ Public Class Main
             Debug.WriteLine(CR_VideoJsonHardSubs.Count.ToString)
             Dim hls_List As New List(Of String)
             For i As Integer = 0 To CR_VideoJsonHardSubs.Count - 1
-                If CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
+                If LangNew = "" And CR_VideoJsonHardSubs(i).Substring(0, 1) = Chr(34) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then
                     CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0)
+                    Debug.WriteLine("Nothing+works")
+                    Exit For
+                ElseIf LangNew IsNot "" And CBool(InStr(CR_VideoJsonHardSubs(i), LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) And CBool(InStr(CR_VideoJsonHardSubs(i), "https://")) Then
+                    CR_URI_Master = CR_VideoJsonHardSubs(i).Replace(LangNew + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34), "").Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)(0)
+                    Debug.WriteLine("Why are we here again?")
                     Exit For
                 End If
             Next
+
             If CR_URI_Master = Nothing Then
                 Me.Invoke(New Action(Function() As Object
                                          ResoNotFoundString = VideoJson
@@ -2095,6 +2101,7 @@ Public Class Main
                 End If
             End If
             CR_URI_Master = CR_URI_Master.Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
+
             If CBool(InStr(CR_URI_Master, "master.m3u8")) Then
                 Me.Invoke(New Action(Function() As Object
                                          Anime_Add.StatusLabel.Text = "Status: m3u8 found, looking for resolution"
@@ -5238,7 +5245,10 @@ Public Class Main
         If CrBetaBasic = Nothing Then
             MsgBox("No CR Beta Basic Token has been found...", MsgBoxStyle.Exclamation)
         Else
-            MsgBox("CR Beta Basic Token found!" + vbNewLine + CrBetaBasic, MsgBoxStyle.Information)
+            If CBool(MessageBox.Show("CR Beta Basic Token found!" + vbNewLine + CrBetaBasic, "Token", MessageBoxButtons.YesNo) = DialogResult.Yes) Then
+                CrBetaBasic = Nothing
+            End If
+
         End If
     End Sub