Skip to content

Commit ed66c28

Browse files
committed
* Fixed UI crash when entering a Port for the printer URL
1 parent 48e74b4 commit ed66c28

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

lib/service/PrinterService.dart

+10-10
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class PrinterService {
102102
List<String> qObjects = [];
103103

104104
objects.forEach((element) {
105-
qObjects.add(element);
105+
qObjects.add(element);
106106

107107
if (element.startsWith("gcode_macro ")) {
108108
String macro = element.split(" ")[1];
@@ -177,7 +177,7 @@ class PrinterService {
177177
}
178178

179179
var controllerFans =
180-
data.keys.where((element) => element.startsWith('controller_fan'));
180+
data.keys.where((element) => element.startsWith('controller_fan'));
181181
if (controllerFans.isNotEmpty) {
182182
for (var controllerFanName in controllerFans) {
183183
var fanJson = data[controllerFanName];
@@ -186,7 +186,7 @@ class PrinterService {
186186
}
187187

188188
var tempFans =
189-
data.keys.where((element) => element.startsWith('temperature_fan'));
189+
data.keys.where((element) => element.startsWith('temperature_fan'));
190190
if (tempFans.isNotEmpty) {
191191
for (var tempFanName in tempFans) {
192192
var fanJson = data[tempFanName];
@@ -195,7 +195,7 @@ class PrinterService {
195195
}
196196

197197
var genericFans =
198-
data.keys.where((element) => element.startsWith('fan_generic'));
198+
data.keys.where((element) => element.startsWith('fan_generic'));
199199
if (genericFans.isNotEmpty) {
200200
for (var genFanName in genericFans) {
201201
var fanJson = data[genFanName];
@@ -282,9 +282,9 @@ class PrinterService {
282282
List<String> split = fanName.split(" ");
283283
String hName = split.length > 1 ? split.skip(1).join(" ") : split[0];
284284

285-
NamedFan namedFan = printer.fans.firstWhere(
286-
(element) => element.name == hName && element is GenericFan,
287-
orElse: () {
285+
NamedFan namedFan = printer.fans
286+
.firstWhere((element) => element.name == hName && element is GenericFan,
287+
orElse: () {
288288
var f = GenericFan(hName);
289289
printer!.fans.add(f);
290290
return f;
@@ -554,11 +554,11 @@ class PrinterService {
554554
}
555555

556556
genericFanFan(String fanName, double perc) {
557-
_webSocket.sendObject("printer.gcode.script", null,
558-
params: {'script': "SET_FAN_SPEED FAN=$fanName SPEED=${perc.toStringAsFixed(2)}"});
557+
_webSocket.sendObject("printer.gcode.script", null, params: {
558+
'script': "SET_FAN_SPEED FAN=$fanName SPEED=${perc.toStringAsFixed(2)}"
559+
});
559560
}
560561

561-
562562
outputPin(String pinName, double perc) {
563563
_webSocket.sendObject("printer.gcode.script", null,
564564
params: {'script': "SET_PIN PIN=$pinName VALUE=${perc.toInt()}"});

lib/ui/views/printers/add/printers_add_viewmodel.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ class PrintersAddViewModel extends StreamViewModel<WebSocketState> {
7070

7171
String? get wsUrl {
7272
var printerUrl = inputUrl;
73-
return (Uri.parse(printerUrl).hasScheme)
73+
var parse = Uri.tryParse(printerUrl);
74+
return (parse?.hasScheme ?? false)
7475
? printerUrl
7576
: 'ws://$printerUrl/websocket';
7677
}

lib/ui/views/printers/edit/printers_edit_viewmodel.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ class PrintersEditViewModel extends BaseViewModel {
3030

3131
String? get wsUrl {
3232
var printerUrl = inputUrl;
33-
return (Uri.parse(printerUrl).hasScheme)
33+
var parse = Uri.tryParse(printerUrl);
34+
return (parse?.hasScheme ?? false)
3435
? printerUrl
3536
: 'ws://$printerUrl/websocket';
3637
}

0 commit comments

Comments
 (0)