Use page_stat instead of page_stat_data to get scaled page data

Author: paviro

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "koshelf"
-version = "1.0.11"
+version = "1.0.12"
 description = "Transform your KOReader library into a beautiful reading dashboard with statistics."
 repository = "https://github.com/paviro/KOShelf"
 license = "EUPL-1.2 license"

src/models.rs

@@ -353,7 +353,6 @@ pub struct PageStat {
     pub page: i64,
     pub start_time: i64,
     pub duration: i64,
-    pub total_pages: i64,
 }
 
 /// Main container for KoReader statistics data

src/statistics_parser.rs

@@ -90,15 +90,18 @@ impl StatisticsParser {
 
     /// Parse page stat entries from the database
     fn parse_page_stats(conn: &Connection) -> Result<Vec<PageStat>> {
-        let mut stmt = conn.prepare("SELECT id_book, page, start_time, duration, total_pages FROM page_stat_data")?;
+        // Query the rescaled view so that page numbers are already expressed in the current
+        // pagination of each document. The `page_stat` view has the same four columns we
+        // actually use (id_book, page, start_time, duration). See KOReader's Lua code for
+        // the precise definition.
+        let mut stmt = conn.prepare("SELECT id_book, page, start_time, duration FROM page_stat")?;
 
         let stat_iter = stmt.query_map([], |row| {
             Ok(PageStat {
                 id_book: row.get(0)?,
                 page: row.get(1)?,
                 start_time: row.get(2)?,
                 duration: row.get(3)?,
-                total_pages: row.get(4)?,
             })
         })?;