From 150a0e48c6a29736ae5d68d0722e1b6258cfd15c Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Sun, 22 May 2022 15:11:31 +0200
Subject: [PATCH] refactor

---
 apps/nspanel-lovelace-ui/luibackend/icons.py | 85 ++++----------------
 1 file changed, 17 insertions(+), 68 deletions(-)

diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py
index 50e22d5e..bb93cd9c 100644
--- a/apps/nspanel-lovelace-ui/luibackend/icons.py
+++ b/apps/nspanel-lovelace-ui/luibackend/icons.py
@@ -60,69 +60,18 @@ sensor_mapping = {
     "voltage": "flash"
 }
 
-cover_mapping_open = {
-    "awning": "window-open",
-    "blind": "blinds-open",
-    "curtain": "curtains-closed",
-    "damper": "checkbox-blank-circle",
-    "door": "door-open",
-    "garage": "garage-open",
-    "gate": "gate-open",
-    "shade": "blinds-open",
-    "shutter": "window-shutter-open",
-    "window": "window-open"
-}
-
-cover_mapping_closed = {
-    "awning": "window-closed",
-    "blind": "blinds",
-    "curtain": "curtains",
-    "damper": "circle-slice-8",
-    "door": "door-closed",
-    "garage": "garage",
-    "gate": "gate",
-    "shade": "blinds",
-    "shutter": "window-shutter",
-    "window": "window-closed"
-}
-
-cover_mapping_action_open = {
-    "awning":   "arrow-up",
-    "blind":    "arrow-up",
-    "curtain":  "arrow-expand-horizontal",
-    "damper":   "arrow-up",
-    "door":     "arrow-expand-horizontal",
-    "garage":   "arrow-up",
-    "gate":     "arrow-expand-horizontal",
-    "shade":    "arrow-up",
-    "shutter":  "arrow-up",
-    "window": "arrow-up"
-}
-
-cover_mapping_action_close = {
-    "awning": "arrow-down",
-    "blind": "arrow-down",
-    "curtain": "arrow-collapse-horizontal",
-    "damper": "arrow-down",
-    "door": "arrow-collapse-horizontal",
-    "garage": "arrow-down",
-    "gate": "arrow-collapse-horizontal",
-    "shade":  "arrow-down",
-    "shutter": "arrow-down",
-    "window": "arrow-down"
-}
-
-cover_mapping_action_stop = {
-    "awning": "stop",
-    "blind": "stop",
-    "curtain": "stop",
-    "damper": "stop",
-    "door": "stop",
-    "garage": "stop",
-    "gate": "stop",
-    "shade": "stop",
-    "shutter": "stop",
-    "window": "stop"
+cover_mapping = {
+    #"device_class": ("icon-open",             "icon-closed",    "icon-cover-open",         "icon-cover-stop", "icon-cover-close")
+    "awning":        ("window-open",           "window-closed",  "arrow-up",                "stop",            "arrow-down"),
+    "blind":         ("blinds-open",           "blinds",         "arrow-up",                "stop",            "arrow-down"),
+    "curtain":       ("curtains-closed",       "curtains",       "arrow-expand-horizontal", "stop",            "arrow-collapse-horizontal"),
+    "damper":        ("checkbox-blank-circle", "circle-slice-8", "arrow-up",                "stop",            "arrow-down"),
+    "door":          ("door-open",             "door-closed",    "arrow-expand-horizontal", "stop",            "arrow-collapse-horizontal"),
+    "garage":        ("garage-open",           "garage",         "arrow-up",                "stop",            "arrow-down"),
+    "gate":          ("gate-open",             "gate",           "arrow-expand-horizontal", "stop",            "arrow-collapse-horizontal"),
+    "shade":         ("blinds-open",           "blinds",         "arrow-up",                "stop",            "arrow-down"),
+    "shutter":       ("window-shutter-open",   "window-shutter", "arrow-up",                "stop",            "arrow-down"),
+    "window":        ("window-open"            "window-closed",  "arrow-up",                "stop",            "arrow-down"),
 }
 
 def map_to_mdi_name(ha_type, state=None, device_class=None, cardType=None):
@@ -148,9 +97,9 @@ def map_to_mdi_name(ha_type, state=None, device_class=None, cardType=None):
         if device_class is None:
             device_class = "window"
         if state == "closed":
-            return cover_mapping_closed[device_class] if device_class in cover_mapping_closed else "alert-circle-outline"
+            return cover_mapping[device_class][1] if device_class in cover_mapping else "alert-circle-outline"
         else:
-            return cover_mapping_open[device_class] if device_class in cover_mapping_open else "alert-circle-outline"
+            return cover_mapping[device_class][0] if device_class in cover_mapping else "alert-circle-outline"
     if ha_type == "lock":
         return "lock-open" if state == "unlocked" else "lock"
 
@@ -176,11 +125,11 @@ def get_action_id_ha(ha_type, action, device_class=None, overwrite=None):
         if device_class is None:
             device_class = "window"
         if action == "open":
-            actionicon = cover_mapping_action_open[device_class] if device_class in cover_mapping_action_open else "alert-circle-outline"
+            actionicon = cover_mapping[device_class][2] if device_class in cover_mapping else "alert-circle-outline"
         elif action == "close":
-            actionicon = cover_mapping_action_close[device_class] if device_class in cover_mapping_action_close else "alert-circle-outline"
+            actionicon = cover_mapping[device_class][4] if device_class in cover_mapping else "alert-circle-outline"
         elif action == "stop":
-            actionicon = cover_mapping_action_stop[device_class] if device_class in cover_mapping_action_stop else "alert-circle-outline"
+            actionicon = cover_mapping[device_class][3] if device_class in cover_mapping else "alert-circle-outline"
         else:
             actionicon = "alert-circle-outline"
     else: