diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index aa082f2..37fb5f8 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/CefSharp_Browser.vb b/Crunchyroll Downloader/CefSharp_Browser.vb index 9611fd4..5a4ba49 100644 --- a/Crunchyroll Downloader/CefSharp_Browser.vb +++ b/Crunchyroll Downloader/CefSharp_Browser.vb @@ -255,6 +255,8 @@ Public Class CefSharp_Browser End If End If ' + 'Debug.WriteLine(e.RequestUrl) + If CBool(InStr(e.RequestUrl, "?deviceType=web")) Then 'Debug.WriteLine(e.RequestUrl) Dim parms As String() = e.RequestUrl.Split(New String() {"?deviceType="}, System.StringSplitOptions.RemoveEmptyEntries) @@ -298,6 +300,15 @@ Public Class CefSharp_Browser Exit Sub End If Debug.WriteLine(e.RequestUrl) + ElseIf CBool(InStr(e.RequestUrl, "https://beta.crunchyroll.com/")) And CBool(InStr(e.RequestUrl, "streams?")) Then + If (Me.InvokeRequired) Then + Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl)) + Exit Sub + Else + Main.LoadedUrls.Add(e.RequestUrl) + Exit Sub + End If + Debug.WriteLine(e.RequestUrl) ElseIf CBool(InStr(e.RequestUrl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(e.RequestUrl, "seasons?series_id=")) Then If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl)) @@ -307,6 +318,15 @@ Public Class CefSharp_Browser Exit Sub End If Debug.WriteLine(e.RequestUrl) + ElseIf CBool(InStr(e.RequestUrl, "https://beta.crunchyroll.com/")) And CBool(InStr(e.RequestUrl, "seasons?series_id=")) Then + If (Me.InvokeRequired) Then + Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl)) + Exit Sub + Else + Main.LoadedUrls.Add(e.RequestUrl) + Exit Sub + End If + Debug.WriteLine(e.RequestUrl) ElseIf CBool(InStr(e.RequestUrl, "https://api.vrv.co")) And CBool(InStr(e.RequestUrl, "streams?")) Then If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl)) @@ -366,13 +386,26 @@ Public Class CefSharp_Browser Main.b = True End If - ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then + ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then + + If Main.b = False Then + Main.GetBetaVideoProxy(requesturl, Main.WebbrowserURL) + Main.b = True + End If + + ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then If Main.b = False Then Main.GetBetaSeasons(requesturl) Main.b = True End If + ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then + + If Main.b = False Then + Main.GetBetaSeasons(requesturl) + Main.b = True + End If End If diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 370c5d3..785961b 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -4480,6 +4480,13 @@ Public Class Main LoadedUrls.Clear() Exit Sub End If + ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then + If b = False Then + GetBetaVideoProxy(requesturl, WebbrowserURL) + b = True + LoadedUrls.Clear() + Exit Sub + End If ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then If b = False Then GetBetaSeasons(requesturl) @@ -4487,6 +4494,13 @@ Public Class Main LoadedUrls.Clear() Exit Sub End If + ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then + If b = False Then + GetBetaSeasons(requesturl) + b = True + LoadedUrls.Clear() + Exit Sub + End If End If If CBool(InStr(requesturl, "https://api.vrv.co")) And CBool(InStr(requesturl, "streams?")) Then Debug.WriteLine("vrv-1 " + requesturl)