Added reading, validation and display of SWAG version number

Author: delphidabbler

Src/FmSWAGImportDlg.dfm

@@ -19,7 +19,7 @@ inherited SWAGImportDlg: TSWAGImportDlg
     inherited pcWizard: TPageControl
       Width = 671
       Height = 456
-      ActivePage = tsUpdate
+      ActivePage = tsCategories
       ExplicitWidth = 671
       ExplicitHeight = 456
       object tsIntro: TTabSheet
@@ -136,6 +136,12 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Caption = '&Select required packets:'
           FocusControl = clbSelectPackets
         end
+        object lblVersionNumber: TLabel
+          Left = 2
+          Top = 427
+          Width = 3
+          Height = 13
+        end
         object lbCategories: TListBox
           Left = 0
           Top = 64
@@ -147,7 +153,7 @@ inherited SWAGImportDlg: TSWAGImportDlg
           OnKeyDown = lbCategoriesKeyDown
         end
         object clbSelectPackets: TCheckListBox
-          Left = 256
+          Left = 240
           Top = 64
           Width = 404
           Height = 321
@@ -178,6 +184,10 @@ inherited SWAGImportDlg: TSWAGImportDlg
         Caption = 'tsUpdate'
         ImageIndex = 2
         TabVisible = False
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object lblUpdateDesc: TLabel
           Left = 0
           Top = 3

Src/FmSWAGImportDlg.pas

@@ -69,6 +69,7 @@   TSWAGImportDlg = class(TWizardDlg, INoPublicConstruct)
     btnBrowse: TButton;
     actBrowse: TAction;
     frmIntro: THTMLTpltDlgFrame;
+    lblVersionNumber: TLabel;
     ///  <summary>Handles clicks on the check boxes next to packets in the
     ///  packet selection list box by selecting and deselecting packets for
     ///  inclusion in the import.</summary>
@@ -243,6 +244,7 @@ implementation
   // Project
   FmPreviewDlg,
   FmWaitDlg,
+  SWAG.UVersion,
   UBrowseForFolderDlg,
   UColours,
   UConsts,
@@ -254,6 +256,7 @@ implementation
   UMessageBox,
   UStrUtils,
   UUrl,
+  UVersionInfo,
   UWaitForThreadUI;
 
 {$R *.dfm}
@@ -319,7 +322,7 @@ procedure TSWAGImportDlg.ArrangeForm;
   lblCategoriesDesc.Width := tsCategories.ClientWidth;
   lblCategoriesDesc.Top := 3;
   TCtrlArranger.AlignLefts(
-    [lblCategoriesDesc, lblCategories, lbCategories], 0
+    [lblCategoriesDesc, lblCategories, lbCategories, lblVersionNumber], 0
   );
   TCtrlArranger.AlignTops(
     [lblCategories, lblSelectPackets],
@@ -333,6 +336,11 @@ procedure TSWAGImportDlg.ArrangeForm;
     [btnDisplayCategory, btnDisplayPacket],
     TCtrlArranger.BottomOf([lbCategories, clbSelectPackets], 8)
   );
+  TCtrlArranger.MoveBelow(
+    [btnDisplayCategory, btnDisplayPacket],
+    lblVersionNumber,
+    8
+  );
   TCtrlArranger.AlignHCentresTo([lbCategories], [btnDisplayCategory]);
   TCtrlArranger.AlignHCentresTo([clbSelectPackets], [btnDisplayPacket]);
 
@@ -604,28 +612,23 @@ function TSWAGImportDlg.HeadingText(const PageIdx: Integer): string;
 end;
 
 procedure TSWAGImportDlg.InitSelectionPage;
-//resourcestring
-//  sDefaultWaitMsg = 'Accessing SWAG database...';
 var
   Cats: TList<TSWAGCategory>;
   Idx: Integer;
+  VerNumStr: string;
+resourcestring
+  sLblVersionNumberCaption = 'SWAG version %s';
 begin
+  lblVersionNumber.Caption := Format(
+    sLblVersionNumberCaption,
+    [string(TSWAGVersion.GetVersion(GetDirNameFromEditCtrl))]
+  );
+
   Application.ProcessMessages;
 
   if (lbCategories.Count > 0) then
     Exit;
 
-//  fPrevSWAGDir := GetDirNameFromEditCtrl;
-//
-//  FreeAndNil(fSWAGReader);
-//  fSWAGReader := TSWAGReader.Create(
-//    GetDirNameFromEditCtrl,
-//    procedure (CallProc: TProc)
-//    begin
-//      WaitWrapper(Self, CallProc, sDefaultWaitMsg);
-//    end
-//  );
-//
   Cats := TList<TSWAGCategory>.Create;
   try
     fSWAGReader.GetCategories(Cats);
@@ -856,11 +859,23 @@ procedure TSWAGImportDlg.ValidatePage(const PageIdx: Integer);
     sNoFolder = 'Please enter the directory where you downloaded the SWAG '
       + 'database.';
     sBadFolder = 'Directory "%s" does not exist. Please specify a valid one.';
+    sBadVersion = '%s.' + EOL2
+      + 'Please specify a directory containing a supported version.';
+    sCorrupt = 'Not a valid SWAG database (%s). ' + EOL2
+      + 'Please specify a different directory.';
   begin
     if GetDirNameFromEditCtrl = '' then
-      raise EDataEntry.Create(sNoFolder);
+      raise EDataEntry.Create(sNoFolder, edPath);
     if not TDirectory.Exists(GetDirNameFromEditCtrl, False) then
-      raise EDataEntry.CreateFmt(sBadFolder, [GetDirNameFromEditCtrl]);
+      raise EDataEntry.CreateFmt(sBadFolder, [GetDirNameFromEditCtrl], edPath);
+    try
+      TSWAGVersion.ValidateVersionFile(GetDirNameFromEditCtrl);
+    except
+      on E: ECorruptSWAGVersion do
+        raise EDataEntry.CreateFmt(sCorrupt, [E.Message], edPath);
+      on E: EUnsupportedSWAGVersion do
+        raise EDataEntry.CreateFmt(sBadVersion, [E.Message], edPath);
+    end;
   end;
 
   procedure ValidateSelectionPage;