mirror of
https://github.com/hama3254/Crunchyroll-Downloader-v3.0.git
synced 2024-11-15 04:35:06 +01:00
Fixes funimation
fix merged subs metadata fix thumbnail fix hybrid mode failed keys
This commit is contained in:
parent
e007da2230
commit
08ce84689a
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -921,7 +921,7 @@ Public Class CRD_List_Item
|
|||||||
WC_TS = New WebClient
|
WC_TS = New WebClient
|
||||||
|
|
||||||
WC_TS.DownloadFile(New Uri(DL_URL), DL_Pfad)
|
WC_TS.DownloadFile(New Uri(DL_URL), DL_Pfad)
|
||||||
If Not CBool(InStr(DL_Pfad, Application.StartupPath)) Then
|
If Not CBool(InStr(DL_Pfad, "Stream-")) Then
|
||||||
Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False)
|
Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False)
|
||||||
Using sink As New StreamWriter(Path.GetDirectoryName(DL_Pfad) + "\Retry\" + Path.GetFileName(DL_Pfad), False, utf8WithoutBom2)
|
Using sink As New StreamWriter(Path.GetDirectoryName(DL_Pfad) + "\Retry\" + Path.GetFileName(DL_Pfad), False, utf8WithoutBom2)
|
||||||
sink.WriteLine(DL_Pfad)
|
sink.WriteLine(DL_Pfad)
|
||||||
|
@ -1183,13 +1183,14 @@ Public Class Main
|
|||||||
|
|
||||||
Public Function HardSubValuesToDisplay(ByVal HardSub As String) As String
|
Public Function HardSubValuesToDisplay(ByVal HardSub As String) As String
|
||||||
Try
|
Try
|
||||||
|
HardSub = HardSub.Replace(Chr(34), "")
|
||||||
If HardSub = "deDE" Then
|
If HardSub = "deDE" Then
|
||||||
Return "Deutsch"
|
Return "Deutsch"
|
||||||
ElseIf HardSub = "enUS" Then
|
ElseIf HardSub = "enUS" Or HardSub = "en" Then
|
||||||
Return "English"
|
Return "English"
|
||||||
ElseIf HardSub = "ptBR" Then
|
ElseIf HardSub = "ptBR" Or HardSub = "pt" Then
|
||||||
Return "Português (Brasil)"
|
Return "Português (Brasil)"
|
||||||
ElseIf HardSub = "esLA" Then
|
ElseIf HardSub = "esLA" Or HardSub = "es" Then
|
||||||
Return "Español (LA)"
|
Return "Español (LA)"
|
||||||
ElseIf HardSub = "frFR" Then
|
ElseIf HardSub = "frFR" Then
|
||||||
Return "Français (France)"
|
Return "Français (France)"
|
||||||
@ -4945,9 +4946,7 @@ Public Class Main
|
|||||||
Dim FunimationDub As String = Nothing
|
Dim FunimationDub As String = Nothing
|
||||||
Dim FunimationAudioMap As String = Nothing
|
Dim FunimationAudioMap As String = Nothing
|
||||||
Dim FunimationEpisodeJson As String = Nothing
|
Dim FunimationEpisodeJson As String = Nothing
|
||||||
|
Dim thumbnail4 As String = ""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Dim ser As JObject = JObject.Parse(v1Json)
|
Dim ser As JObject = JObject.Parse(v1Json)
|
||||||
|
|
||||||
@ -4958,6 +4957,19 @@ Public Class Main
|
|||||||
For Each item As JProperty In data
|
For Each item As JProperty In data
|
||||||
item.CreateReader()
|
item.CreateReader()
|
||||||
Select Case item.Name
|
Select Case item.Name
|
||||||
|
Case "images" 'each record is inside the entries array
|
||||||
|
For Each Entry As JObject In item.Values
|
||||||
|
|
||||||
|
Dim key As String = Entry("key").ToString
|
||||||
|
|
||||||
|
If key = "Key Art - Official Video Image" Or key = "Episode Thumbnail" Then
|
||||||
|
Dim path As String = Entry("path").ToString
|
||||||
|
thumbnail4 = path
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
Next
|
||||||
Case "id" 'id.json for video
|
Case "id" 'id.json for video
|
||||||
|
|
||||||
FunimationEpisodeJson = item.Value.ToString
|
FunimationEpisodeJson = item.Value.ToString
|
||||||
@ -5563,39 +5575,7 @@ Public Class Main
|
|||||||
End If
|
End If
|
||||||
'MsgBox(FunimationName3)
|
'MsgBox(FunimationName3)
|
||||||
'MsgBox(Funimation_m3u8_final)
|
'MsgBox(Funimation_m3u8_final)
|
||||||
#Region "thumbnail"
|
|
||||||
|
|
||||||
'Dim thumbnail As String() = v1Json.Split(New String() {"episodeThumbnail"}, System.StringSplitOptions.RemoveEmptyEntries)
|
|
||||||
'Dim thumbnail2 As String() = thumbnail(1).Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
|
|
||||||
'Dim thumbnail3 As String() = thumbnail2(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
|
|
||||||
Dim thumbnail4 As String = ""
|
|
||||||
For Each item As JProperty In data
|
|
||||||
item.CreateReader()
|
|
||||||
Select Case item.Name
|
|
||||||
Case "images" 'each record is inside the entries array
|
|
||||||
For Each Entry As JObject In item.Values
|
|
||||||
|
|
||||||
Dim key As String = Entry("key").ToString
|
|
||||||
|
|
||||||
If key = "episodeThumbnail" Then
|
|
||||||
Dim path As String = Entry("path").ToString
|
|
||||||
thumbnail4 = path
|
|
||||||
Exit Select
|
|
||||||
End If
|
|
||||||
|
|
||||||
|
|
||||||
'Dim factor As String = Entry("factor").ToList.Item(0)
|
|
||||||
' you can continue listing the array items untill you reach the end of you array
|
|
||||||
|
|
||||||
Next
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
End Select
|
|
||||||
Next
|
|
||||||
|
|
||||||
|
|
||||||
#End Region
|
|
||||||
Dim ResoHTMLDisplay As String = Reso.ToString + "p"
|
Dim ResoHTMLDisplay As String = Reso.ToString + "p"
|
||||||
|
|
||||||
#Region "Subs"
|
#Region "Subs"
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user