ucPlayingStats: Do not remove user statistics on database import

Chixpy · Oct 15, 2023 · 3541d74 · 3541d74
1 parent 16d6d9a
commit 3541d74
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/EmutecaCore/Abstracts/uaEmutecaCustomGroup.pas b/EmutecaCore/Abstracts/uaEmutecaCustomGroup.pas
@@ -112,7 +112,7 @@ procedure caEmutecaCustomGroup.LoadFromStrLst(aTxtFile: TStrings);
     Exit;
 
   while aTxtFile.Count < 6 do
-    aTxtFile.Add('');
+    aTxtFile.Add(krsImportKeepValueKey);
 
   Self.ID := aTxtFile[0];
   Self.Title := aTxtFile[1];

diff --git a/EmutecaCore/Abstracts/uaEmutecaCustomSoft.pas b/EmutecaCore/Abstracts/uaEmutecaCustomSoft.pas
@@ -445,7 +445,7 @@ procedure caEmutecaCustomSoft.LoadFromStrLst(aTxtFile: TStrings);
 
   // Dirty error fix
   while aTxtFile.Count < 22 do
-    aTxtFile.Add('');
+    aTxtFile.Add(krsImportKeepValueKey);
 
   GroupKey := aTxtFile[0];
   SHA1 := StringToSHA1Digest(aTxtFile[1]);

diff --git a/EmutecaCore/Classes/ucEmutecaPlayingStats.pas b/EmutecaCore/Classes/ucEmutecaPlayingStats.pas
@@ -154,8 +154,10 @@ procedure cEmutecaPlayingStats.LoadFromIni(aIniFile: TCustomIniFile;
     Exit;
 
   LastTime := aIniFile.ReadDateTime(Section, krsIniKeyLastTime, LastTime);
-  PlayingTime := aIniFile.ReadInt64(Section, krsIniKeyPlayingTime, PlayingTime);
-  TimesPlayed := aIniFile.ReadInt64(Section, krsIniKeyTimesPlayed, TimesPlayed);
+  PlayingTime := aIniFile.ReadInt64(Section, krsIniKeyPlayingTime,
+    PlayingTime);
+  TimesPlayed := aIniFile.ReadInt64(Section, krsIniKeyTimesPlayed,
+    TimesPlayed);
 end;
 
 procedure cEmutecaPlayingStats.WriteToStrLst(aTxtFile: TStrings;
@@ -181,6 +183,8 @@ procedure cEmutecaPlayingStats.WriteToStrLst(aTxtFile: TStrings;
 
 procedure cEmutecaPlayingStats.LoadFromStrLst(aTxtFile: TStrings;
   const NLine: integer);
+var
+  aStr: string;
 begin
   // TODO: Exception...
   if not Assigned(aTxtFile) then
@@ -189,9 +193,15 @@ procedure cEmutecaPlayingStats.LoadFromStrLst(aTxtFile: TStrings;
   if NLine + 3 > aTxtFile.Count then
     Exit;
 
-  LastTime := StrToDateTimeDef(aTxtFile[Nline], LastTime);
-  TimesPlayed := StrToInt64Def(aTxtFile[Nline + 1], TimesPlayed);
-  PlayingTime := StrToInt64Def(aTxtFile[Nline + 2], PlayingTime);
+  aStr := aTxtFile[Nline];
+  if (aStr <> '') and (aStr <> krsImportKeepValueKey) then
+    LastTime := StrToDateTimeDef(aStr, LastTime);
+  aStr := aTxtFile[Nline + 1];
+  if (aStr <> '') and (aStr <> krsImportKeepValueKey) then
+    TimesPlayed := StrToInt64Def(aStr, TimesPlayed);
+  aStr := aTxtFile[Nline + 2];
+  if (aStr <> '') and (aStr <> krsImportKeepValueKey) then
+    PlayingTime := StrToInt64Def(aStr, PlayingTime);
 end;
 
 constructor cEmutecaPlayingStats.Create(aOwner: TComponent);