hotfix curl output

hama3254 · May 23, 2024 · ca18ed8 · ca18ed8
1 parent ad4d869
commit ca18ed8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo
diff --git 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
@@ -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")