StrafesNET/remote-script-review
3
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update deps

Browse Source
This commit is contained in:
Rhys Lloyd
2025-06-10 17:02:39 -07:00
parent 1976ce8dc8
commit 3486b48446
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.rs
View File

@@ -115,13 +115,13 @@ enum ReviewError{
Cookie(submissions_api::CookieError),
Reqwest(submissions_api::ReqwestError),
GetPolicies(submissions_api::Error),
GetScriptFromHash(submissions_api::types::SingleItemError),
GetScriptFromHash(submissions_api::types::ScriptSingleItemError),
NoScript,
WriteCurrent(std::io::Error),
ActionIO(std::io::Error),
PurgeScript(submissions_api::Error),
ReadCurrent(std::io::Error),
DeduplicateModified(submissions_api::types::SingleItemError),
DeduplicateModified(submissions_api::types::ScriptSingleItemError),
UploadModified(submissions_api::Error),
UpdateScriptPolicy(submissions_api::Error),
}
@@ -248,10 +248,10 @@ enum ScriptUploadError{
AllowedMap(GetMapError),
ReplaceMap(GetMapError),
BlockedSet(std::io::Error),
GetOrCreate(GOCError),
GetOrCreatePolicyReplace(GOCError),
GetOrCreatePolicyAllowed(GOCError),
GetOrCreatePolicyBlocked(GOCError),
GetOrCreate(GOCScriptError),
GetOrCreatePolicyReplace(GOCScriptPolicyError),
GetOrCreatePolicyAllowed(GOCScriptPolicyError),
GetOrCreatePolicyBlocked(GOCScriptPolicyError),
}
fn read_dir_stream(dir:tokio::fs::ReadDir)->impl futures::stream::Stream<Item=std::io::Result<tokio::fs::DirEntry>>{
@@ -330,10 +330,11 @@ fn hash_format(hash:u64)->String{
format!("{:016x}",hash)
}
type GOCError=submissions_api::types::SingleItemError;
type GOCResult=Result<submissions_api::types::ScriptID,GOCError>;
type GOCScriptError=submissions_api::types::ScriptSingleItemError;
type GOCScriptPolicyError=submissions_api::types::ScriptPolicySingleItemError;
type GOCScriptResult=Result<submissions_api::types::ScriptID,GOCScriptError>;
async fn get_or_create_script(api:&submissions_api::external::Context,source:&str)->GOCResult{
async fn get_or_create_script(api:&submissions_api::external::Context,source:&str)->GOCScriptResult{
let script_response=api.get_script_from_hash(submissions_api::types::HashRequest{
hash:hash_format(hash_source(source)).as_str(),
}).await?;
@@ -345,7 +346,7 @@ async fn get_or_create_script(api:&submissions_api::external::Context,source:&st
Source:source,
ResourceType:submissions_api::types::ResourceType::Unknown,
ResourceID:None,
}).await.map_err(GOCError::Other)?.ScriptID
}).await.map_err(GOCScriptError::Other)?.ScriptID
})
}
@@ -353,7 +354,7 @@ async fn check_or_create_script_poicy(
api:&submissions_api::external::Context,
hash:&str,
script_policy:submissions_api::types::CreateScriptPolicyRequest,
)->Result<(),GOCError>{
)->Result<(),GOCScriptPolicyError>{
let script_policy_result=api.get_script_policy_from_hash(submissions_api::types::HashRequest{
hash,
}).await?;
@@ -367,7 +368,7 @@ async fn check_or_create_script_poicy(
},
None=>{
// create a new policy
api.create_script_policy(script_policy).await.map_err(GOCError::Other)?;
api.create_script_policy(script_policy).await.map_err(GOCScriptPolicyError::Other)?;
}
}
@@ -476,7 +477,7 @@ enum RepairPoliciesError{
Cookie(submissions_api::CookieError),
Reqwest(submissions_api::ReqwestError),
GetPolicies(submissions_api::Error),
GetScripts(submissions_api::types::SingleItemError),
GetScripts(submissions_api::types::ScriptSingleItemError),
UpdateScriptPolicy(submissions_api::Error),
}
@@ -595,8 +596,7 @@ async fn repair_duplicates(config:RepairDuplicatesConfig)->Result<(),RepairDupli
enum ReleaseError{
Cookie(submissions_api::CookieError),
Reqwest(submissions_api::ReqwestError),
GetScripts(submissions_api::Error),
DeleteScript(submissions_api::Error),
GetMaps(submissions_api::Error),
}
struct ReleaseConfig{