lucas/lool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(sched): ✨ accept UTC- and UTC+ format in tz_to_s function

Browse Source
This commit is contained in:
Lucas Colombo 2024-04-16 07:29:54 -03:00
parent 790e3235b5
commit 412aecad56
Signed by: lucas
GPG Key ID: EF34786CFEFFAE35
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/sched/utils/mod.rs
View File

@ -9,7 +9,7 @@ const INVALID_OFFSET_MIN_ERR: &str = "invalid timezone offset (minute should be
const INVALID_TIME_ERR: &str = "invalid time format, expected `hh:mm{{:ss}}?`"; const INVALID_TIME_ERR: &str = "invalid time format, expected `hh:mm{{:ss}}?`";
/// 🧉 » parses a time string into hours, minutes and seconds /// 🧉 » parses a time string into hours, minutes and seconds
/// ///
/// e.g. `12:30` -> `(12, 30, 0)` /// e.g. `12:30` -> `(12, 30, 0)`
pub fn parse_time(time: &str) -> Result<(u32, u32, u32)> { pub fn parse_time(time: &str) -> Result<(u32, u32, u32)> {
let parts: Vec<&str> = time.split(':').collect(); let parts: Vec<&str> = time.split(':').collect();
@ -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(())
} }