Changeset 230 for trunk/Forms/FormImportSources.pas

Timestamp:

Jan 24, 2025, 11:42:58 PM (6 weeks ago)

Author:

chronos

Message:

• Modified: Fixed Import sources modification.
• Modified: Catogires don't have direct object references to import sources and acronym meanings.
• Modified: Updated acronyms example file.

File:

• trunk/Forms/FormImportSources.pas (modified) (16 diffs)

trunk/Forms/FormImportSources.pas ¶

@@ -14 +14 @@
   TFormImportSources = class(TFormEx)
     AAdd: TAction;
+    APreview: TAction;
     AEnable: TAction;
     ADisable: TAction;
@@ -31 +32 @@
     MenuItem6: TMenuItem;
     MenuItem7: TMenuItem;
+    MenuItem8: TMenuItem;
     PopupMenuImportSource: TPopupMenu;
     ToolBar1: TToolBar;
@@ -37 +39 @@
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
     procedure AAddExecute(Sender: TObject);
     procedure ADisableExecute(Sender: TObject);
     procedure AEnableExecute(Sender: TObject);
     procedure AModifyExecute(Sender: TObject);
+    procedure APreviewExecute(Sender: TObject);
     procedure AProcessExecute(Sender: TObject);
     procedure ARemoveExecute(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -58 +63 @@
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
   private
+    PreviewAcronymDb: TAcronymDb;
     procedure ProcessImportJob(Job: TJob);
+    procedure PreviewImportJob(Job: TJob);
     procedure FilterList(List: TObjectList<TObject>);
   public
@@ -73 +80 @@
 
 uses
-  FormMain, FormImportSource;
+  FormMain, FormImportSource, FormAcronyms;
 
 resourcestring
@@ -80 +87 @@
   SImportSourceAlreadyExists = 'Import source %s already exists!';
   SProcessSelectedSource = 'Process selected import source';
+  SPreviewSelectedSource = 'Preview selected import source';
 
 
@@ -96 +104 @@
       Item.SubItems.Add(DateToStr(LastImportTime))
       else Item.SubItems.Add('');
+    Item.SubItems.Add(Format.Name);
     Item.Checked := Enabled;
   end;
@@ -133 +142 @@
 function TFormImportSources.ListViewSort1CompareItem(Item1, Item2: TObject
   ): Integer;
-begin
+var
+  ImportSource1, ImportSource2: TImportSource;
+begin
+  ImportSource1 := TImportSource(Item1);
+  ImportSource2 := TImportSource(Item2);
   Result := 0;
   if Assigned(Item1) and Assigned(Item2) and (ListViewSort1.Order <> soNone) then begin
     with ListViewSort1 do
     case Column of
-      0: Result := CompareString(TImportSource(Item1).Name, TImportSource(Item2).Name);
-      1: Result := CompareString(TImportSource(Item1).URL, TImportSource(Item2).URL);
-      2: Result := CompareString(TImportSource(Item1).Categories.GetString, TImportSource(Item2).Categories.GetString);
-      3: Result := CompareInteger(TImportSource(Item1).ItemCount, TImportSource(Item2).ItemCount);
-      4: Result := CompareTime(TImportSource(Item1).LastImportTime, TImportSource(Item2).LastImportTime);
+      0: Result := CompareString(ImportSource1.Name, ImportSource2.Name);
+      1: Result := CompareString(ImportSource1.URL, ImportSource2.URL);
+      2: Result := CompareString(ImportSource1.Categories.GetString, ImportSource2.Categories.GetString);
+      3: Result := CompareInteger(ImportSource1.ItemCount, ImportSource2.ItemCount);
+      4: Result := CompareTime(ImportSource1.LastImportTime, ImportSource2.LastImportTime);
+      5: Result := CompareString(ImportSource1.Format.Name, ImportSource2.Format.Name);
     end;
     if ListViewSort1.Order = soDown then Result := -Result;
@@ -164 +178 @@
   ARemove.Enabled := Assigned(ListView1.Selected);
   AModify.Enabled := Assigned(ListView1.Selected);
+  AProcess.Enabled := Assigned(ListView1.Selected);
+  APreview.Enabled := Assigned(ListView1.Selected);
 end;
 
@@ -185 +201 @@
   NewImportSource: TImportSource;
   FormImportSource: TFormImportSource;
-  I: Integer;
 begin
   NewImportSource := TImportSource.Create;
@@ -197 +212 @@
       if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
         ImportSources.Add(NewImportSource);
-
-        // Update reverse references
-        for I := 0 to NewImportSource.Categories.Count - 1 do
-          if NewImportSource.Categories.Items[I].ImportSources.IndexOf(NewImportSource) = -1 then
-            NewImportSource.Categories.Items[I].ImportSources.Add(NewImportSource);
 
         NewImportSource := nil;
@@ -262 +272 @@
         end;
 
-        // Update reverse references
-        TImportSource(ListView1.Selected.Data).Categories.UpdateLinkImportSources(TImportSource(ListView1.Selected.Data));
-
         UpdateList;
       end;
@@ -270 +277 @@
     finally
       FreeAndNil(FormImportSource);
+    end;
+  end;
+end;
+
+procedure TFormImportSources.APreviewExecute(Sender: TObject);
+var
+  FormAcronyms: TFormAcronyms;
+begin
+  if Assigned(ListView1.Selected) then begin
+    PreviewAcronymDb := TAcronymDb.Create;
+    try
+      JobProgressView1.AddJob(SPreviewSelectedSource, PreviewImportJob);
+      JobProgressView1.Start;
+      FormAcronyms := TFormAcronyms.Create(nil);
+      try
+        FormAcronyms.AcronymDb := PreviewAcronymDb;
+        FormAcronyms.Acronyms := PreviewAcronymDb.Acronyms;
+        FormAcronyms.ShowModal;
+      finally
+        FormAcronyms.Free;
+      end;
+    finally
+      FreeAndNil(PreviewAcronymDb);
     end;
   end;
@@ -287 +317 @@
 procedure TFormImportSources.ProcessImportJob(Job: TJob);
 begin
-  TImportSource(ListView1.Selected.Data).Process;
+  TImportSource(ListView1.Selected.Data).Process(AcronymDb);
+end;
+
+procedure TFormImportSources.PreviewImportJob(Job: TJob);
+begin
+  TImportSource(ListView1.Selected.Data).Process(PreviewAcronymDb);
 end;
 
@@ -313 +348 @@
            if Pos(UTF8LowerCase(StringGrid.Cells[4, 0]),
              UTF8LowerCase(DateTimeToStr(TImportSource(List.Items[I]).LastImportTime))) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[5, 0]),
+             UTF8LowerCase(TImportSource(List.Items[I]).Format.Name)) > 0 then Inc(FoundCount);
            if FoundCount <> EnteredCount then List.Delete(I);
          end;
@@ -338 +375 @@
 end;
 
+procedure TFormImportSources.FormActivate(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListView1);
+end;
+
 procedure TFormImportSources.FormCreate(Sender: TObject);
 var