Skip to content

Commit

Permalink
refactor: fix all clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ResuBaka
ResuBaka committed Mar 1, 2025
1 parent c4d770c commit 7bf0316
Show file tree
Hide file tree
Showing 24 changed files with 494 additions and 739 deletions.
57 changes: 26 additions & 31 deletions rust/api-server/api/src/buildings/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use service::Query as QueryCore;
use std::collections::{HashMap, HashSet};
use std::fs::File;
use std::ops::Add;
use std::path::PathBuf;
use std::time::Duration;
use struson::json_path;
use struson::reader::{JsonReader, JsonStreamReader};
Expand Down Expand Up @@ -189,7 +188,7 @@ pub(crate) async fn find_building_state(

#[allow(dead_code)]
pub(crate) async fn load_building_state_from_file(
storage_path: &PathBuf,
storage_path: &std::path::Path,
) -> anyhow::Result<Vec<building_state::Model>> {
let building_states: Vec<building_state::Model> = {
let item_file = File::open(storage_path.join("State/BuildingState.json"))?;
Expand Down Expand Up @@ -234,7 +233,7 @@ pub(crate) async fn load_state_from_spacetimedb(
let building_descs =
load_building_state_from_spacetimedb(client, domain, protocol, database).await?;

import_building_state(&conn, building_descs, None).await?;
import_building_state(conn, building_descs, None).await?;

Ok(())
}
Expand Down Expand Up @@ -279,7 +278,7 @@ pub(crate) async fn import_building_state(
}
}

if buffer_before_insert.len() > 0 {
if !buffer_before_insert.is_empty() {
db_insert_building_state(conn, &mut buffer_before_insert, &on_conflict).await?;
info!("building_state last batch imported");
}
Expand All @@ -288,7 +287,7 @@ pub(crate) async fn import_building_state(
start.elapsed().as_secs()
);

if known_building_state_ids.len() > 0 {
if !known_building_state_ids.is_empty() {
delete_building_state(conn, known_building_state_ids).await?;
}

Expand Down Expand Up @@ -349,24 +348,16 @@ async fn db_insert_building_state(

let things_to_insert = buffer_before_insert
.iter()
.filter(|building_state| {
match building_state_from_db_map.get(&building_state.entity_id) {
Some(building_state_from_db) => {
if building_state_from_db != *building_state {
return true;
}
}
None => {
return true;
}
}

return false;
})
.filter(
|building_state| match building_state_from_db_map.get(&building_state.entity_id) {
Some(building_state_from_db) => building_state_from_db != *building_state,
None => true,
},
)
.map(|building_state| building_state.clone().into_active_model())
.collect::<Vec<building_state::ActiveModel>>();

if things_to_insert.len() == 0 {
if things_to_insert.is_empty() {
debug!("Nothing to insert");
buffer_before_insert.clear();
return Ok(());
Expand All @@ -386,7 +377,7 @@ async fn db_insert_building_state(

#[allow(dead_code)]
pub(crate) async fn load_building_desc_from_file(
storage_path: &PathBuf,
storage_path: &std::path::Path,
) -> anyhow::Result<Vec<building_desc::Model>> {
let building_descs: Vec<building_desc::Model> = {
let item_file = File::open(storage_path.join("Desc/BuildingDesc.json"))?;
Expand All @@ -411,7 +402,7 @@ async fn delete_building_descs(
Ok(())
}

pub async fn import_job_building_desc(temp_config: Config) -> () {
pub async fn import_job_building_desc(temp_config: Config) {
let config = temp_config.clone();
if config.live_updates {
let conn = super::create_importer_default_db_connection(config.clone()).await;
Expand Down Expand Up @@ -465,7 +456,7 @@ fn import_internal_building_state(config: Config, conn: DatabaseConnection, clie

pub(crate) async fn handle_transaction_update(
p0: &DatabaseConnection,
tables: &Vec<TableWithOriginalEventTransactionUpdate>,
tables: &[TableWithOriginalEventTransactionUpdate],
) -> anyhow::Result<()> {
let on_conflict = sea_query::OnConflict::column(building_state::Column::EntityId)
.update_columns([
Expand All @@ -485,7 +476,7 @@ pub(crate) async fn handle_transaction_update(
match serde_json::from_str::<building_state::Model>(row.as_ref()) {
Ok(building_state) => {
let current_building_state =
QueryCore::find_building_state_by_id(&p0, building_state.entity_id).await?;
QueryCore::find_building_state_by_id(p0, building_state.entity_id).await?;

if current_building_state.is_some() {
let current_building_state = current_building_state.unwrap();
Expand All @@ -507,7 +498,9 @@ pub(crate) async fn handle_transaction_update(
.await?;
}
}
Err(_) => {}
Err(error) => {
error!("TransactionUpdate Insert BuildingState Error: {error}");
}
}
}
}
Expand All @@ -521,7 +514,7 @@ pub(crate) async fn handle_transaction_update(
}

let current_building_state =
QueryCore::find_building_state_by_id(&p0, building_state.entity_id).await?;
QueryCore::find_building_state_by_id(p0, building_state.entity_id).await?;

if current_building_state.is_some() {
let _ = building_state::Entity::delete_many()
Expand All @@ -530,7 +523,9 @@ pub(crate) async fn handle_transaction_update(
.await?;
}
}
Err(_) => {}
Err(error) => {
error!("TransactionUpdate Insert BuildingState Error: {error}");
}
}
}
}
Expand All @@ -552,7 +547,7 @@ pub(crate) async fn handle_initial_subscription(
])
.to_owned();

let chunk_size = Some(5000);
let chunk_size = 5000;
let mut buffer_before_insert: Vec<building_state::Model> = vec![];

let mut known_building_state_ids = get_known_building_state_ids(p0).await?;
Expand All @@ -564,7 +559,7 @@ pub(crate) async fn handle_initial_subscription(
known_building_state_ids.remove(&building_state.entity_id);
}
buffer_before_insert.push(building_state);
if buffer_before_insert.len() == chunk_size.unwrap_or(5000) {
if buffer_before_insert.len() == chunk_size {
db_insert_building_state(p0, &mut buffer_before_insert, &on_conflict)
.await?;
}
Expand All @@ -576,13 +571,13 @@ pub(crate) async fn handle_initial_subscription(
}
}

if buffer_before_insert.len() > 0 {
if !buffer_before_insert.is_empty() {
for buffer_chnk in buffer_before_insert.chunks(5000) {
db_insert_building_state(p0, &mut buffer_chnk.to_vec(), &on_conflict).await?;
}
}

if known_building_state_ids.len() > 0 {
if !known_building_state_ids.is_empty() {
delete_building_state(p0, known_building_state_ids).await?;
}

Expand Down
59 changes: 21 additions & 38 deletions rust/api-server/api/src/cargo_desc/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use serde_json::Value;
use std::collections::HashMap;
use std::fs::File;
use std::ops::Add;
use std::path::PathBuf;
use std::time::Duration;
use struson::json_path;
use struson::reader::{JsonReader, JsonStreamReader};
Expand Down Expand Up @@ -95,24 +94,16 @@ pub(crate) async fn import_cargo_description(

let things_to_insert = buffer_before_insert
.iter()
.filter(|cargo_desc| {
match cargo_desc_from_db_map.get(&cargo_desc.id) {
Some(cargo_desc_from_db) => {
if cargo_desc_from_db != *cargo_desc {
return true;
}
}
None => {
return true;
}
}

return false;
})
.filter(
|cargo_desc| match cargo_desc_from_db_map.get(&cargo_desc.id) {
Some(cargo_desc_from_db) => cargo_desc_from_db != *cargo_desc,
None => true,
},
)
.map(|cargo_desc| cargo_desc.clone().into_active_model())
.collect::<Vec<cargo_desc::ActiveModel>>();

if things_to_insert.len() == 0 {
if things_to_insert.is_empty() {
debug!("Nothing to insert");
buffer_before_insert.clear();
continue;
Expand All @@ -124,8 +115,8 @@ pub(crate) async fn import_cargo_description(
let cargo_desc_in = cargo_desc_to_delete
.iter()
.position(|id| id == cargo_desc.id.as_ref());
if cargo_desc_in.is_some() {
cargo_desc_to_delete.remove(cargo_desc_in.unwrap());
if let Some(cargo_desc_in) = cargo_desc_in {
cargo_desc_to_delete.remove(cargo_desc_in);
}
}

Expand All @@ -138,7 +129,7 @@ pub(crate) async fn import_cargo_description(
}
}

if buffer_before_insert.len() > 0 {
if !buffer_before_insert.is_empty() {
let cargo_desc_from_db = cargo_desc::Entity::find()
.filter(
cargo_desc::Column::Id.is_in(
Expand All @@ -158,24 +149,16 @@ pub(crate) async fn import_cargo_description(

let things_to_insert = buffer_before_insert
.iter()
.filter(|cargo_desc| {
match cargo_desc_from_db_map.get(&cargo_desc.id) {
Some(cargo_desc_from_db) => {
if cargo_desc_from_db != *cargo_desc {
return true;
}
}
None => {
return true;
}
}

return false;
})
.filter(
|cargo_desc| match cargo_desc_from_db_map.get(&cargo_desc.id) {
Some(cargo_desc_from_db) => cargo_desc_from_db != *cargo_desc,
None => true,
},
)
.map(|cargo_desc| cargo_desc.clone().into_active_model())
.collect::<Vec<cargo_desc::ActiveModel>>();

if things_to_insert.len() == 0 {
if things_to_insert.is_empty() {
debug!("Nothing to insert");
buffer_before_insert.clear();
} else {
Expand All @@ -194,7 +177,7 @@ pub(crate) async fn import_cargo_description(
start.elapsed().as_secs()
);

if cargo_desc_to_delete.len() > 0 {
if !cargo_desc_to_delete.is_empty() {
info!("cargo_desc's to delete: {:?}", cargo_desc_to_delete);
cargo_desc::Entity::delete_many()
.filter(cargo_desc::Column::Id.is_in(cargo_desc_to_delete))
Expand All @@ -207,7 +190,7 @@ pub(crate) async fn import_cargo_description(

#[allow(dead_code)]
pub(crate) async fn load_cargo_description_from_file(
storage_path: &PathBuf,
storage_path: &std::path::Path,
) -> anyhow::Result<Vec<cargo_desc::Model>> {
let cargo_descriptions: Vec<cargo_desc::Model> = {
let item_file = File::open(storage_path.join("Desc/CargoDesc.json"))?;
Expand Down Expand Up @@ -259,12 +242,12 @@ pub(crate) async fn load_desc_from_spacetimedb(
let cargo_descriptions =
load_cargo_description_from_spacetimedb(client, domain, protocol, database).await?;

import_cargo_description(&conn, cargo_descriptions, None).await?;
import_cargo_description(conn, cargo_descriptions, None).await?;

Ok(())
}

pub async fn import_job_cargo_desc(temp_config: Config) -> () {
pub async fn import_job_cargo_desc(temp_config: Config) {
let config = temp_config.clone();
if config.live_updates {
let conn = super::create_importer_default_db_connection(config.clone()).await;
Expand Down
Loading

0 comments on commit 7bf0316

Please sign in to comment.