Move ids from gdn-app to gdn
This commit is contained in:
parent
4d71e49752
commit
3855d86730
9 changed files with 13 additions and 8 deletions
|
|
@ -4,7 +4,9 @@ version = { workspace = true }
|
|||
edition = { workspace = true }
|
||||
|
||||
[dependencies]
|
||||
directories.workspace = true
|
||||
directories = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
100
gdn/src/ids.rs
Normal file
100
gdn/src/ids.rs
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
use std::{fmt, ops::Shl, str::FromStr, time::SystemTime};
|
||||
|
||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||
|
||||
/// A timestamp- and randomness-based id.
|
||||
///
|
||||
/// The id consists of 8 bytes. The first 5 bytes are an epoch timestamp in
|
||||
/// seconds, while the remaining 3 bytes are a random number, meant to avoid
|
||||
/// collisions when two ids are created during the same second, possibly even on
|
||||
/// different devices.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
||||
struct TimestampId(u64);
|
||||
|
||||
impl TimestampId {
|
||||
fn new() -> Self {
|
||||
let secs = SystemTime::now()
|
||||
.duration_since(SystemTime::UNIX_EPOCH)
|
||||
.expect("duration is positive")
|
||||
.as_secs();
|
||||
|
||||
let random = rand::random::<u64>();
|
||||
|
||||
// Zeroing the last three bytes just in case. They should already be
|
||||
// zero under normal circumstances.
|
||||
let first_part = secs.shl(3 * 8) & 0xFFFFFFFF_FF000000_u64;
|
||||
let second_part = random & 0x00000000_00FFFFFF_u64;
|
||||
|
||||
Self(first_part | second_part)
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for TimestampId {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{:016X}", self.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for TimestampId {
|
||||
type Err = ();
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
if s.len() != 16 {
|
||||
return Err(());
|
||||
}
|
||||
|
||||
if s.chars().any(|c| c.is_lowercase()) {
|
||||
return Err(());
|
||||
}
|
||||
|
||||
let n = u64::from_str_radix(s, 16).map_err(|_| ())?;
|
||||
|
||||
Ok(Self(n))
|
||||
}
|
||||
}
|
||||
|
||||
/// The id for a single note.
|
||||
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
||||
pub struct NoteId(TimestampId);
|
||||
|
||||
impl NoteId {
|
||||
#[allow(clippy::new_without_default)] // Because side-effects
|
||||
pub fn new() -> Self {
|
||||
Self(TimestampId::new())
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for NoteId {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "NoteId({self})")
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for NoteId {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "n{}", self.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for NoteId {
|
||||
type Err = ();
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
let s = s.strip_prefix("n").ok_or(())?;
|
||||
Ok(Self(s.parse()?))
|
||||
}
|
||||
}
|
||||
|
||||
impl Serialize for NoteId {
|
||||
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
||||
format!("{self}").serialize(serializer)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'de> Deserialize<'de> for NoteId {
|
||||
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
||||
<&'de str as Deserialize<'de>>::deserialize(deserializer)?
|
||||
.parse()
|
||||
.map_err(|()| serde::de::Error::custom("invalid note id"))
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
pub mod ids;
|
||||
mod paths;
|
||||
|
||||
pub use crate::paths::Paths;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue