X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=613a1a4c2c31a912d16abb5fa1f0940996703642;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=a4d5cd2159946067f1b6c031accff633661599d4;hpb=3045a93c249f15a001e9bbf81ec79b6c985545ac;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index a4d5cd21..613a1a4c 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -1,120 +1,292 @@
 /*  frmActivityWindow.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.ComponentModel;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Threading;
-using Handbrake.Functions;
-using Timer = System.Threading.Timer;
+    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. */
 
 namespace Handbrake
 {
+    using System;
+    using System.ComponentModel;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Text;
+    using System.Threading;
+    using System.Windows.Forms;
+    using Functions;
+    using Model;
+    using Services;
+    using Timer = System.Threading.Timer;
+
+    /// <summary>
+    /// The Activity Log Window
+    /// </summary>
     public partial class frmActivityWindow : Form
     {
+        /* Private Variables */
+
+        /// <summary>
+        /// The current position in the log file
+        /// </summary>
+        private int position;
+
+        /// <summary>
+        /// A Timer for this window
+        /// </summary>
+        private Timer windowTimer;
+
+        /// <summary>
+        /// The Encode Object
+        /// </summary>
+        private Encode encode;
+
+        /// <summary>
+        /// The Scan Object
+        /// </summary>
+        private ScanService scan;
+
+        /// <summary>
+        /// The Type of log that the window is currently dealing with
+        /// </summary>
+        private ActivityLogMode mode;
+
+        /* Constructor */
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="frmActivityWindow"/> class.
+        /// </summary>
+        /// <param name="encode">
+        /// The encode.
+        /// </param>
+        /// <param name="scan">
+        /// The scan.
+        /// </param>
+        public frmActivityWindow(Encode encode, ScanService scan)
+        {
+            InitializeComponent();
+
+            this.encode = encode;
+            this.scan = scan;
+            this.position = 0;
+
+            // Listen for Scan and Encode Starting Events
+            scan.ScanStared += scan_ScanStared;
+            encode.EncodeStarted += encode_EncodeStarted;
+        }
+
+        /* Delegates */
+
+        /// <summary>
+        /// A callback function for updating the ui
+        /// </summary>
+        /// <param name="text">
+        /// The text.
+        /// </param>
         private delegate void SetTextCallback(StringBuilder text);
+
+        /// <summary>
+        /// Clear text callback
+        /// </summary>
         private delegate void SetTextClearCallback();
-        private int Position;
-        private string LastMode;
-        private string CurrentMode;
-        private Timer WindowTimer;
- 
-        public frmActivityWindow(string mode)
+
+        /// <summary>
+        /// Set mode callback
+        /// </summary>
+        /// <param name="setMode">
+        /// The set mode.
+        /// </param>
+        private delegate void SetModeCallback(ActivityLogMode setMode);
+
+        /* Private Methods */
+
+        /// <summary>
+        /// Set the window to scan mode
+        /// </summary>
+        /// <param name="setMode">
+        /// The set Mode.
+        /// </param>
+        private void SetMode(ActivityLogMode setMode)
         {
-            InitializeComponent();
+            if (IsHandleCreated)
+            {
+                if (rtf_actLog.InvokeRequired)
+                {
+                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] {setMode});
+                    EndInvoke(invoked);
+                }
+                else
+                {
+                    Reset();
+                    this.mode = setMode;
 
-            Position = 0;
-            if (mode == "scan")
-                SetScanMode();
-            else
-                SetEncodeMode();
+                    Array values = Enum.GetValues(typeof(ActivityLogMode));
+                    Properties.Settings.Default.ActivityWindowLastMode = (int) values.GetValue(Convert.ToInt32(setMode));
+                    Properties.Settings.Default.Save();
+
+                    this.Text = mode == ActivityLogMode.Scan
+                                    ? "Activity Window (Scan Log)"
+                                    : "Activity Window (Encode Log)";
+
+                    if (mode == ActivityLogMode.Scan)
+                    {
+                        scan.ScanCompleted += stopWindowRefresh;
+                        encode.EncodeEnded -= stopWindowRefresh;
+                    }
+                    else
+                    {
+                        scan.ScanCompleted -= stopWindowRefresh;
+                        encode.EncodeEnded += stopWindowRefresh;
+                    }
+
+                    // Start a fresh window timer
+                    windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
+                }
+            }
         }
 
+        /// <summary>
+        /// On Window load, start a new timer
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
         private void NewActivityWindow_Load(object sender, EventArgs e)
         {
-            WindowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
+            ActivityLogMode activitLogMode = (ActivityLogMode) Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);
+            SetMode(activitLogMode);        
         }
 
-        private void LogMonitor(object n)
+        /// <summary>
+        /// Set the Log window to encode mode when an encode starts.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void encode_EncodeStarted(object sender, EventArgs e)
         {
-            if (SetLogFile != LastMode) Reset();
+            SetMode(ActivityLogMode.Encode);
+        }
 
-            // Perform the window update
-            switch (SetLogFile)
-            {
-                case "last_scan_log.txt":
-                    AppendWindowText(ReadFile("last_scan_log.txt"));
-                    LastMode = "last_scan_log.txt";
-                    break;
-                case "last_encode_log.txt":
-                    AppendWindowText(ReadFile("last_encode_log.txt"));
-                    LastMode = "last_encode_log.txt";
-                    break;
-            }
+        /// <summary>
+        /// Set the log widow to scan mode when a scan starts
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void scan_ScanStared(object sender, EventArgs e)
+        {
+            SetMode(ActivityLogMode.Scan);
+        }
+
+        /// <summary>
+        /// Stop refreshing the window when no scanning or encoding is happening.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void stopWindowRefresh(object sender, EventArgs e)
+        {
+            windowTimer.Dispose();
+            LogMonitor(null);
         }
-        private StringBuilder ReadFile(string file)
+
+        /// <summary>
+        /// Append new text to the window
+        /// </summary>
+        /// <param name="n">
+        /// The n.
+        /// </param>
+        private void LogMonitor(object n)
+        {
+            AppendWindowText(GetLog());
+        }
+
+        /// <summary>
+        /// New Code for getting the Activity log from the Services rather than reading a file.
+        /// </summary>
+        /// <returns>
+        /// The StringBuilder containing a log
+        /// </returns>
+        private StringBuilder GetLog()
         {
             StringBuilder appendText = new StringBuilder();
-            lock (this)
+
+            if (this.mode == ActivityLogMode.Scan)
             {
-                // last_encode_log.txt is the primary log file. Since .NET can't read this file whilst the CLI is outputing to it (Not even in read only mode),
-                // we'll need to make a copy of it.
-                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
-                                "\\HandBrake\\logs";
-                string logFile = Path.Combine(logDir, file);
-                string logFile2 = Path.Combine(logDir, "tmp_appReadable_log.txt");
-
-                try
+                if (scan == null || scan.ActivityLog == string.Empty)
                 {
-                    // Make sure the application readable log file does not already exist. FileCopy fill fail if it does.
-                    if (File.Exists(logFile2))
-                        File.Delete(logFile2);
-
-                    // Copy the log file.
-                    if (File.Exists(logFile))
-                        File.Copy(logFile, logFile2, true);
-                    else
-                    {
-                        appendText.AppendFormat("Waiting for the log file to be generated ...\n");
-                        Position = 0;
-                        ClearWindowText();
-                        PrintLogHeader();
-                        return appendText;
-                    }
-
-                    // Start the Reader
-                    // Only use text which continues on from the last read line
-                    StreamReader sr = new StreamReader(logFile2);
-                    string line;
-                    int i = 1;
-                    while ((line = sr.ReadLine()) != null)
-                    {
-                        if (i > Position)
-                        {
-                            appendText.AppendLine(line);
-                            Position++;
-                        }
-                        i++;
-                    }
-                    sr.Close();
-                    sr.Dispose();
+                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                    position = 0;
+                    ClearWindowText();
+                    PrintLogHeader();
+                    return appendText;
+                }
 
+                using (StringReader reader = new StringReader(scan.ActivityLog))
+                {
+                    LogReader(reader, appendText);
                 }
-                catch (Exception exc)
+            }
+            else
+            {
+                if (encode == null || encode.ActivityLog == string.Empty)
                 {
-                    Reset();
-                    appendText = new StringBuilder();
-                    appendText.AppendFormat(
-                        "\nThe Log file is currently in use. Waiting for the log file to become accessible ...\n");
+                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                    position = 0;
+                    ClearWindowText();
+                    PrintLogHeader();
+                    return appendText;
+                }
+
+                using (StringReader reader = new StringReader(encode.ActivityLog))
+                {
+                    LogReader(reader, appendText);
                 }
             }
             return appendText;
         }
+
+        /// <summary>
+        /// Reads the log data from a Scan or Encode object
+        /// </summary>
+        /// <param name="reader">
+        /// The reader.
+        /// </param>
+        /// <param name="appendText">
+        /// The append text.
+        /// </param>
+        private void LogReader(StringReader reader, StringBuilder appendText)
+        {
+            string line;
+            int i = 1;
+            while ((line = reader.ReadLine()) != null)
+            {
+                if (i > position)
+                {
+                    appendText.AppendLine(line);
+                    position++;
+                }
+                i++;
+            }
+        }
+
+        /// <summary>
+        /// Append text to the RTF box
+        /// </summary>
+        /// <param name="text">
+        /// The text.
+        /// </param>
         private void AppendWindowText(StringBuilder text)
         {
             try
@@ -129,6 +301,12 @@ namespace Handbrake
                     else
                         lock (rtf_actLog)
                             rtf_actLog.AppendText(text.ToString());
+
+                    // Stop the refresh process if log has finished.
+                    if (text.ToString().Contains("HandBrake has Exited"))
+                    {
+                        windowTimer.Dispose();
+                    }
                 }
             }
             catch (Exception)
@@ -136,6 +314,10 @@ namespace Handbrake
                 return;
             }
         }
+
+        /// <summary>
+        /// Clear the contents of the log window
+        /// </summary>
         private void ClearWindowText()
         {
             try
@@ -148,7 +330,7 @@ namespace Handbrake
                         EndInvoke(invoked);
                     }
                     else
-                        lock(rtf_actLog)
+                        lock (rtf_actLog)
                             rtf_actLog.Clear();
                 }
             }
@@ -157,6 +339,10 @@ namespace Handbrake
                 return;
             }
         }
+
+        /// <summary>
+        /// Display the log header
+        /// </summary>
         private void PrintLogHeader()
         {
             try
@@ -173,19 +359,19 @@ namespace Handbrake
                         lock (rtf_actLog)
                         {
                             // Print the log header. This function will be re-implimented later. Do not delete.
-                            rtf_actLog.AppendText(String.Format("### Windows GUI {1} {0} \n",
-                                                                Properties.Settings.Default.hb_build,
-                                                                Properties.Settings.Default.hb_version));
-                            rtf_actLog.AppendText(String.Format("### Running: {0} \n###\n", Environment.OSVersion));
-                            rtf_actLog.AppendText(String.Format("### CPU: {0} \n", SystemInfo.GetCpuCount));
-                            rtf_actLog.AppendText(String.Format("### Ram: {0} MB \n", SystemInfo.TotalPhysicalMemory));
-                            rtf_actLog.AppendText(String.Format("### Screen: {0}x{1} \n",
-                                                                SystemInfo.ScreenBounds.Bounds.Width,
-                                                                SystemInfo.ScreenBounds.Bounds.Height));
-                            rtf_actLog.AppendText(String.Format("### Temp Dir: {0} \n", Path.GetTempPath()));
-                            rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));
-                            rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));
-                            rtf_actLog.AppendText("#########################################\n\n");
+                            StringBuilder header = new StringBuilder();
+
+                            header.Append(String.Format("### Windows GUI {1} {0} \n", Properties.Settings.Default.hb_build, Properties.Settings.Default.hb_version));
+                            header.Append(String.Format("### Running: {0} \n###\n", Environment.OSVersion));
+                            header.Append(String.Format("### CPU: {0} \n", SystemInfo.GetCpuCount));
+                            header.Append(String.Format("### Ram: {0} MB \n", SystemInfo.TotalPhysicalMemory));
+                            header.Append(String.Format("### Screen: {0}x{1} \n", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
+                            header.Append(String.Format("### Temp Dir: {0} \n", Path.GetTempPath()));
+                            header.Append(String.Format("### Install Dir: {0} \n", Application.StartupPath));
+                            header.Append(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));
+                            header.Append("#########################################\n\n");
+
+                            rtf_actLog.AppendText(header.ToString());
                         }
                     }
                 }
@@ -194,76 +380,120 @@ namespace Handbrake
             {
                 return;
             }
-
         }
+
+        /// <summary>
+        /// Reset Everything
+        /// </summary>
         private void Reset()
         {
-            if (WindowTimer != null)
-                WindowTimer.Dispose();
-            Position = 0;
+            if (windowTimer != null)
+                windowTimer.Dispose();
+            position = 0;
             ClearWindowText();
-            PrintLogHeader(); 
-            WindowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
+            PrintLogHeader();
+            windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
         }
 
-        #region Public
+        /* Menus and Buttons */
 
-        public string SetLogFile
-        {
-            get { return string.IsNullOrEmpty(CurrentMode) ? "" : CurrentMode; }
-            set { CurrentMode = value; }
-        }
-        public void SetScanMode()
-        {
-            Reset();
-            SetLogFile = "last_scan_log.txt";
-            this.Text = "Activity Window (Scan Log)";
-        }
-        public void SetEncodeMode()
+        /// <summary>
+        /// Copy log to clipboard
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void MnuCopyLogClick(object sender, EventArgs e)
         {
-            Reset();
-            SetLogFile = "last_encode_log.txt";
-            this.Text = "Activity Window (Enocde Log)";
+            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
         }
 
-        #endregion
-
-        #region User Interface
-        private void mnu_copy_log_Click(object sender, EventArgs e)
-        {
-            Clipboard.SetDataObject(rtf_actLog.SelectedText != "" ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
-        }
-        private void mnu_openLogFolder_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Open the log folder
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void MnuOpenLogFolderClick(object sender, EventArgs e)
         {
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
             string windir = Environment.GetEnvironmentVariable("WINDIR");
-            System.Diagnostics.Process prc = new System.Diagnostics.Process
-                                                 {
-                                                     StartInfo =
-                                                         {
-                                                             FileName = windir + @"\explorer.exe",
-                                                             Arguments = logDir
-                                                         }
-                                                 };
+            Process prc = new Process
+                              {
+                                  StartInfo =
+                                      {
+                                          FileName = windir + @"\explorer.exe",
+                                          Arguments = logDir
+                                      }
+                              };
             prc.Start();
         }
-        private void btn_copy_Click(object sender, EventArgs e)
+
+        /// <summary>
+        /// Copy the log
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnCopyClick(object sender, EventArgs e)
         {
-            Clipboard.SetDataObject(rtf_actLog.SelectedText != "" ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
+            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
         }
-        private void btn_scan_log_Click(object sender, EventArgs e)
+
+        /// <summary>
+        /// Set scan mode
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnScanLogClick(object sender, EventArgs e)
         {
-            SetScanMode();
+            SetMode(ActivityLogMode.Scan);
         }
-        private void btn_encode_log_Click(object sender, EventArgs e)
+
+        /// <summary>
+        /// Set the encode mode
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnEncodeLogClick(object sender, EventArgs e)
         {
-            SetEncodeMode();
+            SetMode(ActivityLogMode.Encode);
         }
-        #endregion
 
+        /* Overrides */
+
+        /// <summary>
+        /// override onclosing
+        /// </summary>
+        /// <param name="e">
+        /// The e.
+        /// </param>
         protected override void OnClosing(CancelEventArgs e)
         {
-            WindowTimer.Dispose();
+            scan.ScanStared -= scan_ScanStared;
+            encode.EncodeStarted -= encode_EncodeStarted;
+
+            scan.ScanCompleted -= stopWindowRefresh;
+            encode.EncodeEnded -= stopWindowRefresh;
+
+            windowTimer.Dispose();
             e.Cancel = true;
             this.Dispose();
             base.OnClosing(e);