* See previous commit. Visual studio being silly

Author: CodeDead

MemPlus/Classes/LOG/Log.cs

@@ -2,25 +2,39 @@
 
 namespace MemPlus.Classes.LOG
 {
-    internal class Log
+    public abstract class Log : ILogMethods
     {
-        private readonly DateTime _time;
-        private readonly string _value;
+        /// <summary>
+        /// The type of log
+        /// </summary>
+        internal LogType LogType { get; set; }
 
-        internal Log(string data)
+        protected DateTime Time;
+        protected string Data;
+
+        public DateTime GetDate()
         {
-            _time = DateTime.Now;
-            _value = data;
+            return Time;
         }
 
-        internal DateTime GetDate()
+        public void AddData(string data)
         {
-            return _time;
+            Time = DateTime.Now;
+            Data = data;
         }
 
-        internal string GetValue()
+        public string GetData()
         {
-            return _value;
+            return Data;
         }
     }
+
+    /// <summary>
+    /// An enumeration of all available log types
+    /// </summary>
+    public enum LogType
+    {
+        Application,
+        Ram
+    }
 }

MemPlus/Classes/RAM/RamController.cs

@@ -29,7 +29,7 @@ internal sealed class RamController
         internal RamController(Dispatcher dispatcher, SfCircularGauge gauge, Label lblTotal, Label lblAvailable, int timerInterval, LogController logController)
         {
             _logController = logController ?? throw new ArgumentNullException(nameof(logController));
-            _logController.AddLog(new Log("Initializing RamController"));
+            _logController.AddLog(new ApplicationLog("Initializing RamController"));
 
             if (timerInterval <= 0) throw new ArgumentException("Timer interval cannot be less than or equal to zero!");
 
@@ -46,26 +46,26 @@ internal RamController(Dispatcher dispatcher, SfCircularGauge gauge, Label lblTo
             _ramTimer.Elapsed += OnTimedEvent;
             _ramTimer.Interval = timerInterval;
 
-            _logController.AddLog(new Log("Done initializing RamController"));
+            _logController.AddLog(new ApplicationLog("Done initializing RamController"));
         }
 
         internal void EnableMonitor()
         {
             if (_ramTimer.Enabled) return;
             _ramTimer.Enabled = true;
             OnTimedEvent(null, null);
-            _logController.AddLog(new Log("The RAM monitor has been enabled"));
+            _logController.AddLog(new ApplicationLog("The RAM monitor has been enabled"));
         }
 
         internal void DisableMonitor()
         {
             _ramTimer.Enabled = false;
-            _logController.AddLog(new Log("The RAM monitor has been disabled"));
+            _logController.AddLog(new ApplicationLog("The RAM monitor has been disabled"));
         }
 
         private void OnTimedEvent(object source, ElapsedEventArgs e)
         {
-            _logController.AddLog(new Log("RAM monitor timer has been called"));
+            _logController.AddLog(new ApplicationLog("RAM monitor timer has been called"));
 
             UpdateRamUsage();
 
@@ -77,12 +77,12 @@ private void OnTimedEvent(object source, ElapsedEventArgs e)
                 _lblAvailable.Content = (RamUsage / 1024 / 1024 / 1024).ToString("F2") + " GB";
             });
 
-            _logController.AddLog(new Log("Finished RAM monitor timer"));
+            _logController.AddLog(new ApplicationLog("Finished RAM monitor timer"));
         }
 
         internal async Task ClearMemory(bool filesystemcache)
         {
-            _logController.AddLog(new Log("Clearing RAM memory"));
+            _logController.AddLog(new ApplicationLog("Clearing RAM memory"));
 
             await Task.Run(async () =>
             {
@@ -103,12 +103,12 @@ await Task.Run(async () =>
                 RamSavings = oldUsage - newUsage;
             });
 
-            _logController.AddLog(new Log("Done clearing RAM memory"));
+            _logController.AddLog(new ApplicationLog("Done clearing RAM memory"));
         }
 
         private void UpdateRamUsage()
         {
-            _logController.AddLog(new Log("Updating RAM usage"));
+            _logController.AddLog(new ApplicationLog("Updating RAM usage"));
 
             double total = Convert.ToDouble(_info.TotalPhysicalMemory);
             double usage = total - Convert.ToDouble(_info.AvailablePhysicalMemory);
@@ -118,7 +118,7 @@ private void UpdateRamUsage()
             RamUsagePercentage = perc;
             RamTotal = total;
 
-            _logController.AddLog(new Log("Finished updating RAM usage"));
+            _logController.AddLog(new ApplicationLog("Finished updating RAM usage"));
         }
     }
 }

MemPlus/MemPlus.csproj

@@ -69,6 +69,8 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Classes\LOG\ApplicationLog.cs" />
+    <Compile Include="Classes\LOG\ILogMethods.cs" />
     <Compile Include="Classes\LOG\Log.cs" />
     <Compile Include="Classes\LOG\LogController.cs" />
     <Compile Include="Classes\RAM\RamController.cs" />

MemPlus/Windows/MainWindow.xaml

@@ -18,7 +18,7 @@
         <Menu IsMainMenu="True">
             <MenuItem Header="_File">
                 <MenuItem Header="Export">
-                    <MenuItem Header="RAM usage" />
+                    <MenuItem Header="RAM Optimizer log" />
                     <MenuItem Header="Application logs" />
                 </MenuItem>
                 <Separator />
@@ -29,6 +29,8 @@
                 <MenuItem Header="RAM Analyzer"></MenuItem>
                 <Separator />
                 <MenuItem Header="Logs">
+                    <MenuItem Header="RAM Optimizer log" />
+                    <Separator />
                     <MenuItem Header="Application logs" />
                 </MenuItem>
                 <Separator />

MemPlus/Windows/MainWindow.xaml.cs

@@ -20,7 +20,7 @@ public partial class MainWindow
         public MainWindow()
         {
             _logController = new LogController();
-            _logController.AddLog(new Log("Initializing MemPlus"));
+            _logController.AddLog(new ApplicationLog("Initializing MemPlus"));
 
             _logController.LogAddedEvent += LogAddedEvent;
 
@@ -33,22 +33,23 @@ public MainWindow()
 
         private static void LogAddedEvent(Log log)
         {
-            Console.WriteLine("[" + log.GetDate() + "] " + log.GetValue());
+            if (log.LogType != LogType.Application) return;
+            Console.WriteLine("[" + log.GetDate() + "] " + log.GetData());
         }
 
         internal void ChangeVisualStyle()
         {
-            _logController.AddLog(new Log("Changing MemPlus theme style"));
+            _logController.AddLog(new ApplicationLog("Changing MemPlus theme style"));
 
             StyleManager.ChangeStyle(this);
             CgRamUsage.Scales[0].Ranges[0].Stroke = new SolidColorBrush(Properties.Settings.Default.MetroColor);
 
-            _logController.AddLog(new Log("Done changing MemPlus theme style"));
+            _logController.AddLog(new ApplicationLog("Done changing MemPlus theme style"));
         }
 
         private async void BtnClearMemory_OnClick(object sender, RoutedEventArgs e)
         {
-            _logController.AddLog(new Log("Clearing RAM Memory"));
+            _logController.AddLog(new ApplicationLog("Clearing RAM Memory"));
 
             try
             {
@@ -72,7 +73,7 @@ private async void BtnClearMemory_OnClick(object sender, RoutedEventArgs e)
                 MessageBox.Show(ex.Message, "MemPlus", MessageBoxButton.OK, MessageBoxImage.Error);
             }
 
-            _logController.AddLog(new Log("Done clearing RAM memory"));
+            _logController.AddLog(new ApplicationLog("Done clearing RAM memory"));
         }
     }
 }