Fixed Status on Conversion End

gfrn · Jun 20, 2019 · 0f8453c · 0f8453c
1 parent c117864
commit 0f8453c
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 33 deletions.
diff --git a/App.config b/App.config
@@ -23,7 +23,7 @@
                 <value />
             </setting>
             <setting name="CurrentVersionYoutubeDL" serializeAs="String">
-                <value>2019.04.30</value>
+                <value>2019.06.08</value>
             </setting>
         </youtube_dl.Properties.Settings>
     </userSettings>

diff --git a/Converter.cs b/Converter.cs
@@ -26,15 +26,7 @@ public partial class Converter : Form
         private string videoAudioFilter = "mp4|*.mp4|m4a|*.m4a|3gp|*.3gp|m4v|*.m4v|mov|*.mov|webm|*.webm|ogg|*.ogg|mp3|*.mp3|flac|*.flac";
         private string imageFilter = "png|*.png";
 
-        ProcessStartInfo ffmpegInfo = new ProcessStartInfo
-        {
-
-            UseShellExecute = false,
-            RedirectStandardOutput = true,
-            CreateNoWindow = true,
-            StandardOutputEncoding = Encoding.UTF8,
-            FileName = "ffmpeg.exe"
-        };
+        private Process ffMpegProc = new Process();
 
         public Converter()
         {
@@ -121,27 +113,38 @@ private void ConvertButton_Click(object sender, EventArgs e)
                 }
             }
 
-            ffmpegInfo.Arguments = args;
-            Process ffmpegProc = Process.Start(ffmpegInfo);
+            ffMpegProc.StartInfo.Arguments = args;
+            ffMpegProc.StartInfo.UseShellExecute = false;
+            ffMpegProc.StartInfo.RedirectStandardOutput = true;
+            ffMpegProc.StartInfo.CreateNoWindow = true;
+            ffMpegProc.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+            ffMpegProc.StartInfo.FileName = "ffmpeg.exe";
 
-            ffmpegProc.OutputDataReceived += new DataReceivedEventHandler(
-                (s, f) =>
-                {
-                    AddSubsButton.Enabled = CancelImportButton.Visible = CancelJoinButton.Visible = CancelMergeButton.Visible = CancelSubtitlesButton.Visible = false;
-                    EndOfVideoCheckbox.Enabled = ConvertButton.Enabled = SaveFileButton.Enabled = OpenFileButton.Enabled = MergeButton.Enabled = false;
+            ffMpegProc.EnableRaisingEvents = true;
+            ffMpegProc.Exited += new EventHandler(ffMpegProc_Exited);
 
-                    statusLabel.Text = Properties.strings.FFMpeg;
-                });
+            ffMpegProc.Start();
 
-            statusLabel.Text = Properties.strings.Done;
+            AddSubsButton.Enabled = CancelImportButton.Visible = CancelJoinButton.Visible = CancelMergeButton.Visible = CancelSubtitlesButton.Visible = false;
+            EndOfVideoCheckbox.Enabled = ConvertButton.Enabled = SaveFileButton.Enabled = OpenFileButton.Enabled = MergeButton.Enabled = CutStartTextbox.Enabled = EndOfVideoCheckbox.Enabled = false;
 
-            OriginalFileLabel.Text = "";
-            OutputFileLabel.Text = "";
-            inputFile = "";
-            outputFile = "";
-            ConvertFromToLabel.Text = "";
+            statusLabel.Text = Properties.strings.FFMpeg;
+        }
 
-            ConvertButton.Enabled = false;
+        private void ffMpegProc_Exited(object sender, EventArgs e)
+        {
+            this.BeginInvoke((Action)(() =>
+            {
+                OriginalFileLabel.Text = "";
+                OutputFileLabel.Text = "";
+                inputFile = "";
+                outputFile = "";
+                ConvertFromToLabel.Text = "";
+
+                OpenFileButton.Enabled = CutStartTextbox.Enabled = EndOfVideoCheckbox.Enabled = JoinVideosButton.Enabled = true;
+
+                statusLabel.Text = Properties.strings.Done;
+            }));        
         }
 
         private void EndOfVideoCheckbox_CheckedChanged(object sender, EventArgs e)

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // É possível especificar todos os valores ou usar como padrão os Números de Build e da Revisão
 // utilizando o "*" como mostrado abaixo:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.1")]
+[assembly: AssemblyFileVersion("1.2.3.1")]
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="CurrentVersionYoutubeDL" Type="System.String" Scope="User">
-      <Value Profile="(Default)">2019.04.07</Value>
+      <Value Profile="(Default)">2019.06.08</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Properties/strings.pt-BR.resx b/Properties/strings.pt-BR.resx
@@ -168,6 +168,9 @@
   <data name="NoDownload" xml:space="preserve">
     <value>Nenhum Download</value>
   </data>
+  <data name="Overwrite" xml:space="preserve">
+    <value>Você não pode escolher o mesmo nome e extensão do arquivo original. Por favor escolha outro nome.</value>
+  </data>
   <data name="SaveChanges" xml:space="preserve">
     <value>Salvar</value>
   </data>

diff --git a/Properties/strings.resx b/Properties/strings.resx
@@ -168,6 +168,9 @@
   <data name="NoDownload" xml:space="preserve">
     <value>No Download</value>
   </data>
+  <data name="Overwrite" xml:space="preserve">
+    <value>You cannot choose the same name and extension as the original file. Please pick another name.</value>
+  </data>
   <data name="SaveChanges" xml:space="preserve">
     <value>Save Changes</value>
   </data>

diff --git a/Properties/strings1.Designer.cs b/Properties/strings1.Designer.cs
diff --git a/youtube-dl.csproj b/youtube-dl.csproj
@@ -23,8 +23,8 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.2.2.%2a</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.2.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>