chore: Fix naming of InputProperties in DeviceList

Author: qdot

crates/buttplug_client/src/device/feature.rs

@@ -204,7 +204,7 @@ impl ClientDeviceFeature {
     if let Some(sensor_map) = self.feature.input()
       && let Some(sensor) = sensor_map.get(sensor_type)
       && sensor
-        .input_commands()
+        .command()
         .contains(&InputCommandType::Subscribe)
     {
       let msg = InputCmdV4::new(
@@ -226,7 +226,7 @@ impl ClientDeviceFeature {
     if let Some(sensor_map) = self.feature.input()
       && let Some(sensor) = sensor_map.get(sensor_type)
       && sensor
-        .input_commands()
+        .command()
         .contains(&InputCommandType::Subscribe)
     {
       let msg = InputCmdV4::new(
@@ -247,7 +247,7 @@ impl ClientDeviceFeature {
   fn read_input(&self, sensor_type: InputType) -> ButtplugClientResultFuture<InputTypeReading> {
     if let Some(sensor_map) = self.feature.input()
       && let Some(sensor) = sensor_map.get(sensor_type)
-      && sensor.input_commands().contains(&InputCommandType::Read)
+      && sensor.command().contains(&InputCommandType::Read)
     {
       let msg = InputCmdV4::new(
         self.device_index,

crates/buttplug_core/schema/buttplug-schema.json

@@ -414,18 +414,25 @@
             "^.*$": {
               "type": "object",
               "properties": {
-                "ValueRange": {
+                "Value": {
                   "type": "array",
                   "items": {
                     "type": "array",
                     "items": {
                       "type": "integer"
                     }
                   }
+                },
+                "Command": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
                 }
               },
               "required": [
-                "ValueRange"
+                "Value",
+                "Command"
               ]
             }
           }

crates/buttplug_core/src/message/device_feature.rs

@@ -275,19 +275,19 @@ impl DeviceFeatureOutput {
 pub struct DeviceFeatureInputProperties {
   #[getset(get = "pub", get_mut = "pub(super)")]
   #[serde(serialize_with = "range_sequence_serialize")]
-  value_range: Vec<RangeInclusive<i32>>,
+  value: Vec<RangeInclusive<i32>>,
   #[getset(get = "pub")]
-  input_commands: HashSet<InputCommandType>,
+  command: HashSet<InputCommandType>,
 }
 
 impl DeviceFeatureInputProperties {
   pub fn new(
-    value_range: &Vec<RangeInclusive<i32>>,
+    value: &Vec<RangeInclusive<i32>>,
     sensor_commands: &HashSet<InputCommandType>,
   ) -> Self {
     Self {
-      value_range: value_range.clone(),
-      input_commands: sensor_commands.clone(),
+      value: value.clone(),
+      command: sensor_commands.clone(),
     }
   }
 }

crates/buttplug_server/src/message/v3/client_device_message_attributes.rs

@@ -338,12 +338,12 @@ impl From<Vec<DeviceFeature>> for ClientDeviceMessageAttributesV3 {
             // Only convert Battery backwards. Other sensors weren't really built for v3 and we
             // never recommended using them or implemented much for them.
             if let Some(battery) = sensor_map.battery()
-              && battery.input_commands().contains(&InputCommandType::Read)
+              && battery.command().contains(&InputCommandType::Read)
             {
               sensor_vec.push(SensorDeviceMessageAttributesV3 {
                 feature_descriptor: feature.description().to_owned(),
                 sensor_type: InputType::Battery,
-                sensor_range: battery.value_range().clone(),
+                sensor_range: battery.value().clone(),
                 feature: feature.clone(),
                 index: 0,
               });

crates/buttplug_server/src/message/v3/server_device_message_attributes.rs

@@ -161,7 +161,7 @@ impl From<Vec<ServerDeviceFeature>> for ServerDeviceMessageAttributesV3 {
             sensor_vec.push(ServerSensorDeviceMessageAttributesV3 {
               feature_descriptor: feature.description().to_owned(),
               sensor_type: InputType::Battery,
-              sensor_range: battery.value_range().clone(),
+              sensor_range: battery.value().clone(),
               feature: feature.clone(),
               index: 0,
             });