Mirrors/Crunchyroll-Downloader-v3.0
2
0
Fork 0
mirror of https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git synced 2024-12-24 15:11:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

improvement error messages (add-on)

Browse Source 
add-on error messages are now not saved to a file this should help with #471
This commit is contained in:
hama3254 2022-05-02 18:37:40 +02:00
parent d12deb57e6
commit 343883638f
7 changed files with 71 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Crunchyroll Downloader/v17/.suo
View File

Binary file not shown.

106
Crunchyroll Downloader/Main.vb
View File

@ -4702,7 +4702,7 @@ Public Class Main
End If End If
End If End If
strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
Else Else
Me.Invoke(New Action(Function() As Object Me.Invoke(New Action(Function() As Object
Me.Text = "Status: no video found" Me.Text = "Status: no video found"
@ -4710,17 +4710,21 @@ Public Class Main
Return Nothing Return Nothing
End Function)) End Function))
Dim ErrorPage As String = My.Resources.Post_error_Top + "no video found" + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + "no video found" + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) ' My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
strRequest = rootPath & "error_Page.html" 'PostPage ' strRequest = rootPath & "error_Page.html" 'PostPage
SendHTMLResponse(strRequest, stream) 'SendHTMLResponse(stream, strRequest)
SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
End If End If
Catch abort As ThreadAbortException Catch abort As ThreadAbortException
Exit Sub Exit Sub
Catch ex As Exception Catch ex As Exception
Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
strRequest = rootPath & "error_Page.html" 'PostPage 'strRequest = rootPath & "error_Page.html" 'PostPage
SendHTMLResponse(strRequest, stream) 'SendHTMLResponse(stream, strRequest)
SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
End Try End Try
#End Region #End Region
#Region "mass-dl" #Region "mass-dl"
@ -4754,14 +4758,16 @@ Public Class Main
End Function)) End Function))
End If End If
strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
Catch abort As ThreadAbortException Catch abort As ThreadAbortException
Exit Sub Exit Sub
Catch ex As Exception Catch ex As Exception
Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
strRequest = rootPath & "error_Page.html" 'PostPage 'strRequest = rootPath & "error_Page.html" 'PostPage
SendHTMLResponse(strRequest, stream) 'SendHTMLResponse(stream, strRequest)
SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
End Try End Try
#End Region #End Region
#Region "Funimation-mass" #Region "Funimation-mass"
@ -4798,15 +4804,17 @@ Public Class Main
End Function)) End Function))
End If End If
strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
End If End If
Catch abort As ThreadAbortException Catch abort As ThreadAbortException
Exit Sub Exit Sub
Catch ex As Exception Catch ex As Exception
Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
strRequest = rootPath & "error_Page.html" 'PostPage 'strRequest = rootPath & "error_Page.html" 'PostPage
SendHTMLResponse(strRequest, stream) 'SendHTMLResponse(stream, strRequest)
SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
End Try End Try
#End Region #End Region
#Region "funimation Einzeln" #Region "funimation Einzeln"
@ -4898,23 +4906,23 @@ Public Class Main
End If End If
End If End If
strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
Catch abort As ThreadAbortException Catch abort As ThreadAbortException
Exit Sub Exit Sub
Catch ex As Exception Catch ex As Exception
Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) 'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
strRequest = rootPath & "error_Page.html" 'PostPage 'strRequest = rootPath & "error_Page.html" 'PostPage
SendHTMLResponse(strRequest, stream) 'SendHTMLResponse(stream, strRequest)
SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
End Try End Try
#End Region #End Region
Else Else
strRequest = rootPath & "error_Page_default.html" 'PostPage strRequest = rootPath & "error_Page_default.html" 'PostPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
End If End If
ElseIf strArray(0).Trim().ToUpper.Equals("GET") Then ElseIf strArray(0).Trim().ToUpper.Equals("GET") Then
'Debug.WriteLine(Date.Now + " " + "found GET while procesing")
'Debug.WriteLine(Date.Now + " " + strArray(1))
strRequest = strArray(1).Trim strRequest = strArray(1).Trim
If strRequest.StartsWith("/") Then If strRequest.StartsWith("/") Then
strRequest = strRequest.Substring(1) strRequest = strRequest.Substring(1)
@ -4923,34 +4931,43 @@ Public Class Main
'Debug.WriteLine(Date.Now + " " + "it's index.html") 'Debug.WriteLine(Date.Now + " " + "it's index.html")
strRequest = strRequest & defaultPage '"HTMLString" 'strRequest & defaultPage strRequest = strRequest & defaultPage '"HTMLString" 'strRequest & defaultPage
End If End If
'If CBool(InStr(htmlReq, "CRD_Handshake") Then
' 'Debug.WriteLine(Date.Now + " " + "it's a handshake")
' SendHTMLResponse("Handshake_Confirm", stream)
'Else
'
'End If
strRequest = rootPath & strRequest strRequest = rootPath & strRequest
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
Else ' Not HTTP GET method Else ' Not HTTP GET method
'Debug.WriteLine(Date.Now + " " + "empty request, returning index.html")
'Debug.WriteLine(Date.Now + " " + strArray(0))
strRequest = rootPath & defaultPage strRequest = rootPath & defaultPage
SendHTMLResponse(strRequest, stream) SendHTMLResponse(stream, strRequest)
End If End If
Catch ex As Exception Catch ex As Exception
Debug.WriteLine(ex.ToString()) Debug.WriteLine(ex.ToString())
Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom Dim ErrorPage As String = My.Resources.Post_error_Top + ex.ToString + My.Resources.Post_error_Bottom
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False) ' My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\error_Page.html", ErrorPage, False)
'strRequest = rootPath & "error_Page.html" 'PostPage SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
SendHTMLResponse(Application.StartupPath + "\WebInterface\error_Page.html", stream)
End Try End Try
End Sub End Sub
' Send HTTP Response ' Send HTTP Response
Private Sub SendHTMLResponse(ByVal httpRequest As String, ByVal stream As NetworkStream) Private Sub SendHTMLResponse(ByVal stream As NetworkStream, Optional ByVal httpRequest As String = Nothing, Optional ByVal Response As ServerResponse = Nothing)
Try Try
Dim respByte() As Byte Dim respByte() As Byte
If CBool(InStr(httpRequest, "index.html")) Then If httpRequest = Nothing Then
Debug.WriteLine(httpRequest)
respByte = System.Text.Encoding.UTF8.GetBytes(Response.Content) 'File.ReadAllBytes("") '
' Set HTML Header
Dim htmlHeader As String =
"HTTP/1.0 200 OK" & ControlChars.CrLf &
"Server: CRD 1.0" & ControlChars.CrLf &
"Content-Length: " & respByte.Length & ControlChars.CrLf &
"Content-Type: " & GetContentType(Response.Type) &
ControlChars.CrLf & ControlChars.CrLf
' The content Length of HTML Header
Dim headerByte() As Byte = Encoding.UTF8.GetBytes(htmlHeader)
stream.Write(headerByte, 0, headerByte.Length)
stream.Write(respByte, 0, respByte.Length)
ElseIf CBool(InStr(httpRequest, "index.html")) Then
Debug.WriteLine(httpRequest) Debug.WriteLine(httpRequest)
respByte = System.Text.Encoding.UTF8.GetBytes(HTML) 'File.ReadAllBytes("") ' respByte = System.Text.Encoding.UTF8.GetBytes(HTML) 'File.ReadAllBytes("") '
' Set HTML Header ' Set HTML Header
@ -5186,3 +5203,18 @@ Public Class FunimationStream
Return String.Format("{0}, {1}, {2}", Me.audioLanguage, Me.version, Me.Url) Return String.Format("{0}, {1}, {2}", Me.audioLanguage, Me.version, Me.Url)
End Function End Function
End Class End Class
Public Class ServerResponse
Public Type As String
Public Content As String
Public Sub New(ByVal Content As String, ByVal Type As String)
Me.Content = Content
Me.Type = Type
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.Content, Me.Type)
End Function
End Class

4
Crunchyroll Downloader/My Project/AssemblyInfo.vb
View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.8.6.0")> <Assembly: AssemblyVersion("3.8.6.1")>
<Assembly: AssemblyFileVersion("3.8.6.0")> <Assembly: AssemblyFileVersion("3.8.6.1")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>

BIN
Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe
View File

Binary file not shown.

BIN
Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb
View File

Binary file not shown.

BIN
Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe
View File

Binary file not shown.

BIN
Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb
View File

Binary file not shown.