feat(sched): ✨ accept UTC- and UTC+ format in tz_to_s function
This commit is contained in:
parent
790e3235b5
commit
412aecad56
@ -52,10 +52,19 @@ pub fn hm_to_s(h: i32, m: i32) -> i32 {
|
|||||||
pub fn tz_to_s(offset: &str) -> Result<i32> {
|
pub fn tz_to_s(offset: &str) -> Result<i32> {
|
||||||
// if it doesn't start with '+' or '-', it's invalid
|
// if it doesn't start with '+' or '-', it's invalid
|
||||||
ensure!(
|
ensure!(
|
||||||
offset.starts_with('+') || offset.starts_with('-'),
|
offset.starts_with('+')
|
||||||
|
|| offset.starts_with('-')
|
||||||
|
|| offset.starts_with("UTC-")
|
||||||
|
|| offset.starts_with("UTC+"),
|
||||||
NO_SIGN_ERR
|
NO_SIGN_ERR
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let offset = if offset.starts_with("UTC") {
|
||||||
|
offset[3..].to_string()
|
||||||
|
} else {
|
||||||
|
offset.to_string()
|
||||||
|
};
|
||||||
|
|
||||||
let sign = if offset.starts_with('+') { 1 } else { -1 };
|
let sign = if offset.starts_with('+') { 1 } else { -1 };
|
||||||
let parts: Vec<&str> = offset[1..].split(':').collect();
|
let parts: Vec<&str> = offset[1..].split(':').collect();
|
||||||
|
|
||||||
@ -108,6 +117,16 @@ mod tests {
|
|||||||
assert_eq!(tz_to_s("-3")?, -10800);
|
assert_eq!(tz_to_s("-3")?, -10800);
|
||||||
assert_eq!(tz_to_s("-3:30")?, -12600);
|
assert_eq!(tz_to_s("-3:30")?, -12600);
|
||||||
|
|
||||||
|
// UTC+ and UTC- are also valid
|
||||||
|
|
||||||
|
assert_eq!(tz_to_s("UTC+01:00")?, 3600);
|
||||||
|
assert_eq!(tz_to_s("UTC-03:00")?, -10800);
|
||||||
|
assert_eq!(tz_to_s("UTC+03")?, 10800);
|
||||||
|
assert_eq!(tz_to_s("UTC+00:00")?, 0);
|
||||||
|
assert_eq!(tz_to_s("UTC-00:00")?, 0);
|
||||||
|
assert_eq!(tz_to_s("UTC-3")?, -10800);
|
||||||
|
assert_eq!(tz_to_s("UTC-3:30")?, -12600);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user