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

improve old style compatibility

Browse Source 
improve old style compatibility #677
This commit is contained in:
hama3254 2023-01-21 23:08:14 +01:00
parent 18e4d9a0d4
commit 0a1b38d544
3 changed files with 41 additions and 15 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.

4
Crunchyroll Downloader/Anime_Add.vb
View File

@ -213,8 +213,8 @@ Public Class Anime_Add
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox(ex.ToString) MsgBox(ex.ToString)
Main.b = True Main.b = True
MsgBox(Main.URL_Invaild, MsgBoxStyle.OkOnly) MsgBox(Main.URL_Invaild, MsgBoxStyle.OkOnly)
End Try End Try
ElseIf groupBox2.Visible = True Then ElseIf groupBox2.Visible = True Then

52
Crunchyroll Downloader/Main.vb
View File

@ -1114,29 +1114,57 @@ Public Class Main
Dim SeasonSubData As List(Of JToken) = Entry.Children().ToList Dim SeasonSubData As List(Of JToken) = Entry.Children().ToList
Dim localSeasons As New List(Of CR_Seasons) Dim localSeasons As New List(Of CR_Seasons)
Dim season_number As String = Nothing Dim season_number As String = Nothing
Dim id As String = Nothing
Dim audio_localeMain As String = Nothing
For Each SeasonSubItem As JProperty In SeasonSubData For Each SeasonSubItem As JProperty In SeasonSubData
SeasonSubItem.CreateReader() SeasonSubItem.CreateReader()
Select Case SeasonSubItem.Name Select Case SeasonSubItem.Name
Case "versions" Case "versions"
For Each VersionItem As JObject In SeasonSubItem.Values Try
For Each VersionItem As JObject In SeasonSubItem.Values
Dim guid As String = VersionItem.GetValue("guid").ToString Dim guid As String = VersionItem.GetValue("guid").ToString
Dim audio_locale As String = VersionItem.GetValue("audio_locale").ToString Dim audio_locale As String = VersionItem.GetValue("audio_locale").ToString
localSeasons.Add(New CR_Seasons(guid, audio_locale, Auth))
Next
localSeasons.Add(New CR_Seasons(guid, audio_locale, Auth))
Next
Catch ex As Exception
Debug.WriteLine("Error getting season data")
End Try
Case "season_number" Case "season_number"
season_number = SeasonSubItem.Value.ToString season_number = SeasonSubItem.Value.ToString
Case "id"
id = SeasonSubItem.Value.ToString
Case "audio_locale"
audio_localeMain = SeasonSubItem.Value.ToString
End Select End Select
Next Next
For i As Integer = 0 To localSeasons.Count - 1 If localSeasons.Count = 0 Then
Anime_Add.ComboBox1.Items.Add(HardSubValuesToDisplay(localSeasons.Item(i).audio_locale) + " - Season " + season_number) Anime_Add.ComboBox1.Items.Add(HardSubValuesToDisplay(audio_localeMain) + " - Season " + season_number)
CR_MassSeasons.Add(localSeasons.Item(i)) CR_MassSeasons.Add(New CR_Seasons(id, audio_localeMain, Auth))
Next End If
If localSeasons.Count > 0 Then
For i As Integer = 0 To CR_MassSeasons.Count - 1
If CR_MassSeasons.Item(i).guid = localSeasons.Item(0).guid Then
localSeasons.Clear()
Exit For
End If
Next
End If
If localSeasons.Count > 0 Then
For i As Integer = 0 To localSeasons.Count - 1
Anime_Add.ComboBox1.Items.Add(HardSubValuesToDisplay(localSeasons.Item(i).audio_locale) + " - Season " + season_number)
CR_MassSeasons.Add(localSeasons.Item(i))
Next
End If
Next Next
End Select End Select
Next Next
@ -4398,7 +4426,6 @@ Public Class Main
Dim v1Token As String = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post) Dim v1Token As String = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post)
If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then If CBool(InStr(v1Token, "curl:")) = True And CBool(InStr(v1Token, "400")) = True Then
v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post.Replace("etp_rt_cookie", "client_id")) v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post.Replace("etp_rt_cookie", "client_id"))
@ -4419,7 +4446,6 @@ Public Class Main
v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post) v1Token = CurlPost("https://www.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post)
End If End If
'MsgBox(v1Token) 'MsgBox(v1Token)
If CBool(InStr(v1Token, "curl:")) = True Then If CBool(InStr(v1Token, "curl:")) = True Then