From 99821ed3746fba90f24af21fb0675f03f452e355 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:24:51 +0100 Subject: [PATCH] added subfolder filter #691 added subfolder filter #691 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 184832 -> 198144 bytes Crunchyroll Downloader/Anime_Add.vb | 25 ++++- Crunchyroll Downloader/App.config | 3 + Crunchyroll Downloader/Main.vb | 2 + .../My Project/Settings.Designer.vb | 12 +++ .../My Project/Settings.settings | 3 + .../einstellungen.Designer.vb | 96 ++++++++++++------ Crunchyroll Downloader/einstellungen.resx | 3 + Crunchyroll Downloader/einstellungen.vb | 7 +- 9 files changed, 114 insertions(+), 37 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index be9d376905b520c70696d6cbc246195a36a87cc0..5c9a4d64277a8884b477adfb9879f7eda1a5ff1c 100644 GIT binary patch delta 17958 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 tT62`^pkY=jH8{Ue}KJMB^ZSkKOqP{1flkb6)@e delta 6912 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 Date.Now.Subtract(TS) = True Then + ComboBox2.Items.Add(fi.Name) + End If + End If Next Dim Result As New List(Of String) diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 5eb5548..56b67ae 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -144,6 +144,9 @@ null + + 0 + diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 574ae90..42a1778 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -89,6 +89,7 @@ Public Class Main Public MergeSubs As Boolean = False 'Public IgnoreS1 As Boolean = False Public IgnoreSeason As Integer = 0 + Public HideFLInt As Integer = 0 Public KeepCache As Boolean = False Public SubsOnly As Boolean = False Public VideoFormat As String = ".mp4" @@ -576,6 +577,7 @@ Public Class Main HybridThread = My.Settings.HybridThread IgnoreSeason = My.Settings.IgnoreSeason + HideFLInt = My.Settings.HideSF HybridMode = My.Settings.HybridMode Funimation_srt = My.Settings.Funimation_srt Funimation_vtt = My.Settings.Funimation_vtt diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index 2c57a22..8176a1e 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -545,6 +545,18 @@ Namespace My Me("ffmpeg_command_override") = value End Set End Property + + _ + Public Property HideSF() As Integer + Get + Return CType(Me("HideSF"),Integer) + End Get + Set + Me("HideSF") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index e2c1a20..d7a46cf 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -125,5 +125,8 @@ null + + 0 + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 375c04e..5efe69f 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -129,6 +129,7 @@ Partial Class Einstellungen Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox19 = New System.Windows.Forms.GroupBox() + Me.CB_CR_Audio = New MetroFramework.Controls.MetroComboBox() Me.DubMode = New MetroFramework.Controls.MetroCheckBox() Me.TabPage6 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox15 = New System.Windows.Forms.GroupBox() @@ -159,7 +160,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.CB_CR_Audio = New MetroFramework.Controls.MetroComboBox() + Me.GroupBox21 = New System.Windows.Forms.GroupBox() + Me.CB_HideSF = New MetroFramework.Controls.MetroComboBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -198,6 +200,7 @@ Partial Class Einstellungen Me.GroupBox8.SuspendLayout() Me.TabPage7.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox21.SuspendLayout() Me.SuspendLayout() ' 'ToolTip1 @@ -605,84 +608,84 @@ Partial Class Einstellungen 'copy ' Me.copy.Name = "copy" - Me.copy.Size = New System.Drawing.Size(180, 22) + Me.copy.Size = New System.Drawing.Size(172, 22) Me.copy.Text = "-c copy" ' 'CPU_h264 ' Me.CPU_h264.BackColor = System.Drawing.Color.DarkGray Me.CPU_h264.Name = "CPU_h264" - Me.CPU_h264.Size = New System.Drawing.Size(180, 22) + Me.CPU_h264.Size = New System.Drawing.Size(172, 22) Me.CPU_h264.Text = "-c:v libx264" ' 'CPU_h265 ' Me.CPU_h265.BackColor = System.Drawing.Color.DarkGray Me.CPU_h265.Name = "CPU_h265" - Me.CPU_h265.Size = New System.Drawing.Size(180, 22) + Me.CPU_h265.Size = New System.Drawing.Size(172, 22) Me.CPU_h265.Text = "-c:v libx265" ' 'CPU_AV1 ' Me.CPU_AV1.BackColor = System.Drawing.Color.DarkGray Me.CPU_AV1.Name = "CPU_AV1" - Me.CPU_AV1.Size = New System.Drawing.Size(180, 22) + Me.CPU_AV1.Size = New System.Drawing.Size(172, 22) Me.CPU_AV1.Text = "-c:v libsvtav1" ' 'nv_h264 ' Me.nv_h264.BackColor = System.Drawing.Color.YellowGreen Me.nv_h264.Name = "nv_h264" - Me.nv_h264.Size = New System.Drawing.Size(180, 22) + Me.nv_h264.Size = New System.Drawing.Size(172, 22) Me.nv_h264.Text = "-c:v h264_nvenc " ' 'nv_hevc ' Me.nv_hevc.BackColor = System.Drawing.Color.YellowGreen Me.nv_hevc.Name = "nv_hevc" - Me.nv_hevc.Size = New System.Drawing.Size(180, 22) + Me.nv_hevc.Size = New System.Drawing.Size(172, 22) Me.nv_hevc.Text = "-c:v hevc_nvenc" ' 'nv_AV1 ' Me.nv_AV1.BackColor = System.Drawing.Color.YellowGreen Me.nv_AV1.Name = "nv_AV1" - Me.nv_AV1.Size = New System.Drawing.Size(180, 22) + Me.nv_AV1.Size = New System.Drawing.Size(172, 22) Me.nv_AV1.Text = "-c:v av1_nvenc" ' 'AMD_h264 ' Me.AMD_h264.BackColor = System.Drawing.Color.Tomato Me.AMD_h264.Name = "AMD_h264" - Me.AMD_h264.Size = New System.Drawing.Size(180, 22) + Me.AMD_h264.Size = New System.Drawing.Size(172, 22) Me.AMD_h264.Text = "-c:v h264_amf" ' 'AMD_hevc ' Me.AMD_hevc.BackColor = System.Drawing.Color.Tomato Me.AMD_hevc.Name = "AMD_hevc" - Me.AMD_hevc.Size = New System.Drawing.Size(180, 22) + Me.AMD_hevc.Size = New System.Drawing.Size(172, 22) Me.AMD_hevc.Text = "-c:v hevc_amf" ' 'Intel_h264 ' Me.Intel_h264.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_h264.Name = "Intel_h264" - Me.Intel_h264.Size = New System.Drawing.Size(180, 22) + Me.Intel_h264.Size = New System.Drawing.Size(172, 22) Me.Intel_h264.Text = "-c:v h264_qsv" ' 'Intel_hevc ' Me.Intel_hevc.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_hevc.Name = "Intel_hevc" - Me.Intel_hevc.Size = New System.Drawing.Size(180, 22) + Me.Intel_hevc.Size = New System.Drawing.Size(172, 22) Me.Intel_hevc.Text = "-c:v hevc_qsv" ' 'Intel_AV1 ' Me.Intel_AV1.BackColor = System.Drawing.Color.CornflowerBlue Me.Intel_AV1.Name = "Intel_AV1" - Me.Intel_AV1.Size = New System.Drawing.Size(180, 22) + Me.Intel_AV1.Size = New System.Drawing.Size(172, 22) Me.Intel_AV1.Text = "-c:v av1_qsv" ' 'FFMPEG_CommandP2 @@ -891,6 +894,7 @@ Partial Class Einstellungen ' Me.TabPage1.AutoScroll = True Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) + Me.TabPage1.Controls.Add(Me.GroupBox21) Me.TabPage1.Controls.Add(Me.GroupBox6) Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox1) @@ -900,10 +904,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 35) + Me.TabPage1.Location = New System.Drawing.Point(4, 44) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 528) + Me.TabPage1.Size = New System.Drawing.Size(501, 519) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main" Me.TabPage1.VerticalScrollbar = True @@ -1110,7 +1114,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 3 + Me.TabControl1.SelectedIndex = 0 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1476,6 +1480,19 @@ Partial Class Einstellungen Me.GroupBox19.TabStop = False Me.GroupBox19.Text = "Dubbed" ' + 'CB_CR_Audio + ' + Me.CB_CR_Audio.DropDownHeight = 275 + Me.CB_CR_Audio.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_CR_Audio.FormattingEnabled = True + Me.CB_CR_Audio.IntegralHeight = False + Me.CB_CR_Audio.ItemHeight = 23 + Me.CB_CR_Audio.Location = New System.Drawing.Point(82, 55) + Me.CB_CR_Audio.Name = "CB_CR_Audio" + Me.CB_CR_Audio.Size = New System.Drawing.Size(326, 29) + Me.CB_CR_Audio.TabIndex = 21 + Me.CB_CR_Audio.UseSelectable = True + ' 'DubMode ' Me.DubMode.AutoSize = True @@ -1497,10 +1514,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 35) + Me.TabPage6.Location = New System.Drawing.Point(4, 44) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(501, 528) + Me.TabPage6.Size = New System.Drawing.Size(501, 519) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = " Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1734,9 +1751,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, 35) + Me.TabPage7.Location = New System.Drawing.Point(4, 44) Me.TabPage7.Name = "TabPage7" - Me.TabPage7.Size = New System.Drawing.Size(501, 528) + Me.TabPage7.Size = New System.Drawing.Size(501, 519) Me.TabPage7.TabIndex = 5 Me.TabPage7.Text = " About " ' @@ -1868,18 +1885,32 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_CR_Audio + 'GroupBox21 ' - Me.CB_CR_Audio.DropDownHeight = 275 - Me.CB_CR_Audio.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CB_CR_Audio.FormattingEnabled = True - Me.CB_CR_Audio.IntegralHeight = False - Me.CB_CR_Audio.ItemHeight = 23 - Me.CB_CR_Audio.Location = New System.Drawing.Point(82, 55) - Me.CB_CR_Audio.Name = "CB_CR_Audio" - Me.CB_CR_Audio.Size = New System.Drawing.Size(326, 29) - Me.CB_CR_Audio.TabIndex = 21 - Me.CB_CR_Audio.UseSelectable = True + Me.GroupBox21.BackColor = System.Drawing.Color.Transparent + 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.Name = "GroupBox21" + Me.GroupBox21.Size = New System.Drawing.Size(490, 67) + Me.GroupBox21.TabIndex = 81 + Me.GroupBox21.TabStop = False + Me.GroupBox21.Text = "Subfolder" + ' + 'CB_HideSF + ' + Me.CB_HideSF.DropDownHeight = 275 + Me.CB_HideSF.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_HideSF.FormattingEnabled = True + Me.CB_HideSF.IntegralHeight = False + Me.CB_HideSF.ItemHeight = 23 + Me.CB_HideSF.Items.AddRange(New Object() {"show all subfolder", "hide all subfolder", "hide subfolder by last accessed [> 1 week]", "hide subfolder by last accessed [> 1 month]", "hide subfolder by last accessed [> 3 months]", "hide subfolder by last accessed [> 6 months]"}) + Me.CB_HideSF.Location = New System.Drawing.Point(82, 25) + Me.CB_HideSF.Name = "CB_HideSF" + Me.CB_HideSF.Size = New System.Drawing.Size(326, 29) + Me.CB_HideSF.TabIndex = 21 + Me.CB_HideSF.UseSelectable = True ' 'Einstellungen ' @@ -1949,6 +1980,7 @@ Partial Class Einstellungen Me.GroupBox8.PerformLayout() Me.TabPage7.ResumeLayout(False) CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox21.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -2091,4 +2123,6 @@ Partial Class Einstellungen Friend WithEvents DD_Episode_Prefix As MetroFramework.Controls.MetroTextBox Friend WithEvents DD_Season_Prefix As MetroFramework.Controls.MetroTextBox Friend WithEvents CB_CR_Audio As MetroFramework.Controls.MetroComboBox + Friend WithEvents GroupBox21 As GroupBox + Friend WithEvents CB_HideSF As MetroFramework.Controls.MetroComboBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index e809bf5..f49b9b4 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,6 +126,9 @@ 118, 20 + + 118, 20 + 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index a2c4f50..c908e1f 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -38,6 +38,8 @@ Public Class Einstellungen CB_Ignore.SelectedIndex = Main.IgnoreSeason + CB_HideSF.SelectedIndex = Main.HideFLInt + If Main.IncludeLangName = True Then CB_SoftSubSettings.SelectedIndex = 1 Else @@ -387,11 +389,10 @@ Public Class Einstellungen - + Main.HideFLInt = CB_HideSF.SelectedIndex + My.Settings.HideSF = CB_HideSF.SelectedIndex Main.IgnoreSeason = CB_Ignore.SelectedIndex - - My.Settings.IgnoreSeason = CB_Ignore.SelectedIndex