redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-07-13 17:07:45 +00:00
Code Activity

Put new rusqlite usage behind #[cfg]

Browse source 
This should fix the WebAssembly build.
This commit is contained in:
Joshua Goins 2025-07-12 07:43:01 -04:00
parent 8e3e18812b
commit ae5e168f2d
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/workdefinitions/chara_make.rs
View file

@ -1,4 +1,3 @@
use rusqlite::types::{FromSql, FromSqlResult, ValueRef};
use serde_json::{Value, json}; use serde_json::{Value, json};
use crate::common::CustomizeData; use crate::common::CustomizeData;
@ -14,9 +13,10 @@ pub struct CharaMake {
pub unk2: i32, pub unk2: i32,
} }
impl FromSql for CharaMake { #[cfg(not(target_family = "wasm"))]
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { impl rusqlite::types::FromSql for CharaMake {
Ok(CharaMake::from_json(&String::column_result(value)?)) fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
Ok(Self::from_json(&String::column_result(value)?))
} }
} }

9
src/common/workdefinitions/client_select_data.rs
View file

@ -1,4 +1,3 @@
use rusqlite::types::{FromSql, FromSqlResult, ValueRef};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::json; use serde_json::json;
@ -28,10 +27,10 @@ impl TryFrom<i32> for RemakeMode {
} }
} }
} }
#[cfg(not(target_family = "wasm"))]
impl FromSql for RemakeMode { impl rusqlite::types::FromSql for RemakeMode {
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
Ok(RemakeMode::try_from(i32::column_result(value)?).unwrap()) Ok(Self::try_from(i32::column_result(value)?).unwrap())
} }
} }

6
src/inventory/mod.rs
View file

@ -1,7 +1,6 @@
use crate::common::GameData; use crate::common::GameData;
use icarus::{ClassJob::ClassJobSheet, Race::RaceSheet}; use icarus::{ClassJob::ClassJobSheet, Race::RaceSheet};
use physis::common::Language; use physis::common::Language;
use rusqlite::types::{FromSql, FromSqlResult, ValueRef};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::ipc::zone::ItemOperation; use crate::ipc::zone::ItemOperation;
@ -78,8 +77,9 @@ impl<'a> IntoIterator for &'a Inventory {
} }
} }
impl FromSql for Inventory { #[cfg(not(target_family = "wasm"))]
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { impl rusqlite::types::FromSql for Inventory {
fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
Ok(serde_json::from_str(&String::column_result(value)?).unwrap()) Ok(serde_json::from_str(&String::column_result(value)?).unwrap())
} }
} }

8
src/ipc/zone/common_spawn.rs
View file

@ -5,7 +5,6 @@ use crate::common::{
read_string, write_quantized_rotation, write_string, read_string, write_quantized_rotation, write_string,
}; };
use bitflags::bitflags; use bitflags::bitflags;
use rusqlite::types::{FromSql, FromSqlResult, ValueRef};
use super::StatusEffect; use super::StatusEffect;
@ -116,9 +115,10 @@ pub enum GameMasterRank {
Debug = 90, Debug = 90,
} }
impl FromSql for GameMasterRank { #[cfg(not(target_family = "wasm"))]
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { impl rusqlite::types::FromSql for GameMasterRank {
Ok(GameMasterRank::try_from(u8::column_result(value)?).unwrap()) fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
Ok(Self::try_from(u8::column_result(value)?).unwrap())
} }
} }