put synctoken into common module

crates/caldav/src/calendar/methods/report/sync_collection.rs

@@ -8,7 +8,7 @@ use rustical_dav::{
     },
 };
 use rustical_store::{
-    calendar::{format_synctoken, parse_synctoken},
+    synctoken::{format_synctoken, parse_synctoken},
     CalendarStore,
 };
 use serde::Deserialize;

crates/carddav/src/addressbook/methods/report/sync_collection.rs

@@ -12,7 +12,7 @@ use rustical_dav::{
     },
 };
 use rustical_store::{
-    addressbook::{format_synctoken, parse_synctoken},
+    synctoken::{format_synctoken, parse_synctoken},
     AddressbookStore,
 };
 use serde::Deserialize;

crates/store/src/addressbook/addressbook.rs

@@ -1,3 +1,4 @@
+use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
 
 #[derive(Debug, Clone)]
@@ -15,18 +16,3 @@ impl Addressbook {
         format_synctoken(self.synctoken)
     }
 }
-
-// TODO: make nicer
-const SYNC_NAMESPACE: &str = "github.com/lennart-k/rustical/ns/";
-
-pub fn format_synctoken(synctoken: i64) -> String {
-    format!("{}{}", SYNC_NAMESPACE, synctoken)
-}
-
-pub fn parse_synctoken(synctoken: &str) -> Option<i64> {
-    if !synctoken.starts_with(SYNC_NAMESPACE) {
-        return None;
-    }
-    let (_, synctoken) = synctoken.split_at(SYNC_NAMESPACE.len());
-    synctoken.parse::<i64>().ok()
-}

crates/store/src/calendar/calendar.rs

@@ -1,3 +1,4 @@
+use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
 
@@ -19,17 +20,3 @@ impl Calendar {
         format_synctoken(self.synctoken)
     }
 }
-
-const SYNC_NAMESPACE: &str = "github.com/lennart-k/rustical/ns/";
-
-pub fn format_synctoken(synctoken: i64) -> String {
-    format!("{}{}", SYNC_NAMESPACE, synctoken)
-}
-
-pub fn parse_synctoken(synctoken: &str) -> Option<i64> {
-    if !synctoken.starts_with(SYNC_NAMESPACE) {
-        return None;
-    }
-    let (_, synctoken) = synctoken.split_at(SYNC_NAMESPACE.len());
-    synctoken.parse::<i64>().ok()
-}

crates/store/src/lib.rs

@@ -6,6 +6,7 @@ pub mod timestamp;
 pub use error::Error;
 pub mod auth;
 pub mod calendar;
+pub mod synctoken;
 
 pub use addressbook_store::AddressbookStore;
 pub use calendar_store::CalendarStore;

crates/store/src/synctoken.rs

@@ -0,0 +1,13 @@
+const SYNC_NAMESPACE: &str = "github.com/lennart-k/rustical/ns/";
+
+pub fn format_synctoken(synctoken: i64) -> String {
+    format!("{}{}", SYNC_NAMESPACE, synctoken)
+}
+
+pub fn parse_synctoken(synctoken: &str) -> Option<i64> {
+    if !synctoken.starts_with(SYNC_NAMESPACE) {
+        return None;
+    }
+    let (_, synctoken) = synctoken.split_at(SYNC_NAMESPACE.len());
+    synctoken.parse::<i64>().ok()
+}