use words

This commit is contained in:
Quaternions 2025-03-18 13:40:23 -07:00
parent 8786ff0c79
commit e97ad7f102

@ -187,10 +187,10 @@ enum ScriptUploadError{
AllowedMap(GetMapError), AllowedMap(GetMapError),
ReplaceMap(GetMapError), ReplaceMap(GetMapError),
BlockedSet(std::io::Error), BlockedSet(std::io::Error),
GOC(GOCError), GetOrCreate(GOCError),
GOCPolicyReplace(GOCError), GetOrCreatePolicyReplace(GOCError),
GOCPolicyAllowed(GOCError), GetOrCreatePolicyAllowed(GOCError),
GOCPolicyBlocked(GOCError), GetOrCreatePolicyBlocked(GOCError),
} }
fn read_dir_stream(dir:tokio::fs::ReadDir)->impl futures::stream::Stream<Item=std::io::Result<tokio::fs::DirEntry>>{ fn read_dir_stream(dir:tokio::fs::ReadDir)->impl futures::stream::Stream<Item=std::io::Result<tokio::fs::DirEntry>>{
@ -356,7 +356,7 @@ async fn upload_scripts(config:UploadConfig)->Result<(),ScriptUploadError>{
Ok((source,script_id)) Ok((source,script_id))
}) })
.buffer_unordered(REMOTE_CONCURRENCY) .buffer_unordered(REMOTE_CONCURRENCY)
.try_collect().await.map_err(ScriptUploadError::GOC)?; .try_collect().await.map_err(ScriptUploadError::GetOrCreate)?;
// get or create policy for each script in each category // get or create policy for each script in each category
// //
@ -371,7 +371,7 @@ async fn upload_scripts(config:UploadConfig)->Result<(),ScriptUploadError>{
ToScriptID:script_ids[allowed_map[id].as_str()], ToScriptID:script_ids[allowed_map[id].as_str()],
Policy:submissions_api::types::Policy::Replace, Policy:submissions_api::types::Policy::Replace,
} }
).await.map_err(ScriptUploadError::GOCPolicyReplace) ).await.map_err(ScriptUploadError::GetOrCreatePolicyReplace)
}); });
// allowed // allowed
@ -385,7 +385,7 @@ async fn upload_scripts(config:UploadConfig)->Result<(),ScriptUploadError>{
ToScriptID:script_ids[source.as_str()], ToScriptID:script_ids[source.as_str()],
Policy:submissions_api::types::Policy::Allowed, Policy:submissions_api::types::Policy::Allowed,
} }
).await.map_err(ScriptUploadError::GOCPolicyAllowed) ).await.map_err(ScriptUploadError::GetOrCreatePolicyAllowed)
}); });
// blocked // blocked
@ -399,7 +399,7 @@ async fn upload_scripts(config:UploadConfig)->Result<(),ScriptUploadError>{
ToScriptID:script_ids[source.as_str()], ToScriptID:script_ids[source.as_str()],
Policy:submissions_api::types::Policy::Blocked, Policy:submissions_api::types::Policy::Blocked,
} }
).await.map_err(ScriptUploadError::GOCPolicyBlocked) ).await.map_err(ScriptUploadError::GetOrCreatePolicyBlocked)
}); });
// run futures // run futures