Skip to content

Commit 2bdb0a0

Browse files
committed
fix(stremio-core-web): replace JsValue serialization
Signed-off-by: Lachezar Lechev <[email protected]>
1 parent 30d7b8a commit 2bdb0a0

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

stremio-core-web/src/model/model.rs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use stremio_core::{
3333
};
3434

3535
use super::SerializeModel;
36-
use crate::env::WebEnv;
36+
use crate::{env::WebEnv, SERIALIZER};
3737

3838
#[derive(Model, Clone)]
3939
#[cfg_attr(debug_assertions, derive(Serialize))]
@@ -125,10 +125,30 @@ impl WebModel {
125125
)
126126
}
127127
pub fn get_state(&self, field: &WebModelField) -> JsValue {
128+
return match field {
129+
WebModelField::Ctx => serialize_ctx(&self.ctx),
130+
WebModelField::AuthLink => JsValue::NULL,
131+
WebModelField::DataExport => JsValue::NULL,
132+
WebModelField::ContinueWatchingPreview => JsValue::NULL,
133+
WebModelField::Board => JsValue::NULL,
134+
WebModelField::Discover => JsValue::NULL,
135+
WebModelField::Library => JsValue::NULL,
136+
WebModelField::ContinueWatching => JsValue::NULL,
137+
WebModelField::Calendar => JsValue::NULL,
138+
WebModelField::Search => JsValue::NULL,
139+
WebModelField::LocalSearch => JsValue::NULL,
140+
WebModelField::MetaDetails => JsValue::NULL,
141+
WebModelField::RemoteAddons => JsValue::NULL,
142+
WebModelField::InstalledAddons => JsValue::NULL,
143+
WebModelField::AddonDetails => JsValue::NULL,
144+
WebModelField::StreamingServer => JsValue::NULL,
145+
WebModelField::Player => JsValue::NULL,
146+
};
147+
128148
match field {
129149
WebModelField::Ctx => serialize_ctx(&self.ctx),
130150
WebModelField::AuthLink => {
131-
serde_wasm_bindgen::to_value(&self.auth_link).expect("JsValue from AuthLink")
151+
self.auth_link.serialize(&SERIALIZER).expect("JsValue from AuthLink")
132152
}
133153
WebModelField::DataExport => serialize_data_export(&self.data_export),
134154
WebModelField::ContinueWatchingPreview => serialize_continue_watching_preview(

stremio-core-web/src/model/serialize_catalogs_with_extra.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl super::SerializeModel<wasm_bindgen::JsValue> for CatalogsWithExtra<'_> {
137137
type Error = serde_wasm_bindgen::Error;
138138

139139
fn serialize_model(&self) -> Result<wasm_bindgen::JsValue, Self::Error> {
140-
wasm_bindgen::JsValue::try_from(self)
140+
self.serialize(&crate::SERIALIZER)
141141
}
142142
}
143143

0 commit comments

Comments
 (0)