bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Prefix all crates with oj_ and use release version of dependencies

Browse Source
This commit is contained in:
NG (Graham)
2025-06-03 21:09:03 -04:00
parent d0c2b1ec03
commit f678426e10
85 changed files with 773 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rc_services_room/src/operations/crf_vehicle_data.rs
View File

@@ -1,32 +1,32 @@
use polariton_server::operations::{Operation, OperationCode};
use polariton::operation::{Typed, ParameterTable};
use rc_factory::VehicleFactoryAdapter;
use oj_rc_factory::VehicleFactoryAdapter;
const CODE: u8 = 87;
const ID_PARAM_KEY: u8 = 94;
const DATA_PARAM_KEY: u8 = 95;
async fn do_handling(params: ParameterTable<()>, _user: &crate::UserTy, factory: &std::sync::Arc<rc_core::factory::Factory>) -> Result<ParameterTable, i16> {
async fn do_handling(params: ParameterTable<()>, _user: &crate::UserTy, factory: &std::sync::Arc<oj_rc_core::factory::Factory>) -> Result<ParameterTable, i16> {
let mut params = params.to_dict();
if let Some(Typed::Int(id)) = params.remove(&ID_PARAM_KEY) {
let vehicle = factory.vehicle(id as _).await.map_err(|e| {
log::error!("Failed to retrieve vehicle {} from factory: {}", id, e);
rc_core::data::error_codes::WebServicesError::DatabaseError as i16
oj_rc_core::data::error_codes::WebServicesError::DatabaseError as i16
})?;
if let Some(vehicle) = vehicle {
let vehicle_data = crate::data::crf::ItemData::from(vehicle.0);
params.insert(DATA_PARAM_KEY, vehicle_data.as_transmissible());
} else {
log::warn!("Failed to retrieve non-existent factory vehicle {}", id);
return Err(rc_core::data::error_codes::WebServicesError::InvalidRobot as i16);
return Err(oj_rc_core::data::error_codes::WebServicesError::InvalidRobot as i16);
}
}
Ok(params.into())
}
pub struct CrfItemDataProvider {
factory: std::sync::Arc<rc_core::factory::Factory>,
factory: std::sync::Arc<oj_rc_core::factory::Factory>,
}
#[async_trait::async_trait]
@@ -44,7 +44,7 @@ impl OperationCode for CrfItemDataProvider {
}
}
pub(super) fn crf_item_data_provider(factory: &std::sync::Arc<rc_core::factory::Factory>) -> CrfItemDataProvider {
pub(super) fn crf_item_data_provider(factory: &std::sync::Arc<oj_rc_core::factory::Factory>) -> CrfItemDataProvider {
CrfItemDataProvider {
factory: factory.to_owned(),
}