refactor: Adopt WPF reading data logic

Author: christiankyle-ching

DigitalWellbeingService.NET4.6/ActivityLogger.cs

@@ -65,7 +65,7 @@ private void UpdateTimeEntry(Process proc)
                 // Update Time Entry
                 for (int i = 0; i < lines.Count; i++)
                 {
-                    if (lines[i] == string.Empty) continue;
+                    if (lines[i].Trim() == string.Empty) continue;
 
                     string[] cells = lines[i].Split('\t');
 

DigitalWellbeingWPF/Helpers/StringParser.cs

@@ -19,7 +19,7 @@ public static string TimeSpanToString(TimeSpan duration)
         }
 
         private static readonly TextInfo txtInfo = new CultureInfo("en-US", false).TextInfo;
-        public static string FormatProcessName(string processName)
+        public static string TitleCaseWhenLower(string processName)
         {
             return processName.Any(char.IsUpper) ? processName : txtInfo.ToTitleCase(processName);
         }

DigitalWellbeingWPF/Models/AppUsage.cs

@@ -1,4 +1,5 @@
-using System;
+using DigitalWellbeingWPF.Helpers;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -17,7 +18,7 @@ public class AppUsage : INotifyPropertyChanged
         public AppUsage(string processName, string programName, TimeSpan duration)
         {
             this.ProcessName = processName;
-            this.ProgramName = programName;
+            this.ProgramName = programName != string.Empty ? programName : StringParser.TitleCaseWhenLower(processName);
             this.Duration = duration;
         }
 

DigitalWellbeingWPF/ViewModels/AppUsageViewModel.cs

@@ -501,41 +501,28 @@ public static async Task<List<AppUsage>> GetData(DateTime date)
                     {
                         try
                         {
-                            if (i + 1 >= lines.Length) break;
+                            // Skip empty rows
+                            if (lines[i].Trim() == string.Empty) continue;
 
-                            string line = lines[i];
+                            string[] cells = lines[i].Split('\t');
 
-                            if (line == "") continue;
+                            string processName = cells[0];
+                            int seconds = 0;
+                            string programName = cells.Length > 2 ? cells[2] : "";
 
-                            string[] data = line.Split('\t');
+                            // Try get seconds
+                            int.TryParse(cells[1], out seconds);
 
-                            string processName = data[1];
-                            string programName = data[2] != "" ? data[2] : StringParser.FormatProcessName(processName);
-
-                            DateTime startTime = DateTime.Parse(data[0]);
-                            DateTime endTime = DateTime.Parse(lines[i + 1].Split('\t')[0]);
-
-                            if (endTime < startTime) continue; // Prevents negative values
-
-                            TimeSpan duration = endTime - startTime;
-
-                            AppUsage existingRecord = appUsageList.Find(a => a.ProcessName == processName);
-                            if (existingRecord == null)
-                            {
-                                appUsageList.Add(new AppUsage(processName, programName, duration));
-                            }
-                            else
-                            {
-                                existingRecord.Duration = existingRecord.Duration.Add(duration);
-                            }
+                            appUsageList.Add(
+                                new AppUsage(processName, programName, TimeSpan.FromSeconds(seconds))
+                            );
                         }
-                        catch (FormatException ex)
+                        catch (Exception ex)
                         {
-                            Console.WriteLine("Data parsing error. SKIP ROW... " + ex.Message);
+                            Console.WriteLine("SKIP READING ROW: " + ex);
                         }
                     }
 
-
                     return appUsageList;
                 }
                 catch (FileNotFoundException)

Setup/Setup.aip

@@ -29,10 +29,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="applogo.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="ckcdev"/>
-    <ROW Property="ProductCode" Value="1033:{06568B67-9BC9-4FEA-8591-886302A4CD4E} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{678B77C9-1047-4FA0-962C-D56D4F9F594B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Digital Wellbeing For Windows"/>
-    <ROW Property="ProductVersion" Value="1.0.5.3" Type="32" TargetFile="DigitalWellbeingWPF.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.0.0" Type="32" TargetFile="DigitalWellbeingWPF.exe"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:Force"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{D7DA3A0D-99E1-4FAC-B2CC-FEBB27BCA59A}"/>