From d03e3b4ebc347c90f3ec2aea9492b8c92ebd824f Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 5 Jan 2023 14:26:40 +0100 Subject: [PATCH] bugfixes fix #654 fix #651 possible fix #649 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 178176 -> 179712 bytes Crunchyroll Downloader/Anime_Add.Designer.vb | 2 +- Crunchyroll Downloader/Browser.vb | 5 +- .../Crunchyroll Downloader.vbproj | 9 + Crunchyroll Downloader/Main.designer.vb | 9 +- Crunchyroll Downloader/Main.resx | 16 +- Crunchyroll Downloader/Main.vb | 517 +++++++----------- .../My Project/AssemblyInfo.vb | 4 +- .../einstellungen.Designer.vb | 373 ++++++------- Crunchyroll Downloader/einstellungen.vb | 70 +-- Crunchyroll Downloader/queue.Designer.vb | 57 ++ Crunchyroll Downloader/queue.resx | 120 ++++ Crunchyroll Downloader/queue.vb | 44 ++ 13 files changed, 680 insertions(+), 546 deletions(-) create mode 100644 Crunchyroll Downloader/queue.Designer.vb create mode 100644 Crunchyroll Downloader/queue.resx create mode 100644 Crunchyroll Downloader/queue.vb diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index a0686c00e0f082be46496e262fadb62c63577b20..4b909164b5ab55ec2cbe3be17578701eb63f0da7 100644 GIT binary patch delta 9543 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 delta 9278 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 diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index 41f1747..baf7722 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -393,9 +393,9 @@ Partial Class Anime_Add Me.Controls.Add(Me.btn_dl) Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_Close) - Me.Controls.Add(Me.groupBox2) Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.GroupBox3) + Me.Controls.Add(Me.groupBox2) Me.Font = New System.Drawing.Font("Arial", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Name = "Anime_Add" Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20) diff --git a/Crunchyroll Downloader/Browser.vb b/Crunchyroll Downloader/Browser.vb index 80a673d..fcab076 100644 --- a/Crunchyroll Downloader/Browser.vb +++ b/Crunchyroll Downloader/Browser.vb @@ -66,7 +66,10 @@ Public Class Browser End Sub Public Async Sub GetCookies(ByVal Uri As String) - Main.CookieList = Await WebView2.CoreWebView2.CookieManager.GetCookiesAsync(Uri) + Try + Main.CookieList = Await WebView2.CoreWebView2.CookieManager.GetCookiesAsync(Uri) + Catch ex As Exception + End Try End Sub diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index 3b14bb8..1d7e842 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -150,6 +150,12 @@ + + queue.vb + + + Form + Trackbar.vb @@ -214,6 +220,9 @@ + + queue.vb + Trackbar.vb diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 82afaee..100d2d1 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -53,6 +53,7 @@ Partial Class Main Me.DummyItemToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.ScanTimeout = New System.Windows.Forms.Timer(Me.components) + Me.QueueToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -161,7 +162,7 @@ Partial Class Main ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.Funimation_Token, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.MsgBoxToolStripMenuItem, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.ItemBoundsToolStripMenuItem, Me.DummyItemToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.Funimation_Token, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.MsgBoxToolStripMenuItem, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.ItemBoundsToolStripMenuItem, Me.DummyItemToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -234,6 +235,11 @@ Partial Class Main ' Me.ScanTimeout.Interval = 1000 ' + 'QueueToolStripMenuItem + ' + Me.QueueToolStripMenuItem.Name = "QueueToolStripMenuItem" + resources.ApplyResources(Me.QueueToolStripMenuItem, "QueueToolStripMenuItem") + ' 'Main ' Me.ApplyImageInvert = True @@ -292,4 +298,5 @@ Partial Class Main Friend WithEvents DummyItemToolStripMenuItem As ToolStripMenuItem Public WithEvents Panel1 As Panel Friend WithEvents ScanTimeout As Timer + Friend WithEvents QueueToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index bff13bf..0c3ef9b 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -151,7 +151,7 @@ 9 - 370, 2 + 383, 18 272, 14 @@ -531,6 +531,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + QueueToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -543,6 +549,12 @@ 352, 49 + + 233, 22 + + + Queue + 233, 22 @@ -616,7 +628,7 @@ Dummy_Item - 234, 290 + 234, 312 ContextMenuStrip1 diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 44911ba..dac8b2e 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -107,7 +107,9 @@ Public Class Main Public ffmpeg_command As String = " -c copy -bsf:a aac_adtstoasc" '" -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " Public Reso As Integer Public Season_Prefix As String = "[default season prefix]" + Public Season_PrefixDefault As String = "[default season prefix]" Public Episode_Prefix As String = "[default episode prefix]" + Public Episode_PrefixDefault As String = "[default episode prefix]" Public ResoSave As String = "6666x6666" Public ResoFunBackup As String = "6666x6666" @@ -1125,7 +1127,7 @@ Public Class Main Dim CR_Streams As New List(Of CR_Beta_Stream) Dim CR_series_title As String = Nothing Dim CR_season_number As String = Nothing - Dim CR_season_number2 As String = Nothing + Dim CR_FolderSeason As String = Nothing Dim CR_episode As String = Nothing Dim CR_episode_duration_ms As String = "60000000" Dim CR_episode2 As String = Nothing @@ -1137,7 +1139,7 @@ Public Class Main Dim ResoUsed As String = "x" + Reso.ToString Dim ffmpegInput As String = "-i [Subtitles only]" -#Region "Name + Pfad" + Dim Pfad2 As String Dim TextBox2_Text As String = Nothing Dim CR_FilenName As String = Nothing @@ -1146,7 +1148,6 @@ Public Class Main TextBox2_Text = Anime_Add.TextBox2.Text Return Nothing End Function)) -#Region "Name von Crunchyroll" @@ -1202,232 +1203,45 @@ Public Class Main Dim data As List(Of JToken) = ser.Children().ToList For Each item As JProperty In data - item.CreateReader() - Select Case item.Name + item.CreateReader() + Select Case item.Name - Case "data" 'each record is inside the entries array - For Each Entry As JObject In item.Values - Try - Dim Title As String = Entry("title").ToString - CR_title = String.Join(" ", Title.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - Debug.WriteLine(Date.Now.ToString + " CR-Title: " + CR_title) - Catch ex As Exception - End Try - Dim SubData As List(Of JToken) = Entry.Children().ToList - For Each SubItem As JProperty In SubData - 'SubItem.CreateReader() - Select Case SubItem.Name - Case "episode_metadata" - For Each SubEntry As JProperty In SubItem.Values - Select Case SubEntry.Name - Case "series_title" - CR_series_title = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Case "data" 'each record is inside the entries array + For Each Entry As JObject In item.Values + Try + Dim Title As String = Entry("title").ToString + CR_title = String.Join(" ", Title.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Debug.WriteLine(Date.Now.ToString + " CR-Title: " + CR_title) + Catch ex As Exception + End Try + Dim SubData As List(Of JToken) = Entry.Children().ToList + For Each SubItem As JProperty In SubData + 'SubItem.CreateReader() + Select Case SubItem.Name + Case "episode_metadata" + For Each SubEntry As JProperty In SubItem.Values + Select Case SubEntry.Name + Case "series_title" + CR_series_title = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") 'Case "season_title" ' CR_season_title = SubEntry.Value.ToString - Case "season_number" - CR_season_number = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - Case "episode_number" - CR_episode2 = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - Case "episode" - CR_episode = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - Case "duration_ms" - CR_episode_duration_ms = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") - Case "is_dubbed" - CR_audio_isDubbed = CBool(SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")) - End Select - Next ' - End Select - Next + Case "season_number" + CR_season_number = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Case "episode_number" + CR_episode2 = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Case "episode" + CR_episode = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Case "duration_ms" + CR_episode_duration_ms = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "") + Case "is_dubbed" + CR_audio_isDubbed = CBool(SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")) + End Select + Next ' + End Select Next - End Select - Next - - - If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then - CR_episode_int = "0" - ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then - CR_episode_int = CR_episode - ElseIf CR_episode2 IsNot Nothing Then - CR_episode_int = CR_episode2 - End If - CR_Anime_Staffel_int = CR_season_number - - - - If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Or CBool(InStr(TextBox2_Text, "++")) = True Then - - - If Season_Prefix = "[default season prefix]" Then - If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie - CR_season_number = Nothing - ElseIf CR_season_number = Nothing Then - Else - CR_season_number = "Season " + CR_season_number - End If - Else - If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie - CR_season_number = Nothing - ElseIf CR_season_number = Nothing Then - Else - CR_season_number = Season_Prefix + CR_season_number - End If - End If - - CR_season_number2 = CR_season_number - - If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then - CR_season_number = Nothing - ElseIf IgnoreSeason = 2 Then - CR_season_number = Nothing - End If - - - If Episode_Prefix = "[default episode prefix]" Then - If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then - CR_episode = CR_title - ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then - CR_episode = "Episode " + AddLeadingZeros(CR_episode) - ElseIf CR_episode2 IsNot Nothing Then - CR_episode = "Episode " + AddLeadingZeros(CR_episode2) - End If - 'CR_episode = "Episode " + AddLeadingZeros(CR_episode) - Else - CR_episode = Episode_Prefix + AddLeadingZeros(CR_episode) - End If - - - Dim NameParts As String() = NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries) - - For i As Integer = 0 To NameParts.Count - 1 - - If NameParts(i) = "AnimeTitle" Then - CR_FilenName = CR_FilenName + " " + CR_series_title - ElseIf NameParts(i) = "Season" Then - CR_FilenName = CR_FilenName + " " + CR_season_number - ElseIf NameParts(i) = "EpisodeNR" Then - CR_FilenName = CR_FilenName + " " + CR_episode - ElseIf NameParts(i) = "EpisodeName" Then - CR_FilenName = CR_FilenName + " " + CR_title - ElseIf NameParts(i) = "AnimeDub" Then - CR_FilenName = CR_FilenName + " RepDub" - ElseIf NameParts(i) = "AnimeSub" Then - CR_FilenName = CR_FilenName + " RepSub" - End If - - Next - - - 'If CR_NameMethode = 0 Then 'nummer - ' If CR_season_number = Nothing And CR_episode = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title - ' ElseIf CR_episode = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title - ' ElseIf CR_season_number = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_episode - ' Else - ' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode - ' End If - 'ElseIf CR_NameMethode = 1 Then 'name - ' If CR_season_number = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title - ' Else - ' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_title - ' End If - 'ElseIf CR_NameMethode = 2 Then ' nummer - name - ' If CR_season_number = Nothing And CR_episode = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title - ' ElseIf CR_season_number = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_episode + " " + CR_title - ' Else - ' CR_FilenName = CR_series_title + " " + CR_season_number + " " + CR_episode + " " + CR_title - ' End If - 'ElseIf CR_NameMethode = 3 Then ' name - nummer - ' If CR_season_number = Nothing And CR_episode = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title - ' ElseIf CR_season_number = Nothing Then - ' CR_FilenName = CR_series_title + " " + CR_title + " " + CR_episode - ' Else - ' CR_FilenName = CR_series_title + " " + CR_title + " " + CR_season_number + " " + CR_episode - ' End If - 'End If - - - If CBool(InStr(TextBox2_Text, "++")) = True Then - Dim Backup_CR_FilenName As String = CR_FilenName - Try - Dim AddDef As String = "CRD" - Dim TestString As String = AddDef + TextBox2_Text + AddDef - Dim PrePost As String() = TestString.Split(New String() {"++"}, System.StringSplitOptions.RemoveEmptyEntries) - CR_FilenName = PrePost(0) + CR_FilenName + PrePost(1) - CR_FilenName = CR_FilenName.Replace(AddDef, "") - Catch ex As Exception - CR_FilenName = Backup_CR_FilenName - End Try - End If - - - - - - -#End Region - 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 KodiNaming = True 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_episode_int) ' CR_episode_nr - KodiString = KodiString + "] " - CR_FilenName = KodiString + CR_FilenName - End If - Debug.WriteLine(CR_FilenName) - - 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_series_title, CR_season_number2, 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) - Pfad2 = Pfad2.Replace("\\", "\") - End Try - Else - Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34) - End If -#End Region - -#Region "lösche doppel download" - Dim Pfad5 As String = Pfad2.Replace(Chr(34), "") - If My.Computer.FileSystem.FileExists(Pfad5) And SubsOnly = False 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 + Next + End Select + Next #Region "Chapters" Dim Mdata_File As String = Application.StartupPath + "\" + ObjectsURLBuilder4(0) + "-mdata.txt" @@ -1506,6 +1320,7 @@ Public Class Main End If End If #End Region + #Region "VideoJson" Dim VideoJson As String = Nothing @@ -1598,15 +1413,7 @@ Public Class Main Else CR_audio_locale = "ja-JP" End If - 'Case "subtitles" - ' Dim SubtitleSubData As List(Of JToken) = MetaEntrys.Children().ToList - ' For Each SubtitleSubItem As JObject In SubtitleSubData - ' 'MsgBox(SubtitleSubItem.Children().ToList.Count.ToString) - ' If SubtitleSubItem.Children().ToList.Count > 2 Then - ' CR_audio_locale = "ja-JP" - ' End If - ' Exit For - ' Next + End Select Next @@ -1672,12 +1479,170 @@ Public Class Main #End Region +#Region "Name" + +#Region "Name von Crunchyroll" + + + If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then + CR_episode_int = "0" + ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then + CR_episode_int = CR_episode + ElseIf CR_episode2 IsNot Nothing Then + CR_episode_int = CR_episode2 + End If + CR_Anime_Staffel_int = CR_season_number + + + + If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Or CBool(InStr(TextBox2_Text, "++")) = True Then + + + If Season_Prefix = "[default season prefix]" Then + If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie + CR_season_number = Nothing + ElseIf CR_season_number = Nothing Then + Else + CR_season_number = "Season " + CR_season_number + End If + Else + If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie + CR_season_number = Nothing + ElseIf CR_season_number = Nothing Then + Else + CR_season_number = Season_Prefix + CR_season_number + End If + End If + + CR_FolderSeason = CR_season_number + + If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then + CR_season_number = Nothing + ElseIf IgnoreSeason = 2 Then + CR_season_number = Nothing + End If + + + If Episode_Prefix = "[default episode prefix]" Then + If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then + CR_episode = CR_title + ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then + CR_episode = "Episode " + AddLeadingZeros(CR_episode) + ElseIf CR_episode2 IsNot Nothing Then + CR_episode = "Episode " + AddLeadingZeros(CR_episode2) + End If + 'CR_episode = "Episode " + AddLeadingZeros(CR_episode) + Else + CR_episode = Episode_Prefix + AddLeadingZeros(CR_episode) + End If + + + Dim NameParts As String() = NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries) + + For i As Integer = 0 To NameParts.Count - 1 + + If NameParts(i) = "AnimeTitle" Then + CR_FilenName = CR_FilenName + " " + CR_series_title + ElseIf NameParts(i) = "Season" Then + CR_FilenName = CR_FilenName + " " + CR_season_number + ElseIf NameParts(i) = "EpisodeNR" Then + CR_FilenName = CR_FilenName + " " + CR_episode + ElseIf NameParts(i) = "EpisodeName" Then + CR_FilenName = CR_FilenName + " " + CR_title + ElseIf NameParts(i) = "AnimeDub" Then + CR_FilenName = CR_FilenName + " " + HardSubValuesToDisplay(CR_audio_locale) + ElseIf NameParts(i) = "AnimeSub" Then + ' CR_FilenName = CR_FilenName + " RepSub" 'to be done + End If + + Next + + If CBool(InStr(TextBox2_Text, "++")) = True Then + Dim Backup_CR_FilenName As String = CR_FilenName + Try + Dim AddDef As String = "CRD" + Dim TestString As String = AddDef + TextBox2_Text + AddDef + Dim PrePost As String() = TestString.Split(New String() {"++"}, System.StringSplitOptions.RemoveEmptyEntries) + CR_FilenName = PrePost(0) + CR_FilenName + PrePost(1) + CR_FilenName = CR_FilenName.Replace(AddDef, "") + Catch ex As Exception + CR_FilenName = Backup_CR_FilenName + End Try + End If + + + + + + +#End Region + 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 KodiNaming = True 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_episode_int) ' CR_episode_nr + KodiString = KodiString + "] " + CR_FilenName = KodiString + CR_FilenName + End If + Debug.WriteLine(CR_FilenName) + + 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_series_title, CR_FolderSeason, 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) + Pfad2 = Pfad2.Replace("\\", "\") + End Try + Else + Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34) + End If +#End Region + +#Region "lösche doppel download" + Dim Pfad5 As String = Pfad2.Replace(Chr(34), "") + If My.Computer.FileSystem.FileExists(Pfad5) And SubsOnly = False 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 + + #Region "GetResolution" If Reso = 42 And HybridMode = False Then ffmpegInput = "-i " + Chr(34) + CR_URI_Master + Chr(34) + ElseIf SubsOnly = True Then + ffmpegInput = "-i [Subtitles only]" Else Dim str As String = Nothing @@ -1824,7 +1789,6 @@ Public Class Main ffmpegInput = RemoveExtraSpaces(ffmpegInput) #End Region - #Region "thumbnail" Dim thumbnail As String() = ObjectJson.Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries) Dim thumbnail3 As String = "" @@ -1845,6 +1809,7 @@ Public Class Main Next #End Region + #Region "item constructor" #Region "Display Hard_Softsubs" @@ -1862,17 +1827,7 @@ Public Class Main Next End If #End Region -#Region "Replace Sub/Dub in name" - If CBool(InStr(CR_FilenName, "RepDub")) Then - CR_FilenName = CR_FilenName.Replace("RepDub", HardSubValuesToDisplay(CR_audio_locale)) - End If - - If CBool(InStr(CR_FilenName, " RepSub")) Then - CR_FilenName = CR_FilenName.Replace(" RepSub", "") - End If - -#End Region #Region "Display Resolution" @@ -2153,74 +2108,6 @@ Public Class Main End Function -#Region "unused" - 'Public Shared Function GetPage(url As String) As String - ' Try - ' Dim ourUri As New Uri(url) - ' Dim myHttpWebRequest As HttpWebRequest = CType(WebRequest.Create(ourUri), HttpWebRequest) - ' myHttpWebRequest.Timeout = 10000 - ' Dim myHttpWebResponse As HttpWebResponse = CType(myHttpWebRequest.GetResponse(), HttpWebResponse) - ' Return myHttpWebResponse.ResponseUri.ToString - ' myHttpWebResponse.Close() - ' Catch e As Exception - ' 'MsgBox(e.Message.ToString) - ' Return url - ' End Try - 'End Function - Sub FFMPEGResoBack(ByVal sender As Object, ByVal e As DataReceivedEventArgs) - If CBool(InStr(e.Data, ": Video:")) Then - Dim ZeileReso() As String = e.Data.Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeileReso2() As String = ZeileReso(0).Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeileReso3() As String = e.Data.Split(New String() {": Video:"}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeileReso4() As String = ZeileReso3(0).Split(New String() {"Stream #"}, System.StringSplitOptions.RemoveEmptyEntries) - ResoAvalibe = ResoAvalibe + vbNewLine + ZeileReso2(ZeileReso2.Count - 1).Trim + ":--:" + ZeileReso4(1) - ElseIf CBool(InStr(e.Data, "At least one output file must be specified")) Then - ResoSearchRunning = False - End If - End Sub - - Public Sub FFMPEG_Reso(ByVal DL_URL As String) - ResoSearchRunning = True - Dim proc As New Process - Dim exepath As String = Application.StartupPath + "\ffmpeg.exe" - Dim startinfo As New System.Diagnostics.ProcessStartInfo - Dim cmd As String = "-i " + Chr(34) + DL_URL + Chr(34) 'start ffmpeg with command strFFCMD string - Dim ffmpegOutput As String = Nothing - Dim ffmpegOutput2 As String = Nothing - 'all parameters required to run the process - startinfo.FileName = exepath - startinfo.Arguments = cmd - startinfo.UseShellExecute = False - startinfo.WindowStyle = ProcessWindowStyle.Hidden - startinfo.RedirectStandardError = True - startinfo.RedirectStandardOutput = True - startinfo.CreateNoWindow = True - startinfo.StandardOutputEncoding = Encoding.UTF8 - startinfo.StandardErrorEncoding = Encoding.UTF8 - AddHandler proc.ErrorDataReceived, AddressOf FFMPEGResoBack - AddHandler proc.OutputDataReceived, AddressOf FFMPEGResoBack - proc.StartInfo = startinfo - proc.Start() ' start the process - proc.BeginOutputReadLine() - proc.BeginErrorReadLine() - 'Dim ZeitAnzeige As String = Nothing - 'Dim StreamNR As String = Nothing - ''Math.Abs() - 'Dim AllReso As String = "1080p720p480p360p" - 'Dim AllResoArry() As String = AllReso.Split(New String() {"p"}, System.StringSplitOptions.RemoveEmptyEntries) - 'Dim Zeilen() As String = ffmpegOutput.Split(New String() {vbNewLine}, System.StringSplitOptions.RemoveEmptyEntries) - 'For i As Integer = 0 To Zeilen.Count - 1 - ' If CBool(InStr(Zeilen(i), "x" + Reso.ToString + " [") Then - ' Dim ZeileReso() As String = Zeilen(i).Split(New String() {": Video:"}, System.StringSplitOptions.RemoveEmptyEntries) - ' Dim ZeileReso2() As String = ZeileReso(0).Split(New String() {"Stream #"}, System.StringSplitOptions.RemoveEmptyEntries) - ' StreamNR = ZeileReso2(1) - ' End If - 'Next - 'Return ZeitAnzeige + "#1" + StreamNR - End Sub - -#End Region - Private Sub Timer2_Tick(sender As Object, e As EventArgs) Handles Timer2.Tick Try @@ -4329,6 +4216,10 @@ Public Class Main End Sub + Private Sub QueueToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles QueueToolStripMenuItem.Click + Queue.Show() + End Sub + #End Region diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index d56e9fa..55519e5 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index ae3f1eb..d34a707 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -102,8 +102,6 @@ Partial Class Einstellungen Me.http_support = New MetroFramework.Controls.MetroComboBox() Me.DarkMode = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.MetroLabel2 = New MetroFramework.Controls.MetroLabel() - Me.ProfileTextBox = New MetroFramework.Controls.MetroTextBox() Me.Label1 = New MetroFramework.Controls.MetroLabel() Me.TextBox1 = New MetroFramework.Controls.MetroTextBox() Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox() @@ -120,8 +118,13 @@ Partial Class Einstellungen Me.KodiSupport = New MetroFramework.Controls.MetroToggle() Me.MetroLink1 = New MetroFramework.Controls.MetroLink() Me.GroupBox12 = New System.Windows.Forms.GroupBox() - Me.DD_Episode_Prefix = New MetroFramework.Controls.MetroComboBox() - Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox() + Me.CB_EpisodeName = New MetroFramework.Controls.MetroCheckBox() + Me.CB_AnimeDub = New MetroFramework.Controls.MetroCheckBox() + Me.CB_EpisodeNR = New MetroFramework.Controls.MetroCheckBox() + Me.CB_AnimeSub = New MetroFramework.Controls.MetroCheckBox() + Me.CB_Season = New MetroFramework.Controls.MetroCheckBox() + Me.CB_Anime = New MetroFramework.Controls.MetroCheckBox() + Me.TB_NameString = New MetroFramework.Controls.MetroTextBox() Me.MetroTabPage1 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox() @@ -156,13 +159,8 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.TB_NameString = New MetroFramework.Controls.MetroTextBox() - Me.CB_EpisodeName = New MetroFramework.Controls.MetroCheckBox() - Me.CB_AnimeDub = New MetroFramework.Controls.MetroCheckBox() - Me.CB_EpisodeNR = New MetroFramework.Controls.MetroCheckBox() - Me.CB_AnimeSub = New MetroFramework.Controls.MetroCheckBox() - Me.CB_Season = New MetroFramework.Controls.MetroCheckBox() - Me.CB_Anime = New MetroFramework.Controls.MetroCheckBox() + Me.DD_Season_Prefix = New MetroFramework.Controls.MetroTextBox() + Me.DD_Episode_Prefix = New MetroFramework.Controls.MetroTextBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -923,7 +921,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(3, 360) + Me.GroupBox6.Location = New System.Drawing.Point(5, 299) Me.GroupBox6.Name = "GroupBox6" Me.GroupBox6.Size = New System.Drawing.Size(490, 112) Me.GroupBox6.TabIndex = 80 @@ -977,7 +975,7 @@ Partial Class Einstellungen 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(3, 240) + Me.GroupBox5.Location = New System.Drawing.Point(5, 179) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(490, 114) Me.GroupBox5.TabIndex = 70 @@ -1024,65 +1022,17 @@ Partial Class Einstellungen 'GroupBox1 ' Me.GroupBox1.BackColor = System.Drawing.Color.Transparent - Me.GroupBox1.Controls.Add(Me.MetroLabel2) - Me.GroupBox1.Controls.Add(Me.ProfileTextBox) 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, 149) + Me.GroupBox1.Size = New System.Drawing.Size(490, 88) Me.GroupBox1.TabIndex = 60 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Browser Settings" ' - 'MetroLabel2 - ' - Me.MetroLabel2.Enabled = False - Me.MetroLabel2.FontWeight = MetroFramework.MetroLabelWeight.Regular - Me.MetroLabel2.Location = New System.Drawing.Point(6, 80) - Me.MetroLabel2.Name = "MetroLabel2" - Me.MetroLabel2.Size = New System.Drawing.Size(469, 22) - Me.MetroLabel2.TabIndex = 3 - Me.MetroLabel2.Text = "Profile Folder" - Me.MetroLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'ProfileTextBox - ' - ' - ' - ' - Me.ProfileTextBox.CustomButton.Image = Nothing - Me.ProfileTextBox.CustomButton.Location = New System.Drawing.Point(445, 1) - Me.ProfileTextBox.CustomButton.Name = "" - Me.ProfileTextBox.CustomButton.Size = New System.Drawing.Size(23, 23) - Me.ProfileTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.ProfileTextBox.CustomButton.TabIndex = 1 - Me.ProfileTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.ProfileTextBox.CustomButton.UseSelectable = True - Me.ProfileTextBox.CustomButton.Visible = False - Me.ProfileTextBox.Enabled = False - Me.ProfileTextBox.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.ProfileTextBox.Lines = New String() {"Disabled"} - Me.ProfileTextBox.Location = New System.Drawing.Point(6, 106) - Me.ProfileTextBox.MaxLength = 32767 - Me.ProfileTextBox.Name = "ProfileTextBox" - Me.ProfileTextBox.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.ProfileTextBox.ReadOnly = True - Me.ProfileTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.ProfileTextBox.SelectedText = "" - Me.ProfileTextBox.SelectionLength = 0 - Me.ProfileTextBox.SelectionStart = 0 - Me.ProfileTextBox.ShortcutsEnabled = True - Me.ProfileTextBox.Size = New System.Drawing.Size(469, 25) - Me.ProfileTextBox.TabIndex = 4 - Me.ProfileTextBox.Text = "Disabled" - Me.ProfileTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.ProfileTextBox.UseSelectable = True - Me.ProfileTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.ProfileTextBox.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) - ' 'Label1 ' Me.Label1.FontWeight = MetroFramework.MetroLabelWeight.Regular @@ -1308,6 +1258,8 @@ Partial Class Einstellungen 'GroupBox12 ' Me.GroupBox12.BackColor = System.Drawing.Color.Transparent + Me.GroupBox12.Controls.Add(Me.DD_Episode_Prefix) + Me.GroupBox12.Controls.Add(Me.DD_Season_Prefix) Me.GroupBox12.Controls.Add(Me.CB_EpisodeName) Me.GroupBox12.Controls.Add(Me.CB_AnimeDub) Me.GroupBox12.Controls.Add(Me.CB_EpisodeNR) @@ -1315,8 +1267,6 @@ Partial Class Einstellungen Me.GroupBox12.Controls.Add(Me.CB_Season) Me.GroupBox12.Controls.Add(Me.CB_Anime) Me.GroupBox12.Controls.Add(Me.TB_NameString) - Me.GroupBox12.Controls.Add(Me.DD_Episode_Prefix) - Me.GroupBox12.Controls.Add(Me.DD_Season_Prefix) Me.GroupBox12.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox12.ForeColor = System.Drawing.Color.Black Me.GroupBox12.Location = New System.Drawing.Point(5, 11) @@ -1326,35 +1276,111 @@ Partial Class Einstellungen Me.GroupBox12.TabStop = False Me.GroupBox12.Text = "Filename" ' - 'DD_Episode_Prefix + 'CB_EpisodeName ' - Me.DD_Episode_Prefix.DropDownHeight = 250 - Me.DD_Episode_Prefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDown - Me.DD_Episode_Prefix.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DD_Episode_Prefix.FormattingEnabled = True - Me.DD_Episode_Prefix.IntegralHeight = False - Me.DD_Episode_Prefix.ItemHeight = 23 - Me.DD_Episode_Prefix.Items.AddRange(New Object() {"[default episode prefix]"}) - Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 165) - Me.DD_Episode_Prefix.Name = "DD_Episode_Prefix" - Me.DD_Episode_Prefix.Size = New System.Drawing.Size(225, 29) - Me.DD_Episode_Prefix.TabIndex = 10 - Me.DD_Episode_Prefix.UseSelectable = True + Me.CB_EpisodeName.AutoSize = True + Me.CB_EpisodeName.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_EpisodeName.ForeColor = System.Drawing.Color.Black + Me.CB_EpisodeName.Location = New System.Drawing.Point(153, 124) + Me.CB_EpisodeName.Name = "CB_EpisodeName" + Me.CB_EpisodeName.Size = New System.Drawing.Size(101, 19) + Me.CB_EpisodeName.TabIndex = 31 + Me.CB_EpisodeName.Text = "Episode Title" + Me.CB_EpisodeName.UseSelectable = True ' - 'DD_Season_Prefix + 'CB_AnimeDub ' - Me.DD_Season_Prefix.DropDownHeight = 250 - Me.DD_Season_Prefix.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDown - Me.DD_Season_Prefix.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DD_Season_Prefix.FormattingEnabled = True - Me.DD_Season_Prefix.IntegralHeight = False - Me.DD_Season_Prefix.ItemHeight = 23 - Me.DD_Season_Prefix.Items.AddRange(New Object() {"[default season prefix]"}) - Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 165) - Me.DD_Season_Prefix.Name = "DD_Season_Prefix" - Me.DD_Season_Prefix.Size = New System.Drawing.Size(225, 29) - Me.DD_Season_Prefix.TabIndex = 9 - Me.DD_Season_Prefix.UseSelectable = True + Me.CB_AnimeDub.AutoSize = True + Me.CB_AnimeDub.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_AnimeDub.ForeColor = System.Drawing.Color.Black + Me.CB_AnimeDub.Location = New System.Drawing.Point(320, 86) + Me.CB_AnimeDub.Name = "CB_AnimeDub" + Me.CB_AnimeDub.Size = New System.Drawing.Size(125, 19) + Me.CB_AnimeDub.TabIndex = 29 + Me.CB_AnimeDub.Text = "Audio Language" + Me.CB_AnimeDub.UseSelectable = True + ' + 'CB_EpisodeNR + ' + Me.CB_EpisodeNR.AutoSize = True + Me.CB_EpisodeNR.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_EpisodeNR.ForeColor = System.Drawing.Color.Black + Me.CB_EpisodeNR.Location = New System.Drawing.Point(153, 86) + Me.CB_EpisodeNR.Name = "CB_EpisodeNR" + Me.CB_EpisodeNR.Size = New System.Drawing.Size(126, 19) + Me.CB_EpisodeNR.TabIndex = 28 + Me.CB_EpisodeNR.Text = "Episode Number" + Me.CB_EpisodeNR.UseSelectable = True + ' + 'CB_AnimeSub + ' + Me.CB_AnimeSub.AutoSize = True + Me.CB_AnimeSub.Enabled = False + Me.CB_AnimeSub.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_AnimeSub.ForeColor = System.Drawing.Color.Black + Me.CB_AnimeSub.Location = New System.Drawing.Point(320, 124) + Me.CB_AnimeSub.Name = "CB_AnimeSub" + Me.CB_AnimeSub.Size = New System.Drawing.Size(135, 19) + Me.CB_AnimeSub.TabIndex = 32 + Me.CB_AnimeSub.Text = "Subtitle Language" + Me.CB_AnimeSub.UseSelectable = True + ' + 'CB_Season + ' + Me.CB_Season.AutoSize = True + Me.CB_Season.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Season.ForeColor = System.Drawing.Color.Black + Me.CB_Season.Location = New System.Drawing.Point(17, 124) + Me.CB_Season.Name = "CB_Season" + Me.CB_Season.Size = New System.Drawing.Size(122, 19) + Me.CB_Season.TabIndex = 30 + Me.CB_Season.Text = "Season Number" + Me.CB_Season.UseSelectable = True + ' + 'CB_Anime + ' + Me.CB_Anime.AutoSize = True + Me.CB_Anime.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Anime.ForeColor = System.Drawing.Color.Black + Me.CB_Anime.Location = New System.Drawing.Point(17, 86) + Me.CB_Anime.Name = "CB_Anime" + Me.CB_Anime.Size = New System.Drawing.Size(100, 19) + Me.CB_Anime.TabIndex = 27 + Me.CB_Anime.Text = "Series Name" + Me.CB_Anime.UseSelectable = True + ' + 'TB_NameString + ' + ' + ' + ' + Me.TB_NameString.CustomButton.Image = Nothing + Me.TB_NameString.CustomButton.Location = New System.Drawing.Point(439, 1) + Me.TB_NameString.CustomButton.Name = "" + Me.TB_NameString.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.TB_NameString.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.TB_NameString.CustomButton.TabIndex = 1 + Me.TB_NameString.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.TB_NameString.CustomButton.UseSelectable = True + Me.TB_NameString.CustomButton.Visible = False + Me.TB_NameString.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.TB_NameString.Lines = New String(-1) {} + Me.TB_NameString.Location = New System.Drawing.Point(6, 35) + Me.TB_NameString.MaxLength = 32767 + Me.TB_NameString.Name = "TB_NameString" + Me.TB_NameString.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.TB_NameString.ReadOnly = True + Me.TB_NameString.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.TB_NameString.SelectedText = "" + Me.TB_NameString.SelectionLength = 0 + Me.TB_NameString.SelectionStart = 0 + Me.TB_NameString.ShortcutsEnabled = True + Me.TB_NameString.Size = New System.Drawing.Size(467, 29) + Me.TB_NameString.TabIndex = 21 + Me.TB_NameString.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.TB_NameString.UseSelectable = True + Me.TB_NameString.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.TB_NameString.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' 'MetroTabPage1 ' @@ -1366,9 +1392,9 @@ Partial Class Einstellungen Me.MetroTabPage1.HorizontalScrollbarBarColor = True Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage1.HorizontalScrollbarSize = 10 - Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage1.Location = New System.Drawing.Point(4, 35) Me.MetroTabPage1.Name = "MetroTabPage1" - Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage1.Size = New System.Drawing.Size(501, 528) Me.MetroTabPage1.TabIndex = 7 Me.MetroTabPage1.Text = "Crunchyroll" Me.MetroTabPage1.VerticalScrollbarBarColor = True @@ -1433,10 +1459,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 44) + Me.TabPage6.Location = New System.Drawing.Point(4, 35) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(501, 519) + Me.TabPage6.Size = New System.Drawing.Size(501, 528) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = " Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1670,9 +1696,9 @@ Partial Class Einstellungen Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label5) - Me.TabPage7.Location = New System.Drawing.Point(4, 44) + Me.TabPage7.Location = New System.Drawing.Point(4, 35) Me.TabPage7.Name = "TabPage7" - Me.TabPage7.Size = New System.Drawing.Size(501, 519) + Me.TabPage7.Size = New System.Drawing.Size(501, 528) Me.TabPage7.TabIndex = 5 Me.TabPage7.Text = " About " ' @@ -1804,110 +1830,69 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'TB_NameString + 'DD_Season_Prefix ' ' ' ' - Me.TB_NameString.CustomButton.Image = Nothing - Me.TB_NameString.CustomButton.Location = New System.Drawing.Point(439, 1) - Me.TB_NameString.CustomButton.Name = "" - Me.TB_NameString.CustomButton.Size = New System.Drawing.Size(27, 27) - Me.TB_NameString.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.TB_NameString.CustomButton.TabIndex = 1 - Me.TB_NameString.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.TB_NameString.CustomButton.UseSelectable = True - Me.TB_NameString.CustomButton.Visible = False - Me.TB_NameString.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.TB_NameString.Lines = New String(-1) {} - Me.TB_NameString.Location = New System.Drawing.Point(6, 35) - Me.TB_NameString.MaxLength = 32767 - Me.TB_NameString.Name = "TB_NameString" - Me.TB_NameString.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.TB_NameString.ReadOnly = True - Me.TB_NameString.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.TB_NameString.SelectedText = "" - Me.TB_NameString.SelectionLength = 0 - Me.TB_NameString.SelectionStart = 0 - Me.TB_NameString.ShortcutsEnabled = True - Me.TB_NameString.Size = New System.Drawing.Size(467, 29) - Me.TB_NameString.TabIndex = 21 - Me.TB_NameString.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.TB_NameString.UseSelectable = True - Me.TB_NameString.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.TB_NameString.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) + Me.DD_Season_Prefix.CustomButton.Image = Nothing + Me.DD_Season_Prefix.CustomButton.Location = New System.Drawing.Point(197, 1) + Me.DD_Season_Prefix.CustomButton.Name = "" + Me.DD_Season_Prefix.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.DD_Season_Prefix.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.DD_Season_Prefix.CustomButton.TabIndex = 1 + Me.DD_Season_Prefix.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.DD_Season_Prefix.CustomButton.UseSelectable = True + Me.DD_Season_Prefix.CustomButton.Visible = False + Me.DD_Season_Prefix.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.DD_Season_Prefix.Lines = New String(-1) {} + Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 165) + Me.DD_Season_Prefix.MaxLength = 32767 + Me.DD_Season_Prefix.Name = "DD_Season_Prefix" + Me.DD_Season_Prefix.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.DD_Season_Prefix.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.DD_Season_Prefix.SelectedText = "" + Me.DD_Season_Prefix.SelectionLength = 0 + Me.DD_Season_Prefix.SelectionStart = 0 + Me.DD_Season_Prefix.ShortcutsEnabled = True + Me.DD_Season_Prefix.Size = New System.Drawing.Size(225, 29) + Me.DD_Season_Prefix.TabIndex = 33 + Me.DD_Season_Prefix.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.DD_Season_Prefix.UseSelectable = True + Me.DD_Season_Prefix.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.DD_Season_Prefix.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' - 'CB_EpisodeName + 'DD_Episode_Prefix ' - Me.CB_EpisodeName.AutoSize = True - Me.CB_EpisodeName.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_EpisodeName.ForeColor = System.Drawing.Color.Black - Me.CB_EpisodeName.Location = New System.Drawing.Point(153, 124) - Me.CB_EpisodeName.Name = "CB_EpisodeName" - Me.CB_EpisodeName.Size = New System.Drawing.Size(101, 19) - Me.CB_EpisodeName.TabIndex = 31 - Me.CB_EpisodeName.Text = "Episode Title" - Me.CB_EpisodeName.UseSelectable = True ' - 'CB_AnimeDub ' - Me.CB_AnimeDub.AutoSize = True - Me.CB_AnimeDub.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_AnimeDub.ForeColor = System.Drawing.Color.Black - Me.CB_AnimeDub.Location = New System.Drawing.Point(320, 86) - Me.CB_AnimeDub.Name = "CB_AnimeDub" - Me.CB_AnimeDub.Size = New System.Drawing.Size(125, 19) - Me.CB_AnimeDub.TabIndex = 29 - Me.CB_AnimeDub.Text = "Audio Language" - Me.CB_AnimeDub.UseSelectable = True ' - 'CB_EpisodeNR - ' - Me.CB_EpisodeNR.AutoSize = True - Me.CB_EpisodeNR.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_EpisodeNR.ForeColor = System.Drawing.Color.Black - Me.CB_EpisodeNR.Location = New System.Drawing.Point(153, 86) - Me.CB_EpisodeNR.Name = "CB_EpisodeNR" - Me.CB_EpisodeNR.Size = New System.Drawing.Size(126, 19) - Me.CB_EpisodeNR.TabIndex = 28 - Me.CB_EpisodeNR.Text = "Episode Number" - Me.CB_EpisodeNR.UseSelectable = True - ' - 'CB_AnimeSub - ' - Me.CB_AnimeSub.AutoSize = True - Me.CB_AnimeSub.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_AnimeSub.ForeColor = System.Drawing.Color.Black - Me.CB_AnimeSub.Location = New System.Drawing.Point(320, 124) - Me.CB_AnimeSub.Name = "CB_AnimeSub" - Me.CB_AnimeSub.Size = New System.Drawing.Size(135, 19) - Me.CB_AnimeSub.TabIndex = 32 - Me.CB_AnimeSub.Text = "Subtitle Language" - Me.CB_AnimeSub.UseSelectable = True - ' - 'CB_Season - ' - Me.CB_Season.AutoSize = True - Me.CB_Season.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_Season.ForeColor = System.Drawing.Color.Black - Me.CB_Season.Location = New System.Drawing.Point(17, 124) - Me.CB_Season.Name = "CB_Season" - Me.CB_Season.Size = New System.Drawing.Size(122, 19) - Me.CB_Season.TabIndex = 30 - Me.CB_Season.Text = "Season Number" - Me.CB_Season.UseSelectable = True - ' - 'CB_Anime - ' - Me.CB_Anime.AutoSize = True - Me.CB_Anime.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_Anime.ForeColor = System.Drawing.Color.Black - Me.CB_Anime.Location = New System.Drawing.Point(17, 86) - Me.CB_Anime.Name = "CB_Anime" - Me.CB_Anime.Size = New System.Drawing.Size(100, 19) - Me.CB_Anime.TabIndex = 27 - Me.CB_Anime.Text = "Series Name" - Me.CB_Anime.UseSelectable = True + Me.DD_Episode_Prefix.CustomButton.Image = Nothing + Me.DD_Episode_Prefix.CustomButton.Location = New System.Drawing.Point(197, 1) + Me.DD_Episode_Prefix.CustomButton.Name = "" + Me.DD_Episode_Prefix.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.DD_Episode_Prefix.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.DD_Episode_Prefix.CustomButton.TabIndex = 1 + Me.DD_Episode_Prefix.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.DD_Episode_Prefix.CustomButton.UseSelectable = True + Me.DD_Episode_Prefix.CustomButton.Visible = False + Me.DD_Episode_Prefix.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.DD_Episode_Prefix.Lines = New String(-1) {} + Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 165) + Me.DD_Episode_Prefix.MaxLength = 32767 + Me.DD_Episode_Prefix.Name = "DD_Episode_Prefix" + Me.DD_Episode_Prefix.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.DD_Episode_Prefix.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.DD_Episode_Prefix.SelectedText = "" + Me.DD_Episode_Prefix.SelectionLength = 0 + Me.DD_Episode_Prefix.SelectionStart = 0 + Me.DD_Episode_Prefix.ShortcutsEnabled = True + Me.DD_Episode_Prefix.Size = New System.Drawing.Size(225, 29) + Me.DD_Episode_Prefix.TabIndex = 34 + Me.DD_Episode_Prefix.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.DD_Episode_Prefix.UseSelectable = True + Me.DD_Episode_Prefix.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.DD_Episode_Prefix.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' 'Einstellungen ' @@ -2075,8 +2060,6 @@ Partial Class Einstellungen Friend WithEvents AMD_hevc As ToolStripMenuItem Friend WithEvents ListP3 As ToolStripMenuItem Friend WithEvents Btn_Save As Button - Friend WithEvents MetroLabel2 As MetroFramework.Controls.MetroLabel - Friend WithEvents ProfileTextBox As MetroFramework.Controls.MetroTextBox Friend WithEvents ListBit_1500 As ToolStripMenuItem Friend WithEvents ListBit_6500 As ToolStripMenuItem Friend WithEvents ListBit_5500 As ToolStripMenuItem @@ -2094,8 +2077,6 @@ Partial Class Einstellungen Friend WithEvents MetroLink1 As MetroFramework.Controls.MetroLink Friend WithEvents GroupBox12 As GroupBox Friend WithEvents LeadingZeroDD As MetroFramework.Controls.MetroComboBox - Friend WithEvents DD_Episode_Prefix As MetroFramework.Controls.MetroComboBox - Friend WithEvents DD_Season_Prefix As MetroFramework.Controls.MetroComboBox Friend WithEvents GroupBox17 As GroupBox Friend WithEvents GroupBox3 As GroupBox Friend WithEvents LangNameType_DD As MetroFramework.Controls.MetroComboBox @@ -2123,4 +2104,6 @@ Partial Class Einstellungen Public WithEvents CB_Season As MetroFramework.Controls.MetroCheckBox Public WithEvents CB_Anime As MetroFramework.Controls.MetroCheckBox Friend WithEvents TB_NameString As MetroFramework.Controls.MetroTextBox + Friend WithEvents DD_Episode_Prefix As MetroFramework.Controls.MetroTextBox + Friend WithEvents DD_Season_Prefix As MetroFramework.Controls.MetroTextBox End Class diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index d9ef642..ff8075f 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -31,7 +31,6 @@ Public Class Einstellungen Me.StyleManager = Manager - ProfileTextBox.Text = Main.ProfileFolder TempTB.Text = Main.TempFolder LeadingZeroDD.SelectedIndex = Main.LeadingZero @@ -219,19 +218,10 @@ Public Class Einstellungen Next - If DD_Season_Prefix.Items.Contains(Main.Season_Prefix) Then - DD_Season_Prefix.SelectedItem = Main.Season_Prefix - Else - DD_Season_Prefix.Items.Add(Main.Season_Prefix) - DD_Season_Prefix.SelectedItem = Main.Season_Prefix - End If + DD_Season_Prefix.Text = Main.Season_Prefix + + DD_Episode_Prefix.Text = Main.Episode_Prefix - If DD_Episode_Prefix.Items.Contains(Main.Episode_Prefix) Then - DD_Episode_Prefix.SelectedItem = Main.Episode_Prefix - Else - DD_Episode_Prefix.Items.Add(Main.Episode_Prefix) - DD_Episode_Prefix.SelectedItem = Main.Episode_Prefix - End If NumericUpDown2.Value = Main.ErrorTolerance @@ -323,6 +313,7 @@ Public Class Einstellungen Dim NameParts As String() = Main.NameBuilder.Split(New String() {";"}, System.StringSplitOptions.RemoveEmptyEntries) + For i As Integer = 0 To NameParts.Count - 1 If NameParts(i) = "AnimeTitle" Then @@ -336,11 +327,14 @@ Public Class Einstellungen ElseIf NameParts(i) = "AnimeDub" Then CB_AnimeDub.Checked = True ElseIf NameParts(i) = "AnimeSub" Then - CB_AnimeSub.Checked = True + CB_AnimeSub.Checked = True End If Next + CB_AnimeSub.Checked = False ' to be continued + + End Sub @@ -504,6 +498,8 @@ Public Class Einstellungen Main.NameBuilder = TB_NameString.Text + My.Settings.NameTemplate = Main.NameBuilder + If CB_Format.Text = "MKV" Then Main.VideoFormat = ".mkv" @@ -1181,26 +1177,25 @@ Public Class Einstellungen Private Sub CB_Format_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Format.SelectedIndexChanged If CB_Format.Text = "AAC (Audio only)" Then - CB_Merge.SelectedIndex = 0 CB_Merge.Items.Clear() CB_Merge.Items.Add("[merge disabled]") CB_Merge.SelectedIndex = 0 CB_Merge.Enabled = False ElseIf CB_Format.Text = "MP4" Then CB_Merge.Enabled = True - CB_Merge.SelectedIndex = 0 CB_Merge.Items.Clear() CB_Merge.Items.Add("[merge disabled]") CB_Merge.Items.Add("mov_text") + CB_Merge.SelectedIndex = 0 'CB_Merge.Items.Add("srt") CB_Merge.SelectedItem = Main.MergeSubsFormat ElseIf CB_Format.Text = "MKV" Then CB_Merge.Enabled = True - CB_Merge.SelectedIndex = 0 CB_Merge.Items.Clear() CB_Merge.Items.Add("[merge disabled]") CB_Merge.Items.Add("copy") CB_Merge.Items.Add("srt") + CB_Merge.SelectedIndex = 0 CB_Merge.SelectedItem = Main.MergeSubsFormat End If @@ -1215,20 +1210,6 @@ Public Class Einstellungen End If End Sub - Private Sub ProfileTextBox_Click(sender As Object, e As EventArgs) Handles ProfileTextBox.Click - - Dim FolderBrowserDialog1 As New FolderBrowserDialog() - FolderBrowserDialog1.RootFolder = Environment.SpecialFolder.MyComputer - If FolderBrowserDialog1.ShowDialog() = DialogResult.OK Then - - Main.ProfileFolder = FolderBrowserDialog1.SelectedPath - ProfileTextBox.Text = FolderBrowserDialog1.SelectedPath - My.Settings.Pfad = Main.ProfileFolder - - - End If - End Sub - Private Sub DD_DLMode_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DD_DLMode.SelectedIndexChanged If DD_DLMode.SelectedIndex > 0 Then @@ -1293,6 +1274,33 @@ Public Class Einstellungen End Sub + Private Sub DD_Season_Prefix_UserAction(sender As Object, e As EventArgs) Handles DD_Season_Prefix.Click, DD_Season_Prefix.GotFocus + If DD_Season_Prefix.Text = Main.Season_PrefixDefault Then + DD_Season_Prefix.Text = Nothing + End If + End Sub + + Private Sub DD_Season_Prefix_LostFocus(sender As Object, e As EventArgs) Handles DD_Season_Prefix.LostFocus + If DD_Season_Prefix.Text = Nothing Then + DD_Season_Prefix.Text = Main.Season_PrefixDefault + End If + End Sub + + + Private Sub DD_Episode_Prefix_UserAction(sender As Object, e As EventArgs) Handles DD_Episode_Prefix.Click, DD_Episode_Prefix.GotFocus + If DD_Episode_Prefix.Text = Main.Episode_Prefix Then + DD_Episode_Prefix.Text = Nothing + End If + End Sub + + Private Sub DD_Episode_Prefix_LostFocus(sender As Object, e As EventArgs) Handles DD_Episode_Prefix.LostFocus + If DD_Episode_Prefix.Text = Nothing Then + DD_Episode_Prefix.Text = Main.Episode_Prefix + End If + End Sub + + + #End Region #End Region diff --git a/Crunchyroll Downloader/queue.Designer.vb b/Crunchyroll Downloader/queue.Designer.vb new file mode 100644 index 0000000..da37a62 --- /dev/null +++ b/Crunchyroll Downloader/queue.Designer.vb @@ -0,0 +1,57 @@ + +Partial Class Queue + Inherits MetroFramework.Forms.MetroForm + + '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.Btn_Close = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'Btn_Close + ' + Me.Btn_Close.BackColor = System.Drawing.Color.Transparent + Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand + Me.Btn_Close.FlatAppearance.BorderSize = 0 + Me.Btn_Close.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent + Me.Btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Btn_Close.ForeColor = System.Drawing.Color.Transparent + Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close + Me.Btn_Close.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Btn_Close.Location = New System.Drawing.Point(282, 169) + Me.Btn_Close.Name = "Btn_Close" + Me.Btn_Close.Size = New System.Drawing.Size(40, 40) + Me.Btn_Close.TabIndex = 37 + Me.Btn_Close.UseVisualStyleBackColor = False + ' + 'Queue + ' + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None + Me.ClientSize = New System.Drawing.Size(604, 378) + Me.Controls.Add(Me.Btn_Close) + Me.Name = "Queue" + Me.Text = "Queue" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents Btn_Close As Button +End Class diff --git a/Crunchyroll Downloader/queue.resx b/Crunchyroll Downloader/queue.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Crunchyroll Downloader/queue.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/Crunchyroll Downloader/queue.vb b/Crunchyroll Downloader/queue.vb new file mode 100644 index 0000000..08500fb --- /dev/null +++ b/Crunchyroll Downloader/queue.vb @@ -0,0 +1,44 @@ +Option Strict On +Imports MetroFramework +Imports MetroFramework.Components + +Public Class Queue + + Dim Manager As MetroStyleManager = Main.Manager + + + Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Manager.Owner = Me + Me.StyleManager = Manager + + + End Sub + + + + + + + + + Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click + Me.Close() + End Sub + + + Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Close.MouseEnter, Btn_Close.GotFocus + If Manager.Theme = MetroThemeStyle.Dark Then + Btn_Close.Image = My.Resources.main_close_dark_hover + Else + Btn_Close.Image = My.Resources.main_close_hover + End If + End Sub + + Private Sub Btn_Close_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Close.MouseLeave, Btn_Close.LostFocus + Btn_Close.Image = Main.CloseImg + End Sub + + + + +End Class \ No newline at end of file