diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 04743c0..587d13b 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index f83f81f..139784c 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index b85c69d..840f932 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index f443cf1..0537d8b 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index e9ab128..24dc877 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -921,7 +921,7 @@ Public Class CRD_List_Item WC_TS = New WebClient 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) Using sink As New StreamWriter(Path.GetDirectoryName(DL_Pfad) + "\Retry\" + Path.GetFileName(DL_Pfad), False, utf8WithoutBom2) sink.WriteLine(DL_Pfad) diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 8606765..142d711 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1183,13 +1183,14 @@ Public Class Main Public Function HardSubValuesToDisplay(ByVal HardSub As String) As String Try + HardSub = HardSub.Replace(Chr(34), "") If HardSub = "deDE" Then Return "Deutsch" - ElseIf HardSub = "enUS" Then + ElseIf HardSub = "enUS" Or HardSub = "en" Then Return "English" - ElseIf HardSub = "ptBR" Then + ElseIf HardSub = "ptBR" Or HardSub = "pt" Then Return "Português (Brasil)" - ElseIf HardSub = "esLA" Then + ElseIf HardSub = "esLA" Or HardSub = "es" Then Return "Español (LA)" ElseIf HardSub = "frFR" Then Return "Français (France)" @@ -4945,9 +4946,7 @@ Public Class Main Dim FunimationDub As String = Nothing Dim FunimationAudioMap As String = Nothing Dim FunimationEpisodeJson As String = Nothing - - - + Dim thumbnail4 As String = "" Dim ser As JObject = JObject.Parse(v1Json) @@ -4958,6 +4957,19 @@ Public Class Main 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 = "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 FunimationEpisodeJson = item.Value.ToString @@ -5563,39 +5575,7 @@ Public Class Main End If 'MsgBox(FunimationName3) '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" #Region "Subs" diff --git a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe index e03d96e..6eef89c 100644 Binary files a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb index 89f27ce..ea39ea5 100644 Binary files a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe index e03d96e..6eef89c 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb index 89f27ce..ea39ea5 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb differ