Expert users need raw access to expert values

Author: groue

GRDB/Core/Database.swift

@@ -1320,11 +1320,12 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
         do {
             backupLoop: while true {
                 let rc = sqlite3_backup_step(backup, pagesPerStep)
-                let totalPages = Int(sqlite3_backup_pagecount(backup))
-                let completedPages = totalPages - Int(sqlite3_backup_remaining(backup))
-                let progress = DatabaseBackupProgress(completedPageCount: completedPages,
-                                                      totalPageCount: totalPages,
-                                                      isCompleted: rc == SQLITE_DONE)
+                let totalPageCount = Int(sqlite3_backup_pagecount(backup))
+                let remainingPageCount = Int(sqlite3_backup_remaining(backup))
+                let progress = DatabaseBackupProgress(
+                    remainingPageCount: remainingPageCount,
+                    totalPageCount: totalPageCount,
+                    isCompleted: rc == SQLITE_DONE)
                 switch rc {
                 case SQLITE_DONE:
                     try? afterBackupStep?(progress)

GRDB/Core/DatabaseBackupProgress.swift

@@ -4,13 +4,18 @@
 ///
 /// This is an advanced API for expert users. It is based directly on the SQLite
 /// [online backup API](https://www.sqlite.org/c3ref/backup_finish.html).
-///
-/// This struct is not meant to be instantiated by users.
 public struct DatabaseBackupProgress {
-    /// Completed page count is defined as `sqlite3_backup_pagecount() - sqlite3_backup_remaining()`
-    public let completedPageCount: Int
+    /// Total page count is defined by the `sqlite3_backup_remaining` function
+    public let remainingPageCount: Int
+
     /// Total page count is defined by the `sqlite3_backup_pagecount` function
     public let totalPageCount: Int
+
+    /// Completed page count is defined as `sqlite3_backup_pagecount() - sqlite3_backup_remaining()`
+    public var completedPageCount: Int {
+        totalPageCount - remainingPageCount
+    }
+
     /// This property is true if and only if `sqlite3_backup_step()` returns
     /// `SQLITE_DONE`
     public let isCompleted: Bool