Move device_class

iMicknl · Jul 25, 2021 · 5fc5089 · 5fc5089
1 parent 1e6733f
commit 5fc5089
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 35 deletions.
diff --git a/custom_components/tahoma/cover_devices/horizontal_cover.py b/custom_components/tahoma/cover_devices/horizontal_cover.py
@@ -1,5 +1,5 @@
 """Support for TaHoma cover - shutters etc."""
-from homeassistant.components.cover import ATTR_POSITION
+from homeassistant.components.cover import ATTR_POSITION, DEVICE_CLASS_AWNING
 
 from custom_components.tahoma.cover_devices.tahoma_cover import TahomaCover
 
@@ -13,6 +13,11 @@
 class TahomaHorizontalCover(TahomaCover):
     """Representation of a TaHoma Cover."""
 
+    @property
+    def device_class(self):
+        """Return the class of the device."""
+        return DEVICE_CLASS_AWNING
+
     @property
     def current_cover_position(self):
         """

diff --git a/custom_components/tahoma/cover_devices/tahoma_cover.py b/custom_components/tahoma/cover_devices/tahoma_cover.py
@@ -2,13 +2,6 @@
 from homeassistant.components.cover import (
     ATTR_POSITION,
     ATTR_TILT_POSITION,
-    DEVICE_CLASS_AWNING,
-    DEVICE_CLASS_BLIND,
-    DEVICE_CLASS_CURTAIN,
-    DEVICE_CLASS_GARAGE,
-    DEVICE_CLASS_GATE,
-    DEVICE_CLASS_SHUTTER,
-    DEVICE_CLASS_WINDOW,
     SUPPORT_CLOSE,
     SUPPORT_CLOSE_TILT,
     SUPPORT_OPEN,
@@ -87,23 +80,6 @@
 SUPPORT_COVER_POSITION_LOW_SPEED = 1024
 
 
-TAHOMA_COVER_DEVICE_CLASSES = {
-    "Awning": DEVICE_CLASS_AWNING,
-    "Blind": DEVICE_CLASS_BLIND,
-    "Curtain": DEVICE_CLASS_CURTAIN,
-    "ExteriorScreen": DEVICE_CLASS_BLIND,
-    "ExteriorVenetianBlind": DEVICE_CLASS_BLIND,
-    "GarageDoor": DEVICE_CLASS_GARAGE,
-    "Gate": DEVICE_CLASS_GATE,
-    "MyFoxSecurityCamera": DEVICE_CLASS_SHUTTER,
-    "Pergola": DEVICE_CLASS_AWNING,
-    "RollerShutter": DEVICE_CLASS_SHUTTER,
-    "SwingingShutter": DEVICE_CLASS_SHUTTER,
-    "VeluxInteriorBlind": DEVICE_CLASS_BLIND,
-    "Window": DEVICE_CLASS_WINDOW,
-}
-
-
 class TahomaCover(TahomaEntity, CoverEntity):
     """Representation of a TaHoma Cover."""
 
@@ -156,15 +132,6 @@ def is_closed(self):
 
         return None
 
-    @property
-    def device_class(self):
-        """Return the class of the device."""
-        return (
-            TAHOMA_COVER_DEVICE_CLASSES.get(self.device.widget)
-            or TAHOMA_COVER_DEVICE_CLASSES.get(self.device.ui_class)
-            or DEVICE_CLASS_BLIND
-        )
-
     @property
     def icon(self):
         """Return the icon to use in the frontend, if any."""

diff --git a/custom_components/tahoma/cover_devices/vertical_cover.py b/custom_components/tahoma/cover_devices/vertical_cover.py
@@ -1,5 +1,14 @@
 """Support for TaHoma cover - shutters etc."""
-from homeassistant.components.cover import ATTR_POSITION
+from homeassistant.components.cover import (
+    ATTR_POSITION,
+    DEVICE_CLASS_AWNING,
+    DEVICE_CLASS_BLIND,
+    DEVICE_CLASS_CURTAIN,
+    DEVICE_CLASS_GARAGE,
+    DEVICE_CLASS_GATE,
+    DEVICE_CLASS_SHUTTER,
+    DEVICE_CLASS_WINDOW,
+)
 
 from custom_components.tahoma.cover_devices.tahoma_cover import TahomaCover
 
@@ -24,10 +33,34 @@
 
 SUPPORT_COVER_POSITION_LOW_SPEED = 1024
 
+TAHOMA_COVER_DEVICE_CLASSES = {
+    "Blind": DEVICE_CLASS_BLIND,
+    "Curtain": DEVICE_CLASS_CURTAIN,
+    "ExteriorScreen": DEVICE_CLASS_BLIND,
+    "ExteriorVenetianBlind": DEVICE_CLASS_BLIND,
+    "GarageDoor": DEVICE_CLASS_GARAGE,
+    "Gate": DEVICE_CLASS_GATE,
+    "MyFoxSecurityCamera": DEVICE_CLASS_SHUTTER,
+    "Pergola": DEVICE_CLASS_AWNING,
+    "RollerShutter": DEVICE_CLASS_SHUTTER,
+    "SwingingShutter": DEVICE_CLASS_SHUTTER,
+    "VeluxInteriorBlind": DEVICE_CLASS_BLIND,
+    "Window": DEVICE_CLASS_WINDOW,
+}
+
 
 class TahomaVerticalCover(TahomaCover):
     """Representation of a TaHoma Cover."""
 
+    @property
+    def device_class(self):
+        """Return the class of the device."""
+        return (
+            TAHOMA_COVER_DEVICE_CLASSES.get(self.device.widget)
+            or TAHOMA_COVER_DEVICE_CLASSES.get(self.device.ui_class)
+            or DEVICE_CLASS_BLIND
+        )
+
     @property
     def current_cover_position(self):
         """