diff options
author | sr55 <[email protected]> | 2009-11-25 22:59:39 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2009-11-25 22:59:39 +0000 |
commit | 89e90f79675f8742b5b96b5eaae01367baf76c2f (patch) | |
tree | d7d61378d8d35e8cce2a53a7fada42412107a440 /win/C#/frmActivityWindow.cs | |
parent | 4bff40cd0865f37bbc8680883e1db0e22d9247c7 (diff) |
WinGui:
- Large performance improvements in the Activity Window when working with large log files. This should make the window less laggy when using batch folder scan.
- New scan process handling code which pipes the data direct into the application. GUI now displays "Scanning title x of x" to give the user feedback on the process.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2983 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmActivityWindow.cs')
-rw-r--r-- | win/C#/frmActivityWindow.cs | 265 |
1 files changed, 127 insertions, 138 deletions
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs index 9f9f41128..9e261700f 100644 --- a/win/C#/frmActivityWindow.cs +++ b/win/C#/frmActivityWindow.cs @@ -6,6 +6,7 @@ using System;
using System.ComponentModel;
+using System.Text;
using System.Windows.Forms;
using System.IO;
using System.Threading;
@@ -18,130 +19,113 @@ namespace Handbrake {
public partial class frmActivityWindow : Form
{
- private delegate void setTextCallback(string text);
- private String _readFile;
- private readonly EncodeAndQueueHandler _encodeQueue;
- private int _position; // Position in the arraylist reached by the current log output in the rtf box.
- private readonly frmMain _mainWin;
- private Boolean _lastUpdate;
- private Boolean fileNotFoundQuickFix;
+ private delegate void setTextCallback(StringBuilder text);
+ private delegate void setTextClearCallback();
+ private static int _position;
+ private static string _lastMode;
+ private static string _currentMode;
- public frmActivityWindow(string file, EncodeAndQueueHandler eh, frmMain mw)
+ public frmActivityWindow()
{
InitializeComponent();
+ }
+ private void NewActivityWindow_Load(object sender, EventArgs e)
+ {
+ SetScanMode();
+ Thread monitor = new Thread(LogMonitor);
- _encodeQueue = eh;
- _mainWin = mw;
-
- fileNotFoundQuickFix = false;
-
- if (file == "last_scan_log.txt")
- SetLogView(true);
- else
- SetLogView(false);
-
- // Start a new thread which will montior and keep the log window up to date if required/
try
{
- Thread monitor = new Thread(AutoUpdate) { IsBackground = true };
monitor.Start();
}
catch (Exception exc)
{
- MessageBox.Show("startLogThread(): Exception: \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show(exc.ToString());
}
}
- /// <summary>
- /// Set the view which the Log window displays.
- /// Scan = true;
- /// Encode = false;
- /// </summary>
- /// <param name="scan">Boolean. Scan = true</param>
- public void SetLogView(Boolean scan)
+ private void LogMonitor()
{
- // Reset
- _position = 0;
- rtf_actLog.Text = String.Empty;
+ while (true)
+ {
+ // Perform a reset if require.
+ // If we have switched to a different log file, we want to start from the beginning.
+ if (SetLogFile != _lastMode)
+ {
+ _position = 0;
+ ClearWindowText();
+ }
- // Print the log header
- 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", getCpuCount()));
- rtf_actLog.AppendText(String.Format("### Ram: {0} MB \n", TotalPhysicalMemory()));
- rtf_actLog.AppendText(String.Format("### Screen: {0}x{1} \n", screenBounds().Bounds.Width, 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");
+ // 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;
+ }
- // Seutp the log file
- if (scan)
- {
- txt_log.Text = "Scan Log";
- _readFile = "last_scan_log.txt";
+ Thread.Sleep(1000);
}
- else
- {
- _readFile = "last_encode_log.txt";
- txt_log.Text = "Encode Log";
- if (_encodeQueue.isEncoding)
- if ((!_encodeQueue.LastEncode.IsEmpty) && _encodeQueue.LastEncode.Query != String.Empty)
- {
- rtf_actLog.AppendText("### CLI Query: " + _encodeQueue.LastEncode.Query + "\n");
- rtf_actLog.AppendText("### Custom Query: " + _encodeQueue.LastEncode.CustomQuery + "\n\n");
- rtf_actLog.AppendText("#########################################\n\n");
- }
- }
- _lastUpdate = false;
}
-
- private void AutoUpdate(object state)
+ private StringBuilder ReadFile(string file)
{
+ StringBuilder appendText = new StringBuilder();
+
+ // 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
{
- _lastUpdate = false;
- UpdateTextFromThread();
- while (true)
+ // 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
{
- if (IsHandleCreated)
- {
- if (_encodeQueue.isEncoding || _mainWin.isScanning)
- UpdateTextFromThread();
- else
- {
- // The encode may just have stoped, so, refresh the log one more time before restarting it.
- if (_lastUpdate == false)
- UpdateTextFromThread();
+ appendText.AppendFormat("Waiting for the log file to be generated ...\n");
+ _position = 0;
+ ClearWindowText();
+ return appendText;
+ }
- _lastUpdate = true; // Prevents the log window from being updated when there is no encode going.
- _position = 0; // There is no encoding, so reset the log position counter to 0 so it can be reused
- }
+ // 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++;
}
- Thread.Sleep(1000);
+ i++;
}
- }
- catch (Exception exc)
- {
- MessageBox.Show("AutoUpdate(): Exception: \n" + exc);
- }
- }
- private void UpdateTextFromThread()
- {
- try
- {
- String info = ReadFile();
- if (info.Contains("has exited"))
- info += "\n ############ End of Log ############## \n";
+ sr.Close();
+ sr.Dispose();
- SetText(info);
}
catch (Exception exc)
{
- MessageBox.Show("UpdateTextFromThread(): Exception: \n" + exc);
+ appendText.AppendFormat("\nERROR: The Log file could not be read. You may need to restart HandBrake! " + exc);
+ _position = 0;
+ ClearWindowText();
}
+ return appendText;
}
- private void SetText(string text)
+ private void AppendWindowText(StringBuilder text)
{
try
{
@@ -149,74 +133,73 @@ namespace Handbrake {
if (rtf_actLog.InvokeRequired)
{
- IAsyncResult invoked = BeginInvoke(new setTextCallback(SetText), new object[] { text });
+ IAsyncResult invoked = BeginInvoke(new setTextCallback(AppendWindowText), new object[] { text });
EndInvoke(invoked);
}
else
- rtf_actLog.AppendText(text);
+ rtf_actLog.AppendText(text.ToString());
}
}
catch (Exception exc)
{
- MessageBox.Show("SetText(): Exception: \n" + exc);
+ MessageBox.Show("SetWindowText(): Exception: \n" + exc);
}
}
- private String ReadFile()
+ private void ClearWindowText()
{
- String appendText = String.Empty;
try
{
- // 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, _readFile);
- string logFile2 = Path.Combine(logDir, "tmp_appReadable_log.txt");
-
- // 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
- {
- if (fileNotFoundQuickFix)
- return "";
- fileNotFoundQuickFix = true;
- return "\n\n\nERROR: The log file could not be found. \nMaybe you cleared your system's tempory folder or maybe you just havn't run an encode yet. \nTried to find the log file in: " + logFile;
- }
-
- StreamReader sr = new StreamReader(logFile2);
- string line;
- int i = 1;
- while ((line = sr.ReadLine()) != null)
+ if (IsHandleCreated)
{
- if (i > _position)
+ if (rtf_actLog.InvokeRequired)
{
- appendText += line + Environment.NewLine;
- _position++;
+ IAsyncResult invoked = BeginInvoke(new setTextClearCallback(ClearWindowText));
+ EndInvoke(invoked);
}
- i++;
+ else
+ rtf_actLog.Clear();
}
- sr.Close();
- sr.Dispose();
-
- return appendText;
}
catch (Exception exc)
{
- return "Error in ReadFile() \n Unable to read the log file.\n You may have to restart HandBrake. Will try reading the file again in a few seconds... \n Error Information: \n\n" + exc;
+ MessageBox.Show("ClearWindowText(): Exception: \n" + exc);
}
}
- protected override void OnClosing(CancelEventArgs e)
+ public void PrintLogHeader()
{
- e.Cancel = true;
- this.Hide();
- base.OnClosing(e);
+ // 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", getCpuCount()));
+ rtf_actLog.AppendText(String.Format("### Ram: {0} MB \n", TotalPhysicalMemory()));
+ rtf_actLog.AppendText(String.Format("### Screen: {0}x{1} \n", screenBounds().Bounds.Width, 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");
}
+ #region Public
+
+ public string SetLogFile
+ {
+ get { return string.IsNullOrEmpty(_currentMode) ? "" : _currentMode; }
+ set { _currentMode = value; }
+ }
+ public void SetScanMode()
+ {
+ SetLogFile = "last_scan_log.txt";
+ this.Text = "Activity Window (Scan Log)";
+ }
+ public void SetEncodeMode()
+ {
+ 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)
{
@@ -243,11 +226,11 @@ namespace Handbrake }
private void btn_scan_log_Click(object sender, EventArgs e)
{
- SetLogView(true);
+ SetScanMode();
}
private void btn_encode_log_Click(object sender, EventArgs e)
{
- SetLogView(false);
+ SetEncodeMode();
}
#endregion
@@ -288,5 +271,11 @@ namespace Handbrake }
#endregion
+ protected override void OnClosing(CancelEventArgs e)
+ {
+ e.Cancel = true;
+ this.Hide();
+ base.OnClosing(e);
+ }
}
}
\ No newline at end of file |