diff --git a/App.config b/App.config index b863b94..0fa0af9 100644 --- a/App.config +++ b/App.config @@ -23,7 +23,7 @@ - 2019.04.30 + 2019.06.08 diff --git a/Converter.cs b/Converter.cs index 2a77e33..58eba33 100644 --- 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 index a28fdce..a2dba28 100644 --- 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 index 774f7b3..78a6a19 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace youtube_dl.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -73,7 +73,7 @@ public string Language { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2019.04.07")] + [global::System.Configuration.DefaultSettingValueAttribute("2019.06.08")] public string CurrentVersionYoutubeDL { get { return ((string)(this["CurrentVersionYoutubeDL"])); diff --git a/Properties/Settings.settings b/Properties/Settings.settings index b3f375a..388dc3c 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -15,7 +15,7 @@ - 2019.04.07 + 2019.06.08 \ No newline at end of file diff --git a/Properties/strings.pt-BR.resx b/Properties/strings.pt-BR.resx index 19f6228..20c1a25 100644 --- a/Properties/strings.pt-BR.resx +++ b/Properties/strings.pt-BR.resx @@ -168,6 +168,9 @@ Nenhum Download + + Você não pode escolher o mesmo nome e extensão do arquivo original. Por favor escolha outro nome. + Salvar diff --git a/Properties/strings.resx b/Properties/strings.resx index 197f775..11ac6b5 100644 --- a/Properties/strings.resx +++ b/Properties/strings.resx @@ -168,6 +168,9 @@ No Download + + You cannot choose the same name and extension as the original file. Please pick another name. + Save Changes diff --git a/Properties/strings1.Designer.cs b/Properties/strings1.Designer.cs index dffff96..98b8c5a 100644 --- a/Properties/strings1.Designer.cs +++ b/Properties/strings1.Designer.cs @@ -213,6 +213,15 @@ internal static string NoDownload { } } + /// + /// Consulta uma cadeia de caracteres localizada semelhante a You cannot choose the same name and extension as the original file. Please pick another name.. + /// + internal static string Overwrite { + get { + return ResourceManager.GetString("Overwrite", resourceCulture); + } + } + /// /// Consulta uma cadeia de caracteres localizada semelhante a Save Changes. /// diff --git a/youtube-dl.csproj b/youtube-dl.csproj index 5c6adc9..7613bc6 100644 --- a/youtube-dl.csproj +++ b/youtube-dl.csproj @@ -23,8 +23,8 @@ false false false - 0 - 1.2.2.%2a + 1 + 1.2.3.%2a false true true