From 2c7d26fe51976d2dc8baf2b8412b4953fc6830fc Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Tue, 28 May 2024 21:26:20 +0200 Subject: [PATCH] removed WebView2 removed WebView2 and the browser window --- .vs/Crunchyroll Downloader/v17/.suo | Bin 240128 -> 233472 bytes Crunchyroll Downloader/App.config | 3 - Crunchyroll Downloader/Browser.Designer.vb | 112 ---------- Crunchyroll Downloader/Browser.resx | 126 ----------- Crunchyroll Downloader/Browser.vb | 209 ------------------ .../Crunchyroll Downloader.vbproj | 25 --- Crunchyroll Downloader/Main.designer.vb | 27 +-- Crunchyroll Downloader/Main.resx | 48 ++-- Crunchyroll Downloader/Main.vb | 172 ++++---------- .../My Project/Settings.Designer.vb | 12 - .../My Project/Settings.settings | 3 - .../einstellungen.Designer.vb | 118 +++------- Crunchyroll Downloader/einstellungen.resx | 3 - Crunchyroll Downloader/einstellungen.vb | 13 +- Crunchyroll Downloader/packages.config | 1 - 15 files changed, 100 insertions(+), 772 deletions(-) delete mode 100644 Crunchyroll Downloader/Browser.Designer.vb delete mode 100644 Crunchyroll Downloader/Browser.resx delete mode 100644 Crunchyroll Downloader/Browser.vb diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 691e8cf0286c81b5476b86058f2741ed49fe3343..e48a8c297021c1095e865bde740d72970f756c03 100644 GIT binary patch delta 7365 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 cE*AI9lGBDobic+L#QspFMK^o%NB - - https://www.crunchyroll.com/ - [default season prefix] diff --git a/Crunchyroll Downloader/Browser.Designer.vb b/Crunchyroll Downloader/Browser.Designer.vb deleted file mode 100644 index 6a4cf84..0000000 --- a/Crunchyroll Downloader/Browser.Designer.vb +++ /dev/null @@ -1,112 +0,0 @@ - -Partial Class Browser - Inherits System.Windows.Forms.Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.WebView2 = New Microsoft.Web.WebView2.WinForms.WebView2() - Me.Timer1 = New System.Windows.Forms.Timer(Me.components) - Me.Timer2 = New System.Windows.Forms.Timer(Me.components) - Me.Panel1.SuspendLayout() - CType(Me.WebView2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'TextBox1 - ' - Me.TextBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox1.Location = New System.Drawing.Point(114, 1) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(1153, 26) - Me.TextBox1.TabIndex = 1 - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(12, 1) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(96, 26) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "Copy URL" - Me.Button1.UseVisualStyleBackColor = True - ' - 'Panel1 - ' - Me.Panel1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Panel1.Controls.Add(Me.WebView2) - Me.Panel1.Location = New System.Drawing.Point(0, 30) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1280, 720) - Me.Panel1.TabIndex = 4 - ' - 'WebView2 - ' - Me.WebView2.AllowExternalDrop = True - Me.WebView2.CreationProperties = Nothing - Me.WebView2.DefaultBackgroundColor = System.Drawing.Color.White - Me.WebView2.Dock = System.Windows.Forms.DockStyle.Fill - Me.WebView2.Location = New System.Drawing.Point(0, 0) - Me.WebView2.Name = "WebView2" - Me.WebView2.Size = New System.Drawing.Size(1280, 720) - Me.WebView2.TabIndex = 0 - Me.WebView2.ZoomFactor = 1.0R - ' - 'Timer1 - ' - Me.Timer1.Interval = 60000 - ' - 'Timer2 - ' - Me.Timer2.Interval = 15000 - ' - 'Browser - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1279, 750) - Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.TextBox1) - Me.MinimumSize = New System.Drawing.Size(480, 480) - Me.Name = "Browser" - Me.ShowIcon = False - Me.Text = "Browser" - Me.Panel1.ResumeLayout(False) - CType(Me.WebView2, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Button1 As Button - Friend WithEvents Panel1 As Panel - Friend WithEvents Timer1 As Timer - Friend WithEvents Timer2 As Timer - Public WithEvents WebView2 As Microsoft.Web.WebView2.WinForms.WebView2 -End Class diff --git a/Crunchyroll Downloader/Browser.resx b/Crunchyroll Downloader/Browser.resx deleted file mode 100644 index 22db872..0000000 --- a/Crunchyroll Downloader/Browser.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 106, 17 - - \ No newline at end of file diff --git a/Crunchyroll Downloader/Browser.vb b/Crunchyroll Downloader/Browser.vb deleted file mode 100644 index ba04c64..0000000 --- a/Crunchyroll Downloader/Browser.vb +++ /dev/null @@ -1,209 +0,0 @@ -Option Strict On - -Imports System.IO -Imports System.ComponentModel -Imports System.Threading -Imports System.Net -Imports System.Net.WebUtility -Imports System.IO.Compression -Imports System.Text -Imports System.Security.Policy -Imports Microsoft.Web.WebView2.Core -Imports MetroFramework.Drawing -Imports Newtonsoft.Json.Linq - -Public Class Browser - - - - - Private Sub WebView2_CoreWebView2InitializationCompleted(sender As Object, e As CoreWebView2InitializationCompletedEventArgs) Handles WebView2.CoreWebView2InitializationCompleted - Try - WebView2.CoreWebView2.AddWebResourceRequestedFilter("https://www.crunchyroll.com/*", CoreWebView2WebResourceContext.All) - 'AddHandler WebView2.CoreWebView2.WebResourceResponseReceived, AddressOf ObserveResponse - 'AddHandler WebView2.CoreWebView2.WebResourceRequested, AddressOf ObserveHttp 'this is not the data we are looking for (anymore :( ) - My.Settings.User_Agend = Chr(34) + "User-Agent: " + WebView2.CoreWebView2.Settings.UserAgent + Chr(34) - - If WebView2.CoreWebView2.Source = "about:blank" Or WebView2.CoreWebView2.Source = Nothing Then - 'TextBox1.Text = Main.Startseite - WebView2.CoreWebView2.Navigate(Main.Startseite) - - - End If - Catch ex As Exception - - End Try - - - End Sub - - - Private Sub WebView2_SourceChanged(sender As Object, e As CoreWebView2SourceChangedEventArgs) Handles WebView2.SourceChanged - Try - TextBox1.Text = WebView2.CoreWebView2.Source - - Catch ex As Exception - End Try - - End Sub - - - - Private Sub WebView2_NavigationCompleted(sender As Object, e As CoreWebView2NavigationCompletedEventArgs) Handles WebView2.NavigationCompleted - ' Dim HTML As String = WebView2.CoreWebView2. - 'TextBox1.Text = WebView2.CoreWebView2.Source - ' Exit Sub - - - If e.HttpStatusCode = 200 Then - Dim DocumentTitle As String = WebView2.CoreWebView2.DocumentTitle - - Debug.WriteLine("NavigationCompleted: " + Date.Now.ToString) - Main.WebbrowserURL = WebView2.CoreWebView2.Source - TextBox1.Text = Main.WebbrowserURL - - Main.WebbrowserTitle = DocumentTitle - Main.ProcessHTML("", Main.WebbrowserURL, DocumentTitle) - - GetCookies(Main.WebbrowserURL) - - Main.BowserWasOpen = True - - 'If Application.OpenForms().OfType(Of Anime_Add).Any = True Then - ' Anime_Add.btn_dl.Cursor = Cursors.Default - ' Anime_Add.btn_dl.BackgroundImage = My.Resources.main_button_download_default - 'End If - - If Main.Startseite IsNot My.Settings.Startseite Then - Main.LoadBrowser(Main.Startseite, 1) - Main.Startseite = My.Settings.Startseite - End If - - End If - End Sub - - Public Async Sub GetCookies(ByVal Uri As String) - Try - Main.CookieList = Await WebView2.CoreWebView2.CookieManager.GetCookiesAsync(Uri) - Catch ex As Exception - End Try - End Sub - - - Private Sub Browser_Load(sender As Object, e As EventArgs) Handles Me.Load - Main.waveOutSetVolume(0, 0) - If Me.Width > My.Computer.Screen.Bounds.Width Then - Me.Width = My.Computer.Screen.Bounds.Width - Panel1.Width = Me.Size.Width - 15 ', Me.Size.Height - 69) - Panel1.Location = New Point(0, 30) - TextBox1.Width = My.Computer.Screen.Bounds.Width - 435 - - End If - - If Me.Size.Height > My.Computer.Screen.Bounds.Height Then - Me.Height = My.Computer.Screen.Bounds.Height - Panel1.Height = Me.Size.Height - 69 - Panel1.Location = New Point(0, 30) - End If - - - Try - Me.Icon = My.Resources.icon - Catch ex As Exception - - End Try - - If Main.UserBowser = False Then - Me.Location = New Point(-10000, 10000) - 'Timer1.Enabled = True - End If - WebView2.Source = New Uri(Main.Startseite) - End Sub - - Private Sub Browser_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - Main.BowserWasOpen = False - - 'Main.UserBowser = False - 'Me.Location = New Point(-10000, -10000) - 'Main.LoadingUrl = "" - 'Debug.WriteLine("Collecting") - 'Dim Collector As New TaskCookieVisitor - 'Dim CM As ICookieManager = WebBrowser1.GetCookieManager - 'CM.VisitAllCookies(Collector) - 'Main.CookieList = Collector.Task.Result() - 'Debug.WriteLine("Collecting-end") - ''e.Cancel = True - End Sub - - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - - Try - My.Computer.Clipboard.SetText(WebView2.CoreWebView2.Source) - MsgBox("copied: " + Chr(34) + WebView2.CoreWebView2.Source + Chr(34)) - Catch ex As Exception - End Try - - 'My.Computer.Clipboard.SetText(WebBrowser1.Document.Body.InnerHtml) - - End Sub - - Private Sub TextBox1_KeyDown(sender As Object, e As KeyEventArgs) Handles TextBox1.KeyDown - Try - If e.KeyCode = Keys.Return Then - e.SuppressKeyPress = True - Debug.WriteLine("Start loading: " + Date.Now.ToString) - WebView2.CoreWebView2.Navigate(TextBox1.Text) - End If - - Catch ex As Exception - MsgBox("Error in URL", MsgBoxStyle.Critical) - End Try - End Sub - - - Private Sub ObserveHttp(ByVal sender As Object, ByVal e As CoreWebView2WebResourceRequestedEventArgs) 'Handles RequestResource.GetUrl - - - ' Debug.WriteLine(e.Request.Uri) - - If CBool(InStr(e.Request.Uri, "crunchyroll.com")) = True And Main.CrBetaBasic = Nothing Then - Dim Headers As New List(Of KeyValuePair(Of String, String)) - Headers.AddRange(e.Request.Headers.ToList) - For i As Integer = 0 To Headers.Count - If CBool(InStr(Headers.Item(i).Value, "Basic")) Then - Main.CrBetaBasic = Headers.Item(i).Value - Debug.WriteLine("Auth-Basic: " + Main.CrBetaBasic) - End If - Next - End If - - - End Sub - - - Public Function StringToStream(input As String, enc As Encoding) As Stream - Dim memoryStream = New MemoryStream() - Dim streamWriter = New StreamWriter(memoryStream, enc) - streamWriter.Write(input) - streamWriter.Flush() - memoryStream.Position = 0 - Return memoryStream - End Function - - Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick - 'If Main.UserBowser = False Then - ' WebView2.Reload() - 'Else - ' Timer1.Enabled = False - 'End If - - End Sub - - Private Sub Timer2_Tick(sender As Object, e As EventArgs) Handles Timer2.Tick - Me.Close() - End Sub - - -End Class - diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index 5ea0ad5..138e4b6 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -108,15 +108,6 @@ False Resources\CRD_metroframework_x64\MetroFramework.dll - - ..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.Core.dll - - - ..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.WinForms.dll - - - ..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.Wpf.dll - False Resources\CRD_SettingsProvider_x64\MyProvider.dll @@ -208,12 +199,6 @@ Form - - Browser.vb - - - Form - ErrorDialog.vb @@ -272,9 +257,6 @@ einstellungen.vb - - Browser.vb - CRD_List_Item.vb @@ -454,11 +436,4 @@ - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 6b3a830..c82d8aa 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -34,7 +34,6 @@ Partial Class Main Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) Me.Timer4 = New System.Windows.Forms.Timer(Me.components) Me.Btn_add = New System.Windows.Forms.Button() - Me.Btn_Browser = New System.Windows.Forms.Button() Me.Btn_Settings = New System.Windows.Forms.Button() Me.Btn_min = New System.Windows.Forms.Button() Me.Btn_Close = New System.Windows.Forms.Button() @@ -50,9 +49,10 @@ Partial Class Main Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AudioOnlyQualityToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LoginFormToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ErrorDiaTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.Btn_Queue = New System.Windows.Forms.Button() - Me.ErrorDiaTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.BGW_Update = New System.ComponentModel.BackgroundWorker() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -113,17 +113,6 @@ Partial Class Main Me.Btn_add.Name = "Btn_add" Me.Btn_add.UseVisualStyleBackColor = False ' - 'Btn_Browser - ' - Me.Btn_Browser.BackColor = System.Drawing.Color.Transparent - resources.ApplyResources(Me.Btn_Browser, "Btn_Browser") - Me.Btn_Browser.Cursor = System.Windows.Forms.Cursors.Hand - Me.Btn_Browser.FlatAppearance.BorderSize = 0 - Me.Btn_Browser.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent - Me.Btn_Browser.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_browser - Me.Btn_Browser.Name = "Btn_Browser" - Me.Btn_Browser.UseVisualStyleBackColor = False - ' 'Btn_Settings ' Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent @@ -220,6 +209,11 @@ Partial Class Main Me.LoginFormToolStripMenuItem.Name = "LoginFormToolStripMenuItem" resources.ApplyResources(Me.LoginFormToolStripMenuItem, "LoginFormToolStripMenuItem") ' + 'ErrorDiaTestToolStripMenuItem + ' + Me.ErrorDiaTestToolStripMenuItem.Name = "ErrorDiaTestToolStripMenuItem" + resources.ApplyResources(Me.ErrorDiaTestToolStripMenuItem, "ErrorDiaTestToolStripMenuItem") + ' 'Panel1 ' resources.ApplyResources(Me.Panel1, "Panel1") @@ -236,10 +230,8 @@ Partial Class Main Me.Btn_Queue.Name = "Btn_Queue" Me.Btn_Queue.UseVisualStyleBackColor = False ' - 'ErrorDiaTestToolStripMenuItem + 'BGW_Update ' - Me.ErrorDiaTestToolStripMenuItem.Name = "ErrorDiaTestToolStripMenuItem" - resources.ApplyResources(Me.ErrorDiaTestToolStripMenuItem, "ErrorDiaTestToolStripMenuItem") ' 'Main ' @@ -252,7 +244,6 @@ Partial Class Main Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_Settings) - Me.Controls.Add(Me.Btn_Browser) Me.Controls.Add(Me.Btn_add) Me.Controls.Add(Me.TheTextBox) Me.Controls.Add(Me.ConsoleBar) @@ -281,7 +272,6 @@ Partial Class Main Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager Friend WithEvents Timer4 As Timer Friend WithEvents Btn_add As Button - Friend WithEvents Btn_Browser As Button Friend WithEvents Btn_Settings As Button Friend WithEvents Btn_min As Button Friend WithEvents Btn_Close As Button @@ -300,4 +290,5 @@ Partial Class Main Friend WithEvents AudioOnlyQualityToolStripMenuItem As ToolStripMenuItem Friend WithEvents LoginFormToolStripMenuItem As ToolStripMenuItem Friend WithEvents ErrorDiaTestToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BGW_Update As System.ComponentModel.BackgroundWorker End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index da0f931..c2156e2 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -148,7 +148,7 @@ $this - 10 + 9 383, 18 @@ -187,7 +187,7 @@ $this - 8 + 7 Stretch @@ -214,7 +214,7 @@ $this - 9 + 8 17, 17 @@ -241,7 +241,7 @@ NoControl - 575, 18 + 150, 18 80, 35 @@ -378,33 +378,6 @@ 5 - - Zoom - - - Flat - - - 140, 18 - - - 80, 35 - - - 2 - - - Btn_Browser - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - Zoom @@ -433,7 +406,7 @@ $this - 7 + 6 Microsoft Sans Serif, 8.25pt @@ -555,6 +528,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + BGW_Update + + + System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -640,7 +619,7 @@ ErrorDiaTest - 234, 290 + 234, 268 ContextMenuStrip1 @@ -648,4 +627,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 509, 49 + \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 4c2604a..6ebbe9a 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -13,7 +13,6 @@ Imports System.ComponentModel Imports Newtonsoft.Json.Linq Imports System.Runtime.InteropServices Imports MyProvider.MyProvider -Imports Microsoft.Web.WebView2.Core Imports Crunchyroll_Downloader.CRD_Classes Public Class Main @@ -39,15 +38,12 @@ Public Class Main Public Url_locale As String = Nothing Public LoadingUrl As String = "" - Public LoadedUrls As New List(Of CoreWebView2WebResourceRequest) - Public Manager As New MetroStyleManager Public DarkModeValue As Boolean = False Public invalids As Char() = System.IO.Path.GetInvalidFileNameChars() Dim ServerThread As Thread Public KodiNaming As Boolean = False Public ErrorTolerance As Integer = 0 - Public CookieList As New List(Of CoreWebView2Cookie) Public HTMLString As String = My.Resources.Startuphtml Public ListBoxList As New List(Of String) Public RunningDownloads As Integer = 0 @@ -111,7 +107,6 @@ Public Class Main Public GeckoLogFile As String = Nothing Dim SoftSubsString As String Dim CR_Unlock_Error As String - Public Startseite As String = "https://www.crunchyroll.com/" Dim SubSprache2 As String 'Dim URL_DL As String 'Dim Pfad_DL As String @@ -218,19 +213,6 @@ Public Class Main Btn_add.Image = My.Resources.main_add End Sub - Private Sub Btn_Browser_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Browser.MouseEnter, Btn_Browser.GotFocus - - If Manager.Theme = MetroThemeStyle.Dark Then - Btn_Browser.Image = My.Resources.main_browser_invert_dark - Else - Btn_Browser.Image = My.Resources.main_browser_invert - End If - End Sub - - Private Sub Btn_Browser_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Browser.MouseLeave, Btn_Browser.LostFocus - Btn_Browser.Image = My.Resources.main_browser - End Sub - Private Sub Btn_Settings_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Settings.MouseEnter, Btn_Settings.GotFocus If Manager.Theme = MetroThemeStyle.Dark Then Btn_Settings.Image = My.Resources.main_setting_invert_dark @@ -317,8 +299,8 @@ Public Class Main TheTextBox.Width = Me.Width - 2 Btn_Close.Location = New Point(Me.Width - 36, 1) Btn_min.Location = New Point(Me.Width - 67, 1) - Btn_Settings.Location = New Point(Me.Width - 165, 17) - Btn_Queue.Location = New Point(Me.Width - 265, 17) + Btn_Settings.Location = New Point(Me.Width - 200, 17) + 'Btn_Queue.Location = New Point(Me.Width - 265, 17) Try Panel1.AutoScrollPosition = New Point(0, 0) @@ -467,9 +449,6 @@ Public Class Main DefaultSubCR = My.Settings.DefaultSubCR - Startseite = My.Settings.Startseite - - UseQueue = My.Settings.QueueMode KodiNaming = My.Settings.KodiSupport @@ -2209,24 +2188,6 @@ Public Class Main End If End Sub - Private Sub Btn_Browser_Click(sender As Object, e As EventArgs) Handles Btn_Browser.Click - - 'Dim Teststring As String = TheTextBox.Text - 'TheTextBox.Text = AddScaledBorderAndShadow(Teststring) - 'Exit Sub - 'Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString) - UserBowser = True - - If Application.OpenForms().OfType(Of Browser).Any = True Then - Browser.Location = Me.Location - Else - Browser.Location = Me.Location - Browser.Show() - End If - - - End Sub - Public Function RemoveExtraSpaces(input_text As String) As String Dim rsRegEx As System.Text.RegularExpressions.Regex rsRegEx = New System.Text.RegularExpressions.Regex("\s+") @@ -2294,60 +2255,6 @@ Public Class Main - -#Region "process html" - Public Sub ProcessHTML(ByVal document As String, ByVal Address As String, ByVal DocumentTitle As String) - Dim localHTML As String = document - Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString) - Debug.WriteLine(Address) - - If b = True Then - LoadedUrls.Clear() - Grapp_RDY = True - Debug.WriteLine("Just Browsing, exiting...") - 'Debug.WriteLine("Just Browsing, exiting... for real...") - Exit Sub - End If - 'MsgBox("loaded!") - If CBool(InStr(Address, "crunchyroll.com")) Then - WebbrowserURL = Address - - - End If - 'End If - End Sub - - - - -#End Region - - - - Public Sub Navigate(ByVal Url As String) - If Application.OpenForms().OfType(Of Browser).Any = True Then - If InvokeRequired = True Then - Me.Invoke(New Action(Function() As Object - Browser.WebView2.CoreWebView2.Navigate(Url) - Return Nothing - End Function)) - Else - Browser.WebView2.CoreWebView2.Navigate(Url) - End If - Else - If InvokeRequired = True Then - Me.Invoke(New Action(Function() As Object - Browser.Show() - Browser.WebView2.CoreWebView2.Navigate(Url) - Return Nothing - End Function)) - Else - Browser.Show() - Browser.WebView2.CoreWebView2.Navigate(Url) - End If - End If - End Sub - #Region "server" Dim ListOfThread As New List(Of Thread) Sub ServerStart() @@ -2748,26 +2655,6 @@ Public Class Main Trackbar.ShowDialog() End Sub - Private Sub MsgBoxToolStripMenuItem_Click(sender As Object, e As EventArgs) - MsgBox(LoadedUrls.Count.ToString) - For i As Integer = 0 To LoadedUrls.Count - 1 - MsgBox(LoadedUrls(i)) - Next - End Sub - - Private Sub CRCookieToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CRCookieToolStripMenuItem.Click - - 'MsgBox(Curl(InputBox("test", "test"))) - 'For i As Integer = 0 To CookieList.Count - 1 - - - 'Next - MsgBox(CookieList.Count.ToString) - 'MsgBox(CR_Cookies) - End Sub - - - Private Sub ItemBoundsToolStripMenuItem_Click(sender As Object, e As EventArgs) Try @@ -2935,7 +2822,6 @@ Public Class Main LoadingUrl = Url - LoadedUrls.Clear() Dim NoBrowser As Boolean = False WebbrowserURL = Url @@ -3012,7 +2898,7 @@ Public Class Main ProcessLoading(Url, Auth2, Loc_CR_Cookies, RT_count) Else Dim v1Token As String = CurlPost("https://beta-api.crunchyroll.com/auth/v1/token", Loc_CR_Cookies, Auth, Post, "add_main_4494") - 'MsgBox(v1Token) + MsgBox(v1Token) If CBool(InStr(v1Token, "HTTP Status: 401")) = True Then MsgBox("CR reported :" + vbNewLine + v1Token, MsgBoxStyle.Exclamation, "CR-Error 401") LoginForm.ShowDialog() @@ -3107,23 +2993,13 @@ Public Class Main ObjectJson = CurlAuthNew(ObjectsUrl, Loc_CR_Cookies, Auth2) Catch ex As Exception - MsgBox(ex.ToString) + Error_msg.ShowErrorDia(ex.ToString, "Status: Error getting ObjectJson", True) + + 'MsgBox(ex.ToString) Exit Sub - 'If CBool(InStr(ex.ToString, "Error - Getting")) Then - ' MsgBox("Error invalid CR respone") - ' Exit Sub - 'Else - ' MsgBox("Error processing data") - ' Exit Sub - 'End If End Try - - If CBool(InStr(ObjectJson, "curl:")) = True Then - Browser.WebView2.CoreWebView2.Navigate(url) - - Exit Sub - ElseIf CBool(InStr(ObjectJson, "videos/")) = False Then + If CBool(InStr(ObjectJson, "videos/")) = False Then 'MsgBox(ObjectJson) Error_msg.ShowErrorDia(ObjectJson, "Status: Failed - no video, check CR login", True) @@ -3152,7 +3028,7 @@ Public Class Main ' Debug.WriteLine(StreamsUrl) Catch ex As Exception - Browser.WebView2.CoreWebView2.Navigate(url) + Error_msg.ShowErrorDia(ex.ToString, "Status: Processing Error", True) Exit Sub End Try @@ -3393,6 +3269,38 @@ Public Class Main Error_msg.ShowErrorDia("Error-Error", "CR returnd : HTTP Status - " + "400") End Sub + Private Sub BGW_Update_DoWork(sender As Object, e As DoWorkEventArgs) Handles BGW_Update.DoWork + Try + Dim client0 As New WebClient + client0.Encoding = Encoding.UTF8 + client0.Headers.Add(My.Settings.User_Agend.Replace(Chr(34), "")) + + Dim str0 As String = client0.DownloadString("https://api.github.com/repos/hama3254/Crunchyroll-Downloader-v3.0/releases") + + Dim GitHubLastIsPre() As String = str0.Split(New String() {Chr(34) + "prerelease" + Chr(34) + ": "}, System.StringSplitOptions.RemoveEmptyEntries) + Dim LastNonPreRelase As Integer = 0 + + For i As Integer = 1 To GitHubLastIsPre.Count - 1 + Dim GitHubLastIsPre1() As String = GitHubLastIsPre(i).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) + + If GitHubLastIsPre1(0) = "false" Then + LastNonPreRelase = i + Exit For + End If + Next + + Dim GitHubLastTag() As String = str0.Split(New String() {Chr(34) + "tag_name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) + Dim GitHubLastTag1() As String = GitHubLastTag(LastNonPreRelase).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) + + 'LastVersionString = GitHubLastTag1(0) + + 'Debug.WriteLine(GitHubLastTag1(0)) + + Catch ex As Exception + Debug.WriteLine(ex.ToString) + End Try + End Sub + #End Region diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index c4cf850..cb70108 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -126,18 +126,6 @@ Namespace My End Set End Property - _ - Public Property Startseite() As String - Get - Return CType(Me("Startseite"),String) - End Get - Set - Me("Startseite") = value - End Set - End Property - _ diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index 9776e0c..dbb879b 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -20,9 +20,6 @@ - - https://www.crunchyroll.com/ - [default season prefix] diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index a21a577..0633f6b 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -38,6 +38,7 @@ Partial Class Einstellungen Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox23 = New System.Windows.Forms.GroupBox() Me.GroupBox18 = New System.Windows.Forms.GroupBox() + Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox16 = New System.Windows.Forms.GroupBox() Me.MetroLabel3 = New MetroFramework.Controls.MetroLabel() @@ -100,9 +101,6 @@ Partial Class Einstellungen Me.Chb_Ign_tls = New MetroFramework.Controls.MetroCheckBox() Me.http_support = New MetroFramework.Controls.MetroComboBox() Me.DarkMode = New MetroFramework.Controls.MetroCheckBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.Label1 = New MetroFramework.Controls.MetroLabel() - Me.TextBox1 = New MetroFramework.Controls.MetroTextBox() Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox() Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() Me.TabControl1 = New MetroFramework.Controls.MetroTabControl() @@ -144,7 +142,7 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox() + Me.CB_Update_Pre = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -163,7 +161,6 @@ Partial Class Einstellungen Me.GroupBox6.SuspendLayout() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox5.SuspendLayout() - Me.GroupBox1.SuspendLayout() Me.DL_Count_simultaneous.SuspendLayout() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() @@ -374,6 +371,17 @@ Partial Class Einstellungen Me.GroupBox18.TabStop = False Me.GroupBox18.Text = "Multi-Download" ' + 'CB_HideQueue + ' + Me.CB_HideQueue.AutoSize = True + Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21) + Me.CB_HideQueue.Name = "CB_HideQueue" + Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19) + Me.CB_HideQueue.TabIndex = 6 + Me.CB_HideQueue.Text = "hidden Queue" + Me.CB_HideQueue.UseSelectable = True + ' 'ListViewAdd_True ' Me.ListViewAdd_True.AutoSize = True @@ -839,7 +847,6 @@ Partial Class Einstellungen Me.TabPage1.Controls.Add(Me.GroupBox21) Me.TabPage1.Controls.Add(Me.GroupBox6) Me.TabPage1.Controls.Add(Me.GroupBox5) - Me.TabPage1.Controls.Add(Me.GroupBox1) Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous) Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TabPage1.HorizontalScrollbar = True @@ -863,7 +870,7 @@ Partial Class Einstellungen Me.GroupBox21.Controls.Add(Me.CB_HideSF) Me.GroupBox21.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox21.ForeColor = System.Drawing.Color.Black - Me.GroupBox21.Location = New System.Drawing.Point(5, 417) + Me.GroupBox21.Location = New System.Drawing.Point(5, 349) Me.GroupBox21.Name = "GroupBox21" Me.GroupBox21.Size = New System.Drawing.Size(490, 67) Me.GroupBox21.TabIndex = 81 @@ -893,7 +900,7 @@ Partial Class Einstellungen Me.GroupBox6.Controls.Add(Me.NumericUpDown2) Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox6.ForeColor = System.Drawing.Color.Black - Me.GroupBox6.Location = New System.Drawing.Point(5, 299) + Me.GroupBox6.Location = New System.Drawing.Point(5, 231) Me.GroupBox6.Name = "GroupBox6" Me.GroupBox6.Size = New System.Drawing.Size(490, 112) Me.GroupBox6.TabIndex = 80 @@ -944,12 +951,13 @@ Partial Class Einstellungen Me.GroupBox5.BackColor = System.Drawing.Color.Transparent Me.GroupBox5.Controls.Add(Me.Chb_Ign_tls) Me.GroupBox5.Controls.Add(Me.http_support) + Me.GroupBox5.Controls.Add(Me.CB_Update_Pre) Me.GroupBox5.Controls.Add(Me.DarkMode) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.ForeColor = System.Drawing.Color.Black - Me.GroupBox5.Location = New System.Drawing.Point(5, 179) + Me.GroupBox5.Location = New System.Drawing.Point(5, 85) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(490, 114) + Me.GroupBox5.Size = New System.Drawing.Size(490, 140) Me.GroupBox5.TabIndex = 70 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Other" @@ -958,7 +966,7 @@ Partial Class Einstellungen ' Me.Chb_Ign_tls.AutoSize = True Me.Chb_Ign_tls.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.Chb_Ign_tls.Location = New System.Drawing.Point(135, 80) + Me.Chb_Ign_tls.Location = New System.Drawing.Point(242, 43) Me.Chb_Ign_tls.Name = "Chb_Ign_tls" Me.Chb_Ign_tls.Size = New System.Drawing.Size(223, 19) Me.Chb_Ign_tls.TabIndex = 46 @@ -974,9 +982,9 @@ Partial Class Einstellungen Me.http_support.IntegralHeight = False Me.http_support.ItemHeight = 23 Me.http_support.Items.AddRange(New Object() {"add-on support disabled", "80", "8080"}) - Me.http_support.Location = New System.Drawing.Point(214, 25) + Me.http_support.Location = New System.Drawing.Point(242, 90) Me.http_support.Name = "http_support" - Me.http_support.Size = New System.Drawing.Size(237, 29) + Me.http_support.Size = New System.Drawing.Size(223, 29) Me.http_support.TabIndex = 45 Me.http_support.UseSelectable = True ' @@ -984,70 +992,13 @@ Partial Class Einstellungen ' Me.DarkMode.AutoSize = True Me.DarkMode.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.DarkMode.Location = New System.Drawing.Point(41, 30) + Me.DarkMode.Location = New System.Drawing.Point(39, 43) Me.DarkMode.Name = "DarkMode" Me.DarkMode.Size = New System.Drawing.Size(135, 19) Me.DarkMode.TabIndex = 5 Me.DarkMode.Text = "enable dark mode" Me.DarkMode.UseSelectable = True ' - 'GroupBox1 - ' - Me.GroupBox1.BackColor = System.Drawing.Color.Transparent - Me.GroupBox1.Controls.Add(Me.Label1) - Me.GroupBox1.Controls.Add(Me.TextBox1) - Me.GroupBox1.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox1.ForeColor = System.Drawing.Color.Black - Me.GroupBox1.Location = New System.Drawing.Point(5, 85) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(490, 88) - Me.GroupBox1.TabIndex = 60 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Browser Settings" - ' - 'Label1 - ' - Me.Label1.FontWeight = MetroFramework.MetroLabelWeight.Regular - Me.Label1.Location = New System.Drawing.Point(6, 20) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(469, 22) - Me.Label1.TabIndex = 2 - Me.Label1.Text = "Default Website" - Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'TextBox1 - ' - ' - ' - ' - Me.TextBox1.CustomButton.Image = Nothing - Me.TextBox1.CustomButton.Location = New System.Drawing.Point(445, 1) - Me.TextBox1.CustomButton.Name = "" - Me.TextBox1.CustomButton.Size = New System.Drawing.Size(23, 23) - Me.TextBox1.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.TextBox1.CustomButton.TabIndex = 1 - Me.TextBox1.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.TextBox1.CustomButton.UseSelectable = True - Me.TextBox1.CustomButton.Visible = False - Me.TextBox1.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.TextBox1.Lines = New String() {"https://www.crunchyroll.com/"} - Me.TextBox1.Location = New System.Drawing.Point(6, 45) - Me.TextBox1.MaxLength = 32767 - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.TextBox1.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.TextBox1.SelectedText = "" - Me.TextBox1.SelectionLength = 0 - Me.TextBox1.SelectionStart = 0 - Me.TextBox1.ShortcutsEnabled = True - Me.TextBox1.Size = New System.Drawing.Size(469, 25) - Me.TextBox1.TabIndex = 2 - Me.TextBox1.Text = "https://www.crunchyroll.com/" - Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.TextBox1.UseSelectable = True - Me.TextBox1.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.TextBox1.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) - ' 'DL_Count_simultaneous ' Me.DL_Count_simultaneous.BackColor = System.Drawing.Color.Transparent @@ -1083,7 +1034,7 @@ Partial Class Einstellungen Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50) Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 1 + Me.TabControl1.SelectedIndex = 0 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1646,16 +1597,16 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_HideQueue + 'CB_Update_Pre ' - Me.CB_HideQueue.AutoSize = True - Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21) - Me.CB_HideQueue.Name = "CB_HideQueue" - Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19) - Me.CB_HideQueue.TabIndex = 6 - Me.CB_HideQueue.Text = "hidden Queue" - Me.CB_HideQueue.UseSelectable = True + Me.CB_Update_Pre.AutoSize = True + Me.CB_Update_Pre.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Update_Pre.Location = New System.Drawing.Point(39, 90) + Me.CB_Update_Pre.Name = "CB_Update_Pre" + Me.CB_Update_Pre.Size = New System.Drawing.Size(176, 19) + Me.CB_Update_Pre.TabIndex = 5 + Me.CB_Update_Pre.Text = "Pre-Release Notifications" + Me.CB_Update_Pre.UseSelectable = True ' 'Einstellungen ' @@ -1700,7 +1651,6 @@ Partial Class Einstellungen CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() - Me.GroupBox1.ResumeLayout(False) Me.DL_Count_simultaneous.ResumeLayout(False) CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) @@ -1748,7 +1698,6 @@ Partial Class Einstellungen Friend WithEvents FFMPEG_CommandP4 As ToolStripMenuItem Friend WithEvents GB_Resolution As GroupBox Friend WithEvents GroupBox5 As GroupBox - Friend WithEvents GroupBox1 As GroupBox Friend WithEvents DL_Count_simultaneous As GroupBox Friend WithEvents NumericUpDown1 As NumericUpDown Friend WithEvents SoftSubs As GroupBox @@ -1762,7 +1711,6 @@ Partial Class Einstellungen Friend WithEvents TabPage7 As TabPage Friend WithEvents PictureBox7 As PictureBox Friend WithEvents Button1 As Button - Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel Friend WithEvents Label2 As MetroFramework.Controls.MetroLabel Public WithEvents Label4 As MetroFramework.Controls.MetroLabel Public WithEvents Label6 As MetroFramework.Controls.MetroLabel @@ -1779,7 +1727,6 @@ Partial Class Einstellungen Public WithEvents Label3 As MetroFramework.Controls.MetroLabel Friend WithEvents MetroLabel1 As MetroFramework.Controls.MetroLabel Friend WithEvents DarkMode As MetroFramework.Controls.MetroCheckBox - Friend WithEvents TextBox1 As MetroFramework.Controls.MetroTextBox Friend WithEvents CB_CR_Harsubs As MetroFramework.Controls.MetroComboBox Public WithEvents LastVersion As MetroFramework.Controls.MetroLabel Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker @@ -1845,4 +1792,5 @@ Partial Class Einstellungen Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox Friend WithEvents AMD_AV1 As ToolStripMenuItem Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox + Friend WithEvents CB_Update_Pre As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index f49b9b4..e809bf5 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,9 +126,6 @@ 118, 20 - - 118, 20 - 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index a59e020..d9cc70d 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -190,7 +190,7 @@ Public Class Einstellungen NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown1.Value = Main.MaxDL - TextBox1.Text = Main.Startseite + Try @@ -367,15 +367,9 @@ Public Class Einstellungen End If ' MsgBox(Name_season.Text) - If CBool(InStr(TextBox1.Text, "https://")) Then - Main.Startseite = TextBox1.Text - My.Settings.Startseite = Main.Startseite - ElseIf TextBox1.Text = Nothing Then - Main.Startseite = "https://www.crunchyroll.com/" - My.Settings.Startseite = Main.Startseite - Else - End If + + If DD_Season_Prefix.Text IsNot "[default season prefix]" Then Main.Season_Prefix = DD_Season_Prefix.Text My.Settings.Prefix_S = Main.Season_Prefix @@ -696,7 +690,6 @@ Public Class Einstellungen DL_Count_simultaneous.ForeColor = color GB_Resolution.ForeColor = color GB_Filename_Pre.ForeColor = color - GroupBox1.ForeColor = color GroupBox2.ForeColor = color GroupBox3.ForeColor = color GroupBox4.ForeColor = color diff --git a/Crunchyroll Downloader/packages.config b/Crunchyroll Downloader/packages.config index 974a4fa..0dcc305 100644 --- a/Crunchyroll Downloader/packages.config +++ b/Crunchyroll Downloader/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file