X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=613a1a4c2c31a912d16abb5fa1f0940996703642;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=07e8f3dc8681816d17f85839fb5657c88aa8cd2d;hpb=bbadff781cdcb5c4676d26141c493939ea28b769;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs index 07e8f3dc..613a1a4c 100644 --- a/win/C#/frmActivityWindow.cs +++ b/win/C#/frmActivityWindow.cs @@ -1,8 +1,7 @@ /* frmActivityWindow.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ + This file is part of the HandBrake source code. + Homepage: . + It may be used under the terms of the GNU General Public License. */ namespace Handbrake { @@ -14,111 +13,280 @@ namespace Handbrake using System.Threading; using System.Windows.Forms; using Functions; + using Model; + using Services; using Timer = System.Threading.Timer; + /// + /// The Activity Log Window + /// public partial class frmActivityWindow : Form { + /* Private Variables */ + + /// + /// The current position in the log file + /// + private int position; + + /// + /// A Timer for this window + /// + private Timer windowTimer; + + /// + /// The Encode Object + /// + private Encode encode; + + /// + /// The Scan Object + /// + private ScanService scan; + + /// + /// The Type of log that the window is currently dealing with + /// + private ActivityLogMode mode; + + /* Constructor */ + + /// + /// Initializes a new instance of the class. + /// + /// + /// The encode. + /// + /// + /// The scan. + /// + 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 */ + + /// + /// A callback function for updating the ui + /// + /// + /// The text. + /// private delegate void SetTextCallback(StringBuilder text); + /// + /// Clear text callback + /// private delegate void SetTextClearCallback(); - private int Position; - private string LastMode; - private string CurrentMode; - private Timer WindowTimer; + /// + /// Set mode callback + /// + /// + /// The set mode. + /// + private delegate void SetModeCallback(ActivityLogMode setMode); - public frmActivityWindow(string mode) + /* Private Methods */ + + /// + /// Set the window to scan mode + /// + /// + /// The set Mode. + /// + 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); + } + } } + /// + /// On Window load, start a new timer + /// + /// + /// The sender. + /// + /// + /// The e. + /// 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) + /// + /// Set the Log window to encode mode when an encode starts. + /// + /// + /// The sender. + /// + /// + /// The e. + /// + 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; - } + /// + /// Set the log widow to scan mode when a scan starts + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void scan_ScanStared(object sender, EventArgs e) + { + SetMode(ActivityLogMode.Scan); + } + + /// + /// Stop refreshing the window when no scanning or encoding is happening. + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void stopWindowRefresh(object sender, EventArgs e) + { + windowTimer.Dispose(); + LogMonitor(null); + } + + /// + /// Append new text to the window + /// + /// + /// The n. + /// + private void LogMonitor(object n) + { + AppendWindowText(GetLog()); } - private StringBuilder ReadFile(string file) + /// + /// New Code for getting the Activity log from the Services rather than reading a file. + /// + /// + /// The StringBuilder containing a log + /// + 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; - } + appendText.AppendFormat("Waiting for the log 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(); + using (StringReader reader = new StringReader(scan.ActivityLog)) + { + LogReader(reader, appendText); } - catch (Exception) + } + 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; } + /// + /// Reads the log data from a Scan or Encode object + /// + /// + /// The reader. + /// + /// + /// The append text. + /// + 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++; + } + } + + /// + /// Append text to the RTF box + /// + /// + /// The text. + /// private void AppendWindowText(StringBuilder text) { try @@ -127,12 +295,18 @@ namespace Handbrake { if (rtf_actLog.InvokeRequired) { - IAsyncResult invoked = BeginInvoke(new SetTextCallback(AppendWindowText), new object[] {text}); + IAsyncResult invoked = BeginInvoke(new SetTextCallback(AppendWindowText), new object[] { text }); EndInvoke(invoked); } 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) @@ -141,6 +315,9 @@ namespace Handbrake } } + /// + /// Clear the contents of the log window + /// private void ClearWindowText() { try @@ -163,6 +340,9 @@ namespace Handbrake } } + /// + /// Display the log header + /// private void PrintLogHeader() { try @@ -179,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()); } } } @@ -202,48 +382,45 @@ namespace Handbrake } } + /// + /// Reset Everything + /// 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); + windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000); } - #region Public - - public string SetLogFile - { - get { return string.IsNullOrEmpty(CurrentMode) ? string.Empty : CurrentMode; } - set { CurrentMode = value; } - } + /* Menus and Buttons */ - public void SetScanMode() - { - Reset(); - SetLogFile = "last_scan_log.txt"; - this.Text = "Activity Window (Scan Log)"; - } - - public void SetEncodeMode() - { - Reset(); - SetLogFile = "last_encode_log.txt"; - this.Text = "Activity Window (Enocde Log)"; - } - - #endregion - - #region User Interface - - private void mnu_copy_log_Click(object sender, EventArgs e) + /// + /// Copy log to clipboard + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuCopyLogClick(object sender, EventArgs e) { Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true); } - private void mnu_openLogFolder_Click(object sender, EventArgs e) + /// + /// Open the log folder + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void MnuOpenLogFolderClick(object sender, EventArgs e) { string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs"; string windir = Environment.GetEnvironmentVariable("WINDIR"); @@ -251,33 +428,72 @@ namespace Handbrake { StartInfo = { - FileName = windir + @"\explorer.exe", + FileName = windir + @"\explorer.exe", Arguments = logDir } }; prc.Start(); } - private void btn_copy_Click(object sender, EventArgs e) + /// + /// Copy the log + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void BtnCopyClick(object sender, EventArgs e) { Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true); } - private void btn_scan_log_Click(object sender, EventArgs e) + /// + /// Set scan mode + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void BtnScanLogClick(object sender, EventArgs e) { - SetScanMode(); + SetMode(ActivityLogMode.Scan); } - private void btn_encode_log_Click(object sender, EventArgs e) + /// + /// Set the encode mode + /// + /// + /// The sender. + /// + /// + /// The e. + /// + private void BtnEncodeLogClick(object sender, EventArgs e) { - SetEncodeMode(); + SetMode(ActivityLogMode.Encode); } - #endregion + /* Overrides */ + /// + /// override onclosing + /// + /// + /// The e. + /// 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);