App Services Cleanup Contd

Moving Exceptions and more utilities to the GUI project.

3 files changed, 0 insertions, 209 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Exceptions/GeneralApplicationException.cs b/win/CS/HandBrake.ApplicationServices/Exceptions/GeneralApplicationException.cs
deleted file mode 100644
index 59c952a90..000000000
--- a/win/CS/HandBrake.ApplicationServices/Exceptions/GeneralApplicationException.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="GeneralApplicationException.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The Encode Failure Exception

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Exceptions

-{

-    using System;

-

-    /// <summary>

-    /// The Encode Failure Exception

-    /// </summary>

-    public class GeneralApplicationException : Exception

-    {

-        /// <summary>

-        /// Initializes a new instance of the <see cref="GeneralApplicationException"/> class. 

-        /// </summary>

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

-        /// The error.

-        /// </param>

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

-        /// The solution.

-        /// </param>

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

-        /// The inner Exception.

-        /// </param>

-        public GeneralApplicationException(string error, string solution, Exception innerException)

-        {

-            this.Error = error;

-            this.Solution = solution;

-            this.ActualException = innerException;

-        }

-

-        /// <summary>

-        /// Gets or sets FailureReason.

-        /// </summary>

-        public string Error { get; set; }

-

-        /// <summary>

-        /// Gets or sets Solution.

-        /// </summary>

-        public string Solution { get; set; }

-

-        /// <summary>

-        /// Gets or sets InnerException.

-        /// </summary>

-        public Exception ActualException { get; set; }

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 334414f1f..89562540f 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -80,7 +80,6 @@
     <Reference Include="WindowsBase" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Exceptions\GeneralApplicationException.cs" />

     <Compile Include="Attributes\ShortName.cs" />

     <Compile Include="Interop\EventArgs\EncodeCompletedEventArgs.cs" />

     <Compile Include="Interop\EventArgs\EncodeProgressEventArgs.cs" />

@@ -191,7 +190,6 @@
       <DependentUpon>Resources.resx</DependentUpon>

     </Compile>

     <Compile Include="Utilities\CharCodesUtilities.cs" />

-    <Compile Include="Utilities\GeneralUtilities.cs" />

     <Compile Include="Utilities\LanguageUtilities.cs" />

   </ItemGroup>

   <ItemGroup>

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
deleted file mode 100644
index f92332c61..000000000
--- a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="GeneralUtilities.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   A Set of Static Utilites

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Utilities

-{

-    using System;

-    using System.Collections.Generic;

-    using System.Diagnostics;

-    using System.IO;

-    using System.Linq;

-    using System.Text;

-    using System.Windows.Forms;

-

-    /// <summary>

-    /// A Set of Static Utilites

-    /// </summary>

-    public class GeneralUtilities

-    {

-        #region Constants and Fields

-

-        /// <summary>

-        /// The Default Log Directory

-        /// </summary>

-        private static readonly string LogDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";

-

-        #endregion

-

-        #region Properties

-

-        /// <summary>

-        /// Gets the number of HandBrake instances running.

-        /// </summary>

-        public static int ProcessId

-        {

-            get

-            {

-                return Process.GetCurrentProcess().Id;

-            }

-        }

-

-        #endregion

-

-        #region Public Methods

-

-        /// <summary>

-        /// Clear all the log files older than 30 Days

-        /// </summary>

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

-        /// The Number of Days to Keep

-        /// </param>

-        public static void ClearLogFiles(int daysToKeep)

-        {

-            if (Directory.Exists(LogDir))

-            {

-                // Get all the log files

-                var info = new DirectoryInfo(LogDir);

-                FileInfo[] logFiles = info.GetFiles("*.txt");

-

-                // Delete old and excessivly large files (> ~50MB).

-                foreach (FileInfo file in logFiles)

-                {

-                    try

-                    {

-                        if (file.LastWriteTime < DateTime.Now.AddDays(-daysToKeep))

-                        {

-                            File.Delete(file.FullName);

-                        }

-                        else if (file.Length > 50000000)

-                        {

-                            File.Delete(file.FullName);

-                        }

-                    }

-                    catch (Exception)

-                    {

-                        // Silently ignore files we can't delete. They are probably being used by the app right now.

-                    }

-                }

-            }

-        }

-

-        /// <summary>

-        /// Generate the header for the log file.

-        /// </summary>

-        /// <returns>

-        /// The generatedlog header.

-        /// </returns>

-        public static StringBuilder CreateLogHeader()

-        {

-            var logHeader = new StringBuilder();

-

-            StringBuilder gpuBuilder = new StringBuilder();

-            foreach (var item in SystemInfo.GetGPUInfo)

-            {

-                gpuBuilder.AppendLine(string.Format("  {0}", item));

-            }

-

-            if (string.IsNullOrEmpty(gpuBuilder.ToString().Trim()))

-            {

-                gpuBuilder.Append("GPU Information is unavailable");

-            }

-

-            logHeader.AppendLine(String.Format("HandBrake {0} - {1}", VersionHelper.GetVersion(), VersionHelper.GetPlatformBitnessVersion()));

-            logHeader.AppendLine(String.Format("OS: {0} - {1}", Environment.OSVersion, Environment.Is64BitOperatingSystem ? "64bit" : "32bit"));

-            logHeader.AppendLine(String.Format("CPU: {0}", SystemInfo.GetCpuCount));

-            logHeader.AppendLine(String.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));

-            logHeader.AppendLine(String.Format("GPU Information:{0}{1}", Environment.NewLine, gpuBuilder.ToString().TrimEnd()));

-            logHeader.AppendLine(String.Format("Screen: {0}x{1}", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));

-            logHeader.AppendLine(String.Format("Temp Dir: {0}", Path.GetTempPath()));

-            logHeader.AppendLine(String.Format("Install Dir: {0}", Application.StartupPath));

-            logHeader.AppendLine(String.Format("Data Dir: {0}\n", Application.UserAppDataPath));

-

-            logHeader.AppendLine("-------------------------------------------");

-

-            return logHeader;

-        }

-

-        /// <summary>

-        /// Return the standard log format line of text for a given log message

-        /// </summary>

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

-        /// The Log Message

-        /// </param>

-        /// <returns>

-        /// A Log Message in the format: "[hh:mm:ss] message"

-        /// </returns>

-        public static string LogLine(string message)

-        {

-            return string.Format("[{0}] {1}", DateTime.Now.TimeOfDay, message);

-        }

-

-        /// <summary>

-        /// The find hand brake instance ids.

-        /// </summary>

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

-        /// The id.

-        /// </param>

-        /// <returns>

-        /// The <see cref="bool"/>. True if it's a running HandBrake instance.

-        /// </returns>

-        public static bool IsPidACurrentHandBrakeInstance(int id)

-        {

-            List<int> ids = Process.GetProcessesByName("HandBrake").Select(process => process.Id).ToList();

-            return ids.Contains(id);

-        }

-

-        #endregion

-    }

-}
\ No newline at end of file