Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for volumeid serializer

Browse Source
This commit is contained in:
Aiden McClelland
2021-08-24 22:48:39 -06:00
committed by Aiden McClelland
parent 1f48fcfb97
commit a8db75099b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appmgr/src/volume/mod.rs
View File

@@ -17,10 +17,8 @@ pub mod disk;
pub const PKG_VOLUME_DIR: &'static str = "/mnt/embassy-os/volumes/package-data"; pub const PKG_VOLUME_DIR: &'static str = "/mnt/embassy-os/volumes/package-data";
pub const BACKUP_DIR: &'static str = "/mnt/embassy-os-backups/EmbassyBackups"; pub const BACKUP_DIR: &'static str = "/mnt/embassy-os-backups/EmbassyBackups";
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
#[serde(untagged)]
pub enum VolumeId<S: AsRef<str> = String> { pub enum VolumeId<S: AsRef<str> = String> {
#[serde(rename = "BACKUP")]
Backup, Backup,
Custom(Id<S>), Custom(Id<S>),
} }
@@ -66,6 +64,14 @@ where
}) })
} }
} }
impl<S: AsRef<str>> Serialize for VolumeId<S> {
fn serialize<Ser>(&self, serializer: Ser) -> Result<Ser::Ok, Ser::Error>
where
Ser: serde::Serializer,
{
serializer.serialize_str(self.as_ref())
}
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)] #[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Volumes(IndexMap<VolumeId, Volume>); pub struct Volumes(IndexMap<VolumeId, Volume>);