From 257fd2278cd39523becc424cf42272d228b9e576 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Mon, 16 May 2022 21:48:16 +0200 Subject: [PATCH] aded new beta subdomain aded new beta subdomain #481 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 127488 -> 129024 bytes Crunchyroll Downloader/CefSharp_Browser.vb | 35 ++++++++++++++++++++- Crunchyroll Downloader/Main.vb | 14 +++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index aa082f2ed7fa73b56d6ede5929e178ba4635f130..37fb5f8c001e15de5773c3768c4cfcea596dea63 100644 GIT binary patch delta 6777 zcmeHLdsLH07N7eifdC1FHzGn)Vw zI|pLl7b~A*FU><}PozV!x?$yWoNeRo*p4HFPLwN0L}FisRgEp?QQ~a7&Yb4<^44xMx0lnr*lm^~&#$%EJJoKa zqw(BGu9m&{Bh8I;weg*>7S5&}t`Q<(;>1bUAn5_#>2-~u zD!1M?#m3=Ey7xg0z2-ih_6V^uZiAFIc@)YyFt~;kW`!xZDM*W@Z5R`1UtAPb2aKVa zBT}g`poeA#8^!gX#3g*_b>9=TXJjJ%$uD2QJ;L|lh3`e{M;c)ky%t=k;4B^i`;e>_ ziD=rSK4D!q#Mq|J8io`t(Ws~@TtzE1Qgn`#Muh7WJR;nz5!llC;paU$VXrfhSwf37 z-Y}c$Wg5}``L+pkqf8BZ=^tYYsGzEYcW6Ucp+b#=d_}veaD-k{&6IPJ7j76FrVXBj z3WZI|&XyfQhLm0(na3RjZ_cMH}J@75ofqu@0&~V<@9=!4W{oU%u3snpN{HU=q(7E(9hcRJmv!RI^lOkwFbb#uk z*?--1mv~Vobg{PS=&{jR?&<^My=MLCmFf?^+x+^57c2alt1q~^y;}D6mF~r5`*OF@ zH8ek~#4vFVkS&-|FV6)MhmJaH0P-qkUawt17Gnn5{63J4s9@ZAApR)##V0^^k0K=R z7LZFg9wP|kCCtG4G=eBUFIgZsg{)mGkgqZ88D0^{w@5GQ5XfnipS(>VEdn9UI|Py` zA(iCv0fE#8;Djpz$-uL6!dXIQ9TM_= zI3eRfO15BXKdz9H=W!l)H!s^)S>Ice}{k@#p=dsrq;nJ!@UnWwNnz}UB?^`@9zV~{Xki|mH$B0WR=6DS zPE9YYW6_b|MBNG_XnD5x-ux_3@KyQUV|Ry)!|7StRIt`#e)R%H0pNx;YKSTX^BkV5`;w=Kmd4ij zGNA}U#S4&-d{TEDUod>=#ywHsK@aVDY*QN4zz>_=fqw|i!X`7k)#jD;V0_wdcx#gQ z5AZo{CBX24_@KZ!2KQG8;?SU6?9|b7uSE_gFsh+}VeC^d(F~2Y=x*RU5654aE?zf(V*JEpt*$yDQJaudrPo$g>0`AM zDiiej33`1}d{wmz8DJryP{rJ1U@^O@gl~im0t<0Ri$u=Bc$m!MwUbTJK?-}!7ml(R z1$-wwH>kwx>|IZ=u=9GzV-`0^`?n!r>7(GR`Nts80t_`B-y5@rX^DDNX7z%Z3-xui zx#TamCm z)?NFvp!YDOIR?j!xSS4FK;9Q~xonjZmY6-FKmb^7HQ1;H1&fY`Fu{>yMovAjwH`2b z5SI7F>1n3-25%8{=H)twfFUSUJtt&M(&68V8TN~EgqaG%S7x?GFwu?4Oq)+IBb4tHMj$R zx#Wevl}p4Pp`MFsm}M>`u&tNT5ueR~0CuVX;vDe*fRjFW3dTONhih}uI z#+H=At8D8A$YAwPf)A^h4HsEmDO`a|Y}Foko26;+VzM6*1nf%ag`WY*AFLq5-!Qy$ zuyKIorjPI&NbM644iafA}fzSWN2i$sw9F;=4W}-t6}c zU}AlFu$k3<1v>NkCTJA)<-mFA&x7DH;qC~a$H&mNwH@^8k_hvWHQ)r0!(M2BM0RBz zs)7z~XBF$96mE;L+4>a(wXa7buO5dl;Y-nK{AeQgh`Xa|1giU!)o@fYkoB%d6F=^R zAb|6t(ey;JmyExd^;@N)wqwSB(Tyh!H!0m1r4T0wOc7hV%oYlXbJHZF~Mb&w%;Bf{y2&38pn8Z%y zVTi`E^e)aopE41L{BhZa(c62$4_w&ydGHB8+g>1W;g^|i4-{blF}B_8<0g35I`J0* z_$Z4?oPu%y>?HfJt*;Grd?dg;lPA0CPYWLc-3= zW{8$RM1^=0-0X%h+vyOIW4>tusn9+bvqd`M>w!|A!vz6P2_ow_>os8-#1D4(y)(Tk im)6z%f#G>l%W{!*kBIdo;pt3bSzY!VvGQAJmi`N>4-fDF delta 6462 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 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)