Skip to content

fix: improve type safety and error handling #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
N3XT3R1337 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

fix: improve type safety and error handling #365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::io::ErrorKind as IOErrorKind;
use std::path::Path;
use std::sync::{Arc, Mutex};
use std::thread::sleep;
use std::time::{Duration, SystemTime};
use std::time::{Duration, Instant};

use pyo3::exceptions::{PyFileNotFoundError, PyOSError, PyPermissionError, PyRuntimeError};
use pyo3::prelude::*;
Expand Down Expand Up @@ -274,12 +274,12 @@ impl RustNotify {
false => Some(stop_event.getattr(py, intern!(py, "is_set"))?.into_bound(py)),
};

let mut max_debounce_time: Option<SystemTime> = None;
let mut max_debounce_time: Option<Instant> = None;
let step_time = Duration::from_millis(step_ms);
let mut last_size: usize = 0;
let max_timeout_time: Option<SystemTime> = match timeout_ms {
let max_timeout_time: Option<Instant> = match timeout_ms {
0 => None,
_ => Some(SystemTime::now() + Duration::from_millis(timeout_ms)),
_ => Some(Instant::now() + Duration::from_millis(timeout_ms)),
};
loop {
py.detach(|| sleep(step_time));
Expand Down Expand Up @@ -313,7 +313,7 @@ impl RustNotify {
}
last_size = size;

let now = SystemTime::now();
let now = Instant::now();
if let Some(max_time) = max_debounce_time {
if now > max_time {
break;
Expand All @@ -322,7 +322,7 @@ impl RustNotify {
max_debounce_time = Some(now + Duration::from_millis(debounce_ms));
}
} else if let Some(max_time) = max_timeout_time {
if SystemTime::now() > max_time {
if Instant::now() > max_time {
slf.borrow().clear();
return Ok(intern!(py, "timeout").as_any().to_owned().unbind());
}
Expand Down
Loading