chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: notify user file size (#1161)

This commit is contained in:
Nathan.fooo 2025-01-14 12:50:52 +08:00 committed by GitHub
parent 5a2f54bfdd
commit c5cdb06b77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
services/appflowy-worker/src/import_worker/worker.rs
View File

@ -288,7 +288,23 @@ async fn consume_task(
Some(file_size) => { Some(file_size) => {
if file_size > context.maximum_import_file_size as i64 { if file_size > context.maximum_import_file_size as i64 {
let file_size_in_mb = file_size as f64 / 1_048_576.0; let file_size_in_mb = file_size as f64 / 1_048_576.0;
let max_size_in_mb = context.maximum_import_file_size as f64 / 1_048_576.0; let max_size_in_mb = (context.maximum_import_file_size as f64 / 1_048_576.0).ceil();
if let Ok(import_record) = select_import_task(&context.pg_pool, &task.task_id).await {
handle_failed_task(
&mut context,
&import_record,
task,
stream_name,
group_name,
&entry_id,
ImportError::UploadFileTooLarge {
file_size_in_mb,
max_size_in_mb,
},
ImportTaskState::Failed,
)
.await?;
}
return Err(ImportError::UploadFileTooLarge { return Err(ImportError::UploadFileTooLarge {
file_size_in_mb, file_size_in_mb,
@ -299,16 +315,18 @@ async fn consume_task(
} }
// Check if the task is expired // Check if the task is expired
if let Err(err) = is_task_expired(task.created_at.unwrap(), task.last_process_at) { if let Err(reason) = is_task_expired(task.created_at.unwrap(), task.last_process_at) {
if let Ok(import_record) = select_import_task(&context.pg_pool, &task.task_id).await { if let Ok(import_record) = select_import_task(&context.pg_pool, &task.task_id).await {
handle_expired_task( error!("[Import] {} task is expired: {}", task.workspace_id, reason);
handle_failed_task(
&mut context, &mut context,
&import_record, &import_record,
task, task,
stream_name, stream_name,
group_name, group_name,
&entry_id, &entry_id,
&err, ImportError::UploadFileExpire,
ImportTaskState::Expire,
) )
.await?; .await?;
} }
@ -342,25 +360,23 @@ async fn consume_task(
} }
} }
async fn handle_expired_task( #[allow(clippy::too_many_arguments)]
async fn handle_failed_task(
context: &mut TaskContext, context: &mut TaskContext,
import_record: &AFImportTask, import_record: &AFImportTask,
task: &NotionImportTask, task: &NotionImportTask,
stream_name: &str, stream_name: &str,
group_name: &str, group_name: &str,
entry_id: &str, entry_id: &str,
reason: &str, error: ImportError,
task_state: ImportTaskState,
) -> Result<(), ImportError> { ) -> Result<(), ImportError> {
info!( info!(
"[Import]: {} import is expired with reason:{}", "[Import]: {} import was failed with reason:{}",
task.workspace_id, reason task.workspace_id, error
); );
update_import_task_status( update_import_task_status(&import_record.task_id, task_state, &context.pg_pool)
&import_record.task_id,
ImportTaskState::Expire,
&context.pg_pool,
)
.await .await
.map_err(|e| { .map_err(|e| {
error!("Failed to update import task status: {:?}", e); error!("Failed to update import task status: {:?}", e);
@ -382,13 +398,7 @@ async fn handle_expired_task(
task.workspace_id, err task.workspace_id, err
); );
} }
notify_user( notify_user(task, Err(error), context.notifier.clone(), &context.metrics).await?;
task,
Err(ImportError::UploadFileExpire),
context.notifier.clone(),
&context.metrics,
)
.await?;
Ok(()) Ok(())
} }