extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-06-20 09:58:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use spawn_blocking for file access during async context (#1936)

Browse Source
This commit is contained in:
Conrad Ludgate 2024-04-12 10:40:14 +01:00 committed by GitHub
parent d434d4e8b7
commit c41998e98a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
atuin-client/src/settings.rs
View File

@ -527,7 +527,13 @@ impl Settings {
if !self.needs_update_check()? {
// Worst case, we don't want Atuin to fail to start because something funky is going on with
// version checking.
let version = match Settings::read_from_data_dir(LATEST_VERSION_FILENAME) {
let version = tokio::task::spawn_blocking(|| {
Settings::read_from_data_dir(LATEST_VERSION_FILENAME)
})
.await
.expect("file task panicked");
let version = match version {
Some(v) => Version::parse(&v).unwrap_or(current),
None => current,
};
@ -541,8 +547,14 @@ impl Settings {
#[cfg(not(feature = "sync"))]
let latest = current;
Settings::save_version_check_time()?;
Settings::save_to_data_dir(LATEST_VERSION_FILENAME, latest.to_string().as_str())?;
let latest_encoded = latest.to_string();
tokio::task::spawn_blocking(move || {
Settings::save_version_check_time()?;
Settings::save_to_data_dir(LATEST_VERSION_FILENAME, &latest_encoded)?;
Ok::<(), eyre::Report>(())
})
.await
.expect("file task panicked")?;
Ok(latest)
}