|
1 | | -use std::fmt::Write; |
2 | | - |
3 | 1 | use crate::device_selector::DeviceSelectorError; |
4 | 2 | use sinowisp::to_hex_string; |
5 | 3 |
|
@@ -39,122 +37,140 @@ pub struct ItemNode { |
39 | 37 |
|
40 | 38 | const INDENT_SIZE: usize = 4; |
41 | 39 |
|
42 | | -pub trait TreeDisplay: Sized { |
43 | | - fn write_tree(self, out: &mut String, level: usize); |
44 | | - |
45 | | - fn to_tree_string(self, level: usize) -> String { |
46 | | - let mut out = String::new(); |
47 | | - self.write_tree(&mut out, level); |
48 | | - out |
49 | | - } |
50 | | -} |
51 | | - |
52 | | -fn push_indent(out: &mut String, level: usize) { |
53 | | - out.extend(std::iter::repeat_n(' ', INDENT_SIZE * level)); |
54 | | -} |
55 | | - |
56 | | -fn write_descriptor_lines( |
57 | | - out: &mut String, |
58 | | - level: usize, |
59 | | - descriptor: &Result<Vec<u8>, DeviceSelectorError>, |
60 | | - feature_report_ids: &Result<Vec<u32>, DeviceSelectorError>, |
61 | | -) { |
62 | | - out.push('\n'); |
63 | | - push_indent(out, level); |
64 | | - let _ = match descriptor { |
65 | | - Ok(descriptor) => write!(out, "report_descriptor=[{}]", to_hex_string(descriptor)), |
66 | | - Err(e) => write!(out, "report_descriptor=error: {e}"), |
67 | | - }; |
68 | | - out.push('\n'); |
69 | | - push_indent(out, level); |
70 | | - match feature_report_ids { |
71 | | - Ok(feature_report_ids) => { |
72 | | - out.push_str("feature_report_ids=["); |
73 | | - for (i, rid) in feature_report_ids.iter().enumerate() { |
74 | | - if i > 0 { |
75 | | - out.push_str(", "); |
76 | | - } |
77 | | - let _ = write!(out, "{rid}"); |
78 | | - } |
79 | | - out.push(']'); |
80 | | - } |
81 | | - Err(e) => { |
82 | | - let _ = write!(out, "feature_report_ids=error: {e}"); |
83 | | - } |
84 | | - } |
| 40 | +pub trait TreeDisplay { |
| 41 | + fn to_tree_string(self, level: usize) -> String; |
85 | 42 | } |
86 | 43 |
|
87 | 44 | impl<T, I> TreeDisplay for T |
88 | 45 | where |
89 | 46 | T: Iterator<Item = I>, |
90 | 47 | I: TreeDisplay, |
91 | 48 | { |
92 | | - fn write_tree(self, out: &mut String, level: usize) { |
93 | | - for (i, item) in self.enumerate() { |
94 | | - if i > 0 { |
95 | | - out.push('\n'); |
96 | | - } |
97 | | - push_indent(out, level); |
98 | | - item.write_tree(out, level); |
| 49 | + fn to_tree_string(self, level: usize) -> String { |
| 50 | + let indent = " ".repeat(INDENT_SIZE).repeat(level); |
| 51 | + let mut s: Vec<String> = vec![]; |
| 52 | + for item in self { |
| 53 | + s.push(format!("{}{}", indent, item.to_tree_string(level))); |
99 | 54 | } |
| 55 | + s.join("\n") |
100 | 56 | } |
101 | 57 | } |
102 | 58 |
|
103 | 59 | impl TreeDisplay for DeviceNode { |
104 | | - fn write_tree(self, out: &mut String, level: usize) { |
105 | | - push_indent(out, level); |
106 | | - let _ = write!( |
107 | | - out, |
108 | | - "ID {:04x}:{:04x} manufacturer=\"{}\" product=\"{}\"", |
| 60 | + fn to_tree_string(self, level: usize) -> String { |
| 61 | + let indent = " ".repeat(INDENT_SIZE).repeat(level); |
| 62 | + let mut s: Vec<String> = vec![]; |
| 63 | + s.push(format!( |
| 64 | + "{indent}ID {:04x}:{:04x} manufacturer=\"{:}\" product=\"{:}\"", |
109 | 65 | self.vendor_id, self.product_id, self.manufacturer_string, self.product_string |
110 | | - ); |
| 66 | + )); |
111 | 67 | for child in self.children { |
112 | | - out.push('\n'); |
113 | | - child.write_tree(out, level + 1); |
| 68 | + s.push(child.to_tree_string(level + 1)); |
114 | 69 | } |
| 70 | + s.join("\n") |
115 | 71 | } |
116 | 72 | } |
117 | 73 |
|
118 | 74 | impl TreeDisplay for InterfaceNode { |
119 | | - fn write_tree(self, out: &mut String, level: usize) { |
120 | | - push_indent(out, level); |
| 75 | + fn to_tree_string(self, level: usize) -> String { |
| 76 | + let indent = " ".repeat(INDENT_SIZE).repeat(level); |
| 77 | + let mut s: Vec<String> = vec![]; |
| 78 | + #[cfg(any(target_os = "macos", target_os = "linux"))] |
| 79 | + s.push(format!( |
| 80 | + "{indent}path=\"{}\" interface_number={}", |
| 81 | + self.path, self.interface_number |
| 82 | + )); |
| 83 | + #[cfg(target_os = "windows")] |
| 84 | + s.push(format!( |
| 85 | + "{indent}interface_number={}", |
| 86 | + self.interface_number |
| 87 | + )); |
121 | 88 | #[cfg(any(target_os = "macos", target_os = "linux"))] |
122 | 89 | { |
123 | | - let _ = write!( |
124 | | - out, |
125 | | - "path=\"{}\" interface_number={}", |
126 | | - self.path, self.interface_number |
127 | | - ); |
128 | | - write_descriptor_lines(out, level, &self.descriptor, &self.feature_report_ids); |
| 90 | + let descriptor = self.descriptor.as_ref(); |
| 91 | + match descriptor { |
| 92 | + Ok(descriptor) => { |
| 93 | + s.push(format!( |
| 94 | + "{indent}report_descriptor=[{}]", |
| 95 | + to_hex_string(descriptor) |
| 96 | + )); |
| 97 | + } |
| 98 | + Err(e) => { |
| 99 | + s.push(format!("{indent}report_descriptor=error: {e}")); |
| 100 | + } |
| 101 | + } |
| 102 | + let feature_report_ids = self.feature_report_ids.as_ref(); |
| 103 | + match feature_report_ids { |
| 104 | + Ok(feature_report_ids) => { |
| 105 | + s.push(format!( |
| 106 | + "{indent}feature_report_ids=[{}]", |
| 107 | + feature_report_ids |
| 108 | + .iter() |
| 109 | + .map(|rid| format!("{rid}")) |
| 110 | + .collect::<Vec<String>>() |
| 111 | + .join(", ") |
| 112 | + )); |
| 113 | + } |
| 114 | + Err(e) => { |
| 115 | + s.push(format!("{indent}feature_report_ids=error: {e}")); |
| 116 | + } |
| 117 | + } |
129 | 118 | } |
130 | | - #[cfg(target_os = "windows")] |
131 | | - let _ = write!(out, "interface_number={}", self.interface_number); |
132 | 119 | #[cfg(any(target_os = "macos", target_os = "windows"))] |
133 | | - for child in self.children { |
134 | | - out.push('\n'); |
135 | | - child.write_tree(out, level + 1); |
| 120 | + { |
| 121 | + for child in self.children { |
| 122 | + s.push(child.to_tree_string(level + 1)); |
| 123 | + } |
136 | 124 | } |
| 125 | + s.join("\n") |
137 | 126 | } |
138 | 127 | } |
139 | 128 |
|
140 | 129 | #[cfg(any(target_os = "macos", target_os = "windows"))] |
141 | 130 | impl TreeDisplay for ItemNode { |
142 | | - fn write_tree(self, out: &mut String, level: usize) { |
143 | | - push_indent(out, level); |
| 131 | + fn to_tree_string(self, level: usize) -> String { |
| 132 | + let indent = " ".repeat(INDENT_SIZE).repeat(level); |
| 133 | + let mut s: Vec<String> = vec![]; |
144 | 134 | #[cfg(target_os = "macos")] |
145 | | - let _ = write!( |
146 | | - out, |
147 | | - "usage_page={:#06x} usage={:#06x}", |
| 135 | + s.push(format!( |
| 136 | + "{indent}usage_page={:#06x} usage={:#06x}", |
148 | 137 | self.usage_page, self.usage |
149 | | - ); |
| 138 | + )); |
150 | 139 | #[cfg(target_os = "windows")] |
151 | 140 | { |
152 | | - let _ = write!( |
153 | | - out, |
154 | | - "path=\"{}\" usage_page={:#06x} usage={:#06x}", |
| 141 | + s.push(format!( |
| 142 | + "{indent}path=\"{}\" usage_page={:#06x} usage={:#06x}", |
155 | 143 | self.path, self.usage_page, self.usage |
156 | | - ); |
157 | | - write_descriptor_lines(out, level, &self.descriptor, &self.feature_report_ids); |
| 144 | + )); |
| 145 | + let descriptor = self.descriptor.as_ref(); |
| 146 | + match descriptor { |
| 147 | + Ok(descriptor) => { |
| 148 | + s.push(format!( |
| 149 | + "{indent}report_descriptor=[{}]", |
| 150 | + to_hex_string(descriptor) |
| 151 | + )); |
| 152 | + } |
| 153 | + Err(e) => { |
| 154 | + s.push(format!("{indent}report_descriptor=error: {}", e)); |
| 155 | + } |
| 156 | + } |
| 157 | + let feature_report_ids = self.feature_report_ids.as_ref(); |
| 158 | + match feature_report_ids { |
| 159 | + Ok(feature_report_ids) => { |
| 160 | + s.push(format!( |
| 161 | + "{indent}feature_report_ids=[{}]", |
| 162 | + feature_report_ids |
| 163 | + .iter() |
| 164 | + .map(|rid| format!("{}", rid)) |
| 165 | + .collect::<Vec<String>>() |
| 166 | + .join(", ") |
| 167 | + )); |
| 168 | + } |
| 169 | + Err(e) => { |
| 170 | + s.push(format!("{indent}feature_report_ids=error: {}", e)); |
| 171 | + } |
| 172 | + } |
158 | 173 | } |
| 174 | + s.join("\n") |
159 | 175 | } |
160 | 176 | } |
0 commit comments