From ca18ed8dbb8a4eeab6c518da48c202503cafab94 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 23 May 2024 18:32:31 +0200 Subject: [PATCH] hotfix curl output hotfix curl output --- .vs/Crunchyroll Downloader/v17/.suo | Bin 230400 -> 213504 bytes Crunchyroll Downloader/GetData.vb | 10 +++++++--- Crunchyroll Downloader/Main.vb | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 2bfcf8fb63ffdcf684c1ce402c0f417d9f8bec90..c2b2f23a987b3bea87ca4bc687633b8400043549 100644 GIT binary patch delta 4193 zcmeI#e^8Xi83*utp7%Ho1Vlt-@Wj)c7es@I3Tl;{V*Ej@HP)ImAyElQP@@9kFJk0E z2+@S9+)G$QC3wTUNmJt}*RX0$a#AOgb|Ql|lNyF9F}6)IjzzSjNsaWoaAeSAOxj6j z`bXdK!|uDg@9w_)?EBuUds~FNBz#xWXf_3oNRz1)*(FaA4P=2GlHp!>0-P`hY>)^6!_@%lsKB)j{fc$SZKD{0R=rW|xvuAL zZxq$-_C_%bZEuaD3XqDT3wonyLB2O2h@!Lmo>dfsAQaRP--x1qU&O!&Rr5XL<_$G_ zr?MwLJ*0bg;K?+J=F8;Jli2Jlh(AC+dsG{#Cei63q~@;O+$6e;yfIwA!O1?St%d3h z8~bebi&}k6I)!vUU^#s+&^185DK4v1dj&I^@fJVq%bZph?rEHB zR*ThVj*VsH>5Qp7%7aDjc+FMm)XbtSTC@3f%+C+<VYqh@*BcJ@IX1PDkw)yvJm)*NW#q8i+=XgZ^kek78`M7TL^>7*!D843e}Wg_ zMJR(`zz*06yPzC&7z{5#3{*lDJOb6Q2=>5U*atQ6GSr$(Y?A6-S)S_%I)V~EPKJjx zBByphv#MHt8fRzV5AZ>tM%Dfi`LpmLv_LDUa&;%?kUtM?@DW^qk3mK9&#(^u3ZKA6 zegFO;bJ~$pS6@Ne0jig4NS_Xre~xrEd>J_ZC(;{%yt=Ln`H?En^*l+#EHetk2lne`$&gv7}5hxo8524i^ zlZFIp5>b+Yd=k=oAsHsXM3@9AkP4Gwj(+9npz>Vjpt(4i2N|HY*l2XH4Bd_iS7*J) zqdmo(9$TR-{GX z4xIOV(!Am8cWfx$iYHqLORKw2I(^P}Tc}|HsTa+AtyKSx$~3oz1gTD9)$;rY%li0# zXIWSOFE8ug$(TuuJ?cHi4YR0#XuDW{54|{|I1qtnk(R)7Pzuk(HrTF@s2DhJ2XZ@M z7nFksbf|!rpb`XB!EUIAJtXKRZDa*<@NGzL-wG4ZOi`whLmt1M3bl}?&DZWxpLgYAc`+T9?GI68q~Ro% z*~Rn#i6#fxM8PmBGZKhJ#}RglgEp#`{y1`JczsBF619==hEbuah>~R^5jbNaalgWR+u6=zR_MWWftdIu=q+@V_&$Xv0nxF|j|Dil)gFD{FIUnI=3% z^qL665VF3I76yOokix#U??q%3<8C;QibZXtHdt2WQw}wh60_tTbYq~=fcYPwvn0;` zhT@GQ#D<5gMjI~jze!lvOLU1uV+}195viC`Z8g?&>p?0G5gl()oy_)ACcZ-i%@hmO zZD$;#2I}tS<}RfFZE{@dS)}dfH$~o6JgEyOX%=C2 zVoOi<^1E7P1&@(S_wihkn|E_F-a<9s-ZI>HAIpCTKEN7c`-tSvIYWJM$H|-)uIg{R z%4X4cgiFLDQ`j!+KI2S0d0|?mer`*oG@ALr(YmL0hkj^jn5@3cD-pd|e6qXRIYB00 y=cZsW^AxAaw03SJ5j9rpl${o>b-X;|))Gl98cInrse_v}Jt`tfMx|+&wSNJrAq1ZQ delta 6036 zcmds*3viUx7036SZM)eS$k>(<1Y#AjMbiJ>BpR&kI8&L{-ksl` z`#kq?&Uf$qKKqJL`%_`hrS>+ph6t1C6~u$Uji#n1l}(@nm=31u%c~yTQ8tns{77(W zL)W7zTTfH9cM*>!jY3R%m652Ya!BYnG&(UG4G>1_WbUHZw=*w`LJCU#Ap>z2xEqWI zcYwj*Ym^Rz6c7$V!JQx(YyvNVo}eqRfI^S}(!jl7Ca{8gz(b%fNW^Hmm`rRMuD@vR zNXhzZ=6;q9C{QEOFPh_)^+1iDpbs*;gE+)jKxTq*U<^nF9f4{T2APFAIW1`qlo%n zDh?=Bfuz?3bdHEYp-QUoD-`M1s64prC>%^1{D zquGqH-!-FBqJq1fxw0%IAQqjb;Q1TaHKwIqY>QNt=C{P}(m$Hk<*pZzDgzrqDHsXX zf&ieb8x1)bYzBV>TfsK)s=lZC_R>9wDV-|3j`$m3FL)Ewg15jvpvvEFkq00Tf_K0n za2Wg^905ncG4L*^1INKh{iDGh1O9;6jmqLqbQu#HLtkLdFKy8Tjt6a-MF`xoSn z<(fgCQ($|j+}J^19GBv?#+@d|#qz*xWIYk%U3_sk1^b`<&{i$j;mm>QY%)zW>5CJ3 zc@q=PY8_e!q~wobDKmQezp|9u%8m#aL`@8*OdErE?GY~WCL}k6JJRC3abX{mOwLX5D z-0|#Q67Lw7Z_&`B+P?g5pbY3OAGea+JGmw)4@Xz~Z;md#yvIt(-Ns3}Yj&77%~hwl zcXQ2SN$gE}`OFV-DJkiuRe7tnlmxk}S^8flOljB0v`jgna*lvD-n$TaK}cJ`&s)k> zoe-qM+tiCdyaR{?9YGX`2FgJ?LH-hLZ-X4xMn_kqRDtL1UNF(TI%! zYS6vWdJ4E7>G5C!meuZkpNRX*RU_@g9zS(0Z$OQ?q(F zyr2IiHyH=55^PzQ*nw?7qUDVPtlUjFqwoEluA(HN-pdYBkjysi%a$ z;jVTSdWvbrU;xgp^W?Ox0`U4}=HMP1%*x(l~&z6&E8UeeUKNTV(K zqCY(Y!+7#3u;xe-8%ZN*R#1vBYxwIcKFD9*_1V1K0rx!}?f&$XYwhv8+_avdP0O@5 z%F^G>%WYjq0}HuS`_8%69>xnL0GD=912uRH8#lL z3c7)1x@iq)*OSC-@KU;=c@_|Ro}wtvO0w))Pp355a**PjTPZ~Luc7gNRpMGrNygIE zR1xfPp?VeZu4=NA_%@@4?=4Ef`E4-@e3WSs+d;BzvL7Zkd`HN~^4vQVBNLBPvSELh zd?Y0Y2nT*WohLc`9%Xt?Qpm2(jOz3;HIb(p`u_~8*-p?AaYs>#WV}zqv`0*R^llt2 zY(-5(pCz~3N6H?xbqTa?UP|A|hNJD6b%rE0Xf%6xYE-LNoyo?&Y3uGgP zmX1c$7P^RW@MT&87Wze+a4*OPOwWKnRN%hxdYIgKUN%3Wxs>Yol821qwyNAQ1p$<(g^+D*9M3^ zfbE_mFkuX)8Jd7^2jzGjrYVN`{DiXmdAJQg{!SIESGS?_uaLnSH@6Ytlo@_rHC~(n*}_*lqJnW^ybr8(8V< z>V~~*3T&y{cH5-n5NAv6L!9f$W=tU(&hIKOUmE9yi)9^Wsy8Wr*v7RJuU{Bftx09J*3Yo7gIXFc zG@bi$1>W7JbBQr#21l8xN&1)aH0ig1zxZ}d4XkMi$^2D3jh}C>E~q}&7%+zyQ>zA* z^{HnVvs`(Y@$AmyG-J+OewI8F+3cCZ7Jec|csloyI^s0>a3gbK(0CYUTIv-v!%x@e%#+$8s>07^VvCefEMUCyOHVQ!=aw-SnUpt z)LDV)Xy%7Fg*4A zv))p(lUM6!rzab=b)1XC^#-LHsn@waNO!nasSAd&?h?-+iA>S18dn3gGyRPdXKF|v*;*HM(wX^;8VJrTo Ik6n@e55jMqS^xk5 diff --git a/Crunchyroll Downloader/GetData.vb b/Crunchyroll Downloader/GetData.vb index 82911ee..65d1d81 100644 --- a/Crunchyroll Downloader/GetData.vb +++ b/Crunchyroll Downloader/GetData.vb @@ -117,10 +117,14 @@ Module GetData If CurlOutput = Nothing And CurlError = Nothing Then Throw New System.Exception("Error - Getting" + Sender + vbNewLine + CurlError) Return Nothing + ElseIf CBool(InStr(CurlOutput, "HTTP Status: 4")) Then + Return CurlOutput + ElseIf CBool(InStr(CurlError, "HTTP Status: 4")) Then + Return CurlError ElseIf CurlError = Nothing Then Dim OutputBody() As String = CurlOutput.Split(New String() {"HTTP Status:"}, System.StringSplitOptions.RemoveEmptyEntries) - Return OutputBody(0) - 'Return CurlOutput + Dim Output As String = OutputBody(0) + Return Output Else Return CurlError End If @@ -261,7 +265,7 @@ Module GetData Return Nothing ElseIf CBool(InStr(CurlOutput, "HTTP Status: 4")) Then Debug.WriteLine(CurlOutput) - Throw New System.Exception("Error - Getting" + vbNewLine + CurlError) + Throw New System.Exception("Error - Getting" + vbNewLine + CurlOutput) Return Nothing Else Return CurlOutput diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index acf826b..694b212 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -3042,7 +3042,7 @@ Public Class Main ProcessLoading(Url, Auth2, Loc_CR_Cookies, RT_count) Else Dim v1Token As String = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494") - + 'MsgBox(v1Token) If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401") LoginForm.ShowDialog() @@ -3154,7 +3154,7 @@ Public Class Main Exit Sub ElseIf CBool(InStr(ObjectJson, "videos/")) = False Then - MsgBox(ObjectJson) + 'MsgBox(ObjectJson) 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")