gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-26 11:08:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

async user image fetching

Browse Source
This commit is contained in:
Nikita Galaiko 2023-03-20 15:41:09 +01:00
parent e29d09f2fc
commit 252f589f44
No known key found for this signature in database
GPG Key ID: EBAB54E845BA519D
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src-tauri/src/main.rs
View File

@ -107,7 +107,7 @@ fn build_asset_url(path: &str) -> String {
format!("asset://localhost/{}", urlencoding::encode(path)) format!("asset://localhost/{}", urlencoding::encode(path))
} }
fn proxy_image(handle: tauri::AppHandle, src: &str) -> Result<String> { async fn proxy_image(handle: tauri::AppHandle, src: &str) -> Result<String> {
if src.starts_with("asset://") { if src.starts_with("asset://") {
return Ok(src.to_string()); return Ok(src.to_string());
} }
@ -126,7 +126,7 @@ fn proxy_image(handle: tauri::AppHandle, src: &str) -> Result<String> {
return Ok(build_asset_url(&save_to.display().to_string())); return Ok(build_asset_url(&save_to.display().to_string()));
} }
let resp = reqwest::blocking::get(src)?; let resp = reqwest::get(src).await?;
if !resp.status().is_success() { if !resp.status().is_success() {
return Err(anyhow::anyhow!( return Err(anyhow::anyhow!(
"Failed to download image {}: {}", "Failed to download image {}: {}",
@ -135,7 +135,7 @@ fn proxy_image(handle: tauri::AppHandle, src: &str) -> Result<String> {
)); ));
} }
let bytes = resp.bytes()?; let bytes = resp.bytes().await?;
std::fs::create_dir_all(&images_dir)?; std::fs::create_dir_all(&images_dir)?;
std::fs::write(&save_to, bytes)?; std::fs::write(&save_to, bytes)?;
@ -191,7 +191,7 @@ fn list_sessions(
} }
#[tauri::command(async)] #[tauri::command(async)]
fn get_user(handle: tauri::AppHandle) -> Result<Option<users::User>, Error> { async fn get_user(handle: tauri::AppHandle) -> Result<Option<users::User>, Error> {
let app_state = handle.state::<App>(); let app_state = handle.state::<App>();
match app_state match app_state
@ -200,7 +200,7 @@ fn get_user(handle: tauri::AppHandle) -> Result<Option<users::User>, Error> {
.with_context(|| "Failed to get user".to_string())? .with_context(|| "Failed to get user".to_string())?
{ {
Some(user) => { Some(user) => {
let local_picture = match proxy_image(handle, &user.picture) { let local_picture = match proxy_image(handle, &user.picture).await {
Ok(picture) => picture, Ok(picture) => picture,
Err(e) => { Err(e) => {
log::error!("{:#}", e); log::error!("{:#}", e);