Changeset 210 for branches/highdpi/Packages/CevoComponents/Directories.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

• branches/highdpi/Packages/CevoComponents/Directories.pas (modified) (6 diffs)

branches/highdpi/Packages/CevoComponents/Directories.pas

@@ -4 +4 @@
 
 var
-  HomeDir, DataDir: string;
+  HomeDir: string;
+  DataDir: string;
   LocaleCode: string = '';
   LocaleCodeAuto: string = '';
 
 function LocalizedFilePath(const Path: string): string;
-procedure InitUnit;
+procedure UnitInit;
+function GetSavedDir(Home: Boolean = False): string;
+function GetMapsDir(Home: Boolean = False): string;
+function GetGraphicsDir: string;
+function GetSoundsDir: string;
+function GetAiDir: string;
 
 
@@ -27 +33 @@
 
   if Lang = '' then begin
-      for i := 1 to Paramcount - 1 do
-        if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-          (ParamStrUTF8(i) = '--lang') then
+    for i := 1 to Paramcount - 1 do
+      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
+        (ParamStrUTF8(i) = '--lang') then
           Lang := ParamStrUTF8(i + 1);
   end;
   if Lang = '' then begin
+    T := '';
     LazGetLanguageIDs(Lang, T);
     Lang := Copy(Lang, 1, 2);
@@ -51 +58 @@
   if LocaleCode <> 'en' then begin
     Result := HomeDir + 'Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path;
-    if not FileExists(Result) then
+    if not DirectoryExists(Result) and not FileExists(Result) then
       Result := HomeDir + Path;
   end else Result := HomeDir + Path;
 end;
 
-procedure InitUnit;
+procedure UnitInit;
 var
   AppDataDir: string;
@@ -69 +76 @@
   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 +94 @@
 
   // 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 +105 @@
 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;
+
+function GetGraphicsDir: string;
+begin
+  Result := HomeDir + 'Graphics';
+end;
+
+function GetSoundsDir: string;
+begin
+  Result := HomeDir + 'Sounds';
+end;
+
+function GetAiDir: string;
+begin
+  Result := HomeDir + 'AI';
+end;
+
 end.