From d2797b4b2ef27b42b23b48dcedd0ce5e08fed22e Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sat, 6 Jan 2024 14:35:22 +0100 Subject: [PATCH] add Dub selection (series download) simplified season selection by adding a Dub dropdown added notification for dub override while selecting another dub added 'en-IN' language fix ' not found' string to crash ffmpeg due to spaces --- .vs/Crunchyroll Downloader/v17/.suo | Bin 210432 -> 217088 bytes Crunchyroll Downloader/Anime_Add.Designer.vb | 531 +++++++++--------- Crunchyroll Downloader/Anime_Add.resx | 3 + Crunchyroll Downloader/Anime_Add.vb | 120 ++-- Crunchyroll Downloader/CRD-Classes.vb | 6 +- Crunchyroll Downloader/Main.vb | 178 ++++-- .../My Project/AssemblyInfo.vb | 4 +- 7 files changed, 486 insertions(+), 356 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index c0b44fbcad7e23ca2d3f7296d33dfeb63c9f01f2..aa3fbe4f9105853abd07ac6e4597ecb46d837532 100644 GIT binary patch delta 12503 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 delta 9856 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%0A4i z|0v@9azL|7He~m#Bu?Y$3EDYc5KZeD&K7rZS2Hy|qmPDdE8ZLAtcUTdvmsS=>Qnw? zfEKcDQ>I3m(~u=+XD_8xFyce}L`}vE!g9kX0)N@_L6DFKv5P z^J*!kwEYC6{%PTwKLHK8;h%so?u#2IGp;Z`$324kyhu{sn{$rCS+#94{@V=i*ky*L u!>|HLePWLPOX>f^^yb7+r3 Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Anime_Add)) - Me.groupBox1 = New System.Windows.Forms.GroupBox() - Me.DownloadScope = New MetroFramework.Controls.MetroComboBox() - Me.StatusLabel = New MetroFramework.Controls.MetroLabel() - Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox() - Me.TextBox4 = New MetroFramework.Controls.MetroTextBox() - Me.textBox1 = New MetroFramework.Controls.MetroTextBox() - Me.TextBox2 = New MetroFramework.Controls.MetroTextBox() - Me.groupBox2 = New System.Windows.Forms.GroupBox() - Me.bt_Cancel_mass = New System.Windows.Forms.Button() - Me.comboBox4 = New MetroFramework.Controls.MetroComboBox() - Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox() - Me.comboBox3 = New MetroFramework.Controls.MetroComboBox() - Me.Add_Display = New MetroFramework.Controls.MetroLabel() Me.Btn_min = New System.Windows.Forms.PictureBox() Me.Btn_Close = New System.Windows.Forms.PictureBox() Me.btn_dl = New System.Windows.Forms.Button() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() - Me.groupBox1.SuspendLayout() - Me.groupBox2.SuspendLayout() + Me.Add_Display = New MetroFramework.Controls.MetroLabel() + Me.CB_EP0 = New MetroFramework.Controls.MetroComboBox() + Me.CB_Season = New MetroFramework.Controls.MetroComboBox() + Me.CB_EP1 = New MetroFramework.Controls.MetroComboBox() + Me.bt_Cancel_mass = New System.Windows.Forms.Button() + Me.groupBox2 = New System.Windows.Forms.GroupBox() + Me.CB_Dub = New MetroFramework.Controls.MetroComboBox() + Me.TextBox2 = New MetroFramework.Controls.MetroTextBox() + Me.textBox1 = New MetroFramework.Controls.MetroTextBox() + Me.TextBox4 = New MetroFramework.Controls.MetroTextBox() + Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox() + Me.StatusLabel = New MetroFramework.Controls.MetroLabel() + Me.DownloadScope = New MetroFramework.Controls.MetroComboBox() + Me.groupBox1 = New System.Windows.Forms.GroupBox() + Me.TT_Dub = New System.Windows.Forms.ToolTip(Me.components) CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit() + Me.groupBox2.SuspendLayout() + Me.groupBox1.SuspendLayout() Me.SuspendLayout() ' - 'groupBox1 + 'Btn_min ' - Me.groupBox1.BackColor = System.Drawing.Color.Transparent - Me.groupBox1.Controls.Add(Me.DownloadScope) - Me.groupBox1.Controls.Add(Me.StatusLabel) - Me.groupBox1.Controls.Add(Me.ComboBox2) - Me.groupBox1.Controls.Add(Me.TextBox4) - Me.groupBox1.Controls.Add(Me.textBox1) - Me.groupBox1.Controls.Add(Me.TextBox2) - Me.groupBox1.Location = New System.Drawing.Point(15, 70) - Me.groupBox1.Name = "groupBox1" - Me.groupBox1.Size = New System.Drawing.Size(720, 280) - Me.groupBox1.TabIndex = 33 - Me.groupBox1.TabStop = False + Me.Btn_min.BackColor = System.Drawing.Color.Transparent + Me.Btn_min.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.Btn_min.Cursor = System.Windows.Forms.Cursors.Hand + Me.Btn_min.Image = CType(resources.GetObject("Btn_min.Image"), System.Drawing.Image) + Me.Btn_min.Location = New System.Drawing.Point(567, 1) + Me.Btn_min.Margin = New System.Windows.Forms.Padding(0) + Me.Btn_min.Name = "Btn_min" + Me.Btn_min.Size = New System.Drawing.Size(25, 25) + Me.Btn_min.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.Btn_min.TabIndex = 73 + Me.Btn_min.TabStop = False ' - 'DownloadScope + 'Btn_Close ' - Me.DownloadScope.BackColor = System.Drawing.Color.White - Me.DownloadScope.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.DownloadScope.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.DownloadScope.FormattingEnabled = True - Me.DownloadScope.ItemHeight = 23 - Me.DownloadScope.Items.AddRange(New Object() {"[Default]", "[Merge Audio with existing files]", "[Subtitles only]", "[Audio only (AAC)]"}) - Me.DownloadScope.Location = New System.Drawing.Point(18, 190) - Me.DownloadScope.Name = "DownloadScope" - Me.DownloadScope.Size = New System.Drawing.Size(693, 29) - Me.DownloadScope.TabIndex = 39 - Me.DownloadScope.UseSelectable = True + Me.Btn_Close.BackColor = System.Drawing.Color.Transparent + Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand + Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close + Me.Btn_Close.Location = New System.Drawing.Point(592, 1) + Me.Btn_Close.Margin = New System.Windows.Forms.Padding(0) + Me.Btn_Close.Name = "Btn_Close" + Me.Btn_Close.Size = New System.Drawing.Size(40, 40) + Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.Btn_Close.TabIndex = 72 + Me.Btn_Close.TabStop = False ' - 'StatusLabel + 'btn_dl ' - Me.StatusLabel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Me.btn_dl.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.main_button_download_default + Me.btn_dl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btn_dl.Cursor = System.Windows.Forms.Cursors.No + Me.btn_dl.FlatAppearance.BorderSize = 0 + Me.btn_dl.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_dl.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btn_dl.ForeColor = System.Drawing.SystemColors.Control + Me.btn_dl.Location = New System.Drawing.Point(106, 377) + Me.btn_dl.Name = "btn_dl" + Me.btn_dl.Size = New System.Drawing.Size(538, 50) + Me.btn_dl.TabIndex = 75 + Me.btn_dl.Text = "Download" + Me.btn_dl.UseVisualStyleBackColor = True + ' + 'Add_Display + ' + Me.Add_Display.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.StatusLabel.BackColor = System.Drawing.Color.Transparent - Me.StatusLabel.FontSize = MetroFramework.MetroLabelSize.Tall - Me.StatusLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular - Me.StatusLabel.ForeColor = System.Drawing.SystemColors.InactiveCaptionText - Me.StatusLabel.Location = New System.Drawing.Point(18, 228) - Me.StatusLabel.Name = "StatusLabel" - Me.StatusLabel.Size = New System.Drawing.Size(693, 46) - Me.StatusLabel.TabIndex = 38 - Me.StatusLabel.Text = "Status: idle" - Me.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.Add_Display.BackColor = System.Drawing.Color.Transparent + Me.Add_Display.FontSize = MetroFramework.MetroLabelSize.Tall + Me.Add_Display.FontWeight = MetroFramework.MetroLabelWeight.Regular + Me.Add_Display.ForeColor = System.Drawing.Color.Black + Me.Add_Display.Location = New System.Drawing.Point(20, 228) + Me.Add_Display.Name = "Add_Display" + Me.Add_Display.Size = New System.Drawing.Size(691, 52) + Me.Add_Display.TabIndex = 36 + Me.Add_Display.Text = "..." + Me.Add_Display.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'ComboBox2 + 'CB_EP0 + ' + Me.CB_EP0.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_EP0.FormattingEnabled = True + Me.CB_EP0.ItemHeight = 23 + Me.CB_EP0.Location = New System.Drawing.Point(13, 135) + Me.CB_EP0.Name = "CB_EP0" + Me.CB_EP0.Size = New System.Drawing.Size(693, 29) + Me.CB_EP0.TabIndex = 1 + Me.CB_EP0.UseSelectable = True + ' + 'CB_Season + ' + Me.CB_Season.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_Season.FormattingEnabled = True + Me.CB_Season.ItemHeight = 23 + Me.CB_Season.Location = New System.Drawing.Point(13, 86) + Me.CB_Season.Name = "CB_Season" + Me.CB_Season.Size = New System.Drawing.Size(693, 29) + Me.CB_Season.TabIndex = 1 + Me.CB_Season.UseSelectable = True + ' + 'CB_EP1 + ' + Me.CB_EP1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_EP1.FormattingEnabled = True + Me.CB_EP1.ItemHeight = 23 + Me.CB_EP1.Location = New System.Drawing.Point(13, 184) + Me.CB_EP1.Name = "CB_EP1" + Me.CB_EP1.Size = New System.Drawing.Size(693, 29) + Me.CB_EP1.TabIndex = 2 + Me.CB_EP1.UseSelectable = True ' - Me.ComboBox2.BackColor = System.Drawing.Color.White - Me.ComboBox2.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.ComboBox2.FormattingEnabled = True - Me.ComboBox2.ItemHeight = 23 - Me.ComboBox2.Location = New System.Drawing.Point(18, 148) - Me.ComboBox2.Name = "ComboBox2" - Me.ComboBox2.Size = New System.Drawing.Size(693, 29) - Me.ComboBox2.Sorted = True - Me.ComboBox2.TabIndex = 37 - Me.ComboBox2.UseSelectable = True + 'bt_Cancel_mass ' - 'TextBox4 + Me.bt_Cancel_mass.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel + Me.bt_Cancel_mass.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.bt_Cancel_mass.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.bt_Cancel_mass.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.bt_Cancel_mass.ForeColor = System.Drawing.SystemColors.Control + Me.bt_Cancel_mass.Location = New System.Drawing.Point(159, 231) + Me.bt_Cancel_mass.Name = "bt_Cancel_mass" + Me.bt_Cancel_mass.Size = New System.Drawing.Size(403, 36) + Me.bt_Cancel_mass.TabIndex = 37 + Me.bt_Cancel_mass.Text = "Cancel" + Me.bt_Cancel_mass.UseVisualStyleBackColor = True ' - Me.TextBox4.BackColor = System.Drawing.Color.White - Me.TextBox4.Cursor = System.Windows.Forms.Cursors.Hand + 'groupBox2 ' + Me.groupBox2.BackColor = System.Drawing.Color.Transparent + Me.groupBox2.Controls.Add(Me.CB_Dub) + Me.groupBox2.Controls.Add(Me.bt_Cancel_mass) + Me.groupBox2.Controls.Add(Me.CB_EP1) + Me.groupBox2.Controls.Add(Me.CB_Season) + Me.groupBox2.Controls.Add(Me.CB_EP0) + Me.groupBox2.Controls.Add(Me.Add_Display) + Me.groupBox2.Location = New System.Drawing.Point(15, 60) + Me.groupBox2.Name = "groupBox2" + Me.groupBox2.Size = New System.Drawing.Size(720, 290) + Me.groupBox2.TabIndex = 44 + Me.groupBox2.TabStop = False + Me.groupBox2.Visible = False ' + 'CB_Dub ' - Me.TextBox4.CustomButton.Image = Nothing - Me.TextBox4.CustomButton.Location = New System.Drawing.Point(665, 1) - Me.TextBox4.CustomButton.Name = "" - Me.TextBox4.CustomButton.Size = New System.Drawing.Size(27, 27) - Me.TextBox4.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.TextBox4.CustomButton.TabIndex = 1 - Me.TextBox4.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.TextBox4.CustomButton.UseSelectable = True - Me.TextBox4.CustomButton.Visible = False - Me.TextBox4.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.TextBox4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.TextBox4.Lines = New String() {"Main Directory"} - Me.TextBox4.Location = New System.Drawing.Point(18, 106) - Me.TextBox4.MaxLength = 32767 - Me.TextBox4.Name = "TextBox4" - Me.TextBox4.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.TextBox4.ReadOnly = True - Me.TextBox4.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.TextBox4.SelectedText = "" - Me.TextBox4.SelectionLength = 0 - Me.TextBox4.SelectionStart = 0 - Me.TextBox4.ShortcutsEnabled = True - Me.TextBox4.Size = New System.Drawing.Size(693, 29) - Me.TextBox4.TabIndex = 36 - Me.TextBox4.TabStop = False - Me.TextBox4.Text = "Main Directory" - Me.TextBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.TextBox4.UseSelectable = True - Me.TextBox4.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.TextBox4.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) + Me.CB_Dub.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_Dub.FormattingEnabled = True + Me.CB_Dub.ItemHeight = 23 + Me.CB_Dub.Location = New System.Drawing.Point(13, 37) + Me.CB_Dub.Name = "CB_Dub" + Me.CB_Dub.Size = New System.Drawing.Size(693, 29) + Me.CB_Dub.TabIndex = 38 + Me.CB_Dub.UseSelectable = True + ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.Color.White + Me.TextBox2.Cursor = System.Windows.Forms.Cursors.Hand + ' + ' + ' + Me.TextBox2.CustomButton.Image = Nothing + Me.TextBox2.CustomButton.Location = New System.Drawing.Point(665, 1) + Me.TextBox2.CustomButton.Name = "" + Me.TextBox2.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.TextBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.TextBox2.CustomButton.TabIndex = 1 + Me.TextBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.TextBox2.CustomButton.UseSelectable = True + Me.TextBox2.CustomButton.Visible = False + Me.TextBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.TextBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.TextBox2.Lines = New String() {"Use Custom Name"} + Me.TextBox2.Location = New System.Drawing.Point(18, 78) + Me.TextBox2.MaxLength = 32767 + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.TextBox2.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.TextBox2.SelectedText = "" + Me.TextBox2.SelectionLength = 0 + Me.TextBox2.SelectionStart = 0 + Me.TextBox2.ShortcutsEnabled = True + Me.TextBox2.Size = New System.Drawing.Size(693, 29) + Me.TextBox2.TabIndex = 5 + Me.TextBox2.TabStop = False + Me.TextBox2.Text = "Use Custom Name" + Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.TextBox2.UseSelectable = True + Me.TextBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.TextBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' 'textBox1 ' @@ -163,7 +240,7 @@ Partial Class Anime_Add Me.textBox1.FontSize = MetroFramework.MetroTextBoxSize.Medium Me.textBox1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.textBox1.Lines = New String() {"URL"} - Me.textBox1.Location = New System.Drawing.Point(18, 22) + Me.textBox1.Location = New System.Drawing.Point(18, 36) Me.textBox1.MaxLength = 32767 Me.textBox1.Name = "textBox1" Me.textBox1.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) @@ -181,164 +258,102 @@ Partial Class Anime_Add 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) ' - 'TextBox2 - ' - Me.TextBox2.BackColor = System.Drawing.Color.White - Me.TextBox2.Cursor = System.Windows.Forms.Cursors.Hand - ' - ' + 'TextBox4 ' - Me.TextBox2.CustomButton.Image = Nothing - Me.TextBox2.CustomButton.Location = New System.Drawing.Point(665, 1) - Me.TextBox2.CustomButton.Name = "" - Me.TextBox2.CustomButton.Size = New System.Drawing.Size(27, 27) - Me.TextBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.TextBox2.CustomButton.TabIndex = 1 - Me.TextBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.TextBox2.CustomButton.UseSelectable = True - Me.TextBox2.CustomButton.Visible = False - Me.TextBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.TextBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.TextBox2.Lines = New String() {"Use Custom Name"} - Me.TextBox2.Location = New System.Drawing.Point(18, 64) - Me.TextBox2.MaxLength = 32767 - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.TextBox2.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.TextBox2.SelectedText = "" - Me.TextBox2.SelectionLength = 0 - Me.TextBox2.SelectionStart = 0 - Me.TextBox2.ShortcutsEnabled = True - Me.TextBox2.Size = New System.Drawing.Size(693, 29) - Me.TextBox2.TabIndex = 5 - Me.TextBox2.TabStop = False - Me.TextBox2.Text = "Use Custom Name" - Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.TextBox2.UseSelectable = True - Me.TextBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.TextBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) + Me.TextBox4.BackColor = System.Drawing.Color.White + Me.TextBox4.Cursor = System.Windows.Forms.Cursors.Hand ' - 'groupBox2 ' - Me.groupBox2.BackColor = System.Drawing.Color.Transparent - Me.groupBox2.Controls.Add(Me.bt_Cancel_mass) - Me.groupBox2.Controls.Add(Me.comboBox4) - Me.groupBox2.Controls.Add(Me.ComboBox1) - Me.groupBox2.Controls.Add(Me.comboBox3) - Me.groupBox2.Controls.Add(Me.Add_Display) - Me.groupBox2.Location = New System.Drawing.Point(15, 70) - Me.groupBox2.Name = "groupBox2" - Me.groupBox2.Size = New System.Drawing.Size(720, 280) - Me.groupBox2.TabIndex = 44 - Me.groupBox2.TabStop = False - Me.groupBox2.Visible = False ' - 'bt_Cancel_mass + Me.TextBox4.CustomButton.Image = Nothing + Me.TextBox4.CustomButton.Location = New System.Drawing.Point(665, 1) + Me.TextBox4.CustomButton.Name = "" + Me.TextBox4.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.TextBox4.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.TextBox4.CustomButton.TabIndex = 1 + Me.TextBox4.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.TextBox4.CustomButton.UseSelectable = True + Me.TextBox4.CustomButton.Visible = False + Me.TextBox4.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.TextBox4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.TextBox4.Lines = New String() {"Main Directory"} + Me.TextBox4.Location = New System.Drawing.Point(18, 120) + Me.TextBox4.MaxLength = 32767 + Me.TextBox4.Name = "TextBox4" + Me.TextBox4.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.TextBox4.ReadOnly = True + Me.TextBox4.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.TextBox4.SelectedText = "" + Me.TextBox4.SelectionLength = 0 + Me.TextBox4.SelectionStart = 0 + Me.TextBox4.ShortcutsEnabled = True + Me.TextBox4.Size = New System.Drawing.Size(693, 29) + Me.TextBox4.TabIndex = 36 + Me.TextBox4.TabStop = False + Me.TextBox4.Text = "Main Directory" + Me.TextBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.TextBox4.UseSelectable = True + Me.TextBox4.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.TextBox4.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' - Me.bt_Cancel_mass.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.add_mass_cancel - Me.bt_Cancel_mass.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.bt_Cancel_mass.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.bt_Cancel_mass.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.bt_Cancel_mass.ForeColor = System.Drawing.SystemColors.Control - Me.bt_Cancel_mass.Location = New System.Drawing.Point(159, 231) - Me.bt_Cancel_mass.Name = "bt_Cancel_mass" - Me.bt_Cancel_mass.Size = New System.Drawing.Size(403, 36) - Me.bt_Cancel_mass.TabIndex = 37 - Me.bt_Cancel_mass.Text = "Cancel" - Me.bt_Cancel_mass.UseVisualStyleBackColor = True + 'ComboBox2 ' - 'comboBox4 - ' - Me.comboBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.comboBox4.FormattingEnabled = True - Me.comboBox4.ItemHeight = 23 - Me.comboBox4.Location = New System.Drawing.Point(13, 154) - Me.comboBox4.Name = "comboBox4" - Me.comboBox4.Size = New System.Drawing.Size(693, 29) - Me.comboBox4.TabIndex = 2 - Me.comboBox4.UseSelectable = True - ' - 'ComboBox1 - ' - Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.ItemHeight = 23 - Me.ComboBox1.Location = New System.Drawing.Point(13, 50) - Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(693, 29) - Me.ComboBox1.TabIndex = 1 - Me.ComboBox1.UseSelectable = True - ' - 'comboBox3 - ' - Me.comboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.comboBox3.FormattingEnabled = True - Me.comboBox3.ItemHeight = 23 - Me.comboBox3.Location = New System.Drawing.Point(13, 102) - Me.comboBox3.Name = "comboBox3" - Me.comboBox3.Size = New System.Drawing.Size(693, 29) - Me.comboBox3.TabIndex = 1 - Me.comboBox3.UseSelectable = True + Me.ComboBox2.BackColor = System.Drawing.Color.White + Me.ComboBox2.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ComboBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.ComboBox2.FormattingEnabled = True + Me.ComboBox2.ItemHeight = 23 + Me.ComboBox2.Location = New System.Drawing.Point(18, 162) + Me.ComboBox2.Name = "ComboBox2" + Me.ComboBox2.Size = New System.Drawing.Size(693, 29) + Me.ComboBox2.Sorted = True + Me.ComboBox2.TabIndex = 37 + Me.ComboBox2.UseSelectable = True ' - 'Add_Display + 'StatusLabel ' - Me.Add_Display.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Me.StatusLabel.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.Add_Display.BackColor = System.Drawing.Color.Transparent - Me.Add_Display.FontSize = MetroFramework.MetroLabelSize.Tall - Me.Add_Display.FontWeight = MetroFramework.MetroLabelWeight.Regular - Me.Add_Display.ForeColor = System.Drawing.Color.Black - Me.Add_Display.Location = New System.Drawing.Point(20, 228) - Me.Add_Display.Name = "Add_Display" - Me.Add_Display.Size = New System.Drawing.Size(691, 42) - Me.Add_Display.TabIndex = 36 - Me.Add_Display.Text = "..." - Me.Add_Display.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Btn_min - ' - Me.Btn_min.BackColor = System.Drawing.Color.Transparent - Me.Btn_min.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.Btn_min.Cursor = System.Windows.Forms.Cursors.Hand - Me.Btn_min.Image = CType(resources.GetObject("Btn_min.Image"), System.Drawing.Image) - Me.Btn_min.Location = New System.Drawing.Point(567, 1) - Me.Btn_min.Margin = New System.Windows.Forms.Padding(0) - Me.Btn_min.Name = "Btn_min" - Me.Btn_min.Size = New System.Drawing.Size(25, 25) - Me.Btn_min.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.Btn_min.TabIndex = 73 - Me.Btn_min.TabStop = False + Me.StatusLabel.BackColor = System.Drawing.Color.Transparent + Me.StatusLabel.FontSize = MetroFramework.MetroLabelSize.Tall + Me.StatusLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular + Me.StatusLabel.ForeColor = System.Drawing.SystemColors.InactiveCaptionText + Me.StatusLabel.Location = New System.Drawing.Point(18, 235) + Me.StatusLabel.Name = "StatusLabel" + Me.StatusLabel.Size = New System.Drawing.Size(693, 45) + Me.StatusLabel.TabIndex = 38 + Me.StatusLabel.Text = "Status: idle" + Me.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'Btn_Close + 'DownloadScope ' - Me.Btn_Close.BackColor = System.Drawing.Color.Transparent - Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand - Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close - Me.Btn_Close.Location = New System.Drawing.Point(592, 1) - Me.Btn_Close.Margin = New System.Windows.Forms.Padding(0) - Me.Btn_Close.Name = "Btn_Close" - Me.Btn_Close.Size = New System.Drawing.Size(40, 40) - Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.Btn_Close.TabIndex = 72 - Me.Btn_Close.TabStop = False + Me.DownloadScope.BackColor = System.Drawing.Color.White + Me.DownloadScope.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DownloadScope.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.DownloadScope.FormattingEnabled = True + Me.DownloadScope.ItemHeight = 23 + Me.DownloadScope.Items.AddRange(New Object() {"[Default]", "[Merge Audio with existing files]", "[Subtitles only]", "[Audio only (AAC)]"}) + Me.DownloadScope.Location = New System.Drawing.Point(18, 204) + Me.DownloadScope.Name = "DownloadScope" + Me.DownloadScope.Size = New System.Drawing.Size(693, 29) + Me.DownloadScope.TabIndex = 39 + Me.DownloadScope.UseSelectable = True ' - 'btn_dl + 'groupBox1 ' - Me.btn_dl.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.main_button_download_default - Me.btn_dl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.btn_dl.Cursor = System.Windows.Forms.Cursors.No - Me.btn_dl.FlatAppearance.BorderSize = 0 - Me.btn_dl.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn_dl.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btn_dl.ForeColor = System.Drawing.SystemColors.Control - Me.btn_dl.Location = New System.Drawing.Point(106, 377) - Me.btn_dl.Name = "btn_dl" - Me.btn_dl.Size = New System.Drawing.Size(538, 50) - Me.btn_dl.TabIndex = 75 - Me.btn_dl.Text = "Download" - Me.btn_dl.UseVisualStyleBackColor = True + Me.groupBox1.BackColor = System.Drawing.Color.Transparent + Me.groupBox1.Controls.Add(Me.DownloadScope) + Me.groupBox1.Controls.Add(Me.StatusLabel) + Me.groupBox1.Controls.Add(Me.ComboBox2) + Me.groupBox1.Controls.Add(Me.TextBox4) + Me.groupBox1.Controls.Add(Me.textBox1) + Me.groupBox1.Controls.Add(Me.TextBox2) + Me.groupBox1.Location = New System.Drawing.Point(15, 60) + Me.groupBox1.Name = "groupBox1" + Me.groupBox1.Size = New System.Drawing.Size(720, 290) + Me.groupBox1.TabIndex = 33 + Me.groupBox1.TabStop = False ' 'Anime_Add ' @@ -349,36 +364,38 @@ 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.groupBox1) Me.Controls.Add(Me.groupBox2) + Me.Controls.Add(Me.groupBox1) 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) Me.Text = "Add Video" Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center - Me.groupBox1.ResumeLayout(False) - Me.groupBox2.ResumeLayout(False) CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).EndInit() + Me.groupBox2.ResumeLayout(False) + Me.groupBox1.ResumeLayout(False) Me.ResumeLayout(False) End Sub - Public WithEvents groupBox2 As GroupBox - Public WithEvents groupBox1 As GroupBox - Public WithEvents StatusLabel As MetroFramework.Controls.MetroLabel - Public WithEvents Add_Display As MetroFramework.Controls.MetroLabel Friend WithEvents MetroTextBox1 As MetroFramework.Controls.MetroTextBox - Public WithEvents textBox1 As MetroFramework.Controls.MetroTextBox - Public WithEvents TextBox4 As MetroFramework.Controls.MetroTextBox - Public WithEvents TextBox2 As MetroFramework.Controls.MetroTextBox - Public WithEvents ComboBox2 As MetroFramework.Controls.MetroComboBox - Public WithEvents comboBox4 As MetroFramework.Controls.MetroComboBox - Public WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox - Public WithEvents comboBox3 As MetroFramework.Controls.MetroComboBox Private WithEvents Btn_min As PictureBox Private WithEvents Btn_Close As PictureBox - Public WithEvents DownloadScope As MetroFramework.Controls.MetroComboBox Friend WithEvents btn_dl As Button Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker + Public WithEvents Add_Display As MetroFramework.Controls.MetroLabel + Public WithEvents CB_EP0 As MetroFramework.Controls.MetroComboBox + Public WithEvents CB_Season As MetroFramework.Controls.MetroComboBox + Public WithEvents CB_EP1 As MetroFramework.Controls.MetroComboBox Friend WithEvents bt_Cancel_mass As Button + Public WithEvents groupBox2 As GroupBox + Public WithEvents TextBox2 As MetroFramework.Controls.MetroTextBox + Public WithEvents textBox1 As MetroFramework.Controls.MetroTextBox + Public WithEvents TextBox4 As MetroFramework.Controls.MetroTextBox + Public WithEvents ComboBox2 As MetroFramework.Controls.MetroComboBox + Public WithEvents StatusLabel As MetroFramework.Controls.MetroLabel + Public WithEvents DownloadScope As MetroFramework.Controls.MetroComboBox + Public WithEvents groupBox1 As GroupBox + Public WithEvents CB_Dub As MetroFramework.Controls.MetroComboBox + Public WithEvents TT_Dub As ToolTip End Class diff --git a/Crunchyroll Downloader/Anime_Add.resx b/Crunchyroll Downloader/Anime_Add.resx index c05855f1..ed214524 100644 --- a/Crunchyroll Downloader/Anime_Add.resx +++ b/Crunchyroll Downloader/Anime_Add.resx @@ -128,4 +128,7 @@ 24, 23 + + 187, 23 + \ No newline at end of file diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 2ed68a66..e6562774 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -13,6 +13,7 @@ Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Status Imports Newtonsoft.Json.Linq Imports System.Timers Imports System.Security.Policy +Imports Crunchyroll_Downloader.CRD_Classes Public Class Anime_Add Public Mass_DL_Cancel As Boolean = False @@ -299,9 +300,9 @@ Public Class Anime_Add bt_Cancel_mass.Enabled = False bt_Cancel_mass.Visible = False Main.DownloadFunimationJS_Seasons() - comboBox4.Enabled = False - comboBox3.Enabled = False - ComboBox1.Enabled = False + CB_EP1.Enabled = False + CB_EP0.Enabled = False + CB_Season.Enabled = False ElseIf CBool(InStr(Main.WebbrowserURL, "crunchyroll.com")) = True Then @@ -313,9 +314,9 @@ Public Class Anime_Add bt_Cancel_mass.Visible = False Main.DownloadBetaSeasons() - comboBox4.Enabled = False - comboBox3.Enabled = False - ComboBox1.Enabled = False + CB_EP1.Enabled = False + CB_EP0.Enabled = False + CB_Season.Enabled = False End If @@ -461,34 +462,54 @@ Public Class Anime_Add Dim episode_id As String = Entry.GetValue("id").ToString Dim slug_title As String = Entry.GetValue("slug_title").ToString - comboBox3.Items.Add("Episode " + episode_number) - comboBox4.Items.Add("Episode " + episode_number) - Main.CR_MassEpisodes.Add(New CR_Seasons(episode_id, slug_title, Main.CR_MassSeasons.Item(ComboBox1.SelectedIndex).Auth)) + CB_EP0.Items.Add("Episode " + episode_number) + CB_EP1.Items.Add("Episode " + episode_number) + Main.CR_MassEpisodes.Add(New CR_Seasons(episode_id, slug_title, Main.CR_MassSeasons.Item(CB_Season.SelectedIndex).Auth, "")) Next End Select Next - If comboBox3.Items.Count > 0 Then - comboBox3.SelectedIndex = 0 - comboBox4.SelectedIndex = comboBox4.Items.Count - 1 + If CB_EP0.Items.Count > 0 Then + CB_EP0.SelectedIndex = 0 + CB_EP1.SelectedIndex = CB_EP1.Items.Count - 1 End If - comboBox3.Enabled = True - comboBox4.Enabled = True + CB_EP0.Enabled = True + CB_EP1.Enabled = True End Sub - Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged + Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Season.SelectedIndexChanged If CBool(InStr(Main.WebbrowserURL, "crunchyroll.com")) = True Then - comboBox3.Items.Clear() - comboBox4.Items.Clear() - comboBox3.Enabled = False - comboBox4.Enabled = False - comboBox3.Text = Nothing - comboBox4.Text = Nothing + CB_EP0.Items.Clear() + CB_EP1.Items.Clear() + CB_EP0.Enabled = False + CB_EP1.Enabled = False + CB_EP0.Text = Nothing + CB_EP1.Text = Nothing + + + 'get guid + + Dim guid As String = Nothing + + For i As Integer = 0 To Main.CR_MassSeasons.Count - 1 + If "Season " + Main.CR_MassSeasons.Item(i).Season = CB_Season.Text And Main.ConvertSubValue(Main.CR_MassSeasons.Item(i).audio_locale, ConvertSubsEnum.DisplayText) = CB_Dub.Text Then + guid = Main.CR_MassSeasons.Item(i).guid + 'MsgBox(guid + vbNewLine + Main.CR_MassSeasons.Item(i).audio_locale) + End If + Next + + If guid = Nothing Then + MsgBox("Requested guid not found", MsgBoxStyle.Critical) + Exit Sub + End If + + ' Dim JsonUrl As String = "https://www.crunchyroll.com/content/v2/cms/seasons/" + Main.CR_MassSeasons.Item(CB_Season.SelectedIndex).guid + "/episodes?preferred_audio_language=" + Main.DubSprache.CR_Value + "&locale=" + Main.locale + + Dim JsonUrl As String = "https://www.crunchyroll.com/content/v2/cms/seasons/" + guid + "/episodes?preferred_audio_language=" + Main.DubSprache.CR_Value + "&locale=" + Main.locale - Dim JsonUrl As String = "https://www.crunchyroll.com/content/v2/cms/seasons/" + Main.CR_MassSeasons.Item(ComboBox1.SelectedIndex).guid + "/episodes?preferred_audio_language=" + Main.DubSprache.CR_Value + "&locale=" + Main.locale Dim Loc_CR_Cookies = " -H " + Chr(34) + Main.CR_Cookies.Replace(Chr(34), "").Replace(" -H ", "") + Chr(34) @@ -498,7 +519,7 @@ Public Class Anime_Add Try - EpisodeJson = CurlAuthNew(JsonUrl, Loc_CR_Cookies, Main.CR_MassSeasons.Item(ComboBox1.SelectedIndex).Auth) ' + EpisodeJson = CurlAuthNew(JsonUrl, Loc_CR_Cookies, Main.CR_MassSeasons.Item(CB_Season.SelectedIndex).Auth) ' Catch ex As Exception If CBool(InStr(ex.ToString, "Error - Getting")) Then @@ -516,14 +537,14 @@ Public Class Anime_Add ElseIf Main.WebbrowserURL = "https://funimation.com/js" Then - comboBox3.Items.Clear() - comboBox4.Items.Clear() - comboBox3.Text = Nothing - comboBox4.Text = Nothing + CB_EP0.Items.Clear() + CB_EP1.Items.Clear() + CB_EP0.Text = Nothing + CB_EP1.Text = Nothing Dim ContentID As String = Nothing For i As Integer = 0 To Main.FunimtaionSeasonList.Count - 1 - If ComboBox1.Text = Main.FunimtaionSeasonList.Item(i).Title Then + If CB_Season.Text = Main.FunimtaionSeasonList.Item(i).Title Then ContentID = Main.FunimtaionSeasonList.Item(i).ID Exit For End If @@ -559,9 +580,9 @@ Public Class Anime_Add FillFunimationEpisodes(EpisodeJson) - If comboBox3.Items.Count > 0 Then - comboBox3.SelectedIndex = 0 - comboBox4.SelectedIndex = comboBox4.Items.Count - 1 + If CB_EP0.Items.Count > 0 Then + CB_EP0.SelectedIndex = 0 + CB_EP1.SelectedIndex = CB_EP1.Items.Count - 1 End If @@ -573,16 +594,16 @@ Public Class Anime_Add Public Sub FillFunimationEpisodes(ByVal EpisodeJson As String) Main.FunimationEpisodeJSON = EpisodeJson - comboBox3.Enabled = True - comboBox4.Enabled = True + CB_EP0.Enabled = True + CB_EP1.Enabled = True Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episodeNumber" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) 'EpisodeJson.Split(New String() {Chr(34) + "episodeNumber" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Debug.WriteLine(EpisodeSplit.Count.ToString) For i As Integer = 1 To EpisodeSplit.Count - 1 Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - comboBox3.Items.Add("Episode " + EpisodeSplit2(0)) - comboBox4.Items.Add("Episode " + EpisodeSplit2(0)) + CB_EP0.Items.Add("Episode " + EpisodeSplit2(0)) + CB_EP1.Items.Add("Episode " + EpisodeSplit2(0)) Next Main.WebbrowserURL = "https://funimation.com/js" End Sub @@ -690,6 +711,35 @@ Public Class Anime_Add End If End Sub + Private Sub CB_Dub_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Dub.SelectedIndexChanged + 'MsgBox(CB_Dub.Text) + 'MsgBox(Main.DubSprache.DisplayText) + + If My.Settings.OverrideDub = True And CBool(InStr(CB_Dub.Text, Main.DubSprache.DisplayText)) = False Then + MessageBox.Show("The Duboveride might change the Dub to: " + Main.DubSprache.DisplayText, "Settings - Override enabled", MessageBoxButtons.OK) + End If + + 'clear everything below the dub + CB_Season.Items.Clear() + CB_EP0.Items.Clear() + CB_EP1.Items.Clear() + + 'also remove display text + CB_Season.Text = Nothing + CB_EP0.Text = Nothing + CB_EP1.Text = Nothing + + For i As Integer = 0 To Main.CR_MassSeasons.Count - 1 + If Main.ConvertSubValue(Main.CR_MassSeasons.Item(i).audio_locale, ConvertSubsEnum.DisplayText) = CB_Dub.Text Then + CB_Season.Items.Add("Season " + Main.CR_MassSeasons.Item(i).Season) + End If + Next + + + + CB_Season.Enabled = True + End Sub + End Class diff --git a/Crunchyroll Downloader/CRD-Classes.vb b/Crunchyroll Downloader/CRD-Classes.vb index 4c11db35..08397e35 100644 --- a/Crunchyroll Downloader/CRD-Classes.vb +++ b/Crunchyroll Downloader/CRD-Classes.vb @@ -135,10 +135,12 @@ End Class Public Class CR_Seasons + Public Season As String Public guid As String Public audio_locale As String Public Auth As String - Public Sub New(ByVal guid As String, ByVal audio_locale As String, ByVal Auth As String) + Public Sub New(ByVal guid As String, ByVal audio_locale As String, ByVal Auth As String, ByVal Season As String) + Me.Season = Season Me.guid = guid Me.audio_locale = audio_locale Me.Auth = Auth @@ -146,7 +148,7 @@ Public Class CR_Seasons End Sub Public Overrides Function ToString() As String - Return String.Format("{0}, {1}", Me.guid, Me.audio_locale) + Return String.Format("{0}, {1}", Me.guid, Me.audio_locale, Me.Season) End Function End Class diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 477ffd39..033a95a0 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -734,7 +734,7 @@ Public Class Main End If Next - Return HardSub + " not found" + Return HardSub + "-not-found" End Function @@ -759,14 +759,14 @@ Public Class Main Next Dim First As Integer = 0 Dim Last As Integer = 0 - If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Or Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox3.SelectedIndex Then - First = Anime_Add.comboBox3.SelectedIndex - Last = Anime_Add.comboBox4.SelectedIndex - ElseIf Anime_Add.comboBox3.SelectedIndex > Anime_Add.comboBox4.SelectedIndex Then - First = Anime_Add.comboBox4.SelectedIndex - Last = Anime_Add.comboBox3.SelectedIndex + If Anime_Add.CB_EP1.SelectedIndex > Anime_Add.CB_EP0.SelectedIndex Or Anime_Add.CB_EP1.SelectedIndex = Anime_Add.CB_EP0.SelectedIndex Then + First = Anime_Add.CB_EP0.SelectedIndex + Last = Anime_Add.CB_EP1.SelectedIndex + ElseIf Anime_Add.CB_EP0.SelectedIndex > Anime_Add.CB_EP1.SelectedIndex Then + First = Anime_Add.CB_EP1.SelectedIndex + Last = Anime_Add.CB_EP0.SelectedIndex End If - Dim Anzahl As Integer = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + Dim Anzahl As Integer = Anime_Add.CB_EP1.SelectedIndex - Anime_Add.CB_EP0.SelectedIndex For i As Integer = First To Last For e As Integer = 0 To Integer.MaxValue If Grapp_RDY = True Then @@ -820,8 +820,8 @@ Public Class Main If Debug2 = True Then MsgBox(ex.ToString) End If - Anime_Add.comboBox4.Items.Clear() - Anime_Add.comboBox3.Items.Clear() + Anime_Add.CB_EP1.Items.Clear() + Anime_Add.CB_EP0.Items.Clear() Aktuell = 0.ToString Gesamt = 0.ToString Anime_Add.groupBox1.Visible = True @@ -837,19 +837,29 @@ Public Class Main End Sub Public Sub GetBetaSeasons(ByVal AnimeUrl As String, ByVal JsonUrl As String, ByVal Auth As String, Optional ByVal BrowserData As String = Nothing) ', ByVal SeasonJson As String) + + + 'switch UI Anime_Add.groupBox2.Visible = True Anime_Add.bt_Cancel_mass.Enabled = True Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False - Anime_Add.ComboBox1.Items.Clear() - Anime_Add.comboBox3.Items.Clear() - Anime_Add.comboBox4.Items.Clear() - Anime_Add.ComboBox1.Text = Nothing - Anime_Add.comboBox3.Text = Nothing - Anime_Add.comboBox4.Text = Nothing - Anime_Add.ComboBox1.Enabled = True - Anime_Add.comboBox3.Enabled = True - Anime_Add.comboBox4.Enabled = True + 'clear everything + Anime_Add.CB_Dub.Items.Clear() + Anime_Add.CB_Season.Items.Clear() + Anime_Add.CB_EP0.Items.Clear() + Anime_Add.CB_EP1.Items.Clear() + 'also remove display text + Anime_Add.CB_Dub.Text = Nothing + Anime_Add.CB_Season.Text = Nothing + Anime_Add.CB_EP0.Text = Nothing + Anime_Add.CB_EP1.Text = Nothing + 'disable everything for now + Anime_Add.CB_Dub.Enabled = False + Anime_Add.CB_Season.Enabled = False + Anime_Add.CB_EP0.Enabled = False + Anime_Add.CB_EP1.Enabled = False + Dim SeasonJson As String = Nothing CR_MassSeasons.Clear() If BrowserData = Nothing Then @@ -883,6 +893,8 @@ Public Class Main Dim SeasonJObject As JObject = JObject.Parse(SeasonJson) Dim SeasonData As List(Of JToken) = SeasonJObject.Children().ToList + Dim DubList As New List(Of String) + For Each item As JProperty In SeasonData item.CreateReader() Select Case item.Name @@ -892,21 +904,27 @@ Public Class Main Dim localSeasons As New List(Of CR_Seasons) Dim season_number As String = Nothing Dim id As String = Nothing + Dim title As String = Nothing Dim audio_localeMain As String = Nothing + Dim Dubs As New List(Of CR_Seasons) + For Each SeasonSubItem As JProperty In SeasonSubData SeasonSubItem.CreateReader() + Select Case SeasonSubItem.Name Case "versions" Try For Each VersionItem As JObject In SeasonSubItem.Values + Dim guid As String = Nothing + Dim audio_locale As String = Nothing - Dim guid As String = VersionItem.GetValue("guid").ToString - Dim audio_locale As String = VersionItem.GetValue("audio_locale").ToString + guid = VersionItem.GetValue("guid").ToString + audio_locale = VersionItem.GetValue("audio_locale").ToString + Dubs.Add(New CR_Seasons(guid, audio_locale, Auth, "NaN")) - localSeasons.Add(New CR_Seasons(guid, audio_locale, Auth)) Next Catch ex As Exception Debug.WriteLine("Error getting season data") @@ -917,27 +935,49 @@ Public Class Main id = SeasonSubItem.Value.ToString Case "audio_locale" audio_localeMain = SeasonSubItem.Value.ToString + Case "title" + title = SeasonSubItem.Value.ToString End Select + + Next + 'add dubs to local seasons + For i As Integer = 0 To Dubs.Count - 1 + localSeasons.Add(New CR_Seasons(Dubs.Item(i).guid, Dubs.Item(i).audio_locale, Dubs.Item(i).Auth, season_number + " - " + title)) + Next + + 'localSeasons.Add(New CR_Seasons(guid, audio_locale, Auth, season_number)) + 'MsgBox(audio_locale) + + 'Debug.WriteLine("Start-Seasons") + + 'Debug.WriteLine(localSeasons.Item(0).guid) + 'Debug.WriteLine("END-Seasons") + If localSeasons.Count = 0 Then - Anime_Add.ComboBox1.Items.Add(ConvertSubValue(audio_localeMain, ConvertSubsEnum.DisplayText) + " - Season " + season_number) - CR_MassSeasons.Add(New CR_Seasons(id, audio_localeMain, Auth)) + Continue For End If - If localSeasons.Count > 0 Then - For i As Integer = 0 To CR_MassSeasons.Count - 1 - If CR_MassSeasons.Item(i).guid = localSeasons.Item(0).guid Then - localSeasons.Clear() - Exit For - End If - Next - End If + 'If localSeasons.Count = 0 Then + ' Anime_Add.CB_Season.Items.Add(ConvertSubValue(audio_localeMain, ConvertSubsEnum.DisplayText) + " - Season " + season_number) + ' CR_MassSeasons.Add(New CR_Seasons(id, audio_localeMain, Auth)) + 'End If + + 'If localSeasons.Count > 0 Then + ' For i As Integer = 0 To CR_MassSeasons.Count - 1 + ' If CR_MassSeasons.Item(i).guid = localSeasons.Item(0).guid Then + ' localSeasons.Clear() + ' Exit For + ' End If + ' Next + 'End If If localSeasons.Count > 0 Then For i As Integer = 0 To localSeasons.Count - 1 - Anime_Add.ComboBox1.Items.Add(ConvertSubValue(localSeasons.Item(i).audio_locale, ConvertSubsEnum.DisplayText) + " - Season " + season_number) + 'Anime_Add.CB_Season.Items.Add(ConvertSubValue(localSeasons.Item(i).audio_locale, ConvertSubsEnum.DisplayText) + " - Season " + season_number) + DubList.Add(localSeasons.Item(i).audio_locale) CR_MassSeasons.Add(localSeasons.Item(i)) Next End If @@ -946,6 +986,22 @@ Public Class Main End Select Next + Dim CleanDubs As List(Of String) = DubList.Distinct().ToList + Anime_Add.CB_Dub.Enabled = True + Dim Index As Integer = 0 + For i As Integer = 0 To CleanDubs.Count - 1 + Anime_Add.CB_Dub.Items.Add(ConvertSubValue(CleanDubs.Item(i), ConvertSubsEnum.DisplayText)) + If CleanDubs.Item(i) = DubSprache.CR_Value Then + Index = i + End If + Next + + Anime_Add.CB_Dub.SelectedIndex = Index + + 'Anime_Add.TT_Dub.SetToolTip(Anime_Add.CB_Dub, "Unable to select dub, dub override enabled!") + + 'Anime_Add.CB_Dub.Enabled = False + End Sub Public Sub GetCRVideoProxy(ByVal requesturl As String, ByVal AuthToken As String, ByVal WebsiteURL As String, ByVal RT_count As Integer) @@ -2397,20 +2453,20 @@ Public Class Main Anime_Add.bt_Cancel_mass.Enabled = True Anime_Add.bt_Cancel_mass.Visible = True Anime_Add.groupBox1.Visible = False - Anime_Add.ComboBox1.Items.Clear() - Anime_Add.comboBox3.Items.Clear() - Anime_Add.comboBox4.Items.Clear() - Anime_Add.ComboBox1.Text = Nothing - Anime_Add.comboBox3.Text = Nothing - Anime_Add.comboBox4.Text = Nothing - Anime_Add.ComboBox1.Enabled = True - Anime_Add.comboBox3.Enabled = False - Anime_Add.comboBox4.Enabled = False + Anime_Add.CB_Season.Items.Clear() + Anime_Add.CB_EP0.Items.Clear() + Anime_Add.CB_EP1.Items.Clear() + Anime_Add.CB_Season.Text = Nothing + Anime_Add.CB_EP0.Text = Nothing + Anime_Add.CB_EP1.Text = Nothing + Anime_Add.CB_Season.Enabled = True + Anime_Add.CB_EP0.Enabled = False + Anime_Add.CB_EP1.Enabled = False WebbrowserURL = "https://funimation.com/js" Debug.WriteLine("Count: " + FunimtaionSeasonList.Count.ToString) For i As Integer = 0 To FunimtaionSeasonList.Count - 1 Debug.WriteLine(FunimtaionSeasonList.Item(i).Title) - Anime_Add.ComboBox1.Items.Add(FunimtaionSeasonList.Item(i).Title) + Anime_Add.CB_Season.Items.Add(FunimtaionSeasonList.Item(i).Title) Next End Sub @@ -2452,21 +2508,21 @@ Public Class Main Dim Last As Integer = 0 Dim Anzahl As Integer = 0 - If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Then - First = Anime_Add.comboBox3.SelectedIndex - Last = Anime_Add.comboBox4.SelectedIndex + If Anime_Add.CB_EP1.SelectedIndex > Anime_Add.CB_EP0.SelectedIndex Then + First = Anime_Add.CB_EP0.SelectedIndex + Last = Anime_Add.CB_EP1.SelectedIndex Anzahl = Last - First + 1 - ElseIf Anime_Add.comboBox4.SelectedIndex < Anime_Add.comboBox3.SelectedIndex Then - First = Anime_Add.comboBox4.SelectedIndex - Last = Anime_Add.comboBox3.SelectedIndex + ElseIf Anime_Add.CB_EP1.SelectedIndex < Anime_Add.CB_EP0.SelectedIndex Then + First = Anime_Add.CB_EP1.SelectedIndex + Last = Anime_Add.CB_EP0.SelectedIndex - Anime_Add.comboBox4.SelectedIndex = Last - Anime_Add.comboBox3.SelectedIndex = First + Anime_Add.CB_EP1.SelectedIndex = Last + Anime_Add.CB_EP0.SelectedIndex = First Anzahl = Last - First + 1 - ElseIf Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox3.SelectedIndex Then + ElseIf Anime_Add.CB_EP1.SelectedIndex = Anime_Add.CB_EP0.SelectedIndex Then - First = Anime_Add.comboBox4.SelectedIndex - Last = Anime_Add.comboBox4.SelectedIndex + First = Anime_Add.CB_EP1.SelectedIndex + Last = Anime_Add.CB_EP1.SelectedIndex Anzahl = Last - First + 1 End If @@ -2548,8 +2604,8 @@ Public Class Main If Debug2 = True Then MsgBox(ex.ToString) End If - Anime_Add.comboBox4.Items.Clear() - Anime_Add.comboBox3.Items.Clear() + Anime_Add.CB_EP1.Items.Clear() + Anime_Add.CB_EP0.Items.Clear() Aktuell = 0.ToString Gesamt = 0.ToString Anime_Add.groupBox1.Visible = True @@ -4361,23 +4417,25 @@ Public Class Main LangValueEnum.Add(New NameValuePair("العربية (Arabic)", "ara", "ar-SA", Nothing)) + LangValueEnum.Add(New NameValuePair("Polski", "pol", "pl-PL", Nothing)) + LangValueEnum.Add(New NameValuePair("Русский (Russian)", "rus", "ru-RU", Nothing)) LangValueEnum.Add(New NameValuePair("Italiano (Italian)", "ita", "it-IT", Nothing)) LangValueEnum.Add(New NameValuePair("Español (España)", "spa", "es-ES", Nothing)) + LangValueEnum.Add(New NameValuePair("Türkçe", "tur", "tr-TR", Nothing)) + LangValueEnum.Add(New NameValuePair("Bahasa Indonesia", "ind", "id-ID", Nothing)) LangValueEnum.Add(New NameValuePair("Català", "cat", "ca-ES", Nothing)) - LangValueEnum.Add(New NameValuePair("Polski", "pol", "pl-PL", Nothing)) - LangValueEnum.Add(New NameValuePair("Tiếng Việt", "vie", "vi-VN", Nothing)) - LangValueEnum.Add(New NameValuePair("తెలుగు", "tel", "te-IN", Nothing)) + LangValueEnum.Add(New NameValuePair("English (India)", "eng", "en-IN", Nothing)) - LangValueEnum.Add(New NameValuePair("Türkçe", "tur", "tr-TR", Nothing)) + LangValueEnum.Add(New NameValuePair("తెలుగు", "tel", "te-IN", Nothing)) LangValueEnum.Add(New NameValuePair("हिंदी", "hin", "hi-IN", Nothing)) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index d0d53f95..48e9e603 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: ' - - + +