yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP #266 Card parsing proper error handling and toString for some fields

Browse Source
This commit is contained in:
Yegor Vialov
2019-01-25 22:41:26 +02:00
parent 09199d30e8
commit e82ba60c4e
1 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/home_assistant.class.dart
View File

@ -428,14 +428,23 @@ class HomeAssistant {
List<HACard> _createLovelaceCards(List rawCards) { List<HACard> _createLovelaceCards(List rawCards) {
List<HACard> result = []; List<HACard> result = [];
rawCards.forEach((rawCard){ rawCards.forEach((rawCard){
try {
bool isThereCardOptionsInside = rawCard["card"] != null; bool isThereCardOptionsInside = rawCard["card"] != null;
HACard card = HACard( HACard card = HACard(
id: "card", id: "card",
name: isThereCardOptionsInside ? rawCard["card"]["title"] ?? rawCard["card"]["name"] : rawCard["title"] ?? rawCard["name"], name: isThereCardOptionsInside ? rawCard["card"]["title"] ??
type: isThereCardOptionsInside ? rawCard["card"]['type'] : rawCard['type'], rawCard["card"]["name"] : rawCard["title"] ?? rawCard["name"],
columnsCount: isThereCardOptionsInside ? rawCard["card"]['columns'] ?? 4 : rawCard['columns'] ?? 4, type: isThereCardOptionsInside
showName: isThereCardOptionsInside ? rawCard["card"]['show_name'] ?? true : rawCard['show_name'] ?? true, ? rawCard["card"]['type']
showState: isThereCardOptionsInside ? rawCard["card"]['show_state'] ?? true : rawCard['show_state'] ?? true, : rawCard['type'],
columnsCount: isThereCardOptionsInside
? rawCard["card"]['columns'] ?? 4
: rawCard['columns'] ?? 4,
showName: isThereCardOptionsInside ? rawCard["card"]['show_name'] ??
true : rawCard['show_name'] ?? true,
showState: isThereCardOptionsInside
? rawCard["card"]['show_state'] ?? true
: rawCard['show_state'] ?? true,
showEmpty: rawCard['show_empty'] ?? true, showEmpty: rawCard['show_empty'] ?? true,
stateFilter: rawCard['state_filter'] ?? [], stateFilter: rawCard['state_filter'] ?? [],
content: rawCard['content'] content: rawCard['content']
@ -454,8 +463,8 @@ class HomeAssistant {
card.entities.add( card.entities.add(
EntityWrapper( EntityWrapper(
entity: e, entity: e,
displayName: rawEntity["name"], displayName: rawEntity["name"].toString(),
icon: rawEntity["icon"], icon: rawEntity["icon"].toString(),
uiAction: EntityUIAction(rawEntityData: rawEntity) uiAction: EntityUIAction(rawEntityData: rawEntity)
) )
); );
@ -469,8 +478,8 @@ class HomeAssistant {
Entity e = entities.get(en); Entity e = entities.get(en);
card.linkedEntityWrapper = EntityWrapper( card.linkedEntityWrapper = EntityWrapper(
entity: e, entity: e,
icon: rawCard["icon"], icon: rawCard["icon"].toString(),
displayName: rawCard["name"], displayName: rawCard["name"].toString(),
uiAction: EntityUIAction(rawEntityData: rawCard) uiAction: EntityUIAction(rawEntityData: rawCard)
); );
} }
@ -479,15 +488,17 @@ class HomeAssistant {
Entity e = entities.get(en["entity"]); Entity e = entities.get(en["entity"]);
card.linkedEntityWrapper = EntityWrapper( card.linkedEntityWrapper = EntityWrapper(
entity: e, entity: e,
icon: en["icon"], icon: en["icon"].toString(),
displayName: en["name"], displayName: en["name"].toString(),
uiAction: EntityUIAction(rawEntityData: rawCard) uiAction: EntityUIAction(rawEntityData: rawCard)
); );
} }
} }
} }
result.add(card); result.add(card);
} catch (e) {
Logger.e("There was an error parsing card: ${e.toString()}");
}
}); });
return result; return result;
} }