From ba3883c16ca56bdf4e504f99492e0a16d44aede4 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sat, 29 Oct 2022 23:46:50 +0200 Subject: [PATCH] cached urls clear changed cached urls clear changed --- .vs/Crunchyroll Downloader/v17/.suo | Bin 158208 -> 153088 bytes Crunchyroll Downloader/Anime_Add.vb | 1 + Crunchyroll Downloader/CefSharp_Browser.vb | 38 +++++++++--------- Crunchyroll Downloader/Main.vb | 1 + .../My Project/AssemblyInfo.vb | 4 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index a8069ec2edfada42df3d0e17df19cb448d256988..f673735865be9b6169d53226fce06e0aec4e3e56 100644 GIT binary patch delta 6875 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 bm$PE$6kl9l!cL-gLk{|FNc#>>dIbC%bALD; delta 7761 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 Vr3{SBm@gKyH70Q+ljex_zW^@xILQD2 diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 7cb44ad..9acd68a 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -26,6 +26,7 @@ Public Class Anime_Add Public Sub LoadBrowser(ByVal Url As String) 'Main.LoadedUrl = Url + Main.LoadedUrls.Clear() If CBool(InStr(Url, "crunchyroll.com")) = True And CBool(InStr(Url, "series")) = True Then diff --git a/Crunchyroll Downloader/CefSharp_Browser.vb b/Crunchyroll Downloader/CefSharp_Browser.vb index 4c9a031..8edfd66 100644 --- a/Crunchyroll Downloader/CefSharp_Browser.vb +++ b/Crunchyroll Downloader/CefSharp_Browser.vb @@ -34,12 +34,11 @@ Public Class CefSharp_Browser Me.Invoke(New Action(Function() As Object - Main.LoadedUrls.Clear() + ' Main.LoadedUrls.Clear() Debug.WriteLine("FrameLoadEnd" + Date.Now.ToString) Main.WebbrowserURL = WebBrowser1.Address TextBox1.Text = Main.WebbrowserURL - Try If Btn_Scan.Enabled = False And Btn_Scan.Text = "Start network scan" Then Btn_Scan.Enabled = True @@ -146,7 +145,6 @@ Public Class CefSharp_Browser Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - 'MsgBox(Main.CR_etp_rt) 'MsgBox(Main.CR_ajs_user_id) 'MsgBox(Main.CheckCRLogin.ToString) @@ -265,6 +263,7 @@ Public Class CefSharp_Browser Private Sub ObserveHttp(e As RequestResourceEventArgs) 'Handles RequestResource.GetUrl 'Debug.WriteLine(e.Request.Url) + 'Debug.WriteLine(e.Request.Url) 'If (Me.InvokeRequired) Then ' If Main.b = True And Main.FunimationJsonBrowser = Nothing Then @@ -330,6 +329,7 @@ Public Class CefSharp_Browser End If If CBool(InStr(e.Request.Url, "https://title-api.prd.funimationsvc.com")) Then + Debug.WriteLine("Funimtaion: " + e.Request.Url) If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -337,8 +337,8 @@ Public Class CefSharp_Browser Main.LoadedUrls.Add(e.Request.Url) Exit Sub End If - Debug.WriteLine(e.Request.Url) ElseIf CBool(InStr(e.Request.Url, "/data/v2/shows/")) Then + Debug.WriteLine("Funimtaion: " + e.Request.Url) If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -346,8 +346,8 @@ Public Class CefSharp_Browser Main.LoadedUrls.Add(e.Request.Url) Exit Sub End If - Debug.WriteLine(e.Request.Url) ElseIf CBool(InStr(e.Request.Url, "/data/v1/episodes/")) Then + Debug.WriteLine("Funimtaion: " + e.Request.Url) If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -355,8 +355,8 @@ Public Class CefSharp_Browser Main.LoadedUrls.Add(e.Request.Url) Exit Sub End If - Debug.WriteLine(e.Request.Url) ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "streams?")) Then + Debug.WriteLine("Crunchyroll-Single: " + e.Request.Url) If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -364,17 +364,17 @@ Public Class CefSharp_Browser Main.LoadedUrls.Add(e.Request.Url) Exit Sub End If - Debug.WriteLine(e.Request.Url) - ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "/objects/")) Then - If (Me.InvokeRequired) Then - Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) - Exit Sub - Else - Main.LoadedUrls.Add(e.Request.Url) - Exit Sub - End If - Debug.WriteLine(e.Request.Url) + 'ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "/objects/")) Then + ' If (Me.InvokeRequired) Then + ' Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) + ' Exit Sub + ' Else + ' Main.LoadedUrls.Add(e.Request.Url) + ' Exit Sub + ' End If + ' Debug.WriteLine(e.Request.Url) ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "seasons?series_id=")) Then + Debug.WriteLine("Crunchyroll-Season: " + e.Request.Url) If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -382,8 +382,6 @@ Public Class CefSharp_Browser Main.LoadedUrls.Add(e.Request.Url) Exit Sub End If - Debug.WriteLine(e.Request.Url) - End If @@ -412,6 +410,10 @@ Public Class CefSharp_Browser network_scan.Show() End Sub + Private Sub WebBrowser1_FrameLoadStart(sender As Object, e As FrameLoadStartEventArgs) Handles WebBrowser1.FrameLoadStart + Main.LoadedUrls.Clear() + End Sub + diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 833c886..3d35816 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -3658,6 +3658,7 @@ Public Class Main Me.Text = "Status: nothing found" ProcessUrls() Debug.WriteLine("3530: nothing found") + Grapp_RDY = True Exit Sub End If diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 66f23a1..d63f95f 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: ' - - + +