WinGui:

- getCliProcess(): This is now massively faster at returning the process ID of HandBrakeCLI. This means that the GUI updates it's elements far faster instead of the noticeable few seconds pause when an encode starts. This also fixes an error message that would appear if the CLI process quit before the GUI was setup.
- Code re factoring in Main.cs. Reduced the amount of code needed for a few functions.
- Combined the Encode and Queue handler. This just makes things a bit easier when other parts of the GUI need the encode process info. The new CLI handling code is not in yet.
- Added the CLI build environment to the About window

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2726 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 219 insertions, 231 deletions

diff --git a/win/C#/EncodeQueue/Encode.cs b/win/C#/EncodeQueue/Encode.cs
deleted file mode 100644
index 83ebc986b..000000000
--- a/win/C#/EncodeQueue/Encode.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-/*  Encode.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.fr>.

- 	   It may be used under the terms of the GNU General Public License. */

-

-using System;

-using System.Diagnostics;

-using System.Windows.Forms;

-using System.IO;

-using Handbrake.Functions;

-

-namespace Handbrake.EncodeQueue

-{

-    public class Encode

-    {

-        public Process hbProcess { get; set; }

-        public int processID { get; set; }

-        public IntPtr processHandle { get; set; }

-        public Boolean isEncoding { get; set; }

-        public String currentQuery { get; set; }

-

-        /// <summary>

-        /// Execute a HandBrakeCLI process.

-        /// </summary>

-        /// <param name="query">The CLI Query</param>

-        public void runCli(string query)

-        {

-            try

-            {

-                string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");

-                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

-                string logPath = Path.Combine(logDir, "last_encode_log.txt");

-                string strCmdLine = String.Format(@" CMD /c """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, query, logPath);

-

-                ProcessStartInfo cliStart = new ProcessStartInfo("CMD.exe", strCmdLine);

-                if (Properties.Settings.Default.enocdeStatusInGui)

-                {

-                    cliStart.RedirectStandardOutput = true;

-                    cliStart.UseShellExecute = false;

-                }

-                if (Properties.Settings.Default.cli_minimized)

-                    cliStart.WindowStyle = ProcessWindowStyle.Minimized;

-

-                Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.

-                hbProcess = Process.Start(cliStart);

-                processID = Main.getCliProcess(before);

-                isEncoding = true;

-                currentQuery = query;

-                if (hbProcess != null)

-                    processHandle = hbProcess.MainWindowHandle; // Set the process Handle

-

-                // Set the process Priority

-                Process hbCliProcess = null;

-                if (processID != -1)

-                    hbCliProcess = Process.GetProcessById(processID);

-

-                if (hbCliProcess != null)

-                    switch (Properties.Settings.Default.processPriority)

-                    {

-                        case "Realtime":

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.RealTime;

-                            break;

-                        case "High":

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.High;

-                            break;

-                        case "Above Normal":

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.AboveNormal;

-                            break;

-                        case "Normal":

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.Normal;

-                            break;

-                        case "Low":

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.Idle;

-                            break;

-                        default:

-                            hbCliProcess.PriorityClass = ProcessPriorityClass.BelowNormal;

-                            break;

-                    }

-            }

-            catch (Exception exc)

-            {

-                MessageBox.Show("It would appear that HandBrakeCLI has not started correctly. You should take a look at the Activity log as it may indicate the reason why.\n\n   Detailed Error Information: error occured in runCli()\n\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

-            }

-

-        }

-

-        /// <summary>

-        /// Kill the CLI process

-        /// </summary>

-        public void closeCLI()

-        {

-            hbProcess.Kill();

-        }

-

-        /// <summary>

-        /// Perform an action after an encode. e.g a shutdown, standby, restart etc.

-        /// </summary>

-        public void afterEncodeAction()

-        {

-            isEncoding = false;

-            currentQuery = String.Empty;

-            // Do something whent he encode ends.

-            switch (Properties.Settings.Default.CompletionOption)

-            {

-                case "Shutdown":

-                    Process.Start("Shutdown", "-s -t 60");

-                    break;

-                case "Log Off":

-                    Win32.ExitWindowsEx(0, 0);

-                    break;

-                case "Suspend":

-                    Application.SetSuspendState(PowerState.Suspend, true, true);

-                    break;

-                case "Hibernate":

-                    Application.SetSuspendState(PowerState.Hibernate, true, true);

-                    break;

-                case "Lock System":

-                    Win32.LockWorkStation();

-                    break;

-                case "Quit HandBrake":

-                    Application.Exit();

-                    break;

-                default:

-                    break;

-            }

-        }

-

-        /// <summar>

-        /// Append the CLI query to the start of the log file.

-        /// </summary>

-        /// <param name="query"></param>

-        public void addCLIQueryToLog(string query)

-        {

-            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

-            string logPath = Path.Combine(logDir, "last_encode_log.txt");

-

-            StreamReader reader = new StreamReader(File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.Read));

-            String log = reader.ReadToEnd();

-            reader.Close();

-

-            StreamWriter writer = new StreamWriter(File.Create(logPath));

-

-            writer.Write("### CLI Query: " + query + "\n\n");

-            writer.Write("#########################################\n\n");

-            writer.WriteLine(log);

-            writer.Flush();

-            writer.Close();

-        }

-

-        /// <summary>

-        /// Save a copy of the log to the users desired location or a default location

-        /// if this feature is enabled in options.

-        /// </summary>

-        /// <param name="destination"></param>

-        public void copyLog(string destination)

-        {

-            try

-            {

-                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

-                string tempLogFile = Path.Combine(logDir, "last_encode_log.txt");

-

-                string encodeDestinationPath = Path.GetDirectoryName(destination);

-                String destinationFile = Path.GetFileName(destination);

-                string encodeLogFile = destinationFile + " " + DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + ".txt";

-

-                // Make sure the log directory exists.

-                if (!Directory.Exists(logDir))

-                    Directory.CreateDirectory(logDir);

-

-                // Copy the Log to HandBrakes log folder in the users applciation data folder.

-                File.Copy(tempLogFile, Path.Combine(logDir, encodeLogFile));

-

-                // Save a copy of the log file in the same location as the enocde.

-                if (Properties.Settings.Default.saveLogWithVideo)

-                    File.Copy(tempLogFile, Path.Combine(encodeDestinationPath, encodeLogFile));

-

-                // Save a copy of the log file to a user specified location

-                if (Directory.Exists(Properties.Settings.Default.saveLogPath))

-                    if (Properties.Settings.Default.saveLogPath != String.Empty && Properties.Settings.Default.saveLogToSpecifiedPath)

-                        File.Copy(tempLogFile, Path.Combine(Properties.Settings.Default.saveLogPath, encodeLogFile));

-            }

-            catch (Exception exc)

-            {

-                MessageBox.Show("Something went a bit wrong trying to copy your log file.\nError Information:\n\n" + exc, "Error",

-                                MessageBoxButtons.OK, MessageBoxIcon.Error);

-            }

-        }

-

-    }

-}
\ No newline at end of file
diff --git a/win/C#/EncodeQueue/QueueHandler.cs b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs
index d183af0c5..09d1f1419 100644
--- a/win/C#/EncodeQueue/QueueHandler.cs
+++ b/win/C#/EncodeQueue/EncodeAndQueueHandler.cs
@@ -7,45 +7,22 @@
 using System;

 using System.Collections.Generic;

 using System.Collections.ObjectModel;

+using System.Diagnostics;

 using System.IO;

 using System.Threading;

 using System.Windows.Forms;

 using System.Xml.Serialization;

+using Handbrake.Functions;

 

 namespace Handbrake.EncodeQueue

 {

-    /// <summary>

-    /// Provides a handler for encoding jobs and a queue of those jobs.

-    /// </summary>

-    public class QueueHandler

+    public class EncodeAndQueueHandler

     {

-        public Encode encodeHandler = new Encode();

         private static XmlSerializer serializer = new XmlSerializer(typeof(List<Job>));

         private List<Job> queue = new List<Job>();

         private int nextJobId;

 

-        /// <summary>

-        /// Gets the number of items in the queue.

-        /// </summary>

-        public int Count

-        {

-            get { return queue.Count; }

-        }

-

-        /// <summary>

-        /// Gets the last encode that was processed.

-        /// </summary>

-        /// <returns></returns>

-        public Job LastEncode { get; set; }

-

-        /// <summary>

-        /// Gets the current state of the encode queue.

-        /// </summary>

-        public ReadOnlyCollection<Job> CurrentQueue

-        {

-            get { return queue.AsReadOnly(); }

-        }

-

+        #region Event Handlers

         /// <summary>

         /// Fires when an encode job has been started.

         /// </summary>

@@ -65,9 +42,9 @@ namespace Handbrake.EncodeQueue
         /// Fires when the entire encode queue has completed.

         /// </summary>

         public event EventHandler QueueCompleted;

+        #endregion

 

-        #region Queue Handling

-

+        #region Queue

         /// <summary>

         /// Gets and removes the next job in the queue.

         /// </summary>

@@ -84,6 +61,23 @@ namespace Handbrake.EncodeQueue
         }

 

         /// <summary>

+        /// Gets the current state of the encode queue.

+        /// </summary>

+        public ReadOnlyCollection<Job> CurrentQueue

+        {

+            get { return queue.AsReadOnly(); }

+        }

+

+        /// <summary>

+        /// Gets the number of items in the queue.

+        /// </summary>

+        public int Count

+        {

+            get { return queue.Count; }

+        }

+

+

+        /// <summary>

         /// Adds an item to the queue.

         /// </summary>

         /// <param name="query">The query that will be passed to the HandBrake CLI.</param>

@@ -252,15 +246,23 @@ namespace Handbrake.EncodeQueue
 

         #region Encoding

 

-        public bool PauseRequested { get; private set; }

-        public bool IsEncoding { get; private set; }

+        /// <summary>

+        /// Gets the last encode that was processed.

+        /// </summary>

+        /// <returns></returns> 

+        public Job LastEncode { get; set; }

+

+        /// <summary>

+        /// Request Pause

+        /// </summary>

+        public Boolean PauseRequested { get; private set; }

 

         /// <summary>

         /// Starts encoding the first job in the queue and continues encoding until all jobs

         /// have been encoded.

         /// </summary>

         public void StartEncodeQueue()

-        { 

+        {

             if (this.Count != 0)

             {

                 if (PauseRequested)

@@ -297,7 +299,7 @@ namespace Handbrake.EncodeQueue
         /// </summary>

         public void EndEncodeJob()

         {

-            encodeHandler.closeCLI();

+            closeCLI();

         }

 

         private void startProcess(object state)

@@ -308,18 +310,20 @@ namespace Handbrake.EncodeQueue
                 string query = GetNextJob().Query;

                 WriteQueueStateToFile("hb_queue_recovery.xml"); // Update the queue recovery file

 

-                encodeHandler.runCli(query);

+                runCli(query);

 

                 if (NewJobStarted != null)

                     NewJobStarted(this, new EventArgs());

 

-                encodeHandler.hbProcess.WaitForExit();

+                hbProcess.WaitForExit();

 

-                encodeHandler.addCLIQueryToLog(query);

-                encodeHandler.copyLog(LastEncode.Destination);

+                addCLIQueryToLog(query);

+                copyLog(LastEncode.Destination);

 

-                encodeHandler.hbProcess.Close();

-                encodeHandler.hbProcess.Dispose();

+                hbProcess.Close();

+                hbProcess.Dispose();

+

+                isEncoding = false;

 

                 if (CurrentJobCompleted != null)

                     CurrentJobCompleted(this, new EventArgs());

@@ -334,9 +338,184 @@ namespace Handbrake.EncodeQueue
                 QueueCompleted(this, new EventArgs());

 

             // After the encode is done, we may want to shutdown, suspend etc.

-            encodeHandler.afterEncodeAction();

+            afterEncodeAction();

         }

 

         #endregion

+

+        #region CLI and Log Handling

+        public Process hbProcess { get; set; }

+        public int processID { get; set; }

+        public IntPtr processHandle { get; set; }

+        public String currentQuery { get; set; }

+        public Boolean isEncoding { get; set; }

+

+        /// <summary>

+        /// Execute a HandBrakeCLI process.

+        /// </summary>

+        /// <param name="query">The CLI Query</param>

+        public void runCli(string query)

+        {

+            try

+            {

+                string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");

+                string logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs", "last_encode_log.txt");

+                string strCmdLine = String.Format(@" /C """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, query, logPath);

+                ProcessStartInfo cliStart = new ProcessStartInfo("CMD.exe", strCmdLine);

+

+                if (Properties.Settings.Default.enocdeStatusInGui)

+                {

+                    cliStart.RedirectStandardOutput = true;

+                    cliStart.UseShellExecute = false;

+                }

+                if (Properties.Settings.Default.cli_minimized)

+                    cliStart.WindowStyle = ProcessWindowStyle.Minimized;

+

+                Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.

+                hbProcess = Process.Start(cliStart);

+                processID = Main.getCliProcess(before);

+                isEncoding = true;

+                currentQuery = query;

+                if (hbProcess != null)

+                    processHandle = hbProcess.MainWindowHandle; // Set the process Handle

+

+                // Set the process Priority

+                Process hbCliProcess = null;

+                if (processID != -1)

+                    hbCliProcess = Process.GetProcessById(processID);

+

+                if (hbCliProcess != null)

+                    switch (Properties.Settings.Default.processPriority)

+                    {

+                        case "Realtime":

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.RealTime;

+                            break;

+                        case "High":

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.High;

+                            break;

+                        case "Above Normal":

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.AboveNormal;

+                            break;

+                        case "Normal":

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.Normal;

+                            break;

+                        case "Low":

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.Idle;

+                            break;

+                        default:

+                            hbCliProcess.PriorityClass = ProcessPriorityClass.BelowNormal;

+                            break;

+                    }

+            }

+            catch (Exception exc)

+            {

+                MessageBox.Show("It would appear that HandBrakeCLI has not started correctly. You should take a look at the Activity log as it may indicate the reason why.\n\n   Detailed Error Information: error occured in runCli()\n\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+            }

+

+        }

+

+        /// <summary>

+        /// Kill the CLI process

+        /// </summary>

+        public void closeCLI()

+        {

+            hbProcess.Kill();

+            isEncoding = false;

+        }

+

+        /// <summary>

+        /// Perform an action after an encode. e.g a shutdown, standby, restart etc.

+        /// </summary>

+        public void afterEncodeAction()

+        {

+            isEncoding = false;

+            currentQuery = String.Empty;

+            // Do something whent he encode ends.

+            switch (Properties.Settings.Default.CompletionOption)

+            {

+                case "Shutdown":

+                    Process.Start("Shutdown", "-s -t 60");

+                    break;

+                case "Log Off":

+                    Win32.ExitWindowsEx(0, 0);

+                    break;

+                case "Suspend":

+                    Application.SetSuspendState(PowerState.Suspend, true, true);

+                    break;

+                case "Hibernate":

+                    Application.SetSuspendState(PowerState.Hibernate, true, true);

+                    break;

+                case "Lock System":

+                    Win32.LockWorkStation();

+                    break;

+                case "Quit HandBrake":

+                    Application.Exit();

+                    break;

+                default:

+                    break;

+            }

+        }

+

+        /// <summar>

+        /// Append the CLI query to the start of the log file.

+        /// </summary>

+        /// <param name="query"></param>

+        public void addCLIQueryToLog(string query)

+        {

+            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

+            string logPath = Path.Combine(logDir, "last_encode_log.txt");

+

+            StreamReader reader = new StreamReader(File.Open(logPath, FileMode.Open, FileAccess.Read, FileShare.Read));

+            String log = reader.ReadToEnd();

+            reader.Close();

+

+            StreamWriter writer = new StreamWriter(File.Create(logPath));

+

+            writer.Write("### CLI Query: " + query + "\n\n");

+            writer.Write("#########################################\n\n");

+            writer.WriteLine(log);

+            writer.Flush();

+            writer.Close();

+        }

+

+        /// <summary>

+        /// Save a copy of the log to the users desired location or a default location

+        /// if this feature is enabled in options.

+        /// </summary>

+        /// <param name="destination"></param>

+        public void copyLog(string destination)

+        {

+            try

+            {

+                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

+                string tempLogFile = Path.Combine(logDir, "last_encode_log.txt");

+

+                string encodeDestinationPath = Path.GetDirectoryName(destination);

+                String destinationFile = Path.GetFileName(destination);

+                string encodeLogFile = destinationFile + " " + DateTime.Now.ToString().Replace("/", "-").Replace(":", "-") + ".txt";

+

+                // Make sure the log directory exists.

+                if (!Directory.Exists(logDir))

+                    Directory.CreateDirectory(logDir);

+

+                // Copy the Log to HandBrakes log folder in the users applciation data folder.

+                File.Copy(tempLogFile, Path.Combine(logDir, encodeLogFile));

+

+                // Save a copy of the log file in the same location as the enocde.

+                if (Properties.Settings.Default.saveLogWithVideo)

+                    File.Copy(tempLogFile, Path.Combine(encodeDestinationPath, encodeLogFile));

+

+                // Save a copy of the log file to a user specified location

+                if (Directory.Exists(Properties.Settings.Default.saveLogPath))

+                    if (Properties.Settings.Default.saveLogPath != String.Empty && Properties.Settings.Default.saveLogToSpecifiedPath)

+                        File.Copy(tempLogFile, Path.Combine(Properties.Settings.Default.saveLogPath, encodeLogFile));

+            }

+            catch (Exception exc)

+            {

+                MessageBox.Show("Something went a bit wrong trying to copy your log file.\nError Information:\n\n" + exc, "Error",

+                                MessageBoxButtons.OK, MessageBoxIcon.Error);

+            }

+        }

+        #endregion

     }

 }
\ No newline at end of file