From 0d5fabd784e12b3577da224ed32b242740ae5e9f Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sun, 5 Mar 2023 14:24:20 +0100 Subject: [PATCH] CR concert adjustments CR concert adjustments #704 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 187392 -> 171520 bytes Crunchyroll Downloader/Main.vb | 52 ++++++++++++++---- .../My Project/AssemblyInfo.vb | 4 +- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 137786dcb9c1813dcc79d2592fe1a94a7b82a27a..9052868dca8f36e9b050f18f4dbd0450812912ab 100644 GIT binary patch delta 5784 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 diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 5f63fb4..4bb7c30 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1244,16 +1244,6 @@ Public Class Main If CBool(InStr(WebsiteURL, "musicvideo")) = True Then 'TextBox2_Text to bypasss name for now - 'https://www.crunchyroll.com/content/v2/cms/objects/G69PX0W3Y?locale=de-DE - 'https://www.crunchyroll.com/content/v2/cms/videos/G25FVQD3Q/streams?locale=de-DE - - 'https://www.crunchyroll.com/content/v2/music/MV2FD1FECE/streams?locale=de-DE - - 'https://www.crunchyroll.com/content/v2/music/MV2FD1FECE?locale=de-DE - - 'https://www.crunchyroll.com/content/v2/music/music_videos/MV2FD1FECE?locale=de-DE - - Dim ObjectsURL As String = Streams.Replace("music/", "music/music_videos/").Replace("/streams", "") @@ -1281,7 +1271,31 @@ Public Class Main TextBox2_Text = Arti2(0) + " - " + Title2(0) + ElseIf CBool(InStr(WebsiteURL, "/concert/")) = True Then + 'TextBox2_Text to bypasss name for now + + 'https://www.crunchyroll.com/content/v2/music/MCB3E02384/streams?locale=de-DE + + 'https://www.crunchyroll.com/content/v2/music/concerts/MCB3E02384?locale=de-DE + + Dim ObjectsURL As String = Streams.Replace("music/", "music/concerts/").Replace("/streams", "") + + ObjectJson = CurlAuth(ObjectsURL, Loc_CR_Cookies, Loc_AuthToken) + + + Dim Title() As String = ObjectJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim Title2() As String = Title(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + Dim Arti() As String = ObjectJson.Split(New String() {Chr(34) + "name" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim Arti2() As String = Arti(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + + 'MsgBox(Arti2(0)) + 'MsgBox(Title2(0)) + + + TextBox2_Text = Arti2(0) + " - " + Title2(0) Else @@ -2037,6 +2051,7 @@ Public Class Main Dim thumbnail3 As String = "" Try + Dim thumbnail As String() = ObjectJson.Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries) For i As Integer = 0 To thumbnail.Count - 1 If CBool(InStr(thumbnail(i), ".jpg" + Chr(34))) Then @@ -2051,6 +2066,18 @@ Public Class Main Dim thumbnail2 As String() = thumbnail(i).Split(New String() {".jpe" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) thumbnail3 = "https://" + thumbnail2(0).Replace("\/", "/") + ".jpe" Exit For + ElseIf CBool(InStr(thumbnail(i), ".JPEG" + Chr(34))) Then + Dim thumbnail2 As String() = thumbnail(i).Split(New String() {".JPEG" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + thumbnail3 = "https://" + thumbnail2(0).Replace("\/", "/") + ".JPEG" + Exit For + ElseIf CBool(InStr(thumbnail(i), ".JPG" + Chr(34))) Then + Dim thumbnail2 As String() = thumbnail(i).Split(New String() {".JPG" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + thumbnail3 = "https://" + thumbnail2(0).Replace("\/", "/") + ".JPG" + Exit For + ElseIf CBool(InStr(thumbnail(i), ".JPE" + Chr(34))) Then + Dim thumbnail2 As String() = thumbnail(i).Split(New String() {".JPE" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) + thumbnail3 = "https://" + thumbnail2(0).Replace("\/", "/") + ".JPE" + Exit For End If Next @@ -4596,6 +4623,11 @@ Public Class Main Browser.WebView2.CoreWebView2.Navigate(Url) Exit Sub + ElseIf CBool(InStr(Url, "/concert/")) Then + + SetStatusLabel("Status: concert detected - partial support only") + Browser.WebView2.CoreWebView2.Navigate(Url) + Exit Sub End If diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index aa24f82..5d4bd76 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +