Merge #3543 Play Time

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Add Release Date column to GUI modinfo versions list (#3481 by: HebaruSan; reviewed: DasSkelett)
 - [Multiple] Global install filters (#3458 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Negated search for name, desc, author, lang, relationships, tags (#3460 by: HebaruSan; reviewed: DasSkelett)
+- [GUI] Play Time (#3543 by: PizzaRules668; reviewed: HebaruSan)
 
 ### Bugfixes
 

Core/Extensions/EnumerableExtensions.cs

@@ -55,6 +55,18 @@ public static void RemoveWhere<K, V>(
                 }
             }
         }
+
+        /// <summary>
+        /// Sum a sequence of TimeSpans.
+        /// Mysteriously not defined standardly.
+        /// </summary>
+        /// <param name="source">Sequence of TimeSpans to sum</param>
+        /// <returns>
+        /// Sum of the TimeSpans
+        /// </returns>
+        public static TimeSpan Sum(this IEnumerable<TimeSpan> source)
+            => source.Aggregate(TimeSpan.Zero,
+                                (a, b) => a + b);
     }
 
     /// <summary>

Core/GameInstance.cs

@@ -30,6 +30,8 @@ public class GameInstance : IEquatable<GameInstance>
         private GameVersion version;
         private List<GameVersion> _compatibleVersions = new List<GameVersion>();
 
+        public TimeLog playTime;
+
         public string Name { get; set; }
         /// <summary>
         /// Returns a file system safe version of the instance name that can be used within file names.
@@ -111,6 +113,8 @@ private void SetupCkanDirectories(bool scan = true)
                 }
             }
 
+            playTime = TimeLog.Load(TimeLog.GetPath(CkanDir())) ?? new TimeLog();
+
             if (!Directory.Exists(InstallHistoryDir()))
             {
                 User.RaiseMessage("Creating {0}", InstallHistoryDir());

Core/Types/TimeLog.cs

@@ -0,0 +1,65 @@
+using System;
+using System.IO;
+using System.Drawing;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace CKAN
+{
+    [JsonObject(MemberSerialization.OptIn)]
+    public class TimeLog
+    {
+        [JsonProperty("time", NullValueHandling = NullValueHandling.Ignore)]
+        public TimeSpan Time;
+
+        public static string GetPath(string dir)
+        {
+            return Path.Combine(dir, filename);
+        }
+
+        public static TimeLog Load(string path)
+        {
+            try
+            {
+                return JsonConvert.DeserializeObject<TimeLog>(File.ReadAllText(path));
+            }
+            catch (FileNotFoundException)
+            {
+                return null;
+            }
+        }
+
+        public void Save(string path)
+        {
+            File.WriteAllText(path, JsonConvert.SerializeObject(this, Formatting.Indented));
+        }
+
+        public override String ToString()
+        {
+            return Time.TotalHours.ToString("N1");
+        }
+
+        private Stopwatch playTime = new Stopwatch();
+
+        public void Start()
+        {
+            playTime.Restart();
+        }
+
+        public void Stop(string dir)
+        {
+            if (playTime.IsRunning)
+            {
+                playTime.Stop();
+                Time += playTime.Elapsed;
+                Save(GetPath(dir));
+            }
+        }
+
+        private const string filename = "playtime.json";
+    }
+}

Core/Utilities.cs

@@ -61,6 +61,11 @@ private static void _CopyDirectory(string sourceDirPath, string destDirPath, boo
                     continue;
                 }
 
+                else if (file.Name == "playtime.json")
+                {
+                    continue;
+                }
+
                 string temppath = Path.Combine(destDirPath, file.Name);
                 file_transaction.Copy(file.FullName, temppath, false);
             }

GUI/CKAN-GUI.csproj

@@ -44,6 +44,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
@@ -229,6 +230,12 @@
     <Compile Include="Controls\ManageMods.Designer.cs">
       <DependentUpon>ManageMods.cs</DependentUpon>
     </Compile>
+    <Compile Include="Controls\PlayTime.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\PlayTime.Designer.cs">
+      <DependentUpon>PlayTime.cs</DependentUpon>
+    </Compile>
     <Compile Include="Controls\ThemedTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -239,7 +246,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Controls\TriStateToggle.cs">
-      <SubType>Component</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -293,6 +300,9 @@
     <Compile Include="Main\MainTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Main\MainTime.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Main\MainTrayIcon.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -677,6 +687,12 @@
     <EmbeddedResource Include="Controls\ModInfo.resx">
       <DependentUpon>ModInfo.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Controls\PlayTime.resx">
+      <DependentUpon>PlayTime.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Localization\fr-FR\PlayTime.fr-FR.resx">
+      <DependentUpon>..\..\Controls\PlayTime.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Controls\ManageMods.resx">
       <DependentUpon>ManageMods.cs</DependentUpon>
     </EmbeddedResource>
@@ -1004,4 +1020,4 @@
     <Exec Command="powershell ../build.ps1 Generate-GlobalAssemblyVersionInfo" Condition="!Exists('../_build/meta/GlobalAssemblyVersionInfo.cs') And '$(OS)' == 'Windows_NT'" />
     <Exec Command="sh ../build Generate-GlobalAssemblyVersionInfo" Condition="!Exists('../_build/meta/GlobalAssemblyVersionInfo.cs') And '$(OS)' == 'Unix'" />
   </Target>
-</Project>
+</Project>