From d9034f126c47a7d8c2eb29c282d90f968ae47298 Mon Sep 17 00:00:00 2001 From: Ivandro Jao Date: Sun, 24 Nov 2024 17:27:02 +0000 Subject: [PATCH] Remove unused UI elements and redundant code Removed the comboBoxExtension, groupBox1, and progressBar1 along with related code in Main.Designer.cs and Main.cs files. This cleanup simplifies the user interface and codebase by excluding functionality that is not currently utilized. The adjustments improve maintainability and readability of the code. --- source/SaveAllFormat/Main.Designer.cs | 55 ++------------------------- source/SaveAllFormat/Main.cs | 19 +++------ 2 files changed, 9 insertions(+), 65 deletions(-) diff --git a/source/SaveAllFormat/Main.Designer.cs b/source/SaveAllFormat/Main.Designer.cs index a039a246..744645ea 100644 --- a/source/SaveAllFormat/Main.Designer.cs +++ b/source/SaveAllFormat/Main.Designer.cs @@ -31,18 +31,13 @@ private void InitializeComponent() this.buttonCancel = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.textBoxLocation = new System.Windows.Forms.TextBox(); - this.comboBoxExtension = new System.Windows.Forms.ComboBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); this.buttonBrowse = new System.Windows.Forms.Button(); this.buttonExport = new System.Windows.Forms.Button(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(385, 187); + this.buttonCancel.Location = new System.Drawing.Point(304, 78); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); this.buttonCancel.TabIndex = 1; @@ -65,34 +60,6 @@ private void InitializeComponent() this.textBoxLocation.Size = new System.Drawing.Size(364, 20); this.textBoxLocation.TabIndex = 3; // - // comboBoxExtension - // - this.comboBoxExtension.FormattingEnabled = true; - this.comboBoxExtension.Location = new System.Drawing.Point(9, 35); - this.comboBoxExtension.Name = "comboBoxExtension"; - this.comboBoxExtension.Size = new System.Drawing.Size(121, 21); - this.comboBoxExtension.TabIndex = 4; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.comboBoxExtension); - this.groupBox1.Location = new System.Drawing.Point(15, 60); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(445, 79); - this.groupBox1.TabIndex = 5; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Filter"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 16); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(56, 13); - this.label2.TabIndex = 5; - this.label2.Text = "Extension:"; - // // buttonBrowse // this.buttonBrowse.Location = new System.Drawing.Point(385, 23); @@ -105,7 +72,7 @@ private void InitializeComponent() // // buttonExport // - this.buttonExport.Location = new System.Drawing.Point(15, 145); + this.buttonExport.Location = new System.Drawing.Point(385, 78); this.buttonExport.Name = "buttonExport"; this.buttonExport.Size = new System.Drawing.Size(75, 23); this.buttonExport.TabIndex = 7; @@ -113,44 +80,28 @@ private void InitializeComponent() this.buttonExport.UseVisualStyleBackColor = true; this.buttonExport.Click += new System.EventHandler(this.buttonExport_Click); // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(15, 187); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(283, 23); - this.progressBar1.TabIndex = 8; - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(472, 222); - this.Controls.Add(this.progressBar1); + this.ClientSize = new System.Drawing.Size(472, 125); this.Controls.Add(this.buttonExport); this.Controls.Add(this.buttonBrowse); - this.Controls.Add(this.groupBox1); this.Controls.Add(this.textBoxLocation); this.Controls.Add(this.label1); this.Controls.Add(this.buttonCancel); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Main"; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); - } #endregion private System.Windows.Forms.Button buttonCancel; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox textBoxLocation; - private System.Windows.Forms.ComboBox comboBoxExtension; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label2; private System.Windows.Forms.Button buttonBrowse; private System.Windows.Forms.Button buttonExport; - private System.Windows.Forms.ProgressBar progressBar1; } } \ No newline at end of file diff --git a/source/SaveAllFormat/Main.cs b/source/SaveAllFormat/Main.cs index 6b1c6602..342a966b 100644 --- a/source/SaveAllFormat/Main.cs +++ b/source/SaveAllFormat/Main.cs @@ -19,7 +19,6 @@ public partial class Main : Form private readonly Subtitle _subtitle; private readonly string _file; private string _exportLocation; - private volatile string _selExtension; // todo: add support to portable version // todo: add support to export specific format e.g: xml, txt... @@ -34,7 +33,6 @@ public Main(Form parentForm, Subtitle subtitle) throw new ArgumentNullException(nameof(parentForm)); } - progressBar1.Visible = false; _parentForm = parentForm; _subtitle = subtitle; @@ -51,16 +49,6 @@ public Main(Form parentForm, Subtitle subtitle) Process.Start($"{textBoxLocation.Text}"); }; - - comboBoxExtension.BeginUpdate(); - comboBoxExtension.Items.Add("all"); - foreach (var extension in SubtitleFormat.AllSubtitleFormats.Select(f => f.Extension)) - { - comboBoxExtension.Items.Add(extension); - } - - comboBoxExtension.SelectedIndex = 0; - comboBoxExtension.EndUpdate(); } private void buttonBrowse_Click(object sender, EventArgs e) @@ -86,9 +74,9 @@ private async void buttonExport_Click(object sender, EventArgs e) return; } - _selExtension = comboBoxExtension.SelectedItem.ToString(); await Task.Run(() => { + // TODO: Use Parallel.ForeachAsync in .NET >= 6 ParallelLoopResult parallelLoopResult = Parallel.ForEach(SubtitleFormat.AllSubtitleFormats, exportFormat => { try @@ -111,6 +99,11 @@ await Task.Run(() => private static string GetExportFileName(string file, string formatName, string extension) { + if (string.IsNullOrWhiteSpace(file)) + { + return Path.GetRandomFileName() + extension; + } + string fileName = Path.GetFileNameWithoutExtension(file); string newName = $"{fileName}_{formatName}{extension}"; foreach (var ch in Path.GetInvalidFileNameChars().Concat(Path.GetInvalidPathChars()))