Correct brand names for manufacturers

.github/scripts/profile_library/update-library.py

@@ -139,9 +139,20 @@ def get_manufacturer_json(manufacturer: str) -> dict:
     json_path = os.path.join(DATA_DIR, manufacturer, "manufacturer.json")
     try:
         with open(json_path) as json_file:
-            return json.load(json_file)
+            manufacturer_data =  json.load(json_file)
+            return {
+                "aliases": manufacturer_data.get("aliases", []),
+                "name": manufacturer,
+                "full_name": manufacturer_data.get("name"),
+                "dir_name": manufacturer
+            }
     except FileNotFoundError:
-        default_json = {"name": manufacturer, "aliases": []}
+        default_json = {
+            "name": manufacturer,
+            "full_name": manufacturer,
+            "dir_name": manufacturer,
+            "aliases": []
+        }
         with open(json_path, "w", encoding="utf-8") as json_file:
             json.dump(default_json, json_file, ensure_ascii=False, indent=4)
         git.Repo(PROJECT_ROOT).git.add(json_path)

custom_components/powercalc/config_flow.py

@@ -991,7 +991,7 @@ async def _create_schema() -> vol.Schema:
             library = await ProfileLibrary.factory(self.hass)
             device_types = DOMAIN_DEVICE_TYPE_MAPPING.get(self.source_entity.domain, set()) if self.source_entity else None
             manufacturers = [
-                selector.SelectOptionDict(value=manufacturer, label=manufacturer)
+                selector.SelectOptionDict(value=manufacturer[0], label=manufacturer[1])
                 for manufacturer in await library.get_manufacturer_listing(device_types)
             ]
             return vol.Schema(

custom_components/powercalc/power_profile/library.py

@@ -66,7 +66,7 @@ def create_loader(hass: HomeAssistant) -> Loader:
 
         return CompositeLoader(loaders)
 
-    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None = None) -> list[str]:
+    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None = None) -> list[tuple[str, str]]:
         """Get listing of available manufacturers."""
         manufacturers = await self._loader.get_manufacturer_listing(device_types)
         return sorted(manufacturers)

custom_components/powercalc/power_profile/loader/composite.py

@@ -13,7 +13,7 @@ def __init__(self, loaders: list[Loader]) -> None:
     async def initialize(self) -> None:
         [await loader.initialize() for loader in self.loaders]  # type: ignore[func-returns-value]
 
-    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[str]:
+    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[tuple[str, str]]:
         """Get listing of available manufacturers."""
 
         return {manufacturer for loader in self.loaders for manufacturer in await loader.get_manufacturer_listing(device_types)}

custom_components/powercalc/power_profile/loader/local.py

@@ -25,17 +25,17 @@ async def initialize(self) -> None:
         if not self._is_custom_directory:
             await self._hass.async_add_executor_job(self._load_custom_library)
 
-    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[str]:
+    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[tuple[str, str]]:
         """Get listing of all available manufacturers or filtered by model device_type."""
         if device_types is None:
-            return set(self._manufacturer_model_listing.keys())
+            return {(manufacturer, manufacturer) for manufacturer in self._manufacturer_model_listing}
 
-        manufacturers: set[str] = set()
+        manufacturers: set[tuple[str, str]] = set()
         for manufacturer in self._manufacturer_model_listing:
             models = await self.get_model_listing(manufacturer, device_types)
             if not models:
                 continue
-            manufacturers.add(manufacturer)
+            manufacturers.add((manufacturer, manufacturer))
 
         return manufacturers
 

custom_components/powercalc/power_profile/loader/protocol.py

@@ -7,7 +7,7 @@ class Loader(Protocol):
     async def initialize(self) -> None:
         """Initialize the loader."""
 
-    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[str]:
+    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[tuple[str, str]]:
         """Get listing of possible manufacturers."""
 
     async def find_manufacturers(self, search: str) -> set[str]:

custom_components/powercalc/power_profile/loader/remote.py

@@ -64,7 +64,7 @@ async def initialize(self) -> None:
         manufacturers: list[LibraryManufacturer] = self.library_contents.get("manufacturers", [])
 
         for manufacturer in manufacturers:
-            manufacturer_name = str(manufacturer.get("name"))
+            manufacturer_name = str(manufacturer.get("dir_name"))
             models = manufacturer.get("models", [])
 
             # Store model info and group models by manufacturer
@@ -126,11 +126,11 @@ def _save_to_local_storage(data: bytes) -> None:
             return await self.hass.async_add_executor_job(_load_local_library_json)
 
     @async_cache
-    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[str]:
+    async def get_manufacturer_listing(self, device_types: set[DeviceType] | None) -> set[tuple[str, str]]:
         """Get listing of available manufacturers."""
 
         return {
-            manufacturer["name"]
+            (manufacturer["dir_name"], manufacturer["full_name"])
             for manufacturer in self.library_contents.get("manufacturers", [])
             if not device_types or any(device_type in manufacturer.get("device_types", []) for device_type in device_types)
         }

profile_library/3a smarthome/manufacturer.json

@@ -1,6 +1,7 @@
 {
-  "name": "3a smarthome",
+  "name": "3A Smart Home",
   "aliases": [
+    "3a smarthome",
     "3A Smart Home DE",
     "3a Smarthome"
   ]

profile_library/ajax online/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "ajax online",
+  "name": "Ajax Online",
   "aliases": []
 }

profile_library/amazon/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "amazon",
+  "name": "Amazon",
   "aliases": []
 }

profile_library/anko/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "anko",
+  "name": "Anko",
   "aliases": []
 }

profile_library/apple/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "apple",
+  "name": "Apple",
   "aliases": []
 }

profile_library/aqara/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "aqara",
+  "name": "Aqara",
   "aliases": [
     "Xiaomi",
     "LUMI"

profile_library/arlec/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "arlec",
+  "name": "Arlec",
   "aliases": []
 }

profile_library/athom/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "athom",
+  "name": "Athom",
   "aliases": [
     "Athom_Technology"
   ]

profile_library/avm/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "avm",
+  "name": "AVM",
   "aliases": []
 }

profile_library/belkin/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "belkin",
+  "name": "Belkin",
   "aliases": []
 }

profile_library/blitzwolf/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "blitzwolf",
+  "name": "BlitzWolf",
   "aliases": []
 }

profile_library/bosch/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "bosch",
+  "name": "Bosch",
   "aliases": []
 }

profile_library/bose/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "bose",
+  "name": "Bose",
   "aliases": []
 }

profile_library/casalux/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "casalux",
+  "name": "Casalux",
   "aliases": []
 }

profile_library/cree/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "cree",
+  "name": "Cree",
   "aliases": []
 }

profile_library/denon/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "denon",
+  "name": "Denon",
   "aliases": [
     "HEOS"
   ]

profile_library/dygsm/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "dygsm",
+  "name": "DYGSM",
   "aliases": []
 }

profile_library/elgato/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "elgato",
+  "name": "Elgato",
   "aliases": []
 }

profile_library/elgin/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "elgin",
+  "name": "Elgin",
   "aliases": []
 }

profile_library/emos/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "emos",
+  "name": "Emos",
   "aliases": []
 }

profile_library/epson/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "epson",
+  "name": "Epson",
   "aliases": []
 }

profile_library/eq-3/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "eq-3",
+  "name": "eQ-3",
   "aliases": []
 }

profile_library/eufy/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "eufy",
+  "name": "Eufy",
   "aliases": []
 }

profile_library/eve/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "eve",
+  "name": "Eve",
   "aliases": []
 }

profile_library/everspring/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "everspring",
+  "name": "Everspring",
   "aliases": []
 }

profile_library/ewelight/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "ewelight",
+  "name": "eWeLight",
   "aliases": []
 }

profile_library/ewelink/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "ewelink",
+  "name": "eWeLink",
   "aliases": []
 }

profile_library/fibaro/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "fibaro",
+  "name": "Fibaro",
   "aliases": [
     "Fibargroup"
   ]

profile_library/ge/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "ge",
+  "name": "GE",
   "aliases": [
     "GE Appliances"
   ]

profile_library/genio/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "genio",
+  "name": "Genio",
   "aliases": []
 }

profile_library/gledopto/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "gledopto",
+  "name": "Gledopto",
   "aliases": []
 }

profile_library/google/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "google",
+  "name": "Google",
   "aliases": [
     "Google Inc."
   ]

profile_library/govee/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "govee",
+  "name": "Govee",
   "aliases": []
 }

profile_library/greenwave/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "greenwave",
+  "name": "GreenWave",
   "aliases": [
     "GreenWave Reality Inc."
   ]

profile_library/hampton bay/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "hampton bay",
+  "name": "Hampton Bay",
   "aliases": []
 }

profile_library/harman kardon/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "harman kardon",
+  "name": "Harman Kardon",
   "aliases": []
 }

profile_library/ikea/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "ikea",
+  "name": "IKEA",
   "aliases": [
     "IKEA of Sweden"
   ]

profile_library/innr/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "innr",
+  "name": "Innr",
   "aliases": []
 }

profile_library/jbl/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "jbl",
+  "name": "JBL",
   "aliases": [
     "HARMAN International Industries"
   ]

profile_library/kauf/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "kauf",
+  "name": "Kauf",
   "aliases": []
 }

profile_library/ledvance/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "ledvance",
+  "name": "LEDVANCE",
   "aliases": []
 }

profile_library/ledworks/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "ledworks",
+  "name": "Ledworks",
   "aliases": []
 }

profile_library/lenovo/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "lenovo",
+  "name": "Lenovo",
   "aliases": []
 }

profile_library/lexman/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "lexman",
+  "name": "Lexman",
   "aliases": [
     "ADEO"
   ]

profile_library/lidl/manufacturer.json

@@ -1,5 +1,5 @@
 {
-  "name": "lidl",
+  "name": "Lidl",
   "aliases": [
     "_TZ3000_riwp3k79",
     "_TZ3210_hxtfthp5",

profile_library/lifx/manufacturer.json

@@ -1,4 +1,4 @@
 {
-  "name": "lifx",
+  "name": "LIFX",
   "aliases": []
 }