This commit is contained in:
2023-08-09 04:22:30 +02:00
parent 7d6aeca21e
commit 4681de3d49
2 changed files with 11 additions and 5 deletions

View File

@@ -98,8 +98,6 @@ pub async fn download_from_cache(
.await .await
.unwrap(); .unwrap();
tokio::spawn(cache_file(cached_data.object_id, cached_data.object_type, db));
log::error!("{:?}", err); log::error!("{:?}", err);
return None; return None;
}, },

View File

@@ -27,15 +27,23 @@ async fn download_cached_file(
Path((object_id, object_type)): Path<(i32, String)>, Path((object_id, object_type)): Path<(i32, String)>,
Extension(Ext { db }): Extension<Ext> Extension(Ext { db }): Extension<Ext>
) -> impl IntoResponse { ) -> impl IntoResponse {
let cached_file = match get_cached_file_or_cache(object_id, object_type, db.clone()).await { let cached_file = match get_cached_file_or_cache(object_id, object_type.clone(), db.clone()).await {
Some(cached_file) => cached_file, Some(cached_file) => cached_file,
None => return StatusCode::NO_CONTENT.into_response(), None => return StatusCode::NO_CONTENT.into_response(),
}; };
let data = match download_from_cache(cached_file, db).await { let data = match download_from_cache(cached_file, db.clone()).await {
Some(v) => v, Some(v) => v,
None => { None => {
return StatusCode::NO_CONTENT.into_response(); let cached_file = match get_cached_file_or_cache(object_id, object_type, db.clone()).await {
Some(v) => v,
None => return StatusCode::NO_CONTENT.into_response(),
};
match download_from_cache(cached_file, db).await {
Some(v) => v,
None => return StatusCode::NO_CONTENT.into_response(),
}
} }
}; };