Fix imported item counts

Imported items are counted by files rather than database objects. Corrected the displayed output while building from source.
joyfullservice · Nov 7, 2020 · 2ec44ff · 2ec44ff
1 parent 1526539
commit 2ec44ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
@@ -2,7 +2,7 @@
   "Info": {
     "Class": "clsDbProperty",
     "Description": "Database Properties (DAO)",
-    "VCS Version": "3.1.77"
+    "VCS Version": "3.2.0"
   },
   "Items": {
     "AccessVersion": {
@@ -42,7 +42,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "3.2.0",
+      "Value": "3.2.1",
       "Type": 10
     },
     "Auto Compact": {

diff --git a/Version Control.accda.src/modules/modImportExport.bas b/Version Control.accda.src/modules/modImportExport.bas
@@ -83,6 +83,7 @@ Public Sub ExportSource()
             ' Show category header and clear out any orphaned files.
             Log.Spacer Options.ShowDebug
             Log.PadRight "Exporting " & cCategory.Category & "...", , Options.ShowDebug
+            Log.ProgMax = cCategory.Count
             Perf.ComponentStart cCategory.Category
 
             ' Loop through each object in this category.
@@ -261,6 +262,7 @@ Public Sub Build(strSourceFolder As String)
             ' Show category header
             Log.Spacer Options.ShowDebug
             Log.PadRight "Importing " & cCategory.Category & "...", , Options.ShowDebug
+            Log.ProgMax = colFiles.Count
             Perf.ComponentStart cCategory.Category
 
             ' Loop through each file in this category.
@@ -272,9 +274,9 @@ Public Sub Build(strSourceFolder As String)
             Next varFile
 
             ' Show category wrap-up.
-            Log.Add "[" & cCategory.Count & "]" & IIf(Options.ShowDebug, " " & cCategory.Category & " processed.", vbNullString)
+            Log.Add "[" & colFiles.Count & "]" & IIf(Options.ShowDebug, " " & cCategory.Category & " processed.", vbNullString)
             'Log.Flush  ' Gives smoother output, but slows down the import.
-            Perf.ComponentEnd cCategory.Count
+            Perf.ComponentEnd colFiles.Count
         End If
     Next cCategory
 

diff --git a/Version Control.accda.src/vcs-options.json b/Version Control.accda.src/vcs-options.json
@@ -1,6 +1,6 @@
 {
   "Info": {
-    "AddinVersion": "3.2.0",
+    "AddinVersion": "3.2.1",
     "AccessVersion": "14.0 32-bit"
   },
   "Options": {