Minor mbtiles summary improvements (#1004)

Partial fix of #1002 

* [x] Move all summary code from `mbtiles/src/mbtiles.rs` to
`mbtiles/src/summary.rs`
* [x] Move Metadata and Validation function to separate files
* [x] Remove `filename` String from the summary stats - not much point
because it is accessible from the mbtiles struct itself

---------

Co-authored-by: Yuri Astrakhan <[email protected]>

mbtiles/src/bin/main.rs

@@ -120,6 +120,7 @@ async fn main_int() -> anyhow::Result<()> {
         Commands::Summary { file } => {
             let mbt = Mbtiles::new(file.as_path())?;
             let mut conn = mbt.open_readonly().await?;
+            println!("MBTiles file summary for {mbt}");
             println!("{}", mbt.summary(&mut conn).await?);
         }
     }

mbtiles/src/copier.rs

@@ -10,13 +10,12 @@ use sqlite_hashes::rusqlite::params_from_iter;
 use sqlx::{query, Executor as _, Row, SqliteConnection};
 
 use crate::errors::MbtResult;
-use crate::mbtiles::MbtType::{Flat, FlatWithHash, Normalized};
-use crate::mbtiles::{MbtType, MbtTypeCli};
 use crate::queries::{
     create_flat_tables, create_flat_with_hash_tables, create_normalized_tables,
     create_tiles_with_hash_view, detach_db, is_empty_database,
 };
-use crate::{MbtError, Mbtiles, AGG_TILES_HASH, AGG_TILES_HASH_IN_DIFF};
+use crate::MbtType::{Flat, FlatWithHash, Normalized};
+use crate::{MbtError, MbtType, MbtTypeCli, Mbtiles, AGG_TILES_HASH, AGG_TILES_HASH_IN_DIFF};
 
 #[derive(PartialEq, Eq, Default, Debug, Clone, EnumDisplay)]
 #[enum_display(case = "Kebab")]

mbtiles/src/lib.rs

@@ -1,26 +1,33 @@
 #![doc = include_str!("../README.md")]
 #![allow(clippy::missing_errors_doc)]
 
+mod copier;
+pub use copier::{CopyDuplicateMode, MbtilesCopier};
+
 mod errors;
 pub use errors::{MbtError, MbtResult};
 
 mod mbtiles;
-pub use mbtiles::{
-    calc_agg_tiles_hash, IntegrityCheckType, MbtType, MbtTypeCli, Mbtiles, Metadata,
-    AGG_TILES_HASH, AGG_TILES_HASH_IN_DIFF,
-};
+pub use mbtiles::{MbtTypeCli, Mbtiles};
 
-mod pool;
-pub use pool::MbtilesPool;
-
-mod copier;
-pub use copier::{CopyDuplicateMode, MbtilesCopier};
+mod metadata;
+pub use metadata::Metadata;
 
 mod patcher;
 pub use patcher::apply_patch;
 
+mod pool;
+pub use pool::MbtilesPool;
+
 mod queries;
 pub use queries::{
     create_flat_tables, create_flat_with_hash_tables, create_metadata_table,
     create_normalized_tables, is_flat_with_hash_tables_type, is_normalized_tables_type,
 };
+
+mod summary;
+
+mod validation;
+pub use validation::{
+    calc_agg_tiles_hash, IntegrityCheckType, MbtType, AGG_TILES_HASH, AGG_TILES_HASH_IN_DIFF,
+};