From 11dca1fab21d49d8e8d0205c340b9b23e91b076e Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Wed, 5 Feb 2025 00:03:26 +0100 Subject: [PATCH] Use data manager name everywhere --- src/{persistence.rs => data_manager.rs} | 8 ++++---- src/main.rs | 10 +++++----- src/ui/collatable_container/collated_grid.rs | 3 ++- src/ui/collatable_container/collation_menu/mod.rs | 3 ++- src/ui/collatable_container/mod.rs | 2 +- src/ui/mod.rs | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) rename src/{persistence.rs => data_manager.rs} (94%) diff --git a/src/persistence.rs b/src/data_manager.rs similarity index 94% rename from src/persistence.rs rename to src/data_manager.rs index 2bad8d7..6d62648 100644 --- a/src/persistence.rs +++ b/src/data_manager.rs @@ -12,10 +12,10 @@ use crate :: error :: { * , ZoodexError :: * } ; -pub struct Collection { sqlite_client : Client } +pub struct DataManager { sqlite_client : Client } -impl Collection { - pub async fn new () -> Result { +impl DataManager { + pub async fn new () -> Result { let sqlite_client = ClientBuilder :: new () . path ("zoodex.sqlite") . flags ( OpenFlags :: SQLITE_OPEN_READ_WRITE | OpenFlags :: SQLITE_OPEN_NO_MUTEX ) @@ -24,7 +24,7 @@ impl Collection { Ok ( Self { sqlite_client } ) } - pub async fn get_overview ( & self ) -> CollectionOverview { + pub async fn get_collection_overview ( & self ) -> CollectionOverview { self . sqlite_client . conn ( |sqlite_connection| { let films = sqlite_connection . prepare ( " diff --git a/src/main.rs b/src/main.rs index 1b1ae0b..768cbde 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ mod error ; -mod persistence ; +mod data_manager ; mod ui ; mod utility ; @@ -13,7 +13,7 @@ use { } , libadwaita :: { * , prelude :: * } } ; -use crate :: { error :: { * , ZoodexError :: * } , persistence :: * , ui :: * } ; +use crate :: { data_manager :: * , error :: { * , ZoodexError :: * } , ui :: * } ; @@ -43,9 +43,9 @@ fn show_window ( app : & Application ) { spawn_future_local ( async move { async_unit_result_context ( async { - let collection = Collection :: new () . await ? ; - let collection_overview = collection . get_overview () . await ; - ui . render_collection_overview (collection_overview) ; + let data_manager = DataManager :: new () . await ? ; + let collection = data_manager . get_collection_overview () . await ; + ui . render_collection_overview (collection) ; Ok (()) } , |error| { diff --git a/src/ui/collatable_container/collated_grid.rs b/src/ui/collatable_container/collated_grid.rs index 409e74a..9d9bb8b 100644 --- a/src/ui/collatable_container/collated_grid.rs +++ b/src/ui/collatable_container/collated_grid.rs @@ -1,7 +1,8 @@ use { gtk4 :: { * , - Align :: * , Orientation :: * , + Align :: * , + Orientation :: * , gdk :: * , pango :: { * , Weight :: * } , prelude :: * , diff --git a/src/ui/collatable_container/collation_menu/mod.rs b/src/ui/collatable_container/collation_menu/mod.rs index 760edd2..ec9374f 100644 --- a/src/ui/collatable_container/collation_menu/mod.rs +++ b/src/ui/collatable_container/collation_menu/mod.rs @@ -6,7 +6,8 @@ use { } ; use crate :: ui :: { - component :: * , utility :: * , + component :: * , + utility :: * , collatable_container :: { * , collation_menu :: sort_button :: * } , } ; diff --git a/src/ui/collatable_container/mod.rs b/src/ui/collatable_container/mod.rs index 7e723c6..50d3c45 100644 --- a/src/ui/collatable_container/mod.rs +++ b/src/ui/collatable_container/mod.rs @@ -4,7 +4,7 @@ mod collation_menu ; use gtk4 :: { * , Orientation :: * , prelude :: * } ; use crate :: { - persistence :: * , + data_manager :: * , ui :: { component :: * , utility :: * , collatable_container :: { collated_grid :: * , collation_menu :: * } , diff --git a/src/ui/mod.rs b/src/ui/mod.rs index b29b48f..13951b6 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -10,7 +10,7 @@ use { } ; use crate :: { - persistence :: * , + data_manager :: * , ui :: { application_header_bar :: * , collatable_container :: * ,