Changeset 169 for trunk/Packages

Timestamp:

Jun 15, 2019, 11:42:35 AM (6 years ago)

Author:

chronos

Message:

• Modified: Store Saved and Maps subdirectory names only once in string variable.

File:

• trunk/Packages/CevoComponents/Directories.pas (modified) (5 diffs)

trunk/Packages/CevoComponents/Directories.pas

@@ -4 +4 @@
 
 var
-  HomeDir, DataDir: string;
+  HomeDir: string;
+  DataDir: string;
   LocaleCode: string = '';
   LocaleCodeAuto: string = '';
@@ -10 +11 @@
 function LocalizedFilePath(const Path: string): string;
 procedure InitUnit;
+function GetSavedDir(Home: Boolean = False): string;
+function GetMapsDir(Home: Boolean = False): string;
 
 
@@ -69 +72 @@
   else
   begin
-    if not DirectoryExists(AppDataDir) then
-      CreateDir(AppDataDir);
+    if not DirectoryExists(AppDataDir) then CreateDir(AppDataDir);
     DataDir := AppDataDir;
   end;
-  if not DirectoryExists(DataDir + 'Saved') then
-    CreateDir(DataDir + 'Saved');
-  if not DirectoryExists(DataDir + 'Maps') then
-    CreateDir(DataDir + 'Maps');
+  if not DirectoryExists(GetSavedDir) then CreateDir(GetSavedDir);
+  if not DirectoryExists(GetMapsDir) then CreateDir(GetMapsDir);
 
   // Copy appdata if not done yet
-  if FindFirst(HomeDir + 'Saved' + DirectorySeparator + '*.cevo', $21, src) = 0 then
+  if FindFirst(GetSavedDir(True) + DirectorySeparator + '*.cevo', $21, src) = 0 then
     repeat
-      if (FindFirst(DataDir + 'Saved' + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(GetSavedDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
-        CopyFile(PChar(HomeDir + 'Saved' + DirectorySeparator + src.Name),
-          PChar(DataDir + 'Saved' + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(GetSavedDir(True) + DirectorySeparator + src.Name),
+          PChar(GetSavedDir(True) + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
@@ -90 +90 @@
 
   // Copy appdata if not done yet
-  if FindFirst(HomeDir + 'Maps' + DirectorySeparator + '*.*', $21, src) = 0 then
+  if FindFirst(GetMapsDir(True) + DirectorySeparator + '*.*', $21, src) = 0 then
     repeat
-      if (FindFirst(DataDir + 'Maps' + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(GetMapsDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
-        CopyFile(PChar(HomeDir + 'Maps' + DirectorySeparator + src.Name),
-          PChar(DataDir + 'Maps' + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(GetMapsDir(True) + DirectorySeparator + src.Name),
+          PChar(GetMapsDir(True) + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
@@ -101 +101 @@
 end;
 
+function GetSavedDir(Home: Boolean = False): string;
+begin
+  if Home then Result := HomeDir + 'Saved'
+    else Result := DataDir + 'Saved';
+end;
+
+function GetMapsDir(Home: Boolean = False): string;
+begin
+  if Home then Result := HomeDir + 'Maps'
+    else Result := DataDir + 'Maps';
+end;
+
 end.