ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-17 14:58:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lrwn: Update Deserialize trait implementation.

Browse Source
This commit is contained in:
Orne Brocaar
2024-09-12 14:20:59 +01:00
parent 9d04a74a94
commit 190d977bf5
1 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
lrwn/src/region/mod.rs
View File

@ -13,7 +13,7 @@ use diesel::{
{deserialize, serialize}, {deserialize, serialize},
}; };
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
use serde::{Deserialize, Serialize}; use serde::{de, Deserialize, Deserializer, Serialize};
use crate::{ use crate::{
CFList, CFListChannelMasks, CFListChannels, ChMask, DevAddr, LinkADRReqPayload, Redundancy, CFList, CFListChannelMasks, CFListChannels, ChMask, DevAddr, LinkADRReqPayload, Redundancy,
@ -33,7 +33,7 @@ pub mod us915;
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
#[derive(Copy, Clone, Debug, Eq, PartialEq)] #[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] #[cfg_attr(feature = "serde", derive(Serialize))]
#[cfg_attr(feature = "diesel", derive(AsExpression, FromSqlRow))] #[cfg_attr(feature = "diesel", derive(AsExpression, FromSqlRow))]
#[cfg_attr(feature = "diesel", diesel(sql_type = diesel::sql_types::Text))] #[cfg_attr(feature = "diesel", diesel(sql_type = diesel::sql_types::Text))]
pub enum CommonName { pub enum CommonName {
@ -59,6 +59,43 @@ impl fmt::Display for CommonName {
} }
} }
impl FromStr for CommonName {
type Err = anyhow::Error;
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
Ok(match s {
"EU868" => CommonName::EU868,
"US915" => CommonName::US915,
"CN779" => CommonName::CN779,
"EU433" => CommonName::EU433,
"AU915" => CommonName::AU915,
"CN470" => CommonName::CN470,
"AS923" => CommonName::AS923,
"AS923_2" | "AS923-2" => CommonName::AS923_2,
"AS923_3" | "AS923-3" => CommonName::AS923_3,
"AS923_4" | "AS923-4" => CommonName::AS923_4,
"KR920" => CommonName::KR920,
"IN865" => CommonName::IN865,
"RU864" => CommonName::RU864,
"ISM2400" => CommonName::ISM2400,
_ => {
return Err(anyhow!("Unexpected CommonName: {}", s));
}
})
}
}
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for CommonName {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
FromStr::from_str(&s).map_err(de::Error::custom)
}
}
#[cfg(feature = "diesel")] #[cfg(feature = "diesel")]
impl<DB> deserialize::FromSql<Text, DB> for CommonName impl<DB> deserialize::FromSql<Text, DB> for CommonName
where where
@ -95,32 +132,6 @@ impl serialize::ToSql<Text, Sqlite> for CommonName {
} }
} }
impl FromStr for CommonName {
type Err = anyhow::Error;
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
Ok(match s {
"EU868" => CommonName::EU868,
"US915" => CommonName::US915,
"CN779" => CommonName::CN779,
"EU433" => CommonName::EU433,
"AU915" => CommonName::AU915,
"CN470" => CommonName::CN470,
"AS923" => CommonName::AS923,
"AS923_2" | "AS923-2" => CommonName::AS923_2,
"AS923_3" | "AS923-3" => CommonName::AS923_3,
"AS923_4" | "AS923-4" => CommonName::AS923_4,
"KR920" => CommonName::KR920,
"IN865" => CommonName::IN865,
"RU864" => CommonName::RU864,
"ISM2400" => CommonName::ISM2400,
_ => {
return Err(anyhow!("Unexpected CommonName: {}", s));
}
})
}
}
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
#[derive(Clone, Copy, PartialEq, Eq, Hash)] #[derive(Clone, Copy, PartialEq, Eq, Hash)]
#[cfg_attr(feature = "diesel", derive(AsExpression, FromSqlRow))] #[cfg_attr(feature = "diesel", derive(AsExpression, FromSqlRow))]
@ -181,6 +192,17 @@ impl FromStr for Revision {
} }
} }
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Revision {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
FromStr::from_str(&s).map_err(de::Error::custom)
}
}
#[cfg(feature = "diesel")] #[cfg(feature = "diesel")]
impl<DB> deserialize::FromSql<Text, DB> for Revision impl<DB> deserialize::FromSql<Text, DB> for Revision
where where
@ -274,6 +296,17 @@ impl FromStr for MacVersion {
} }
} }
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for MacVersion {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
FromStr::from_str(&s).map_err(de::Error::custom)
}
}
#[cfg(feature = "diesel")] #[cfg(feature = "diesel")]
impl<DB> deserialize::FromSql<Text, DB> for MacVersion impl<DB> deserialize::FromSql<Text, DB> for MacVersion
where where