From fad0adccb5aedd60291d55fd25e04fd1f7a4d930 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 20 Oct 2022 18:23:22 +0200 Subject: [PATCH] restore base functionality restore base functionality #546 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 134144 -> 125440 bytes Crunchyroll Downloader/Anime_Add.vb | 348 ++--- Crunchyroll Downloader/CefSharp_Browser.vb | 217 +-- Crunchyroll Downloader/Main.designer.vb | 9 +- Crunchyroll Downloader/Main.resx | 12 + Crunchyroll Downloader/Main.vb | 1387 ++++------------- .../My Project/Resources.Designer.vb | 9 + .../My Project/Resources.resx | 3 + 8 files changed, 549 insertions(+), 1436 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index af79778123d84880da5bb073832eb6ea1fbe3bab..0db710b27019952e53aaaae761b37b3a14460101 100644 GIT binary patch delta 5662 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 EFL2`cx&QzG diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 584d1e8..7dafe5b 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -22,158 +22,158 @@ Public Class Anime_Add Public AuthorizationCookie As String = Nothing - Private Sub LoadBrowser(ByVal Url As String) + Public Sub LoadBrowser(ByVal Url As String) Main.LoadedUrl = Url - Dim locale As String = "en-US" - If CBool(InStr(Url, "beta.crunchyroll.com")) = True And CBool(InStr(Url, "watch")) = True And CBool(Main.CrBetaBasic = Nothing) = False Then -#Region "Get Cookies" - Dim Cookies As String = "Cookie: " - Try - Dim Collector As New TaskCookieVisitor - Dim CM As ICookieManager = CefSharp_Browser.WebBrowser1.GetCookieManager - CM.VisitAllCookies(Collector) - Dim DeviceRegion As String = Nothing - Dim list As List(Of Global.CefSharp.Cookie) = Collector.Task.Result() - For i As Integer = 0 To list.Count - 1 - 'MsgBox(list.Item(i).Name + ":" + vbNewLine + list.Item(i).Value) - If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) And CBool(InStr(list.Item(i).Name, "_evidon_suppress")) = False Then - Cookies = Cookies + list.Item(i).Name + "=" + list.Item(i).Value + ";" - End If - If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) And CBool(InStr(list.Item(i).Name, "c_locale")) Then - locale = list.Item(i).Value + ' Dim locale As String = "en-US" + ' If CBool(InStr(Url, "beta.crunchyroll.com")) = True And CBool(InStr(Url, "watch")) = True And CBool(Main.CrBetaBasic = Nothing) = False Then + '#Region "Get Cookies" + ' Dim Cookies As String = Main.CR_Cookies '"Cookie: " + ' 'Try + ' ' Dim Collector As New TaskCookieVisitor + ' ' Dim CM As ICookieManager = CefSharp_Browser.WebBrowser1.GetCookieManager + ' ' CM.VisitAllCookies(Collector) + ' ' Dim DeviceRegion As String = Nothing + ' ' Dim list As List(Of Global.CefSharp.Cookie) = Collector.Task.Result() + ' ' For i As Integer = 0 To list.Count - 1 + ' ' 'MsgBox(list.Item(i).Name + ":" + vbNewLine + list.Item(i).Value) + ' ' If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) And CBool(InStr(list.Item(i).Name, "_evidon_suppress")) = False Then + ' ' Cookies = Cookies + list.Item(i).Name + "=" + list.Item(i).Value + ";" + ' ' End If + ' ' If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) And CBool(InStr(list.Item(i).Name, "c_locale")) Then + ' ' locale = list.Item(i).Value - End If - Next - Catch ex As Exception - CefSharp_Browser.WebBrowser1.Load(Url) - Exit Sub - End Try + ' ' End If + ' ' Next + ' 'Catch ex As Exception + ' ' CefSharp_Browser.WebBrowser1.Load(Url) + ' ' Exit Sub + ' 'End Try -#End Region - Dim CRBetaBearer As String = "Bearer " - Try + '#End Region + ' Dim CRBetaBearer As String = "Bearer " + ' Try - Dim Request As HttpWebRequest = CType(WebRequest.Create("https://beta.crunchyroll.com/auth/v1/token"), HttpWebRequest) - Request.Method = "POST" - Request.ContentType = "application/x-www-form-urlencoded" - Request.Accept = "application/json, text/plain, */*" - 'Request.Headers.Add("Accept-Language: de,en-US;q=0.7,en;q=0.3") - Request.Headers.Add("Accept-Encoding: identity") - Request.Headers.Add("Authorization: " + Main.CrBetaBasic) - 'Request.Headers.Add("Referer: " + Url) - Request.Referer = Url - Request.Headers.Add("Origin: https://beta.crunchyroll.com") - Request.Headers.Add(Cookies) - Dim Post As String = "grant_type=etp_rt_cookie" - Dim byteArray() As Byte = Encoding.UTF8.GetBytes(Post) - Request.ContentLength = byteArray.Length - Dim DataStream As Stream = Request.GetRequestStream() - DataStream.Write(byteArray, 0, byteArray.Length) - DataStream.Close() - Dim Response As HttpWebResponse = CType(Request.GetResponse(), HttpWebResponse) - DataStream = Response.GetResponseStream() - Dim reader As New StreamReader(DataStream) - Dim ServerResponseString As String = reader.ReadToEnd() - reader.Close() - DataStream.Close() - Response.Close() - 'Debug.WriteLine(ServerResponseString) - Dim Token() As String = ServerResponseString.Split(New String() {Chr(34) + "access_token" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim Token2() As String = Token(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - CRBetaBearer = CRBetaBearer + Token2(0) - Catch ex As Exception - Debug.WriteLine(ex.ToString) - CefSharp_Browser.WebBrowser1.Load(Url) - Exit Sub - End Try + ' Dim Request As HttpWebRequest = CType(WebRequest.Create("https://www.crunchyroll.com/auth/v1/token"), HttpWebRequest) + ' Request.Method = "POST" + ' Request.ContentType = "application/x-www-form-urlencoded" + ' Request.Accept = "application/json, text/plain, */*" + ' 'Request.Headers.Add("Accept-Language: de,en-US;q=0.7,en;q=0.3") + ' Request.Headers.Add("Accept-Encoding: gzip, deflate, br") 'identity") + ' Request.Headers.Add("Authorization: " + Main.CrBetaBasic) + ' 'Request.Headers.Add("Referer: " + Url) + ' Request.Referer = Url + ' Request.Headers.Add("Origin: https://www.crunchyroll.com") + ' Request.Headers.Add(Cookies) + ' Dim Post As String = "grant_type=etp_rt_cookie" + ' Dim byteArray() As Byte = Encoding.UTF8.GetBytes(Post) + ' Request.ContentLength = byteArray.Length + ' Dim DataStream As Stream = Request.GetRequestStream() + ' DataStream.Write(byteArray, 0, byteArray.Length) + ' DataStream.Close() + ' Dim Response As HttpWebResponse = CType(Request.GetResponse(), HttpWebResponse) + ' DataStream = Response.GetResponseStream() + ' Dim reader As New StreamReader(DataStream) + ' Dim ServerResponseString As String = reader.ReadToEnd() + ' reader.Close() + ' DataStream.Close() + ' Response.Close() + ' 'Debug.WriteLine(ServerResponseString) + ' Dim Token() As String = ServerResponseString.Split(New String() {Chr(34) + "access_token" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim Token2() As String = Token(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' CRBetaBearer = CRBetaBearer + Token2(0) + ' Catch ex As Exception + ' Debug.WriteLine(ex.ToString) + ' CefSharp_Browser.WebBrowser1.Load(Url) + ' Exit Sub + ' End Try - Dim ObjectsUrl As String = Nothing + ' Dim ObjectsUrl As String = Nothing - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01") - client.Headers.Add("Accept-Encoding: identity") - client.Headers.Add("Referer: " + Url) - client.Headers.Add("Authorization: " + CRBetaBearer) - client.Headers.Add(Cookies) '+ WebBrowser1.Document.Cookie) - 'MsgBox(OmUStreamSplitEpisodeIndex(1)) - Dim v2Content As String = client.DownloadString("https://beta.crunchyroll.com/index/v2") - 'Debug.WriteLine(v2Content) + ' Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' client.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01") + ' client.Headers.Add("Accept-Encoding: identity") + ' client.Headers.Add("Referer: " + Url) + ' client.Headers.Add("Authorization: " + CRBetaBearer) + ' client.Headers.Add(Cookies) '+ WebBrowser1.Document.Cookie) + ' 'MsgBox(OmUStreamSplitEpisodeIndex(1)) + ' Dim v2Content As String = client.DownloadString("https://www.crunchyroll.com/index/v2") + ' 'Debug.WriteLine(v2Content) - Dim v2ContentBeta() As String = v2Content.Split(New String() {Chr(34) + "cms_beta" + Chr(34) + ":"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim v2ContentBeta() As String = v2Content.Split(New String() {Chr(34) + "cms_beta" + Chr(34) + ":"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim bucket() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "bucket" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim bucket2() As String = bucket(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim bucket() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "bucket" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim bucket2() As String = bucket(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim policy() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "policy" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim policy2() As String = policy(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim policy() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "policy" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim policy2() As String = policy(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim signature() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "signature" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim signature2() As String = signature(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim signature() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "signature" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim signature2() As String = signature(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim key_pair_id() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "key_pair_id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim key_pair_id2() As String = key_pair_id(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim key_pair_id() As String = v2ContentBeta(1).Split(New String() {Chr(34) + "key_pair_id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim key_pair_id2() As String = key_pair_id(1).Split(New String() {Chr(34) + "," + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ObjectsURLBuilder3() As String = Url.Split(New String() {"watch/"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ObjectsURLBuilder4() As String = ObjectsURLBuilder3(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ObjectsURLBuilder3() As String = Url.Split(New String() {"watch/"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim ObjectsURLBuilder4() As String = ObjectsURLBuilder3(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) - ObjectsUrl = "https://beta.crunchyroll.com/cms/v2" + bucket2(0) + "/objects/" + ObjectsURLBuilder4(0) + "?locale=" + locale + "&Signature=" + signature2(0) + "&Policy=" + policy2(0) + "&Key-Pair-Id=" + key_pair_id2(0) - End Using + ' ObjectsUrl = "https://www.crunchyroll.com/cms/v2" + bucket2(0) + "/objects/" + ObjectsURLBuilder4(0) + "?locale=" + locale + "&Signature=" + signature2(0) + "&Policy=" + policy2(0) + "&Key-Pair-Id=" + key_pair_id2(0) + ' End Using - 'Debug.WriteLine(ObjectsUrl) + ' 'Debug.WriteLine(ObjectsUrl) - Catch ex As Exception - CefSharp_Browser.WebBrowser1.Load(Url) - Exit Sub - End Try + ' Catch ex As Exception + ' CefSharp_Browser.WebBrowser1.Load(Url) + ' Exit Sub + ' End Try - Dim StreamsUrl As String = Nothing - Dim ObjectJson As String - Try - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - ObjectJson = client.DownloadString(ObjectsUrl) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting name data") - Exit Sub - End Try + ' Dim StreamsUrl As String = Nothing + ' Dim ObjectJson As String + ' Try + ' Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' ObjectJson = client.DownloadString(ObjectsUrl) + ' End Using + ' Catch ex As Exception + ' Debug.WriteLine("error- getting name data") + ' Exit Sub + ' End Try - Catch ex As Exception - CefSharp_Browser.WebBrowser1.Load(Url) - Exit Sub - End Try + ' Catch ex As Exception + ' CefSharp_Browser.WebBrowser1.Load(Url) + ' Exit Sub + ' End Try - Try - Dim StreamsUrlBuilder() As String = ObjectJson.Split(New String() {"videos/"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim StreamsUrlBuilder2() As String = StreamsUrlBuilder(1).Split(New String() {"/streams"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Try + ' Dim StreamsUrlBuilder() As String = ObjectJson.Split(New String() {"videos/"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim StreamsUrlBuilder2() As String = StreamsUrlBuilder(1).Split(New String() {"/streams"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim StreamsUrlBuilder3() As String = ObjectsUrl.Split(New String() {"objects/"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim StreamsUrlBuilder4() As String = StreamsUrlBuilder3(1).Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim StreamsUrlBuilder3() As String = ObjectsUrl.Split(New String() {"objects/"}, System.StringSplitOptions.RemoveEmptyEntries) + ' Dim StreamsUrlBuilder4() As String = StreamsUrlBuilder3(1).Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries) - StreamsUrl = StreamsUrlBuilder3(0) + "videos/" + StreamsUrlBuilder2(0) + "/streams?" + StreamsUrlBuilder4(1) + ' StreamsUrl = StreamsUrlBuilder3(0) + "videos/" + StreamsUrlBuilder2(0) + "/streams?" + StreamsUrlBuilder4(1) - ' Debug.WriteLine(StreamsUrl) - Catch ex As Exception - CefSharp_Browser.WebBrowser1.Load(Url) - Exit Sub - End Try + ' ' Debug.WriteLine(StreamsUrl) + ' Catch ex As Exception + ' CefSharp_Browser.WebBrowser1.Load(Url) + ' Exit Sub + ' End Try - Main.GetBetaVideoProxy(StreamsUrl, Url) + ' Main.GetBetaVideoProxy(StreamsUrl, Url) - Else - CefSharp_Browser.WebBrowser1.Load(Url) - End If + ' Else + CefSharp_Browser.WebBrowser1.Load(Url) + 'End If End Sub @@ -457,7 +457,7 @@ Public Class Anime_Add comboBox3.Enabled = False ComboBox1.Enabled = False - ElseIf CBool(InStr(Main.WebbrowserURL, "beta.crunchyroll.com")) = True Then + ElseIf CBool(InStr(Main.WebbrowserURL, "crunchyroll.com")) = True Then StatusLabel.Text = "Status: idle" 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel @@ -484,18 +484,6 @@ Public Class Anime_Add comboBox3.Enabled = False ComboBox1.Enabled = False - Else 'CR - - StatusLabel.Text = "Status: idle" - 'btn_dl.BackgroundImage = My.Resources.add_mass_running_cancel - btn_dl.Text = "Cancel" - Mass_DL_Cancel = True - bt_Cancel_mass.Enabled = False - bt_Cancel_mass.Visible = False - Main.MassDL() - comboBox4.Enabled = False - comboBox3.Enabled = False - ComboBox1.Enabled = False End If ElseIf GroupBox3.Visible = True Then @@ -605,11 +593,11 @@ Public Class Anime_Add End Sub Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged - If CBool(InStr(Main.WebbrowserURL, "beta.crunchyroll.com")) = True Then + If CBool(InStr(Main.WebbrowserURL, "crunchyroll.com")) = True Then comboBox3.Items.Clear() comboBox4.Items.Clear() - comboBox3.Enabled = True - comboBox4.Enabled = True + comboBox3.Enabled = False + comboBox4.Enabled = False comboBox3.Text = Nothing comboBox4.Text = Nothing Dim SeasonSplit() As String = Main.CrBetaMass.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) @@ -617,45 +605,25 @@ Public Class Anime_Add Dim SeasonSplit2() As String = SeasonSplit(ComboBox1.SelectedIndex + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim EpisodeJsonURL As String = Main.CrBetaMassBaseURL + "episodes?season_id=" + SeasonSplit2(0) + "&locale=" + Main.CrBetaMassParameters - Dim EpisodeJson As String = Nothing + Debug.WriteLine(EpisodeJsonURL) - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - EpisodeJson = client.DownloadString(EpisodeJsonURL) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting EpisodeJson data") - Debug.WriteLine(ex.ToString) - Exit Sub - End Try - Main.CrBetaMassEpisodes = EpisodeJson - - Dim EpisodeNameSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + CefSharp_Browser.WebBrowser1.LoadUrl(EpisodeJsonURL) - Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episode" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - For i As Integer = 1 To EpisodeSplit.Count - 1 - Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim EpisodeNameSplit2() As String = EpisodeNameSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - If EpisodeSplit(i).Substring(0, 1) = Chr(34) Then - comboBox3.Items.Add(EpisodeNameSplit2(0)) - comboBox4.Items.Add(EpisodeNameSplit2(0)) - Else - comboBox3.Items.Add("Episode " + EpisodeSplit2(0)) - comboBox4.Items.Add("Episode " + EpisodeSplit2(0)) - End If - - Next - - If comboBox3.Items.Count > 0 Then - comboBox3.SelectedIndex = 0 - comboBox4.SelectedIndex = comboBox4.Items.Count - 1 - End If + 'Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' EpisodeJson = client.DownloadString(EpisodeJsonURL) + ' End Using + 'Catch ex As Exception + ' Debug.WriteLine("error- getting EpisodeJson data") + ' Debug.WriteLine(ex.ToString) + ' Exit Sub + 'End Try @@ -761,42 +729,6 @@ Public Class Anime_Add End If - Else - - 'MsgBox(Main.WebbrowserURL) - comboBox3.Items.Clear() - comboBox4.Items.Clear() - comboBox3.Enabled = True - comboBox4.Enabled = True - 'comboBox3.Items.Add("[First Episode]") - 'comboBox4.Items.Add("[Last Episode]") - Dim SeasonDropdownAnzahl As String() = Main.WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries) - Array.Reverse(SeasonDropdownAnzahl) - Dim SDV As Integer = 0 - For i As Integer = 0 To SeasonDropdownAnzahl.Count - 1 - If CBool(InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + ComboBox1.SelectedItem.ToString + "")) Then - SDV = i - End If - Next - 'MsgBox(SDV) - Dim Anzahl As String() = SeasonDropdownAnzahl(SDV).Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries) - 'MsgBox(Anzahl(0)) - Dim c As Integer = Anzahl.Count - 1 - Array.Reverse(Anzahl) - For i As Integer = 0 To Anzahl.Count - 2 - Dim URLGrapp As String() = Anzahl(i).Split(New String() {"title=" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - - Dim URLGrapp2 As String() = URLGrapp(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - - comboBox3.Items.Add(URLGrapp2(0)) - comboBox4.Items.Add(URLGrapp2(0)) - Next - - If comboBox3.Items.Count > 0 Then - comboBox3.SelectedIndex = 0 - comboBox4.SelectedIndex = comboBox4.Items.Count - 1 - End If - End If End Sub diff --git a/Crunchyroll Downloader/CefSharp_Browser.vb b/Crunchyroll Downloader/CefSharp_Browser.vb index 4b6a94f..ad170ae 100644 --- a/Crunchyroll Downloader/CefSharp_Browser.vb +++ b/Crunchyroll Downloader/CefSharp_Browser.vb @@ -9,6 +9,7 @@ Imports System.Net.WebUtility Imports System.IO.Compression Imports System.Text Imports AdapterRequestHandler +Imports System.Security.Policy Public Class CefSharp_Browser @@ -39,6 +40,7 @@ Public Class CefSharp_Browser Main.WebbrowserURL = WebBrowser1.Address TextBox1.Text = Main.WebbrowserURL + Try If Btn_Scan.Enabled = False And Btn_Scan.Text = "Start network scan" Then Btn_Scan.Enabled = True @@ -71,15 +73,17 @@ Public Class CefSharp_Browser Try Dim HTML As String = Await WebBrowser1.GetSourceAsync + ' Dim HTML2 As String = Await + Document = HTML Debug.WriteLine("get html") Me.Invoke(New Action(Function() As Object + Main.WebbrowserText = HTML Main.WebbrowserURL = WebBrowser1.Address Main.WebbrowserTitle = DocumentTitle Main.ProcessHTML(HTML, WebBrowser1.Address, DocumentTitle) - 'If Main.UserBowser = False Then ' Me.Close() 'End If @@ -143,6 +147,28 @@ Public Class CefSharp_Browser Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Dim locale As String = "en-US" + Main.CR_Cookies = "Cookies: " + Try + Dim Collector As New TaskCookieVisitor + Dim CM As ICookieManager = WebBrowser1.GetCookieManager + CM.VisitAllCookies(Collector) + Dim DeviceRegion As String = Nothing + Dim list As List(Of Global.CefSharp.Cookie) = Collector.Task.Result() + For i As Integer = 0 To list.Count - 1 + + If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) = True And CBool(InStr(list.Item(i).Name, "_evidon_suppress")) = False Then + Main.CR_Cookies = Main.CR_Cookies + list.Item(i).Name + "=" + list.Item(i).Value + ";" + ' MsgBox(list.Item(i).Domain + vbNewLine + list.Item(i).Name + ":" + vbNewLine + list.Item(i).Value) + End If + If CBool(InStr(list.Item(i).Domain, ".crunchyroll.com")) And CBool(InStr(list.Item(i).Name, "c_locale")) Then + locale = list.Item(i).Value + + End If + Next + Catch ex As Exception + Debug.Write(ex.ToString) + End Try Try My.Computer.Clipboard.SetText(WebBrowser1.Address) @@ -283,23 +309,32 @@ Public Class CefSharp_Browser If (Me.InvokeRequired) Then Me.Invoke(Sub() - If CBool(InStr(e.Request.Url, "beta.crunchyroll.com")) = True And CBool(InStr(e.Request.Headers, "Basic ")) = True And Main.CrBetaBasic = Nothing Then + If CBool(InStr(e.Request.Url, "crunchyroll.com")) = True And CBool(InStr(e.Request.Headers, "Basic ")) = True And Main.CrBetaBasic = Nothing Then Dim Basic As String() = e.Request.Headers.Split(New String() {"Basic "}, System.StringSplitOptions.RemoveEmptyEntries) Dim Basic2 As String() = Basic(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) Main.CrBetaBasic = "Basic " + Basic2(0) Debug.WriteLine(Main.CrBetaBasic) End If + + + End Sub) Else - If CBool(InStr(e.Request.Url, "beta.crunchyroll.com")) = True And CBool(InStr(e.Request.Headers, "Basic ")) = True And Main.CrBetaBasic = Nothing Then + If CBool(InStr(e.Request.Url, "crunchyroll.com")) = True And CBool(InStr(e.Request.Headers, "Basic ")) = True And Main.CrBetaBasic = Nothing Then Dim Basic As String() = e.Request.Headers.Split(New String() {"Basic "}, System.StringSplitOptions.RemoveEmptyEntries) Dim Basic2 As String() = Basic(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) Main.CrBetaBasic = "Basic " + Basic2(0) Debug.WriteLine(Main.CrBetaBasic) End If + + + End If + + + ' 'Debug.WriteLine(e.Request.Url) @@ -336,8 +371,7 @@ Public Class CefSharp_Browser Exit Sub End If Debug.WriteLine(e.Request.Url) - - ElseIf CBool(InStr(e.Request.Url, "https://beta-api.crunchyroll.com/")) And CBool(InStr(e.Request.Url, "streams?")) Then + ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "streams?")) Then If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -346,25 +380,7 @@ Public Class CefSharp_Browser Exit Sub End If Debug.WriteLine(e.Request.Url) - ElseIf CBool(InStr(e.Request.Url, "https://beta.crunchyroll.com/")) And CBool(InStr(e.Request.Url, "streams?")) Then - If (Me.InvokeRequired) Then - Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) - Exit Sub - Else - Main.LoadedUrls.Add(e.Request.Url) - Exit Sub - End If - Debug.WriteLine(e.Request.Url) - ElseIf CBool(InStr(e.Request.Url, "https://beta-api.crunchyroll.com/")) And CBool(InStr(e.Request.Url, "seasons?series_id=")) Then - If (Me.InvokeRequired) Then - Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) - Exit Sub - Else - Main.LoadedUrls.Add(e.Request.Url) - Exit Sub - End If - Debug.WriteLine(e.Request.Url) - ElseIf CBool(InStr(e.Request.Url, "https://beta.crunchyroll.com/")) And CBool(InStr(e.Request.Url, "seasons?series_id=")) Then + ElseIf CBool(InStr(e.Request.Url, "crunchyroll.com/")) And CBool(InStr(e.Request.Url, "seasons?series_id=")) Then If (Me.InvokeRequired) Then Me.Invoke(Sub() Main.LoadedUrls.Add(e.Request.Url)) Exit Sub @@ -394,159 +410,6 @@ Public Class CefSharp_Browser End If - Exit Sub - - - Dim requesturl As String = Nothing - Try - requesturl = e.Request.Url - Catch ex As Exception - Exit Sub - End Try - - - - - If CBool(InStr(requesturl, "https://api.vrv.co")) And CBool(InStr(requesturl, "streams?")) Then - Debug.WriteLine("vrv-1 " + requesturl) - If Main.b = False Then - Main.Get_VRV_VideoProxy(requesturl, Main.WebbrowserURL) - Main.b = True - End If - - ElseIf CBool(InStr(requesturl, "https://api.vrv.co")) And CBool(InStr(requesturl, "seasons?series_id=")) Then - Debug.WriteLine("vrv-2 " + requesturl) - Exit Sub - If Main.b = False Then - Main.GetBetaSeasons(requesturl) - Main.b = True - End If - - End If - - - If CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then - - If Main.b = False Then - Main.GetBetaVideoProxy(requesturl, Main.WebbrowserURL) - Main.b = True - End If - - ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then - - If Main.b = False Then - Main.GetBetaVideoProxy(requesturl, Main.WebbrowserURL) - Main.b = True - End If - - ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then - - If Main.b = False Then - Main.GetBetaSeasons(requesturl) - Main.b = True - End If - - ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then - - If Main.b = False Then - Main.GetBetaSeasons(requesturl) - Main.b = True - End If - End If - - - If CBool(InStr(requesturl, "https://title-api.prd.funimationsvc.com")) And CBool(InStr(requesturl, "?region=")) Then - Try - Main.WebbrowserCookie = Cookie - Catch ex As Exception - End Try - - If Main.FunimationAPIRegion = Nothing Then - - Me.Invoke(New Action(Function() As Object - Dim parms As String() = requesturl.Split(New String() {"?region="}, System.StringSplitOptions.RemoveEmptyEntries) - Main.FunimationAPIRegion = "?region=" + parms(1) - Return Nothing - End Function)) - - End If - - If Main.b = False Then - If CBool(InStr(requesturl, "https://title-api.prd.funimationsvc.com/v1/show")) And CBool(InStr(requesturl, "/episodes/")) Then - Main.GetFunimationNewJS_VideoProxy(requesturl) - Main.b = True - Exit Sub - Else - Debug.WriteLine("processing js") - Me.Invoke(New Action(Function() As Object - Anime_Add.ProcessFunimationJS(WebBrowser1.Address) - Return Nothing - End Function)) - Main.b = True - - Exit Sub - End If - - - End If - End If - - If ScanTrue = True Then - - If CBool(InStr(requesturl, ".m3u8")) Then - Dim client0 As New WebClient - client0.Encoding = Encoding.UTF8 - 'client0.Headers.Add(HttpRequestHeader.Cookie, e.Channel.GetRequestHeader("Cookie")) - Dim str0 As String = client0.DownloadString(requesturl) - - If CBool(InStr(str0, "#EXTM3U")) Then - Main.m3u8List.Add(requesturl) - Else - Dim DecodedUrl As String = UrlDecode(requesturl) - 'MsgBox(DecodedUrl) - Dim URLSplit() As String = DecodedUrl.Split(New String() {".m3u8"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim URLSplit2() As String = URLSplit(0).Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim NewUrl As String = "https://" + URLSplit2(URLSplit2.Count - 1) + ".m3u8" + URLSplit(1) - 'MsgBox(NewUrl) - Dim str1 As String = client0.DownloadString(NewUrl) - 'MsgBox(str1) - If CBool(InStr(str1, "#EXTM3U")) Then - Main.m3u8List.Add(NewUrl) - End If - - End If - ElseIf CBool(InStr(requesturl, ".mpd")) Then - Main.mpdList.Add(requesturl) - ElseIf CBool(InStr(requesturl, "googlevideo.com")) And CBool(InStr(requesturl, "&range=")) = True Then - - Dim DecodedUrl As String = UrlDecode(requesturl) - 'MsgBox(DecodedUrl) - Dim VideoUrl() As String = DecodedUrl.Split(New String() {"&range="}, System.StringSplitOptions.RemoveEmptyEntries) - Dim VideoUrl2() As String = VideoUrl(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim NewUrl As String = VideoUrl(0) + "&" + VideoUrl2(1) - 'Debug.WriteLine(NewUrl) - - If Not Main.mpdList.Contains(NewUrl) Then - Main.mpdList.Add(NewUrl) - End If - - - ElseIf CBool(InStr(requesturl, ".txt")) Then - Main.txtList.Add(requesturl) - ElseIf CBool(InStr(requesturl, ".vtt")) Then - Main.txtList.Add(requesturl) - ElseIf CBool(InStr(requesturl, ".srt")) Then - Main.txtList.Add(requesturl) - ElseIf CBool(InStr(requesturl, ".ass")) Then - Main.txtList.Add(requesturl) - ElseIf CBool(InStr(requesturl, ".ssa")) Then - Main.txtList.Add(requesturl) - ElseIf CBool(InStr(requesturl, ".dfxp")) Then - Main.txtList.Add(requesturl) - End If - End If - - End Sub diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 4e82f32..ce76fc9 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -51,6 +51,7 @@ Partial Class Main Me.Timer3OffToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ThreadCount = New System.Windows.Forms.ToolStripMenuItem() Me.MsgBoxToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CRCookieToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -184,7 +185,7 @@ Partial Class Main ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.MsgBoxToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.MsgBoxToolStripMenuItem, Me.CRCookieToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -228,6 +229,11 @@ Partial Class Main Me.MsgBoxToolStripMenuItem.Name = "MsgBoxToolStripMenuItem" resources.ApplyResources(Me.MsgBoxToolStripMenuItem, "MsgBoxToolStripMenuItem") ' + 'CRCookieToolStripMenuItem + ' + Me.CRCookieToolStripMenuItem.Name = "CRCookieToolStripMenuItem" + resources.ApplyResources(Me.CRCookieToolStripMenuItem, "CRCookieToolStripMenuItem") + ' 'Main ' Me.ApplyImageInvert = True @@ -284,4 +290,5 @@ Partial Class Main Friend WithEvents Timer3OffToolStripMenuItem As ToolStripMenuItem Friend WithEvents ThreadCount As ToolStripMenuItem Friend WithEvents MsgBoxToolStripMenuItem As ToolStripMenuItem + Friend WithEvents CRCookieToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index cadd56d..08fd487 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -534,6 +534,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + CRCookieToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -597,6 +603,12 @@ MsgBox(LoadedUrls) + + 233, 22 + + + CR_Cookie + 234, 202 diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index e11cd72..c6fb3a6 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -15,17 +15,23 @@ Imports Newtonsoft.Json.Linq Imports System.Runtime.InteropServices Imports CefSharp.WinForms Imports CefSharp +Imports System.Security.Policy Public Class Main Inherits MetroForm Dim t As Thread Dim HTML As String = Nothing + Public CR_Cookies As String = "Cookie: " Public LoadedUrl As String = Nothing Public CrBetaMass As String = Nothing Public CrBetaMassEpisodes As String = Nothing Public CrBetaMassParameters As String = Nothing Public CrBetaMassBaseURL As String = Nothing Public CrBetaBasic As String = Nothing + Public CrBetaObjects As String = Nothing + Public CrBetaStreams As String = Nothing + Public CrBetaStreamsUrl As String = Nothing + Public BlockList As List(Of String) Public LoadedUrls As New List(Of String) Public VRVMass As String = Nothing @@ -429,7 +435,7 @@ Public Class Main Catch ex As Exception End Try ServicePointManager.Expect100Continue = True - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 Try Me.Icon = My.Resources.icon Catch ex As Exception @@ -799,164 +805,10 @@ Public Class Main #End Region #Region "Season DL" - Public Sub MassGrapp() - Anime_Add.groupBox2.Visible = True - Anime_Add.bt_Cancel_mass.Enabled = True - Anime_Add.bt_Cancel_mass.Visible = True - Anime_Add.groupBox1.Visible = False - Anime_Add.ComboBox1.Items.Clear() - Anime_Add.comboBox3.Items.Clear() - Anime_Add.comboBox4.Items.Clear() - Anime_Add.ComboBox1.Text = Nothing - Anime_Add.comboBox3.Text = Nothing - Anime_Add.comboBox4.Text = Nothing - Anime_Add.ComboBox1.Enabled = False - Anime_Add.comboBox3.Enabled = True - Anime_Add.comboBox4.Enabled = True - Dim Anzahl As String() = WebbrowserText.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim Titel As String() = Anzahl(0).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) - Dim Titel2 As String() = Titel(0).Split(New String() {">"}, System.StringSplitOptions.RemoveEmptyEntries) - 'MsgBox(Titel2(0)) - Anime_Add.ComboBox1.Items.Add(Titel2(1)) - Next - End Sub - Public Async Sub MassDL() - If Anime_Add.comboBox3.Text = Nothing Then - Exit Sub - End If - Anime_Add.Add_Display.Text = "preparing ..." - Dim Website As String = WebbrowserText - If Anime_Add.ComboBox1.Enabled = True Then - Dim SeasonDropdownAnzahl As String() = Website.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries) - Array.Reverse(SeasonDropdownAnzahl) - Dim SDV As Integer = 0 - For i As Integer = 0 To SeasonDropdownAnzahl.Count - 1 - If CBool(InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + Anime_Add.ComboBox1.SelectedItem.ToString + "")) Then - SDV = i - End If - Next - Website = SeasonDropdownAnzahl(SDV) - End If - Try - Dim Anzahl As String() = Website.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries) - Array.Reverse(Anzahl) - Dim c As Integer = 0 - Aktuell = "0" - If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Or Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox3.SelectedIndex Then - c = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + 1 - Else - Dim TempCB3 As Integer = Anime_Add.comboBox3.SelectedIndex - Dim TempCB4 As Integer = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex = TempCB4 - Anime_Add.comboBox4.SelectedIndex = TempCB3 - c = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + 1 - End If - Gesamt = c.ToString - For i As Integer = Anime_Add.comboBox3.SelectedIndex To Anime_Add.comboBox4.SelectedIndex - For e As Integer = 0 To Integer.MaxValue - 'FontLabel.Visible = True - 'FontLabel.Text = RunningDownloads - If Grapp_RDY = True Then - Try - Dim ItemFinshedCount As Integer = 0 - For i2 As Integer = 0 To ListView1.Items.Count - 1 - If ItemList(i2).GetIsStatusFinished() = True Then - ItemFinshedCount = ItemFinshedCount + 1 - End If - Next - RunningDownloads = ListView1.Items.Count - ItemFinshedCount - Catch ex As Exception - RunningDownloads = ListView1.Items.Count - End Try - If RunningDownloads < MaxDL Then - Exit For - Else - 'MsgBox(e) - Await Task.Delay(1000) - End If - Else - Await Task.Delay(5000) - End If - Next - If Anime_Add.Mass_DL_Cancel = False Then - b = True - Exit For - Grapp_Abord = True - 'MsgBox("dl_abourd") - End If - Dim d As Integer = i - Anime_Add.comboBox3.SelectedIndex + 1 - Dim URLGrapp As String() = Anzahl(i).Split(New String() {"")) Then ' false on movie true on series - Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - Dim CR_Name_Staffel0_Folge1 As String() - If CBool(InStr(CR_Name_2(0), ",")) Then - CR_Name_Staffel0_Folge1 = CR_Name_2(0).Split(New [Char]() {System.Convert.ToChar(",")}, System.StringSplitOptions.RemoveEmptyEntries) - CR_Anime_Staffel = CR_Name_Staffel0_Folge1(0).Trim() - CR_Anime_Folge = CR_Name_Staffel0_Folge1(1) - CR_Anime_Folge = String.Join(" ", CR_Anime_Folge.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ") - Else - CR_Anime_Staffel = Nothing - CR_Anime_Folge = CR_Name_2(0).Trim() - 'MsgBox(CR_Anime_Folge) - CR_Anime_Folge = String.Join(" ", CR_Anime_Folge.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ") - End If - Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries) - CR_Name_Anime0(0) = String.Join(" ", CR_Name_Anime0(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ") - CR_Anime_Titel = CR_Name_Anime0(0).Trim - 'CR_FilenName_Backup = RemoveExtraSpaces(CR_FilenName) - End If - If CBool(InStr(WebbrowserText, My.Resources.CR_Episode_Nr)) Then - If CBool(InStr(WebbrowserText, My.Resources.CR_Episode_Nr + Chr(34))) Then - Debug.WriteLine("No Episode Number in a movie") - Else - Dim CR_Episode_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_Episode_Nr}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Episode_2 As String() = CR_Episode_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - CR_Anime_Folge_int = String.Join(" ", CR_Episode_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") - CR_Anime_Folge_int = RemoveExtraSpaces(CR_Anime_Folge_int) - 'CR_Anime_Folge_int = AddLeadingZeros(CR_Anime_Folge_int) - End If - If CBool(InStr(CR_Anime_Folge_int, ",")) Then - CR_Anime_Folge_int = CR_Anime_Folge_int.Replace(",", ".") - End If - End If - If CBool(InStr(WebbrowserHeadText, My.Resources.CR_Season_Nr)) Then - If CBool(InStr(WebbrowserHeadText, My.Resources.CR_Season_Nr + Chr(34))) Then - Debug.WriteLine("No Season Number in a movie") - Else - Dim CR_Season_1 As String() = WebbrowserHeadText.Split(New String() {My.Resources.CR_Season_Nr}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Season_2 As String() = CR_Season_1(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - CR_Anime_Staffel_int = String.Join(" ", CR_Season_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") - CR_Anime_Staffel_int = RemoveExtraSpaces(CR_Anime_Staffel_int) - End If - Else - Debug.WriteLine("Not found?") - End If - If CBool(InStr(WebbrowserText, My.Resources.CR_MediaName)) = True Then ' And CBool(InStr(WebbrowserText, "”")) - Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_MediaName}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {My.Resources.CR_MediaName2}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - CR_Anime_Name = String.Join(" ", CR_Name_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") - CR_Anime_Name = RemoveExtraSpaces(CR_Anime_Name) - End If - If CR_Anime_Titel = Nothing Then 'it's a movie?? - - Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {My.Resources.CR_MovieTop}, System.StringSplitOptions.RemoveEmptyEntries) - Dim CR_Name_2 As String() = CR_Name_1(2).Split(New String() {My.Resources.CR_MovieBT}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - CR_Anime_Titel = String.Join(" ", CR_Name_2(0).Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_Name_2(0), "[^\w\\-]", " ") - CR_Anime_Titel = RemoveExtraSpaces(CR_Anime_Titel) - - - End If - - - If Season_Prefix = "[default season prefix]" Then - Else - If CR_Anime_Staffel_int = "0" Then - Else - CR_Anime_Staffel = Season_Prefix + CR_Anime_Staffel_int - End If - End If - If Episode_Prefix = "[default episode prefix]" Then - If CR_Anime_Folge_int = Nothing Then - - ElseIf CR_Anime_Folge = Nothing = True And CR_Anime_Folge_int = Nothing = False Then - CR_Anime_Folge = "Episode " + AddLeadingZeros(CR_Anime_Folge_int) - Else - CR_Anime_Folge = CR_Anime_Folge.Replace(CR_Anime_Folge_int, AddLeadingZeros(CR_Anime_Folge_int)) - End If - Else - If CR_Anime_Folge_int = Nothing Then - - ElseIf CR_Anime_Folge = Nothing = True And CR_Anime_Folge_int = Nothing = False Then - CR_Anime_Folge = "Episode " + AddLeadingZeros(CR_Anime_Folge_int) - Else - CR_Anime_Folge = Episode_Prefix + AddLeadingZeros(CR_Anime_Folge_int) - End If - End If - - If CR_Anime_Titel = Nothing Then - CR_FilenName = CR_Anime_Name - ElseIf CR_NameMethode = 0 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge - End If - ElseIf CR_NameMethode = 1 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Name - End If - ElseIf CR_NameMethode = 2 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge + " " + CR_Anime_Name - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge + " " + CR_Anime_Name - End If - ElseIf CR_NameMethode = 3 Then - If CR_Anime_Staffel = Nothing Then - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name + " " + CR_Anime_Folge - Else - CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Name + " " + CR_Anime_Staffel + " " + CR_Anime_Folge - End If - End If - If KodiNaming = True And CR_Anime_Folge_int IsNot Nothing Then - Dim KodiString As String = "[S" - If CR_Anime_Staffel_int = "0" Then - CR_Anime_Staffel_int = "01" - Else - CR_Anime_Staffel_int = "0" + CR_Anime_Staffel_int - End If - KodiString = KodiString + CR_Anime_Staffel_int + " E" + AddLeadingZeros(CR_Anime_Folge_int) - KodiString = KodiString + "] " - CR_FilenName = KodiString + CR_FilenName - End If - 'MsgBox(CR_FilenName) -#End Region - If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Then - Else - CR_FilenName = RemoveExtraSpaces(String.Join(" ", TextBox2_Text.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c)).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " ")) - End If - If CR_FilenName = Nothing Then - CR_FilenName = WebbrowserTitle - End If - CR_FilenName = String.Join(" ", CR_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ") - CR_FilenName = RemoveExtraSpaces(CR_FilenName) - 'My.Computer.FileSystem.WriteAllText("log.log", WebbrowserText, False) - Pfad2 = UseSubfolder(CR_Anime_Titel, CR_Anime_Staffel, Pfad) - If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then - ' Nein! Jetzt erstellen... - Try - Directory.CreateDirectory(Path.GetDirectoryName(Pfad2)) - Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34) - Catch ex As Exception - ' Ordner wurde nich erstellt - Pfad2 = Chr(34) + Pfad + CR_FilenName + VideoFormat + Chr(34) - End Try - Else - Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34) - End If -#End Region -#Region "Subs" - Dim SoftSubs2 As New List(Of String) - If SoftSubs.Count > 0 Then - For i As Integer = 0 To SoftSubs.Count - 1 - If CBool(InStr(WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + ",")) Then - SoftSubs2.Add(SoftSubs(i)) - Else - 'MsgBox("Softsubtitle for " + SoftSubs(i) + " is not avalible.", MsgBoxStyle.Information) - End If - Next - End If - If SubSprache = "None" Then - If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then - SubSprache2 = "null" - Else - Me.Invoke(New Action(Function() As Object - ResoNotFoundString = WebbrowserText - DialogTaskString = "Language" - ErrorDialog.ShowDialog() - Return Nothing - End Function)) - If UserCloseDialog = True Then - Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) - Else - If ResoBackString = Nothing Then - Else - SubSprache2 = ResoBackString - End If - End If - 'Throw New System.Exception("Could not find the sub language") - End If - Else - If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then - SubSprache2 = Chr(34) + SubSprache + Chr(34) - ElseIf CBool(InStr(WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then - If MessageBox.Show("It look like only Softsubtitle are avalibe." + vbNewLine + "Are you want to use Softsubtitle this time instead?", "No Hardsubtitle", MessageBoxButtons.YesNo) = DialogResult.Yes Then - SubSprache2 = "null" - SoftSubs2.Add(SubSprache) - Else - Throw New System.Exception("Could not find the sub language") - End If - Else - Me.Invoke(New Action(Function() As Object - ResoNotFoundString = WebbrowserText - DialogTaskString = "Language" - ErrorDialog.ShowDialog() - Return Nothing - End Function)) - If UserCloseDialog = True Then - Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) - Else - If ResoBackString = Nothing Then - Else - SubSprache2 = ResoBackString - End If - End If - End If - End If -#End Region - If Grapp_Abord = True Then - Grapp_RDY = True - Grapp_Abord = False - 'MsgBox("grapp_abourd") - Exit Sub - End If -#Region "m3u8 suche" - Dim CR_URI_Master As String = Nothing - If SubsOnly = False Then - Dim ii As Integer = 0 - 'MsgBox(Chr(34) + "hardsub_lang" + Chr(34) + ":" + SubSprache2 + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)) - Dim CR_URI_Master_Split1 As String() = WebbrowserText.Split(New String() {My.Resources.hls_Value}, System.StringSplitOptions.RemoveEmptyEntries) - Dim hls_List As New List(Of String) - For i As Integer = 0 To CR_URI_Master_Split1.Count - 1 - If CBool(InStr(CR_URI_Master_Split1(i), My.Resources.hls_endString)) Then - Dim s As String() = CR_URI_Master_Split1(i).Split(New String() {My.Resources.hls_endString}, System.StringSplitOptions.RemoveEmptyEntries) - hls_List.Add(s(0)) - End If - Next - 'Dim CR_URI_Master_Split1 As String() = WebbrowserText.Split(New String() {Chr(34) + "hardsub_lang" + Chr(34) + ":" + SubSprache2 + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - For i As Integer = 0 To hls_List.Count - 1 - If CBool(InStr(hls_List(i), Chr(34) + "hardsub_lang" + Chr(34) + ":" + SubSprache2 + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then - Dim s() As String = hls_List(i).Split(New String() {Chr(34) + "hardsub_lang" + Chr(34) + ":" + SubSprache2 + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - CR_URI_Master = s(1).Replace("\/", "/") - Dim dub() As String = hls_List(i).Split(New String() {Chr(34) + "audio_lang" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim dub2() As String = dub(0).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) - CR_Anime_Dub = dub2(0) - 'MsgBox(CR_URI_Master) - End If - Next - If CBool(InStr(CR_URI_Master, "master.m3u8")) Then - Me.Invoke(New Action(Function() As Object - Anime_Add.StatusLabel.Text = "Status: m3u8 found, looking for resolution" - Me.Text = "Status: m3u8 found, looking for resolution" - Me.Invalidate() - Return Nothing - End Function)) - Else - Throw New System.Exception("Premium Episode") - End If - Else - Me.Invoke(New Action(Function() As Object - Anime_Add.StatusLabel.Text = "Status: Substitles only mode - skipped video" - Me.Text = "Status: Substitles only mode - skipped video" - Me.Invalidate() - Return Nothing - End Function)) - End If -#End Region -#Region "Download softsub file or build ffmpeg cmd" - Dim SoftSubMergeURLs As String = Nothing - Dim SoftSubMergeMaps As String = " -map 0:v -map 0:a" - Dim SoftSubMergeMetatata As String = Nothing - If SoftSubs2.Count > 0 Then - If MergeSubs = True And SubsOnly = False Then - Dim DispositionIndex As Integer - For i As Integer = 0 To SoftSubs2.Count - 1 - Debug.WriteLine(SoftSubs2(i)) - If SoftSubs2(i) = DefaultSubCR Then - DispositionIndex = i - End If - Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)}) - Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/") - If SoftSubMergeURLs = Nothing Then - SoftSubMergeURLs = " -i " + Chr(34) + SoftSub_3 + Chr(34) - Else - SoftSubMergeURLs = SoftSubMergeURLs + " -i " + Chr(34) + SoftSub_3 + Chr(34) - End If - SoftSubMergeMaps = SoftSubMergeMaps + " -map " + (i + 1).ToString - If SoftSubMergeMetatata = Nothing Then - SoftSubMergeMetatata = " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i)) + " -metadata:s:s:" + i.ToString + " title=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) + " -metadata:s:s:" + i.ToString + " handler_name=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) - Else - SoftSubMergeMetatata = SoftSubMergeMetatata + " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i)) + " -metadata:s:s:" + i.ToString + " title=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) + " -metadata:s:s:" + i.ToString + " handler_name=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) - End If - Next - If DispositionIndex = Nothing Then - Else - SoftSubMergeMetatata = SoftSubMergeMetatata + " -disposition:s:" + DispositionIndex.ToString + " default" - End If - Else - For i As Integer = 0 To SoftSubs2.Count - 1 - Dim ii As Integer = i - Me.Invoke(New Action(Function() As Object - Anime_Add.StatusLabel.Text = "Status: downloading subtitle file " + HardSubValuesToDisplay(SoftSubs2(ii)) - Me.Text = "Status: downloading subtitle file " + HardSubValuesToDisplay(SoftSubs2(ii)) - Me.Invalidate() - Return Nothing - End Function)) - Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)}) - Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/") - Dim client0 As New WebClient - client0.Encoding = Encoding.UTF8 - Dim str0 As String = client0.DownloadString(SoftSub_3) - Dim Pfad3 As String = Pfad2.Replace(Chr(34), "") - Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubs2(i)) + Path.GetExtension(Pfad3)), "ass") - 'MsgBox(FN) - If i = 0 And IncludeLangName = False Then - FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass") - 'MsgBox(FN) - End If - Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN) - 'MsgBox(Pfad4) - 'File.WriteAllText(Pfad4, str0, Encoding.UTF8) - WriteText(Pfad4, str0) - Pause(3) - Next - End If - End If -#End Region -#Region "lösche doppel download" - Dim Pfad5 As String = Pfad2.Replace(Chr(34), "") - If My.Computer.FileSystem.FileExists(Pfad5) Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung - Me.Invoke(New Action(Function() As Object - Anime_Add.StatusLabel.Text = "Status: The file video already exists." - Me.Text = "Status: The file video already exists." - Me.Invalidate() - Return Nothing - End Function)) - If MessageBox.Show("The file " + Pfad5 + " already exists." + vbNewLine + "You want to override it?", "File exists!", MessageBoxButtons.OKCancel) = DialogResult.OK Then - Try - My.Computer.FileSystem.DeleteFile(Pfad5) - Catch ex As Exception - End Try - Else - Grapp_RDY = True - Exit Sub - End If - End If -#End Region - If SubsOnly = False Then - If Reso = 42 And HybridMode = False Then - If MergeSubs = True Then - URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) - Else - URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command_temp - End If - 'MsgBox(URL_DL) - Else - Dim client As New System.Net.WebClient - client.Encoding = Encoding.UTF8 - 'MsgBox(CR_URI_Master) - Dim str As String = client.DownloadString(CR_URI_Master) - 'MsgBox(str) - If CBool(InStr(str, "x" + Reso.ToString + ",")) Then - Reso2 = "x" + Reso.ToString - Else - 'MsgBox(str) - If CBool(InStr(str, ResoSave + ",")) Then - Reso2 = Reso2 - Else - Me.Invoke(New Action(Function() As Object - DialogTaskString = "Resolution" - ResoNotFoundString = str - ErrorDialog.ShowDialog() - Return Nothing - End Function)) - 'MsgBox(ResoBackString) - If UserCloseDialog = True Then - Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) - Else - Reso2 = ResoBackString - ResoSave = ResoBackString - End If - End If - End If - Dim ffmpeg_url_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ffmpeg_url_3 As String() = Nothing - Dim ffmpeg_url_2 As String() = ffmpeg_url_1(1).Split(New [Char]() {Chr(34)}) - ffmpeg_url_3 = ffmpeg_url_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) - If MergeSubs = True Then - URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) - Else - URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) + " " + ffmpeg_command_temp - End If - End If - End If -#Region "thumbnail" - Dim thumbnail As String() = WebbrowserText.Split(New String() {My.Resources.thumbnailString}, System.StringSplitOptions.RemoveEmptyEntries) - Dim thumbnail2 As String() = thumbnail(1).Split(New String() {Chr(34) + "}"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) - Dim thumbnail3 As String = thumbnail2(0).Replace("\/", "/") -#End Region -#Region "
  • constructor" - Dim Subsprache3 As String = HardSubValuesToDisplay(SubSprache2.Replace(Chr(34), "")) - Dim ResoHTMLDisplay As String = Nothing - If ResoBackString = Nothing Then - ResoHTMLDisplay = Reso.ToString + "p" - ElseIf DialogTaskString = "Language" Then - ResoHTMLDisplay = Reso.ToString + "p" - Else - Dim ResoHTML As String() = ResoBackString.Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries) - If ResoHTML.Count > 1 Then - ResoHTMLDisplay = ResoHTML(1) + "p" - Else - ResoHTMLDisplay = ResoHTML(0) + "p" - End If - End If - Dim L2Name As String = String.Join(" ", CR_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_FilenName_Backup, "[^\w\\-]", " ") - If Reso = 42 And HybridMode = False Then - ResoHTMLDisplay = "[Auto]" - ElseIf Reso = 42 And HybridMode = False Then - ResoHTMLDisplay = Reso2 - End If - Pfad_DL = Pfad2 - Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + HardSubValuesToDisplay(CR_Anime_Dub) - If SubsOnly = True Then - URL_DL = "-i [Subtitles only]" - End If - Me.Invoke(New Action(Function() As Object - ListItemAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) - Return Nothing - End Function)) - 'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
    " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "") - 'Form1.RichTextBox1.Text = My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_Anime_Titel + "
    " + CR_Anime_Staffel + " " + CR_Anime_Folge + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "" -#End Region - Grapp_RDY = True - Me.Invoke(New Action(Function() As Object - Anime_Add.StatusLabel.Text = "Status: idle" - Me.Text = "Crunchyroll Downloader" - Me.Invalidate() - ResoBackString = Nothing - Return Nothing - End Function)) - Catch ex As Exception - 'Me.Invoke(New Action(Function() As Object - ' Anime_Add.StatusLabel.Text = "Status: idle" - ' Me.Text = "Crunchyroll Downloader" - ' Me.Invalidate() - ' Return Nothing - ' End Function)) - Grapp_RDY = True - If CBool(InStr(ex.ToString, "Could not find the sub language")) Then - MsgBox(Sub_language_NotFound + SubSprache) - ElseIf CBool(InStr(ex.ToString, "RESOLUTION Not Found")) Then - MsgBox(Resolution_NotFound) - ElseIf CBool(InStr(ex.ToString, "Premium Episode")) Then - MsgBox(Premium_Stream, MsgBoxStyle.Information) - ElseIf CBool(InStr(ex.ToString, "System.UnauthorizedAccessException")) Then - MsgBox(ErrorNoPermisson + vbNewLine + ex.ToString, MsgBoxStyle.Information) - ElseIf CBool(InStr(ex.ToString, Chr(34) + "UserAbort" + Chr(34))) Then - MsgBox(ex.ToString, MsgBoxStyle.Information) - Else - MsgBox(ex.ToString, MsgBoxStyle.Information) - End If - End Try - End Sub #Region "CR-Beta" Public Async Sub DownloadBetaSeasons() Try Dim ListOfEpisodes As New List(Of String) Dim EpisodeSplit() As String = CrBetaMassEpisodes.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + My.Computer.FileSystem.WriteAllText("D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - CefSharp\Crunchyroll Downloader\bin\x64\Debug\WebInterface\EpisodeSplit.txt", CrBetaMassEpisodes, False) + '"slug_title":" For i As Integer = 1 To EpisodeSplit.Count - 1 Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - ListOfEpisodes.Add("https://beta.crunchyroll.com/watch/" + EpisodeSplit2(0) + "/") + Dim EpisodeSplit3() As String = EpisodeSplit(i).Split(New String() {Chr(34) + "slug_title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim EpisodeSplit4() As String = EpisodeSplit3(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + MsgBox("https://www.crunchyroll.com/watch/" + EpisodeSplit2(0) + "/" + EpisodeSplit4(0) + "/") + ListOfEpisodes.Add("https://www.crunchyroll.com/watch/" + EpisodeSplit2(0) + "/" + EpisodeSplit4(0) + "/") Next Dim First As Integer = 0 Dim Last As Integer = 0 @@ -1684,7 +1057,7 @@ Public Class Main Grapp_RDY = False b = False Debug.WriteLine("b: " + b.ToString) - Navigate(ListOfEpisodes(i)) + Anime_Add.LoadBrowser(ListOfEpisodes(i)) End If Anime_Add.Add_Display.Text = (i - First + 1).ToString + " / " + (Last - First + 1).ToString Next @@ -1710,7 +1083,7 @@ Public Class Main Anime_Add.btn_dl.Text = "Download" 'Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default End Sub - Public Sub GetBetaSeasons(ByVal JsonUrl As String) + Public Sub GetBetaSeasons(ByVal JsonUrl As String, ByVal SeasonJson As String) Anime_Add.groupBox2.Visible = True Anime_Add.bt_Cancel_mass.Enabled = True Anime_Add.bt_Cancel_mass.Visible = True @@ -1724,16 +1097,16 @@ Public Class Main Anime_Add.ComboBox1.Enabled = True Anime_Add.comboBox3.Enabled = True Anime_Add.comboBox4.Enabled = True - Dim SeasonJson As String = Nothing - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - SeasonJson = client.DownloadString(JsonUrl) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting SeasonJson data") - End Try + 'Dim SeasonJson As String = Nothing + 'Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' SeasonJson = client.DownloadString(JsonUrl) + ' End Using + 'Catch ex As Exception + ' Debug.WriteLine("error- getting SeasonJson data") + 'End Try SeasonJson = CleanJSON(SeasonJson) Dim ParameterSplit() As String = JsonUrl.Split(New String() {"&locale="}, System.StringSplitOptions.RemoveEmptyEntries) CrBetaMassParameters = ParameterSplit(1) @@ -1747,15 +1120,26 @@ Public Class Main Next End Sub - Public Sub GetBetaVideoProxy(ByVal requesturl As String, ByVal WebsiteURL As String) - Dim Evaluator = New Thread(Sub() Me.GetBetaVideo(requesturl, WebsiteURL)) + Public Sub GetBetaVideoProxy(ByVal requesturl As String, ByVal WebsiteURL As String, ByVal ObjectJson As String, ByVal VideoJson As String) + Dim Evaluator = New Thread(Sub() Me.GetBetaVideo(requesturl, WebsiteURL, ObjectJson, VideoJson)) Evaluator.Start() End Sub - Public Sub GetBetaVideo(ByVal Streams As String, ByVal WebsiteURL As String) - Debug.WriteLine(Streams) - Debug.WriteLine(vbCrLf) - Debug.WriteLine(WebsiteURL) + Public Sub GetBetaVideo(ByVal Streams As String, ByVal WebsiteURL As String, ByVal ObjectJson As String, ByVal VideoJson As String) ' + 'Debug.WriteLine(Streams) + ' Debug.WriteLine(vbCrLf) + ' Debug.WriteLine("Website: " + WebsiteURL) + + CrBetaStreams = Nothing + CrBetaObjects = Nothing + CrBetaStreamsUrl = Nothing + LoadedUrl = Nothing + + 'My.Computer.FileSystem.WriteAllText("D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - CefSharp\Crunchyroll Downloader\bin\x64\Debug\WebInterface\debugObjects.txt", ObjectJson, False) + + 'My.Computer.FileSystem.WriteAllText("D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - CefSharp\Crunchyroll Downloader\bin\x64\Debug\WebInterface\debugStreams.txt", VideoJson, False) + + Try Grapp_RDY = False Dim ffmpeg_command_temp As String = ffmpeg_command @@ -1779,36 +1163,52 @@ Public Class Main Dim Pfad2 As String Dim TextBox2_Text As String = Nothing Dim CR_FilenName As String = Nothing - Dim ObjectJson As String = Nothing + 'Dim ObjectJson As String = Nothing Me.Invoke(New Action(Function() As Object TextBox2_Text = Anime_Add.TextBox2.Text Return Nothing End Function)) #Region "Name von Crunchyroll" + + + Dim ObjectsURLBuilder() As String = Streams.Split(New String() {"videos"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ObjectsURLBuilder2() As String = ObjectsURLBuilder(1).Split(New String() {"/streams"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ObjectsURLBuilder3() As String = WebsiteURL.Split(New String() {"watch/"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ObjectsURLBuilder4() As String = ObjectsURLBuilder3(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) Dim ObjectsURL As String = ObjectsURLBuilder(0) + "objects/" + ObjectsURLBuilder4(0) + ObjectsURLBuilder2(1) - Debug.WriteLine(ObjectsURL) - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - ObjectJson = client.DownloadString(ObjectsURL) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting name data") - Exit Sub - End Try + 'Debug.WriteLine(ObjectsURL) + 'Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' client.Headers.Add(CR_Cookies) 'document + ' client.Headers.Add("Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8") + ' client.Headers.Add("Accept-Encoding: gzip, deflate, br") + ' client.Headers.Add("Sec-Fetch-Dest: document") + ' client.Headers.Add("Sec-Fetch-Mode: navigate") + ' client.Headers.Add("Sec-Fetch-Site: none") 'Sec-Fetch-User + ' client.Headers.Add("Sec-Fetch-User: ?1") ' + ' client.Headers.Add("TE: trailers") + ' client.Headers.Add("Upgrade-Insecure-Requests: 1") + ' ObjectJson = client.DownloadString(ObjectsURL) + ' End Using + 'Catch ex As Exception + + ' Debug.WriteLine("error- getting name data") + ' Debug.WriteLine(vbNewLine + ex.ToString) + + ' Exit Sub + 'End Try 'Filter JSON esqaped characters - Debug.WriteLine(Date.Now.ToString + "before:" + ObjectJson) + 'Debug.WriteLine(Date.Now.ToString + "before:" + ObjectJson) ObjectJson = CleanJSON(ObjectJson) - Debug.WriteLine(Date.Now.ToString + "after:" + ObjectJson) + 'Debug.WriteLine(Date.Now.ToString + "after:" + ObjectJson) Dim ser As JObject = JObject.Parse(ObjectJson) Dim data As List(Of JToken) = ser.Children().ToList + If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Then For Each item As JProperty In data item.CreateReader() @@ -2049,17 +1449,17 @@ Public Class Main #End Region #Region "VideoJson" - Dim VideoJson As String = Nothing - Try - Using client As New WebClient() - client.Encoding = System.Text.Encoding.UTF8 - client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) - VideoJson = client.DownloadString(Streams) - End Using - Catch ex As Exception - Debug.WriteLine("error- getting stream data") - Exit Sub - End Try + 'Dim VideoJson As String = Nothing + 'Try + ' Using client As New WebClient() + ' client.Encoding = System.Text.Encoding.UTF8 + ' client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), "")) + ' VideoJson = client.DownloadString(Streams) + ' End Using + 'Catch ex As Exception + ' Debug.WriteLine("error- getting stream data") + ' Exit Sub + 'End Try 'Dim hls_type As String = Nothing 'If CBool(InStr(VideoJson, Chr(34) + "adaptive_hls")) = True Then ' hls_type = "adaptive_hls" @@ -4537,7 +3937,63 @@ Public Class Main Dim localHTML As String = document Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString) Debug.WriteLine(Address) - If CBool(InStr(Address, "title-api.prd.funimationsvc.com")) Then + If CBool(InStr(Address, "crunchyroll.com/")) And CBool(InStr(Address, "streams?")) Then + Debug.WriteLine("Streams") + CrBetaStreamsUrl = Address + CrBetaStreams = localHTML.Replace("", "").Replace("", "").Replace("
    ", "").Replace("
    ", "").Replace("", "").Replace(My.Resources.htmlReplace, "") + + Dim ObjectsURLBuilder() As String = Address.Split(New String() {"videos"}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ObjectsURLBuilder2() As String = ObjectsURLBuilder(1).Split(New String() {"/streams"}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ObjectsURLBuilder3() As String = LoadedUrl.Split(New String() {"watch/"}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ObjectsURLBuilder4() As String = ObjectsURLBuilder3(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ObjectsURL As String = ObjectsURLBuilder(0) + "objects/" + ObjectsURLBuilder4(0) + ObjectsURLBuilder2(1) + Debug.WriteLine(ObjectsURL) + CefSharp_Browser.WebBrowser1.LoadUrl(ObjectsURL) + + ElseIf CBool(InStr(Address, "crunchyroll.com/")) And CBool(InStr(Address, "objects")) Then + + CrBetaObjects = localHTML.Replace("", "").Replace("", "").Replace("
    ", "").Replace("
    ", "").Replace("", "").Replace(My.Resources.htmlReplace, "") + + GetBetaVideoProxy(CrBetaStreamsUrl, LoadedUrl, CrBetaObjects, CrBetaStreams) + + ElseIf CBool(InStr(Address, "crunchyroll.com/")) And CBool(InStr(Address, "seasons?series_id=")) Then + + GetBetaSeasons(Address, localHTML.Replace("", "").Replace("", "").Replace("
    ", "").Replace("
    ", "").Replace("", "").Replace(My.Resources.htmlReplace, "")) + + ElseIf CBool(InStr(Address, CrBetaMassBaseURL + "episodes?season_id=")) Then + + + Dim EpisodeJson As String = localHTML.Replace("", "").Replace("", "").Replace("
    ", "").Replace("
    ", "").Replace("", "").Replace(My.Resources.htmlReplace, "") + + + CrBetaMassEpisodes = EpisodeJson + + Dim EpisodeNameSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + + + Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episode" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + For i As Integer = 1 To EpisodeSplit.Count - 1 + Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim EpisodeNameSplit2() As String = EpisodeNameSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + If EpisodeSplit(i).Substring(0, 1) = Chr(34) Then + Anime_Add.comboBox3.Items.Add(EpisodeNameSplit2(0)) + Anime_Add.comboBox4.Items.Add(EpisodeNameSplit2(0)) + Else + Anime_Add.comboBox3.Items.Add("Episode " + EpisodeSplit2(0)) + Anime_Add.comboBox4.Items.Add("Episode " + EpisodeSplit2(0)) + End If + + Next + + If Anime_Add.comboBox3.Items.Count > 0 Then + Anime_Add.comboBox3.SelectedIndex = 0 + Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox4.Items.Count - 1 + End If + + Anime_Add.comboBox3.Enabled = True + Anime_Add.comboBox4.Enabled = True + + ElseIf CBool(InStr(Address, "title-api.prd.funimationsvc.com")) Then If FunimationJsonBrowser = "EpisodeJson" Then Anime_Add.FillFunimationEpisodes(localHTML.Replace("", "").Replace("", "").Replace("
    ", "").Replace("
    ", "").Replace("", "").Replace("
    ", "")) '
                 FunimationJsonBrowser = Nothing
@@ -4590,7 +4046,7 @@ Public Class Main
             Exit Sub
         End If
         'MsgBox("loaded!")
-        If CBool(InStr(Address, "beta.crunchyroll.com")) Then
+        If CBool(InStr(Address, "crunchyroll.com")) Then
             WebbrowserURL = Address
             For i As Integer = 10 To 1 Step -1
                 If b = True Then
@@ -4613,97 +4069,18 @@ Public Class Main
             Me.Text = "Status: Processing... "
             ProcessUrls()
             Exit Sub
-        ElseIf CBool(InStr(Address, "crunchyroll.com")) Then
-            If b = False Then
-                Try
-                    If Address = "https://www.crunchyroll.com/" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/en-gb" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/es" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/es-es" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/pt-br" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/pt-pt" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/fr" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/de" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/ar" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/it" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf Address = "https://www.crunchyroll.com/ru" Then
-                        MainPageLoaded()
-                        Exit Sub
-                    ElseIf CBool(InStr(localHTML, "hardsub_lang")) Then
-                        Debug.WriteLine("starting grabber")
-                        WebbrowserURL = Address
-                        WebbrowserText = localHTML
-                        WebbrowserTitle = DocumentTitle
-                        WebbrowserHeadText = localHTML
-                        b = True
-                        Debug.WriteLine("Invoke Required: " + InvokeRequired.ToString)
-                        'Dim Evaluator = New Thread(Sub() Me.GrappURL())
-                        'Evaluator.Start()
-                        t = New Thread(AddressOf GrappURL)
-                        t.Priority = ThreadPriority.Normal
-                        t.IsBackground = True
-                        t.Start()
-                        Exit Sub
-                    ElseIf CBool(InStr(localHTML, "season-dropdown content-menu block")) Then
-                        b = True
-                        Anime_Add.TextBox2.Text = "Use Custom Name"
-                        WebbrowserURL = Address
-                        WebbrowserText = localHTML
-                        WebbrowserTitle = DocumentTitle
-                        WebbrowserHeadText = localHTML
-                        SeasonDropdownGrapp()
-                        Exit Sub
-                    ElseIf CBool(InStr(localHTML, "wrapper container-shadow hover-classes")) Then
-                        b = True
-                        Anime_Add.TextBox2.Text = "Use Custom Name"
-                        WebbrowserURL = Address
-                        WebbrowserText = localHTML
-                        WebbrowserTitle = DocumentTitle
-                        WebbrowserHeadText = localHTML
-                        MassGrapp()
-                        Exit Sub
-                    Else
-                        My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\html.log", localHTML, True)
-                        b = True
-                        MsgBox(No_Stream, MsgBoxStyle.OkOnly)
-                        Anime_Add.StatusLabel.Text = "Status: idle"
-                        Exit Sub
-                    End If
-                Catch ex As Exception
-                    MsgBox(ex.ToString)
-                    Anime_Add.StatusLabel.Text = "Status: idle"
-                End Try
-            ElseIf c = False Then
-                If CBool(InStr(localHTML, "hardsub_lang")) Then
-                    c = True
-                    WebbrowserURL = Address
-                    WebbrowserText = localHTML
-                    WebbrowserTitle = DocumentTitle
-                    WebbrowserHeadText = localHTML
-                    'SoftSub.DownloadSubs()
-                    Exit Sub
+
+        ElseIf c = False Then
+            If CBool(InStr(localHTML, "hardsub_lang")) Then
+                c = True
+                WebbrowserURL = Address
+                WebbrowserText = localHTML
+                WebbrowserTitle = DocumentTitle
+                WebbrowserHeadText = localHTML
+                'SoftSub.DownloadSubs()
+                Exit Sub
                 End If
-            End If
+
         ElseIf CBool(InStr(Address, "funimation.com")) Then
             Dim Collector As New TaskCookieVisitor
             Dim CM As ICookieManager = CefSharp_Browser.WebBrowser1.GetCookieManager
@@ -4746,30 +4123,7 @@ Public Class Main
         'End If
     End Sub
 
-    Sub MainPageLoaded()
 
-        b = True
-        If CBool(InStr(LoadedUrl, "beta.crunchyroll.com")) Then
-            Me.Invoke(New Action(Function() As Object
-                                     Anime_Add.StatusLabel.Text = "Status: invalid redirection, check beta login"
-                                     Me.Text = "Crunchyroll Downloader"
-                                     Me.Invalidate()
-                                     Return Nothing
-                                 End Function))
-            LoadedUrl = Nothing
-        Else
-            Me.Invoke(New Action(Function() As Object
-                                     Anime_Add.StatusLabel.Text = "Status: idle"
-                                     Me.Text = "Crunchyroll Downloader"
-                                     Me.Invalidate()
-                                     Return Nothing
-                                 End Function))
-            LoadedUrl = Nothing
-        End If
-
-
-
-    End Sub
 
 
 #End Region
@@ -4779,38 +4133,28 @@ Public Class Main
         Dim VRVSeason As String = Nothing
         For i As Integer = 0 To LoadedUrls.Count - 1
             Dim requesturl As String = LoadedUrls.Item(i)
-            If CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then
+            If CBool(InStr(requesturl, "crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then
                 If b = False Then
-                    GetBetaVideoProxy(requesturl, WebbrowserURL)
-                    b = True
-                    LoadedUrls.Clear()
-                    Me.Text = "Crunchyroll Downloader"
-                    Exit Sub
-                End If
-            ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "streams?")) Then
-                If b = False Then
-                    GetBetaVideoProxy(requesturl, WebbrowserURL)
-                    b = True
-                    LoadedUrls.Clear()
-                    Me.Text = "Crunchyroll Downloader"
-                    Exit Sub
-                End If
-            ElseIf CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then
-                If b = False Then
-                    GetBetaSeasons(requesturl)
-                    b = True
-                    LoadedUrls.Clear()
-                    Me.Text = "Crunchyroll Downloader"
-                    Exit Sub
-                End If
-            ElseIf CBool(InStr(requesturl, "https://beta.crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then
-                If b = False Then
-                    GetBetaSeasons(requesturl)
+                    'GetBetaVideoProxy(requesturl, WebbrowserURL)
+                    b = True
+
+                    CefSharp_Browser.WebBrowser1.LoadUrl(requesturl)
+
+
+                    LoadedUrls.Clear()
+                    Me.Text = "Crunchyroll Downloader"
+                    Exit Sub
+                End If
+            ElseIf CBool(InStr(requesturl, "crunchyroll.com/")) And CBool(InStr(requesturl, "seasons?series_id=")) Then
+                If b = False Then
+                    'GetBetaSeasons(requesturl)
+                    CefSharp_Browser.WebBrowser1.LoadUrl(requesturl)
                     b = True
                     LoadedUrls.Clear()
                     Me.Text = "Crunchyroll Downloader"
                     Exit Sub
                 End If
+
             End If
             If CBool(InStr(requesturl, "https://api.vrv.co")) And CBool(InStr(requesturl, "streams?")) Then
                 Debug.WriteLine("vrv-1 " + requesturl)
@@ -5022,143 +4366,31 @@ Public Class Main
                                          Me.Invalidate()
                                          Return Nothing
                                      End Function))
-#Region "CR Einzeln"
-                If CBool(InStr(htmlReq, "HTMLSingle=")) Then
-                    Debug.WriteLine("Single episode mode - Crunchyroll")
-                    Try
-                        Dim html() As String = htmlReq.Split(New String() {"HTMLSingle="}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim DecodedHTML As String = UrlDecode(html(1))
-                        Dim URLSplit() As String = DecodedHTML.Split(New String() {My.Resources.CR_Head_Url_Split}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim URLSplit2() As String = URLSplit(1).Split(New String() {Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
-                        WebbrowserURL = URLSplit2(0)
-                        Dim BodySplit() As String = DecodedHTML.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim TitleSplit2() As String = TitleSplit(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
-                        WebbrowserTitle = TitleSplit2(0)
-                        If CBool(InStr(WebbrowserText, "hardsub_lang")) Then
-                            Me.Invoke(New Action(Function() As Object
-                                                     Me.Text = "Status: Download added from add-on"
-                                                     Me.Invalidate()
-                                                     Return Nothing
-                                                 End Function))
-                            If Grapp_RDY = True Then
-                                Dim t As Thread
-                                t = New Thread(AddressOf GrappURL)
-                                t.Priority = ThreadPriority.Normal
-                                t.IsBackground = True
-                                t.Start()
-                            Else
-                                If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
-                                    Me.Invoke(New Action(Function() As Object
-                                                             If Anime_Add.ListBox1.Items.Contains(WebbrowserURL) = False Then
-                                                                 Anime_Add.ListBox1.Items.Add(WebbrowserURL)
-                                                             End If
-                                                             'Anime_Add.ListBox1.Items.Add(WebbrowserURL)
-                                                             Return Nothing
-                                                         End Function))
-                                Else
-                                    If ListBoxList.Contains(WebbrowserURL) = False Then
-                                        ListBoxList.Add(WebbrowserURL)
-                                    End If
-                                    'ListBoxList.Add(WebbrowserURL)
-                                End If
-                            End If
-                            strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage
-                            SendHTMLResponse(stream, strRequest)
-                        Else
-                            Me.Invoke(New Action(Function() As Object
-                                                     Me.Text = "Status: no video found"
-                                                     Me.Invalidate()
-                                                     Return Nothing
-                                                 End Function))
-                            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)
-                            '   strRequest = rootPath & "error_Page.html" 'PostPage
-                            'SendHTMLResponse(stream, strRequest)
-                            SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
 
-                        End If
-                    Catch abort As ThreadAbortException
-                        Exit Sub
-                    Catch ex As Exception
-                        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)
-                        'strRequest = rootPath & "error_Page.html" 'PostPage
-                        'SendHTMLResponse(stream, strRequest)
-                        SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
-
-                    End Try
-#End Region
 #Region "mass-dl"
-                ElseIf CBool(InStr(htmlReq, "HTMLMass=")) Then
-                    Debug.WriteLine("multi episode mode")
-                    Try
-                        Dim html() As String = htmlReq.Split(New String() {"HTMLMass="}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim DecodedHTML As String = UrlDecode(html(1))
-                        Dim URLSplit() As String = DecodedHTML.Split(New String() {"javascript:"}, System.StringSplitOptions.RemoveEmptyEntries)
-                        If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
-                            For i As Integer = 0 To URLSplit.Count - 1
-                                Dim ii As Integer = i
-                                Me.Invoke(New Action(Function() As Object
-                                                         If Anime_Add.ListBox1.Items.Contains(URLSplit(ii)) = False Then
-                                                             Anime_Add.ListBox1.Items.Add(URLSplit(ii))
-                                                         End If
-                                                         'Anime_Add.ListBox1.Items.Add(URLSplit(ii))
-                                                         Return Nothing
-                                                     End Function))
-                            Next
-                        Else
-                            For i As Integer = 0 To URLSplit.Count - 1
-                                If ListBoxList.Contains(URLSplit(i)) = False Then
-                                    ListBoxList.Add(URLSplit(i))
-                                End If
-                            Next
-                            Me.Invoke(New Action(Function() As Object
-                                                     Me.Text = "Status: " + ListBoxList.Count.ToString + " downloads in queue" + vbNewLine + "open the add window to continue"
-                                                     Me.Invalidate()
-                                                     Return Nothing
-                                                 End Function))
-                        End If
-                        strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage
-                        SendHTMLResponse(stream, strRequest)
-                    Catch abort As ThreadAbortException
-                        Exit Sub
-                    Catch ex As Exception
-                        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)
-                        'strRequest = rootPath & "error_Page.html" 'PostPage
-                        'SendHTMLResponse(stream, strRequest)
-                        SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
 
-                    End Try
-#End Region
-#Region "Funimation-mass"
-                ElseIf CBool(InStr(htmlReq, "FunimationMass=")) Then
-                    Debug.WriteLine("Funimation multi episode mode")
-                    Try
-                        Dim DecodedHTML As String = UrlDecode(htmlReq)
-                        If CBool(InStr(DecodedHTML, "&FunimationCookie=")) Then
-                            Dim CookieSplit() As String = DecodedHTML.Split(New String() {"&FunimationCookie="}, System.StringSplitOptions.RemoveEmptyEntries)
-                            SystemWebBrowserCookie = CookieSplit(1)
-                            Dim URLSplit() As String = CookieSplit(0).Split(New String() {"FunimationMass="}, System.StringSplitOptions.RemoveEmptyEntries)
-                            Dim URLSplit2() As String = URLSplit(1).Split(New String() {"javascript:"}, System.StringSplitOptions.RemoveEmptyEntries)
+
+                If CBool(InStr(htmlReq, "HTMLMass=")) Then
+                        Debug.WriteLine("multi episode mode")
+                        Try
+                            Dim html() As String = htmlReq.Split(New String() {"HTMLMass="}, System.StringSplitOptions.RemoveEmptyEntries)
+                            Dim DecodedHTML As String = UrlDecode(html(1))
+                            Dim URLSplit() As String = DecodedHTML.Split(New String() {"javascript:"}, System.StringSplitOptions.RemoveEmptyEntries)
                             If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
-                                For i As Integer = 0 To URLSplit2.Count - 1
+                                For i As Integer = 0 To URLSplit.Count - 1
                                     Dim ii As Integer = i
                                     Me.Invoke(New Action(Function() As Object
-                                                             If Anime_Add.ListBox1.Items.Contains(URLSplit2(ii)) = False Then
-                                                                 Anime_Add.ListBox1.Items.Add(URLSplit2(ii))
+                                                             If Anime_Add.ListBox1.Items.Contains(URLSplit(ii)) = False Then
+                                                                 Anime_Add.ListBox1.Items.Add(URLSplit(ii))
                                                              End If
                                                              'Anime_Add.ListBox1.Items.Add(URLSplit(ii))
                                                              Return Nothing
                                                          End Function))
                                 Next
                             Else
-                                For i As Integer = 0 To URLSplit2.Count - 1
-                                    If ListBoxList.Contains(URLSplit2(i)) = False Then
-                                        ListBoxList.Add(URLSplit2(i))
+                                For i As Integer = 0 To URLSplit.Count - 1
+                                    If ListBoxList.Contains(URLSplit(i)) = False Then
+                                        ListBoxList.Add(URLSplit(i))
                                     End If
                                 Next
                                 Me.Invoke(New Action(Function() As Object
@@ -5169,121 +4401,167 @@ Public Class Main
                             End If
                             strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage
                             SendHTMLResponse(stream, strRequest)
-                        End If
-                    Catch abort As ThreadAbortException
-                        Exit Sub
-                    Catch ex As Exception
-                        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)
-                        'strRequest = rootPath & "error_Page.html" 'PostPage
-                        'SendHTMLResponse(stream, strRequest)
-                        SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
+                        Catch abort As ThreadAbortException
+                            Exit Sub
+                        Catch ex As Exception
+                            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)
+                            'strRequest = rootPath & "error_Page.html" 'PostPage
+                            'SendHTMLResponse(stream, strRequest)
+                            SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
 
-                    End Try
+                        End Try
+#End Region
+#Region "Funimation-mass"
+                    ElseIf CBool(InStr(htmlReq, "FunimationMass=")) Then
+                        Debug.WriteLine("Funimation multi episode mode")
+                        Try
+                            Dim DecodedHTML As String = UrlDecode(htmlReq)
+                            If CBool(InStr(DecodedHTML, "&FunimationCookie=")) Then
+                                Dim CookieSplit() As String = DecodedHTML.Split(New String() {"&FunimationCookie="}, System.StringSplitOptions.RemoveEmptyEntries)
+                                SystemWebBrowserCookie = CookieSplit(1)
+                                Dim URLSplit() As String = CookieSplit(0).Split(New String() {"FunimationMass="}, System.StringSplitOptions.RemoveEmptyEntries)
+                                Dim URLSplit2() As String = URLSplit(1).Split(New String() {"javascript:"}, System.StringSplitOptions.RemoveEmptyEntries)
+                                If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
+                                    For i As Integer = 0 To URLSplit2.Count - 1
+                                        Dim ii As Integer = i
+                                        Me.Invoke(New Action(Function() As Object
+                                                                 If Anime_Add.ListBox1.Items.Contains(URLSplit2(ii)) = False Then
+                                                                     Anime_Add.ListBox1.Items.Add(URLSplit2(ii))
+                                                                 End If
+                                                                 'Anime_Add.ListBox1.Items.Add(URLSplit(ii))
+                                                                 Return Nothing
+                                                             End Function))
+                                    Next
+                                Else
+                                    For i As Integer = 0 To URLSplit2.Count - 1
+                                        If ListBoxList.Contains(URLSplit2(i)) = False Then
+                                            ListBoxList.Add(URLSplit2(i))
+                                        End If
+                                    Next
+                                    Me.Invoke(New Action(Function() As Object
+                                                             Me.Text = "Status: " + ListBoxList.Count.ToString + " downloads in queue" + vbNewLine + "open the add window to continue"
+                                                             Me.Invalidate()
+                                                             Return Nothing
+                                                         End Function))
+                                End If
+                                strRequest = rootPath & "Post_Mass_Sucess.html" 'PostPage
+                                SendHTMLResponse(stream, strRequest)
+                            End If
+                        Catch abort As ThreadAbortException
+                            Exit Sub
+                        Catch ex As Exception
+                            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)
+                            'strRequest = rootPath & "error_Page.html" 'PostPage
+                            'SendHTMLResponse(stream, strRequest)
+                            SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
+
+                        End Try
 #End Region
 #Region "funimation Einzeln"
-                ElseIf CBool(InStr(htmlReq, "FunimationURL=")) Then
-                    Debug.WriteLine("single episode mode - Funimation")
-                    'MsgBox(htmlReq)
-                    Me.Invoke(New Action(Function() As Object
-                                             Me.Text = "Status: Download added from add-on"
-                                             Me.Invalidate()
-                                             Return Nothing
-                                         End Function))
-                    Try
-                        Dim URLSplit() As String = htmlReq.Split(New String() {"FunimationURL="}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim URLSplit2() As String = URLSplit(1).Split(New String() {"&FunimationCookie="}, System.StringSplitOptions.RemoveEmptyEntries)
-                        SystemWebBrowserCookie = URLSplit2(1)
-                        WebbrowserURL = UrlDecode(URLSplit2(0))
-                        If CBool(InStr(WebbrowserURL, "funimation.com")) Then
-                            If DubFunimation = "Disabled" Then
-                            Else
-                                If CBool(InStr(WebbrowserURL, "?lang=")) Then
-                                    Dim ClearUri As String() = WebbrowserURL.Split(New String() {"?lang="}, System.StringSplitOptions.RemoveEmptyEntries)
-                                    If ClearUri.Count > 1 Then
-                                        If CBool(InStr(ClearUri(1), "&")) Then
-                                            Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
-                                            Dim Parms As String = Nothing
-                                            For i As Integer = 1 To ClearUri2.Count - 1
-                                                Parms = Parms + "&" + ClearUri2(i)
-                                            Next
-                                            WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation + Parms
+                    ElseIf CBool(InStr(htmlReq, "FunimationURL=")) Then
+                        Debug.WriteLine("single episode mode - Funimation")
+                        'MsgBox(htmlReq)
+                        Me.Invoke(New Action(Function() As Object
+                                                 Me.Text = "Status: Download added from add-on"
+                                                 Me.Invalidate()
+                                                 Return Nothing
+                                             End Function))
+                        Try
+                            Dim URLSplit() As String = htmlReq.Split(New String() {"FunimationURL="}, System.StringSplitOptions.RemoveEmptyEntries)
+                            Dim URLSplit2() As String = URLSplit(1).Split(New String() {"&FunimationCookie="}, System.StringSplitOptions.RemoveEmptyEntries)
+                            SystemWebBrowserCookie = URLSplit2(1)
+                            WebbrowserURL = UrlDecode(URLSplit2(0))
+                            If CBool(InStr(WebbrowserURL, "funimation.com")) Then
+                                If DubFunimation = "Disabled" Then
+                                Else
+                                    If CBool(InStr(WebbrowserURL, "?lang=")) Then
+                                        Dim ClearUri As String() = WebbrowserURL.Split(New String() {"?lang="}, System.StringSplitOptions.RemoveEmptyEntries)
+                                        If ClearUri.Count > 1 Then
+                                            If CBool(InStr(ClearUri(1), "&")) Then
+                                                Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
+                                                Dim Parms As String = Nothing
+                                                For i As Integer = 1 To ClearUri2.Count - 1
+                                                    Parms = Parms + "&" + ClearUri2(i)
+                                                Next
+                                                WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation + Parms
+                                            Else
+                                                WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation
+                                            End If
                                         Else
                                             WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation
                                         End If
-                                    Else
-                                        WebbrowserURL = ClearUri(0) + "?lang=" + DubFunimation
-                                    End If
-                                ElseIf CBool(InStr(WebbrowserURL, "&lang=")) Then
-                                    Dim ClearUri As String() = WebbrowserURL.Split(New String() {"&lang="}, System.StringSplitOptions.RemoveEmptyEntries)
-                                    If ClearUri.Count > 1 Then
-                                        If CBool(InStr(ClearUri(1), "&")) Then
-                                            Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
-                                            Dim Parms As String = Nothing
-                                            For i As Integer = 1 To ClearUri2.Count - 1
-                                                Parms = Parms + "&" + ClearUri2(i)
-                                            Next
-                                            WebbrowserURL = ClearUri(0) + "&lang=" + DubFunimation + Parms
+                                    ElseIf CBool(InStr(WebbrowserURL, "&lang=")) Then
+                                        Dim ClearUri As String() = WebbrowserURL.Split(New String() {"&lang="}, System.StringSplitOptions.RemoveEmptyEntries)
+                                        If ClearUri.Count > 1 Then
+                                            If CBool(InStr(ClearUri(1), "&")) Then
+                                                Dim ClearUri2 As String() = ClearUri(1).Split(New String() {"&"}, System.StringSplitOptions.RemoveEmptyEntries)
+                                                Dim Parms As String = Nothing
+                                                For i As Integer = 1 To ClearUri2.Count - 1
+                                                    Parms = Parms + "&" + ClearUri2(i)
+                                                Next
+                                                WebbrowserURL = ClearUri(0) + "&lang=" + DubFunimation + Parms
+                                            Else
+                                                WebbrowserURL = ClearUri(0) + "&lang=" + DubFunimation
+                                            End If
                                         Else
                                             WebbrowserURL = ClearUri(0) + "&lang=" + DubFunimation
                                         End If
+                                    ElseIf CBool(InStr(WebbrowserURL, "?")) Then
+                                        WebbrowserURL = WebbrowserURL + "&lang=" + DubFunimation
                                     Else
-                                        WebbrowserURL = ClearUri(0) + "&lang=" + DubFunimation
+                                        WebbrowserURL = WebbrowserURL + "?lang=" + DubFunimation
                                     End If
-                                ElseIf CBool(InStr(WebbrowserURL, "?")) Then
-                                    WebbrowserURL = WebbrowserURL + "&lang=" + DubFunimation
+                                End If
+                            End If
+                            If Funimation_Grapp_RDY = True Then
+                                If RunningDownloads >= MaxDL Then
+                                    If ListBoxList.Contains(WebbrowserURL) = False Then
+                                        ListBoxList.Add(WebbrowserURL)
+                                    End If
+                                    'ListBoxList.Add(WebbrowserURL)
                                 Else
-                                    WebbrowserURL = WebbrowserURL + "?lang=" + DubFunimation
+                                    Me.Invoke(New Action(Function() As Object
+                                                             Navigate(WebbrowserURL)
+                                                             Return Nothing
+                                                         End Function))
+                                    b = False
                                 End If
-                            End If
-                        End If
-                        If Funimation_Grapp_RDY = True Then
-                            If RunningDownloads >= MaxDL Then
-                                If ListBoxList.Contains(WebbrowserURL) = False Then
-                                    ListBoxList.Add(WebbrowserURL)
-                                End If
-                                'ListBoxList.Add(WebbrowserURL)
                             Else
-                                Me.Invoke(New Action(Function() As Object
-                                                         Navigate(WebbrowserURL)
-                                                         Return Nothing
-                                                     End Function))
-                                b = False
-                            End If
-                        Else
-                            If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
-                                Me.Invoke(New Action(Function() As Object
-                                                         If Anime_Add.ListBox1.Items.Contains(WebbrowserURL) = False Then
-                                                             Anime_Add.ListBox1.Items.Add(WebbrowserURL)
-                                                         End If
-                                                         Return Nothing
-                                                     End Function))
-                            Else
-                                If ListBoxList.Contains(WebbrowserURL) = False Then
-                                    ListBoxList.Add(WebbrowserURL)
+                                If Application.OpenForms().OfType(Of Anime_Add).Any = True Then
+                                    Me.Invoke(New Action(Function() As Object
+                                                             If Anime_Add.ListBox1.Items.Contains(WebbrowserURL) = False Then
+                                                                 Anime_Add.ListBox1.Items.Add(WebbrowserURL)
+                                                             End If
+                                                             Return Nothing
+                                                         End Function))
+                                Else
+                                    If ListBoxList.Contains(WebbrowserURL) = False Then
+                                        ListBoxList.Add(WebbrowserURL)
+                                    End If
+                                    Me.Invoke(New Action(Function() As Object
+                                                             Me.Text = "Status: " + ListBoxList.Count.ToString + " downloads in queue"
+                                                             Me.Invalidate()
+                                                             Return Nothing
+                                                         End Function))
                                 End If
-                                Me.Invoke(New Action(Function() As Object
-                                                         Me.Text = "Status: " + ListBoxList.Count.ToString + " downloads in queue"
-                                                         Me.Invalidate()
-                                                         Return Nothing
-                                                     End Function))
                             End If
-                        End If
-                        strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage
-                        SendHTMLResponse(stream, strRequest)
-                    Catch abort As ThreadAbortException
-                        Exit Sub
-                    Catch ex As Exception
-                        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)
-                        'strRequest = rootPath & "error_Page.html" 'PostPage
-                        'SendHTMLResponse(stream, strRequest)
-                        SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
+                            strRequest = rootPath & "Post_Single_Sucess.html" 'PostPage
+                            SendHTMLResponse(stream, strRequest)
+                        Catch abort As ThreadAbortException
+                            Exit Sub
+                        Catch ex As Exception
+                            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)
+                            'strRequest = rootPath & "error_Page.html" 'PostPage
+                            'SendHTMLResponse(stream, strRequest)
+                            SendHTMLResponse(stream, Nothing, New ServerResponse(ErrorPage, "html"))
 
-                    End Try
+                        End Try
 #End Region
-                Else
-                    strRequest = rootPath & "error_Page_default.html" 'PostPage
+                    Else
+                        strRequest = rootPath & "error_Page_default.html" 'PostPage
                     SendHTMLResponse(stream, strRequest)
                 End If
             ElseIf strArray(0).Trim().ToUpper.Equals("GET") Then
@@ -5552,6 +4830,15 @@ Public Class Main
         Next
     End Sub
 
+    Private Sub CRCookieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CRCookieToolStripMenuItem.Click
+        MsgBox(CR_Cookies)
+    End Sub
+
+
+    'Dim TN As String = "https://www.crunchyroll.com/imgsrv/display/thumbnail/320x180/catalog/crunchyroll/43a60a9d2877b11429d71c81db6d7636.jpeg"
+    'Dim cmd As String = "-i " + Chr(34) + "https://pl.crunchyroll.com/evs3/edc1a2ad856c347b4f86c0985ecc6d01/assets/efmaqxcadlmjn3o_2040239.mp4/index-v1-a1.m3u8?res=640x360&Expires=1666448510&Policy=eyJTdGF0ZW1lbnQiOlt7IlJlc291cmNlIjoiaHR0cHM6Ly9wbC5jcnVuY2h5cm9sbC5jb20vZXZzMy9lZGMxYTJhZDg1NmMzNDdiNGY4NmMwOTg1ZWNjNmQwMS9hc3NldHMvZWZtYXF4Y2FkbG1qbjNvXzIwNDAyMzkubXA0L2luZGV4LXYxLWExLm0zdTg~cmVzPTY0MHgzNjAiLCJDb25kaXRpb24iOnsiRGF0ZUxlc3NUaGFuIjp7IkFXUzpFcG9jaFRpbWUiOjE2NjY0NDg1MTB9fX1dfQ__&Signature=gd6oVG0w2pUa~l8~3JTecsU~0yyzkK1aaPQ~0WN32MeAuYfo49eYwz1C3AgeFAEeFyy8yMyW~3D4awwE7veS8BHptQzRlrcdFqw7VNDPUaA-3kzaqPFWOPlj2V~HkVv4m-soVs2HSs14i7Is8cWGQ6-0vQ6lFkxSxu2dg-eZdxcagkqSPwMsnjU~M17p1MhK0aQNWh2KyJUZ3zmeZNHrMQiAq4cBXM9aMp05XxI-li2ptCRMh63wYaYdmnvwOICDqgq5kwhLA-NNBavnjYo4HlEyfXwQWWEF2H~lQeAsZ90S6wF8~IrbP~DdMZc1Othh26Z0QWVX0BFEhPHmsoHqqw__&Key-Pair-Id=APKAJMWSQ5S7ZB3MF5VA" + Chr(34) + " -c copy "
+    'ListItemAdd("TestDL", "CR", "TestDL", "9987p", "DE", "None", TN, cmd, "E:\Test\RWBY\Testdl.mkv")
+
 
 
 
diff --git a/Crunchyroll Downloader/My Project/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb
index e39fc9b..ca83711 100644
--- a/Crunchyroll Downloader/My Project/Resources.Designer.vb	
+++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb	
@@ -548,6 +548,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''
+        '''  Sucht eine lokalisierte Zeichenfolge, die <html><head><meta name="color-scheme" content="light dark"></head><pre style="word-wrap: break-word; white-space: pre-wrap;"> ähnelt.
+        '''
+        Friend ReadOnly Property htmlReplace() As String
+            Get
+                Return ResourceManager.GetString("htmlReplace", resourceCulture)
+            End Get
+        End Property
+        
         '''
         '''  Sucht eine lokalisierte Zeichenfolge, die <a class="main_titel">Placeholder</a>
         '''<img alt="image error" src="balken.png" class="class-balken"> ähnelt.
diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx
index aa84b5a..f221097 100644
--- a/Crunchyroll Downloader/My Project/Resources.resx	
+++ b/Crunchyroll Downloader/My Project/Resources.resx	
@@ -562,4 +562,7 @@ START=[Start]
 END=[duration_ms]
 title=Ending
   
+  
+    <html><head><meta name="color-scheme" content="light dark"></head><pre style="word-wrap: break-word; white-space: pre-wrap;">
+  
 
\ No newline at end of file