From 93776c8ceef4b4ae66366998062d63f16c548266 Mon Sep 17 00:00:00 2001 From: Igor Bubelov Date: Fri, 11 Oct 2024 13:43:06 +0700 Subject: [PATCH] Fix issue with JSON handling --- src/command/area.rs | 7 ++++--- src/command/element.rs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/command/area.rs b/src/command/area.rs index ab231ac..bdee136 100644 --- a/src/command/area.rs +++ b/src/command/area.rs @@ -1,6 +1,6 @@ use crate::{rpc, Result}; use clap::Args; -use serde_json::json; +use serde_json::{json, Value}; #[derive(Args)] pub struct GetAreaArgs { @@ -15,13 +15,14 @@ pub fn get_area(args: &GetAreaArgs) -> Result<()> { pub struct SetAreaTagArgs { pub id: String, pub name: String, - pub value: serde_json::Value, + pub value: String, } pub fn set_area_tag(args: &SetAreaTagArgs) -> Result<()> { + let value: Value = serde_json::from_str(&args.value)?; rpc::call( "set_area_tag", - json!({"id": args.id,"name": args.name, "value": args.value}), + json!({"id": args.id,"name": args.name, "value": value}), ) } diff --git a/src/command/element.rs b/src/command/element.rs index b5fc859..3b5d80f 100644 --- a/src/command/element.rs +++ b/src/command/element.rs @@ -1,6 +1,6 @@ use crate::{rpc, Result}; use clap::Args; -use serde_json::json; +use serde_json::{json, Value}; #[derive(Args)] pub struct GetElementArgs { @@ -15,13 +15,14 @@ pub fn get_element(args: &GetElementArgs) -> Result<()> { pub struct SetElementTagArgs { pub id: String, pub name: String, - pub value: serde_json::Value, + pub value: String, } pub fn set_element_tag(args: &SetElementTagArgs) -> Result<()> { + let value: Value = serde_json::from_str(&args.value)?; rpc::call( "set_element_tag", - json!({"id": args.id,"name": args.name, "value": args.value}), + json!({"id": args.id,"name": args.name, "value": value}), ) }