X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=9509500a61036066dc2b4ba7154f7912baf044cb;hb=b4464b6d962bb939a8f38b4d50057c441ab48111;hp=d21eecd51cd934418a9aaa5c429721c101565d49;hpb=d388b5ce1f840eaad25a2c9ccdbcce862b72f988;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index d21eecd5..9509500a 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -5,17 +5,12 @@
  	   It may be used under the terms of the GNU General Public License. */
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.IO;
 using System.Threading;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
+using Handbrake.EncodeQueue;
+using Handbrake.Functions;
 using Microsoft.Win32;
 
 
@@ -23,49 +18,55 @@ namespace Handbrake
 {
     public partial class frmActivityWindow : Form
     {
-        delegate void SetTextCallback(string text);
-        String read_file;
-        Thread monitor;
-        frmMain mainWindow;
-        frmQueue queueWindow;
-        int position = 0;  // Position in the arraylist reached by the current log output in the rtf box.
-
-        /// <summary>
-        /// This window should be used to display the RAW output of the handbrake CLI which is produced during an encode.
-        /// </summary>
-        public frmActivityWindow(string file, frmMain fm, frmQueue fq)
+        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;
+
+        public frmActivityWindow(string file, EncodeAndQueueHandler eh, frmMain mw)
         {
             InitializeComponent();
-            this.rtf_actLog.Text = string.Empty;
-
-            // When the window closes, we want to abort the monitor thread.
-            this.Disposed += new EventHandler(forceQuit);
 
-            mainWindow = fm;
-            queueWindow = fq;
-            read_file = file;
-            position = 0;
+            _encodeQueue = eh;
+            _mainWin = mw;
 
-            // Print the Log header in the Rich text box.
-            displayLogHeader();
+            fileNotFoundQuickFix = false;
 
-            if (file == "dvdinfo.dat")
-                txt_log.Text = "Scan Log";
-            else if (file == "hb_encode_log.dat")
-                txt_log.Text = "Encode Log";
+            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/
-            startLogThread(read_file);            
+            try
+            {
+                Thread monitor = new Thread(AutoUpdate) { IsBackground = true };
+                monitor.Start();
+            }
+            catch (Exception exc)
+            {
+                MessageBox.Show("startLogThread(): Exception: \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
 
         /// <summary>
-        /// Displays the Log header
+        /// Set the view which the Log window displays.
+        /// Scan = true;
+        /// Encode = false;
         /// </summary>
-        private void displayLogHeader()
+        /// <param name="scan">Boolean. Scan = true</param>
+        public void SetLogView(Boolean scan)
         {
-            // Add a header to the log file indicating that it's from the Windows GUI and display the windows version
+            // Reset
+            _position = 0;
+            rtf_actLog.Text = String.Empty;
+
+            // 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.ToString()));
+            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));
@@ -73,167 +74,84 @@ namespace Handbrake
             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");
-        }
-
-        /// <summary>
-        /// Starts a new thread which runs the autoUpdate function.
-        /// </summary>
-        /// <param name="file"> File which will be used to populate the Rich text box.</param>
-        private void startLogThread(string file)
-        {
-            try
+            if ((!_encodeQueue.LastEncode.IsEmpty) && _encodeQueue.LastEncode.Query != String.Empty)
             {
-                string logFile = Path.Combine(Path.GetTempPath(), file);
-                if (File.Exists(logFile))
-                {
-                    // Start a new thread to run the autoUpdate process
-                    monitor = new Thread(autoUpdate);
-                    monitor.IsBackground = true;
-                    monitor.Start();
-                }
-                else
-                    rtf_actLog.AppendText("\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);
-
+                rtf_actLog.AppendText("### CLI Query: " + _encodeQueue.LastEncode.Query + "\n\n");
+                rtf_actLog.AppendText("#########################################\n\n");
             }
-            catch (Exception exc)
+
+            // Seutp the log file
+            if (scan)
             {
-                MessageBox.Show("startLogThread(): Exception: \n" + exc);
+                txt_log.Text = "Scan Log";
+                _readFile = "last_scan_log.txt";
             }
-        }
-
-        /// <summary>
-        /// Change the log file to be displayed to hb_encode_log.dat
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btn_scan_log_Click(object sender, EventArgs e)
-        {
-            if (monitor != null)
-                monitor.Abort();
-
-            rtf_actLog.Clear();
-            read_file = "dvdinfo.dat";
-            displayLogHeader();
-            startLogThread(read_file);
-            txt_log.Text = "Scan Log";
-        }
-
-        /// <summary>
-        /// Change the log file to be displayed to dvdinfo.dat
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btn_encode_log_Click(object sender, EventArgs e)
-        {
-            if (monitor != null)
-                monitor.Abort();
-
-            rtf_actLog.Clear();
-            read_file = "hb_encode_log.dat";
-            position = 0;
-            displayLogHeader();
-            startLogThread(read_file);
-            txt_log.Text = "Encode Log";
-        }
-
-        /// <summary>
-        /// Copy to Clipboard
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btn_copy_Click(object sender, EventArgs e)
-        {
-            if (rtf_actLog.SelectedText != "")
-                Clipboard.SetDataObject(rtf_actLog.SelectedText, true);
             else
-                Clipboard.SetDataObject(rtf_actLog.Text, true);
+            {
+                _readFile = "last_encode_log.txt";
+                txt_log.Text = "Encode Log";
+            }
+            _lastUpdate = false;
         }
 
-        /// <summary>
-        /// Updates the log window with any new data which is in the log file.
-        /// This is done every 5 seconds.
-        /// </summary>
-        /// <param name="state"></param>
-        private void autoUpdate(object state)
+        private void AutoUpdate(object state)
         {
             try
             {
-                Boolean lastUpdate = false;
-                updateTextFromThread();
+                _lastUpdate = false;
+                UpdateTextFromThread();
                 while (true)
                 {
-                    if ((mainWindow.isEncoding() == true) || (queueWindow.isEncoding() == true))
-                        updateTextFromThread();
-                    else
+                    if (IsHandleCreated)
                     {
-                        // The encode may just have stoped, so, refresh the log one more time before restarting it.
-                        if (lastUpdate == false)
-                            updateTextFromThread();
-
-                        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
+                        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();
+
+                            _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
+                        }
                     }
-                    Thread.Sleep(5000);
+                    Thread.Sleep(1000);
                 }
             }
-            catch (ThreadAbortException)
-            {
-                // Do Nothing. This is needed since we run thread.abort(). 
-                // Should probably find a better way of making this work at some point.
-            }
             catch (Exception exc)
             {
-                MessageBox.Show("autoUpdate(): Exception: \n" + exc);
+                MessageBox.Show("AutoUpdate(): Exception: \n" + exc);
             }
         }
-
-        /// <summary>
-        /// Finds any new text in the log file and calls a funciton to display this new text.
-        /// </summary>
-        private void updateTextFromThread()
+        private void UpdateTextFromThread()
         {
             try
             {
-                string text = "";
-                List<string> data = readFile();
-                int count = data.Count;
-
-                while (position < count)
-                {
-                    text = data[position].ToString();
-                    if (data[position].ToString().Contains("has exited"))
-                        text = "\n ############ End of Log ############## \n";
-                    position++;
+                String info = ReadFile();
+                if (info.Contains("has exited"))
+                    info += "\n ############ End of Log ############## \n";
 
-                    SetText(text);
-                }
+                SetText(info);
             }
             catch (Exception exc)
             {
-                MessageBox.Show("updateTextFromThread(): Exception: \n" + exc);
+                MessageBox.Show("UpdateTextFromThread(): Exception: \n" + exc);
             }
         }
-
-        /// <summary>
-        /// Updates the rich text box with anything in the string text.
-        /// </summary>
-        /// <param name="text"></param>
         private void SetText(string text)
         {
             try
             {
-                // InvokeRequired required compares the thread ID of the
-                // calling thread to the thread ID of the creating thread.
-                // If these threads are different, it returns true.
-                if (this.IsHandleCreated) // Make sure the windows has a handle before doing anything
+                if (IsHandleCreated)
                 {
-                    if (this.rtf_actLog.InvokeRequired)
+                    if (rtf_actLog.InvokeRequired)
                     {
-                        SetTextCallback d = new SetTextCallback(SetText);
-                        this.Invoke(d, new object[] { text });
+                        IAsyncResult invoked = BeginInvoke(new setTextCallback(SetText), new object[] { text });
+                        EndInvoke(invoked);
                     }
                     else
-                        this.rtf_actLog.AppendText(text);
+                        rtf_actLog.AppendText(text);
                 }
             }
             catch (Exception exc)
@@ -241,74 +159,63 @@ namespace Handbrake
                 MessageBox.Show("SetText(): Exception: \n" + exc);
             }
         }
-
-        /// <summary>
-        /// Read the log file, and store the data in a List.
-        /// </summary>
-        /// <returns></returns>
-        private List<string> readFile()
+        private String ReadFile()
         {
-            // Ok, the task here is to, Get an arraylist of log data.
-            // And update some global varibles which are pointers to the last displayed log line.
-            List<string> logData = new List<string>();
-
+            String appendText = String.Empty;
             try
             {
-                // hb_encode_log.dat 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),
+                // 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 logFile = Path.Combine(Path.GetTempPath(), read_file);
-                string logFile2 = Path.Combine(Path.GetTempPath(), "hb_encode_log_AppReadable.dat");
+                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.
-                File.Copy(logFile, logFile2);
-
-                // Open the copied log file for reading
+                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 = sr.ReadLine();
-                while (line != null)
+                string line;
+                int i = 1;
+                while ((line = sr.ReadLine()) != null)
                 {
-                    if (line.Trim() != "")
-                        logData.Add(line + System.Environment.NewLine);
-
-                    line = sr.ReadLine();
+                    if (i > _position)
+                    {
+                        appendText += line + Environment.NewLine;
+                        _position++;
+                    }
+                    i++;
                 }
                 sr.Close();
                 sr.Dispose();
 
-                return logData;
+                return appendText;
             }
             catch (Exception exc)
             {
-                MessageBox.Show("Error in readFile() \n Unable to read the log file.\n You may have to restart HandBrake.\n  Error Information: \n\n" + exc.ToString(), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                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;
             }
-            return null;
         }
 
-        /// <summary>
-        /// Kills the montior thead when the window is disposed of.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void forceQuit(object sender, EventArgs e)
+        protected override void OnClosing(CancelEventArgs e)
         {
-            if (monitor != null)
-            {
-                while (monitor.IsAlive)
-                    monitor.Abort();
-            }
-
-            this.Close();
+            e.Cancel = true;
+            this.Hide();
+            base.OnClosing(e);
         }
 
-        /// <summary>
-        /// Copy Log Menu Item on the right click menu for the log rtf box
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        #region User Interface
         private void mnu_copy_log_Click(object sender, EventArgs e)
         {
             if (rtf_actLog.SelectedText != "")
@@ -316,34 +223,41 @@ namespace Handbrake
             else
                 Clipboard.SetDataObject(rtf_actLog.Text, true);
         }
-
-        #region System Information
-        private struct MEMORYSTATUS
+        private void mnu_openLogFolder_Click(object sender, EventArgs e)
         {
-            public UInt32 dwLength;
-            public UInt32 dwMemoryLoad;
-            public UInt32 dwTotalPhys; // Used
-            public UInt32 dwAvailPhys;
-            public UInt32 dwTotalPageFile;
-            public UInt32 dwAvailPageFile;
-            public UInt32 dwTotalVirtual;
-            public UInt32 dwAvailVirtual;
+            string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
+            string windir = Environment.GetEnvironmentVariable("WINDIR");
+            System.Diagnostics.Process prc = new System.Diagnostics.Process();
+            prc.StartInfo.FileName = windir + @"\explorer.exe";
+            prc.StartInfo.Arguments = logDir;
+            prc.Start();
         }
+        private void btn_copy_Click(object sender, EventArgs e)
+        {
+            if (rtf_actLog.SelectedText != "")
+                Clipboard.SetDataObject(rtf_actLog.SelectedText, true);
+            else
+                Clipboard.SetDataObject(rtf_actLog.Text, true);
+        }
+        private void btn_scan_log_Click(object sender, EventArgs e)
+        {
+            SetLogView(true);
+        }
+        private void btn_encode_log_Click(object sender, EventArgs e)
+        {
+            SetLogView(false);
+        }
+        #endregion
 
-        [DllImport("kernel32.dll")]
-        private static extern void GlobalMemoryStatus
-        (
-            ref MEMORYSTATUS lpBuffer
-        );
-
+        #region System Information
         /// <summary>
         /// Returns the total physical ram in a system
         /// </summary>
         /// <returns></returns>
         public uint TotalPhysicalMemory()
         {
-            MEMORYSTATUS memStatus = new MEMORYSTATUS();
-            GlobalMemoryStatus(ref memStatus);
+            Win32.MEMORYSTATUS memStatus = new Win32.MEMORYSTATUS();
+            Win32.GlobalMemoryStatus(ref memStatus);
 
             uint MemoryInfo = memStatus.dwTotalPhys;
             MemoryInfo = MemoryInfo / 1024 / 1024;
@@ -366,11 +280,10 @@ namespace Handbrake
         /// Get the System screen size information.
         /// </summary>
         /// <returns>System.Windows.Forms.Scree</returns>
-        public System.Windows.Forms.Screen screenBounds()
+        public Screen screenBounds()
         {
-            return System.Windows.Forms.Screen.PrimaryScreen;
+            return Screen.PrimaryScreen;
         }
-
         #endregion
 
     }