winpnp 0.0.2__py3-none-any.whl → 0.1.0__py3-none-any.whl

winpnp/properties/keys/__init__.py

@@ -4,6 +4,7 @@ from winpnp.properties import kinds
 from winpnp.properties.pnp_property import PnpPropertyKey
 
 from . import (
+    bluetooth,
     dev_query,
     device,
     device_class,

winpnp/properties/pnp_property.py

@@ -15,6 +15,7 @@ class PnpPropertyType(Generic[T]):
     """
 
     _DERIVED_DATA: ClassVar[dict[int, tuple[str, Callable[[bytes], Any]]]] = {}
+    _NAME_TO_ID: ClassVar[dict[str, int]] = {}
 
     type_id: int
     name: Optional[str] = field(compare=False)
@@ -48,6 +49,7 @@ class PnpPropertyType(Generic[T]):
             )
 
         PnpPropertyType._DERIVED_DATA[kind.type_id] = (kind.name, kind._decoder)
+        PnpPropertyType._NAME_TO_ID[kind.name] = kind.type_id
 
     @staticmethod
     def register_new(
@@ -62,6 +64,14 @@ class PnpPropertyType(Generic[T]):
         PnpPropertyType.register(kind)
         return kind
 
+    @staticmethod
+    def from_name(name: str) -> Optional["PnpPropertyType[U]"]:
+        type_id = PnpPropertyType._NAME_TO_ID.get(name)
+        if type_id is None:
+            return None
+
+        return PnpPropertyType(type_id)
+
     def decode(self, data: bytes) -> T:
         """
         Decodes raw bytes to the actual python type that this `PnpPropertyType` represents.
@@ -69,13 +79,16 @@ class PnpPropertyType(Generic[T]):
         return self._decoder(data)
 
 
-@dataclass(init=False)
+@dataclass(init=False, frozen=True)
 class PnpPropertyKey(Generic[T]):
     """
     A key that specifies a PnP property. This is an abstraction over the Windows DEVPROPKEY struct. Can be used as key for `__getitem__` of various winpnp classes.
     """
 
-    _NAMES: ClassVar[dict[tuple[UUID, int], str]] = {}
+    _DERIVED_DATA: ClassVar[
+        dict[tuple[UUID, int], tuple[str, Optional[tuple[PnpPropertyType[Any], ...]]]]
+    ] = {}
+    _NAME_TO_ID: ClassVar[dict[str, tuple[UUID, int]]] = {}
 
     category: UUID
     property_id: int
@@ -89,15 +102,25 @@ class PnpPropertyKey(Generic[T]):
         name: Optional[str] = None,
         allowed_types: Optional[Iterable[PnpPropertyType[T]]] = None,
     ) -> None:
-        self.category = category
-        self.property_id = property_id
-        self.name = (
-            name if name is not None else self._NAMES.get((category, property_id))
+        # Intentionally not setting allowed_types from derived data to allow creating a PnpPropertyKey with registered id but without type limitations
+        derived_name, _ = self._DERIVED_DATA.get((category, property_id), (None, None))
+
+        # Using object.__setattr__ because the class is frozen
+        object.__setattr__(self, "category", category)
+        object.__setattr__(self, "property_id", property_id)
+        object.__setattr__(
+            self,
+            "name",
+            name if name is not None else derived_name,
         )
-        self.allowed_types = (
-            {kind.type_id: kind for kind in allowed_types}
-            if allowed_types is not None
-            else None
+        object.__setattr__(
+            self,
+            "allowed_types",
+            (
+                {kind.type_id: kind for kind in allowed_types}
+                if allowed_types is not None
+                else None
+            ),
         )
 
     @staticmethod
@@ -109,12 +132,17 @@ class PnpPropertyKey(Generic[T]):
             raise ValueError(f"Cannot register {repr(key)} because it is unnamed.")
 
         _id = (key.category, key.property_id)
-        if _id in PnpPropertyKey._NAMES:
+        if _id in PnpPropertyKey._DERIVED_DATA:
             raise ValueError(
-                f"Cannot register {repr(key)} because its (category, property_id) pair is already registered with name {repr(PnpPropertyKey._NAMES[_id])}"
+                f"Cannot register {repr(key)} because its (category, property_id) pair is already registered with name {repr(PnpPropertyKey._DERIVED_DATA[_id][0])}"
             )
 
-        PnpPropertyKey._NAMES[_id] = key.name
+        allowed_types = (
+            tuple(key.allowed_types.values()) if key.allowed_types is not None else None
+        )
+
+        PnpPropertyKey._DERIVED_DATA[_id] = (key.name, allowed_types)
+        PnpPropertyKey._NAME_TO_ID[key.name] = _id
 
     @staticmethod
     def register_new(
@@ -130,6 +158,15 @@ class PnpPropertyKey(Generic[T]):
         PnpPropertyKey.register(key)
         return key
 
+    @staticmethod
+    def from_name(name: str) -> Optional["PnpPropertyKey[U]"]:
+        _id = PnpPropertyKey._NAME_TO_ID.get(name)
+        if _id is None:
+            return None
+
+        _, allowed_types = PnpPropertyKey._DERIVED_DATA.get(_id, (None, None))
+        return PnpPropertyKey(*_id, name, allowed_types)
+
 
 @dataclass()
 class PnpProperty(Generic[T]):

{winpnp-0.0.2.dist-info → winpnp-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: winpnp
-Version: 0.0.2
+Version: 0.1.0
 Summary: A package for interacting with Windows Plug and Play (PnP) entities
 Project-URL: Homepage, https://github.com/SuperPudding98/winpnp
 Project-URL: Issues, https://github.com/SuperPudding98/winpnp/issues

{winpnp-0.0.2.dist-info → winpnp-0.1.0.dist-info}/RECORD

@@ -7,8 +7,8 @@ winpnp/info/setup_class.py,sha256=PaXmW4m2ycSFH6i88Wcxgdhr7y-33LuSDU_9V1iM0ZQ,37
 winpnp/properties/__init__.py,sha256=oqncCBWwr5EBZm2lHkRmds0fmWZ7G8stC0U_AS87JqY,41
 winpnp/properties/decoding.py,sha256=0a8kM24Q4AoJ6GvHF0GXitS5OHa5q-VX_TeXtQPF5ek,4149
 winpnp/properties/kinds.py,sha256=U6v-4kNeQabozUhsx39jQARO11S6sapdXxglcije6Jc,9314
-winpnp/properties/pnp_property.py,sha256=nfHAhh4fxqFFDLkO2QIWlHZObVYxPc98cWwx7KFBjeo,4746
-winpnp/properties/keys/__init__.py,sha256=UFNASfjn-h9isFvQAeXBeHa9IwIPuKSZPovac6WEyXY,409
+winpnp/properties/pnp_property.py,sha256=5mtElAYkLMcaPOtEHoCHcTB4tjvYO9xIdNSa3QXSHGs,6254
+winpnp/properties/keys/__init__.py,sha256=368jCeJ3XGn7iMr5KfWT7cTyUDNcXRO3bfqktVqBMyg,425
 winpnp/properties/keys/bluetooth.py,sha256=SRhz3sks6EESA01LCX4O4BQwoIm33_PyUlUSl1izJBw,2140
 winpnp/properties/keys/dev_query.py,sha256=kwmXcUb7bEbhjXm4yTnL8lWJxcBej0ZUvjMmHB_Fj_0,280
 winpnp/properties/keys/device.py,sha256=h8pjY7-PwpkY1Up_BhjPrXxygm5UFyMp-tvd_R0DoFY,18384
@@ -17,7 +17,7 @@ winpnp/properties/keys/device_container.py,sha256=1cxKFYiRfFTQ6d_OjL8tr3nIuwuCHV
 winpnp/properties/keys/device_interface.py,sha256=Fjaj8fJdtYKgcLsnolHBN4LorC1BRbCsV0gkys1VHtk,1333
 winpnp/properties/keys/device_interface_class.py,sha256=ci80vR0Ue8lba5XBIqg-8VVa5CxvJNzJ9sVi4yr3JlU,462
 winpnp/properties/keys/driver_package.py,sha256=YXMOA7PjsDEyu92tT7ppUpoY31UCMrRQmUqmrOGQLzU,1076
-winpnp-0.0.2.dist-info/METADATA,sha256=3rRzqfyPngnLipvI2xBII8256VPK_5VPk2q6jxmJnos,1930
-winpnp-0.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-winpnp-0.0.2.dist-info/licenses/LICENSE,sha256=kMhLdtRDEv5y1xkgn_gpWXxkNbjNeGdE0rIZoEWsx90,1070
-winpnp-0.0.2.dist-info/RECORD,,
+winpnp-0.1.0.dist-info/METADATA,sha256=-qY-dsA9I6ABFYnUbGKz1_lULXFLsXBtrIPgWv_zuyw,1930
+winpnp-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+winpnp-0.1.0.dist-info/licenses/LICENSE,sha256=kMhLdtRDEv5y1xkgn_gpWXxkNbjNeGdE0rIZoEWsx90,1070
+winpnp-0.1.0.dist-info/RECORD,,