diff --git a/crates/caldav/src/calendar/methods/mkcalendar.rs b/crates/caldav/src/calendar/methods/mkcalendar.rs index ab36b08..cb3ead6 100644 --- a/crates/caldav/src/calendar/methods/mkcalendar.rs +++ b/crates/caldav/src/calendar/methods/mkcalendar.rs @@ -2,8 +2,7 @@ use crate::Error; use actix_web::web::{Data, Path}; use actix_web::HttpResponse; use rustical_store::auth::User; -use rustical_store::model::Calendar; -use rustical_store::CalendarStore; +use rustical_store::{Calendar, CalendarStore}; use serde::{Deserialize, Serialize}; #[derive(Deserialize, Serialize, Clone, Debug)] diff --git a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs index efa4be3..0358335 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs +++ b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs @@ -16,7 +16,7 @@ use rustical_dav::{ MultistatusElement, }, }; -use rustical_store::{model::object::CalendarObject, CalendarStore}; +use rustical_store::{CalendarObject, CalendarStore}; use serde::Deserialize; #[derive(Deserialize, Clone, Debug)] diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs index 9fbb915..60ca18a 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_query.rs +++ b/crates/caldav/src/calendar/methods/report/calendar_query.rs @@ -5,7 +5,7 @@ use rustical_dav::{ resource::Resource, xml::{multistatus::PropstatWrapper, MultistatusElement}, }; -use rustical_store::{model::object::CalendarObject, CalendarStore}; +use rustical_store::{CalendarObject, CalendarStore}; use serde::Deserialize; use crate::{ diff --git a/crates/caldav/src/calendar/methods/report/sync_collection.rs b/crates/caldav/src/calendar/methods/report/sync_collection.rs index 7d40c02..265c5d5 100644 --- a/crates/caldav/src/calendar/methods/report/sync_collection.rs +++ b/crates/caldav/src/calendar/methods/report/sync_collection.rs @@ -8,7 +8,7 @@ use rustical_dav::{ }, }; use rustical_store::{ - model::calendar::{format_synctoken, parse_synctoken}, + calendar::{format_synctoken, parse_synctoken}, CalendarStore, }; use serde::Deserialize; diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs index e062a86..e3ceece 100644 --- a/crates/caldav/src/calendar/resource.rs +++ b/crates/caldav/src/calendar/resource.rs @@ -15,8 +15,7 @@ use async_trait::async_trait; use derive_more::derive::{From, Into}; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; use rustical_dav::xml::HrefElement; -use rustical_store::model::Calendar; -use rustical_store::CalendarStore; +use rustical_store::{Calendar, CalendarStore}; use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::sync::Arc; diff --git a/crates/caldav/src/calendar_object/methods.rs b/crates/caldav/src/calendar_object/methods.rs index 8b6d4da..aa38c4b 100644 --- a/crates/caldav/src/calendar_object/methods.rs +++ b/crates/caldav/src/calendar_object/methods.rs @@ -5,8 +5,7 @@ use actix_web::web::{Data, Path}; use actix_web::HttpRequest; use actix_web::HttpResponse; use rustical_store::auth::User; -use rustical_store::model::CalendarObject; -use rustical_store::CalendarStore; +use rustical_store::{CalendarObject, CalendarStore}; use tracing::instrument; use tracing_actix_web::RootSpan; diff --git a/crates/caldav/src/calendar_object/resource.rs b/crates/caldav/src/calendar_object/resource.rs index 715c002..1a05c7e 100644 --- a/crates/caldav/src/calendar_object/resource.rs +++ b/crates/caldav/src/calendar_object/resource.rs @@ -4,8 +4,7 @@ use actix_web::{dev::ResourceMap, web::Data, HttpRequest}; use async_trait::async_trait; use derive_more::derive::{From, Into}; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; -use rustical_store::model::object::CalendarObject; -use rustical_store::CalendarStore; +use rustical_store::{CalendarObject, CalendarStore}; use serde::{Deserialize, Serialize}; use std::sync::Arc; use strum::{EnumString, VariantNames}; diff --git a/crates/carddav/src/address_object/methods.rs b/crates/carddav/src/address_object/methods.rs index 91b061f..bdb53c8 100644 --- a/crates/carddav/src/address_object/methods.rs +++ b/crates/carddav/src/address_object/methods.rs @@ -6,8 +6,7 @@ use actix_web::web::{Data, Path}; use actix_web::HttpRequest; use actix_web::HttpResponse; use rustical_store::auth::User; -use rustical_store::model::AddressObject; -use rustical_store::AddressbookStore; +use rustical_store::{AddressObject, AddressbookStore}; use tracing::instrument; use tracing_actix_web::RootSpan; diff --git a/crates/carddav/src/address_object/resource.rs b/crates/carddav/src/address_object/resource.rs index 9426449..55bccad 100644 --- a/crates/carddav/src/address_object/resource.rs +++ b/crates/carddav/src/address_object/resource.rs @@ -3,7 +3,7 @@ use actix_web::{dev::ResourceMap, web::Data, HttpRequest}; use async_trait::async_trait; use derive_more::derive::{From, Into}; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; -use rustical_store::{model::AddressObject, AddressbookStore}; +use rustical_store::{AddressObject, AddressbookStore}; use serde::{Deserialize, Serialize}; use std::sync::Arc; use strum::{EnumString, VariantNames}; diff --git a/crates/carddav/src/addressbook/methods/mkcol.rs b/crates/carddav/src/addressbook/methods/mkcol.rs index ce04e36..adfcb16 100644 --- a/crates/carddav/src/addressbook/methods/mkcol.rs +++ b/crates/carddav/src/addressbook/methods/mkcol.rs @@ -1,8 +1,7 @@ use crate::Error; use actix_web::web::Path; use actix_web::{web::Data, HttpResponse}; -use rustical_store::model::Addressbook; -use rustical_store::{auth::User, AddressbookStore}; +use rustical_store::{auth::User, Addressbook, AddressbookStore}; use serde::{Deserialize, Serialize}; #[derive(Deserialize, Serialize, Clone, Debug)] diff --git a/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs b/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs index a361b5e..6b38671 100644 --- a/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs +++ b/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs @@ -16,7 +16,7 @@ use rustical_dav::{ MultistatusElement, }, }; -use rustical_store::{model::AddressObject, AddressbookStore}; +use rustical_store::{AddressObject, AddressbookStore}; use serde::Deserialize; #[derive(Deserialize, Clone, Debug)] diff --git a/crates/carddav/src/addressbook/methods/report/sync_collection.rs b/crates/carddav/src/addressbook/methods/report/sync_collection.rs index b5bb8b8..c943580 100644 --- a/crates/carddav/src/addressbook/methods/report/sync_collection.rs +++ b/crates/carddav/src/addressbook/methods/report/sync_collection.rs @@ -12,7 +12,7 @@ use rustical_dav::{ }, }; use rustical_store::{ - model::addressbook::{format_synctoken, parse_synctoken}, + addressbook::{format_synctoken, parse_synctoken}, AddressbookStore, }; use serde::Deserialize; diff --git a/crates/carddav/src/addressbook/resource.rs b/crates/carddav/src/addressbook/resource.rs index a9673f9..faa3bd6 100644 --- a/crates/carddav/src/addressbook/resource.rs +++ b/crates/carddav/src/addressbook/resource.rs @@ -12,8 +12,7 @@ use async_trait::async_trait; use derive_more::derive::{From, Into}; use rustical_dav::resource::{InvalidProperty, Resource, ResourceService}; use rustical_dav::xml::HrefElement; -use rustical_store::model::Addressbook; -use rustical_store::AddressbookStore; +use rustical_store::{Addressbook, AddressbookStore}; use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::sync::Arc; diff --git a/crates/frontend/src/lib.rs b/crates/frontend/src/lib.rs index 7fa01b0..9834e15 100644 --- a/crates/frontend/src/lib.rs +++ b/crates/frontend/src/lib.rs @@ -9,8 +9,7 @@ use askama::Template; use routes::login::{route_get_login, route_post_login}; use rustical_store::{ auth::{AuthenticationMiddleware, AuthenticationProvider, User}, - model::Calendar, - CalendarStore, + Calendar, CalendarStore, }; use std::sync::Arc; diff --git a/crates/store/src/model/address_object.rs b/crates/store/src/addressbook/address_object.rs similarity index 99% rename from crates/store/src/model/address_object.rs rename to crates/store/src/addressbook/address_object.rs index 250fe11..391bf60 100644 --- a/crates/store/src/model/address_object.rs +++ b/crates/store/src/addressbook/address_object.rs @@ -1,6 +1,5 @@ -use sha2::{Digest, Sha256}; - use crate::Error; +use sha2::{Digest, Sha256}; #[derive(Debug, Clone)] pub struct AddressObject { diff --git a/crates/store/src/model/addressbook.rs b/crates/store/src/addressbook/addressbook.rs similarity index 100% rename from crates/store/src/model/addressbook.rs rename to crates/store/src/addressbook/addressbook.rs diff --git a/crates/store/src/addressbook/mod.rs b/crates/store/src/addressbook/mod.rs new file mode 100644 index 0000000..dcb0549 --- /dev/null +++ b/crates/store/src/addressbook/mod.rs @@ -0,0 +1,5 @@ +pub mod address_object; +pub mod addressbook; + +pub use address_object::*; +pub use addressbook::*; diff --git a/crates/store/src/addressbook_store.rs b/crates/store/src/addressbook_store.rs index bb2184f..4915945 100644 --- a/crates/store/src/addressbook_store.rs +++ b/crates/store/src/addressbook_store.rs @@ -1,5 +1,5 @@ use crate::{ - model::{AddressObject, Addressbook}, + addressbook::{AddressObject, Addressbook}, Error, }; use async_trait::async_trait; diff --git a/crates/store/src/model/calendar.rs b/crates/store/src/calendar/calendar.rs similarity index 100% rename from crates/store/src/model/calendar.rs rename to crates/store/src/calendar/calendar.rs diff --git a/crates/store/src/model/event.rs b/crates/store/src/calendar/event.rs similarity index 100% rename from crates/store/src/model/event.rs rename to crates/store/src/calendar/event.rs diff --git a/crates/store/src/model/journal.rs b/crates/store/src/calendar/journal.rs similarity index 100% rename from crates/store/src/model/journal.rs rename to crates/store/src/calendar/journal.rs diff --git a/crates/store/src/calendar/mod.rs b/crates/store/src/calendar/mod.rs new file mode 100644 index 0000000..81c2d9a --- /dev/null +++ b/crates/store/src/calendar/mod.rs @@ -0,0 +1,11 @@ +mod calendar; +mod event; +mod journal; +mod object; +mod todo; + +pub use calendar::*; +pub use event::*; +pub use journal::*; +pub use object::*; +pub use todo::*; diff --git a/crates/store/src/model/object.rs b/crates/store/src/calendar/object.rs similarity index 100% rename from crates/store/src/model/object.rs rename to crates/store/src/calendar/object.rs diff --git a/crates/store/src/model/todo.rs b/crates/store/src/calendar/todo.rs similarity index 100% rename from crates/store/src/model/todo.rs rename to crates/store/src/calendar/todo.rs diff --git a/crates/store/src/calendar_store.rs b/crates/store/src/calendar_store.rs index 954906a..adaed17 100644 --- a/crates/store/src/calendar_store.rs +++ b/crates/store/src/calendar_store.rs @@ -1,6 +1,5 @@ +use crate::calendar::{Calendar, CalendarObject}; use crate::error::Error; -use crate::model::object::CalendarObject; -use crate::model::Calendar; use async_trait::async_trait; #[async_trait] diff --git a/crates/store/src/lib.rs b/crates/store/src/lib.rs index b515654..5d6fc48 100644 --- a/crates/store/src/lib.rs +++ b/crates/store/src/lib.rs @@ -1,10 +1,14 @@ +pub mod addressbook; pub mod addressbook_store; pub mod calendar_store; pub mod error; -pub mod model; pub mod timestamp; pub use error::Error; pub mod auth; +pub mod calendar; pub use addressbook_store::AddressbookStore; pub use calendar_store::CalendarStore; + +pub use addressbook::{AddressObject, Addressbook}; +pub use calendar::{Calendar, CalendarObject}; diff --git a/crates/store/src/model/mod.rs b/crates/store/src/model/mod.rs deleted file mode 100644 index 4ef96d8..0000000 --- a/crates/store/src/model/mod.rs +++ /dev/null @@ -1,14 +0,0 @@ -pub mod calendar; -pub mod event; -pub mod journal; -pub mod object; -pub mod todo; - -pub use calendar::Calendar; -pub use object::CalendarObject; - -pub mod addressbook; -pub use addressbook::Addressbook; - -pub mod address_object; -pub use address_object::AddressObject; diff --git a/crates/store_sqlite/src/addressbook_store.rs b/crates/store_sqlite/src/addressbook_store.rs index 9233ef7..4cc2168 100644 --- a/crates/store_sqlite/src/addressbook_store.rs +++ b/crates/store_sqlite/src/addressbook_store.rs @@ -1,9 +1,6 @@ use super::{ChangeOperation, SqliteStore}; use async_trait::async_trait; -use rustical_store::{ - model::{AddressObject, Addressbook}, - AddressbookStore, -}; +use rustical_store::{AddressObject, Addressbook, AddressbookStore}; use sqlx::{Sqlite, Transaction}; use tracing::instrument; diff --git a/crates/store_sqlite/src/calendar_store.rs b/crates/store_sqlite/src/calendar_store.rs index d41433a..b7b51ab 100644 --- a/crates/store_sqlite/src/calendar_store.rs +++ b/crates/store_sqlite/src/calendar_store.rs @@ -1,9 +1,6 @@ use super::{ChangeOperation, SqliteStore}; use async_trait::async_trait; -use rustical_store::model::object::CalendarObject; -use rustical_store::model::Calendar; -use rustical_store::CalendarStore; -use rustical_store::Error; +use rustical_store::{Calendar, CalendarObject, CalendarStore, Error}; use sqlx::Sqlite; use sqlx::Transaction; use tracing::instrument;