[GExperts-Checkins] SF.net SVN: gexperts:[4318] trunk/Source/CodeLibraria n

[<tw...@us...>]

Revision: 4318
          http://sourceforge.net/p/gexperts/code/4318
Author:   twm
Date:     2024-09-16 10:29:11 +0000 (Mon, 16 Sep 2024)
Log Message:
-----------
* new overlaoded version of TGXStorageFile.GetObjectAttribute that combines .GetObjectAttribute and .MakeFileName
* added todos

Modified Paths:
--------------
    trunk/Source/CodeLibrarian/GX_CodeLib.pas
    trunk/Source/CodeLibrarian/GX_CodeLibFile.pas

Modified: trunk/Source/CodeLibrarian/GX_CodeLib.pas
===================================================================
--- trunk/Source/CodeLibrarian/GX_CodeLib.pas	2024-09-16 10:10:21 UTC (rev 4317)
+++ trunk/Source/CodeLibrarian/GX_CodeLib.pas	2024-09-16 10:29:11 UTC (rev 4318)
@@ -294,7 +294,7 @@
       CodeDB.ListFolders(RootPath, Folders);
       for i := 0 to Folders.Count - 1 do
       begin
-        RNode := tvTopics.Items.AddChild(Node, CodeDB.GetObjectAttribute(CodeDb.MakeFileName(RootPath, Folders[i]), AttrTopic));
+        RNode := tvTopics.Items.AddChild(Node, CodeDB.GetObjectAttribute(RootPath, Folders[i], AttrTopic));
         RNode.ImageIndex := ImageIndexClosedFolder;
         RNode.SelectedIndex := ImageIndexOpenFolder;
         LoadTreeView(RNode);
@@ -302,7 +302,7 @@
       CodeDB.ListFiles(RootPath, Files);
       for i := 0 to Files.Count - 1 do
       begin
-        RNode := tvTopics.Items.AddChild(Node, CodeDB.GetObjectAttribute(CodeDb.MakeFileName(RootPath, Files[i]), AttrTopic));
+        RNode := tvTopics.Items.AddChild(Node, CodeDB.GetObjectAttribute(RootPath, Files[i], AttrTopic));
         RNode.ImageIndex := ImageIndexDocument;
         RNode.SelectedIndex := ImageIndexDocument;
       end;

Modified: trunk/Source/CodeLibrarian/GX_CodeLibFile.pas
===================================================================
--- trunk/Source/CodeLibrarian/GX_CodeLibFile.pas	2024-09-16 10:10:21 UTC (rev 4317)
+++ trunk/Source/CodeLibrarian/GX_CodeLibFile.pas	2024-09-16 10:29:11 UTC (rev 4318)
@@ -8,6 +8,9 @@
   GpStructuredStorage,
   GX_StringList;
 
+//TODO 3 -cIssue -oAnyone: Handle invalid filenames with \/, or use Topic attribute as the display text?
+//                         (See AssertValidFilename method calls.)
+
 const
   CodeLibPathSep = '\';
 
@@ -50,7 +53,8 @@
     procedure SetAttribute(const AttrName: TGXUnicodeString; const Value: TGXUnicodeString); overload;
     procedure SetAttribute(const AttrName: TGXUnicodeString; const Value: Integer); overload;
     procedure SetObjectAttribute(const ObjectName, AttrName, AttrValue: TGXUnicodeString);
-    function GetObjectAttribute(const ObjectName, AttrName: TGXUnicodeString): TGXUnicodeString;
+    function GetObjectAttribute(const ObjectName, AttrName: TGXUnicodeString): TGXUnicodeString; overload;
+    function GetObjectAttribute(const FolderName, FileName, AttrName: TGXUnicodeString): TGXUnicodeString; overload;
     function MakeFileName(const FolderName, FileName: TGXUnicodeString): TGXUnicodeString;
   end;
 
@@ -63,6 +67,7 @@
 
 function TGXStorageFile.MakeFileName(const FolderName, FileName: TGXUnicodeString): TGXUnicodeString;
 begin
+  // todo: This is not consistent: Either use CodeLibPathSep or use AddSlash, but not both
   Result := FolderName;
   if Result = '' then
     Result := CodeLibPathSep
@@ -280,6 +285,12 @@
   Result := FileInfo.Attribute[AttrName];
 end;
 
+function TGXStorageFile.GetObjectAttribute(const FolderName, FileName,
+  AttrName: TGXUnicodeString): TGXUnicodeString;
+begin
+  Result := GetObjectAttribute(MakeFileName(FolderName, FileName), AttrName);
+end;
+
 procedure TGXStorageFile.AssertExistingObjectName(const ObjectName: TGXUnicodeString);
 begin
   Assert(ObjectExists(ObjectName), ObjectName + ' does not exist');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.