libmdr-cli 0.1.1__tar.gz → 0.1.2__tar.gz

{libmdr_cli-0.1.1 → libmdr_cli-0.1.2}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: libmdr-cli
-Version: 0.1.1
+Version: 0.1.2
 Summary: libmdr CLI Frontend
 License-Expression: MIT
 Project-URL: Source, https://github.com/mos9527/libmdr-py
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: libmdr==0.1.1
-Requires-Dist: libmdr-bt==0.1.1
+Requires-Dist: libmdr==0.1.2
+Requires-Dist: libmdr-bt==0.1.2
 Dynamic: license-file
 
 # libmdr-cli

{libmdr_cli-0.1.1 → libmdr_cli-0.1.2}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "libmdr-cli"
-version = "0.1.1"
+version = "0.1.2"
 description = "libmdr CLI Frontend"
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
 license-files = ["LICENSE"]
-dependencies = ["libmdr==0.1.1", "libmdr-bt==0.1.1"]
+dependencies = ["libmdr==0.1.2", "libmdr-bt==0.1.2"]
 
 [project.urls]
 Source = "https://github.com/mos9527/libmdr-py"

{libmdr_cli-0.1.1 → libmdr_cli-0.1.2}/src/libmdr_cli.egg-info/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: libmdr-cli
-Version: 0.1.1
+Version: 0.1.2
 Summary: libmdr CLI Frontend
 License-Expression: MIT
 Project-URL: Source, https://github.com/mos9527/libmdr-py
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: libmdr==0.1.1
-Requires-Dist: libmdr-bt==0.1.1
+Requires-Dist: libmdr==0.1.2
+Requires-Dist: libmdr-bt==0.1.2
 Dynamic: license-file
 
 # libmdr-cli

libmdr_cli-0.1.2/src/libmdr_cli.egg-info/requires.txt

@@ -0,0 +1,2 @@
+libmdr==0.1.2
+libmdr-bt==0.1.2

{libmdr_cli-0.1.1 → libmdr_cli-0.1.2}/src/mdr/__main__.py

@@ -116,7 +116,7 @@ class Battery:
 
 @dataclass
 class NoiseControl:
-    mode: Literal["off", "nc", "amb"]
+    mode: Literal["off", "nc", "amb", "wind"]
     level: Annotated[int, "ambient level 0..20"]
     voice: Annotated[bool, "focus on voice"]
     adaptive: Annotated[bool, "adaptive ambient sound"]
@@ -143,6 +143,7 @@ class Playback:
     title: Annotated[str, RO] = ""
     artist: Annotated[str, RO] = ""
     album: Annotated[str, RO] = ""
+    genre: Annotated[str, RO] = ""
 
 
 @dataclass
@@ -402,23 +403,25 @@ def read_battery(hp: Headphones, proto: int, view: int) -> Battery:
     out = Battery()
     for b in hp.get_batteries():
         part = C.BATTERY_PART_NAMES.get(b.part)
-        if b.present and part:
+        if part:
             setattr(out, part, int(b.level_percent))
             if b.charging == C.CHARGING_YES:
                 out.charging.append(part)
     return out
 
 
+NOISE_MODES = {
+    "off": C.NOISE_MODE_OFF,
+    "nc": C.NOISE_MODE_CANCELLING,
+    "amb": C.NOISE_MODE_AMBIENT,
+    "wind": C.NOISE_MODE_WIND_NOISE_REDUCTION,
+}
+
+
 def read_anc(hp: Headphones, proto: int, view: int) -> NoiseControl:
     nc = hp.get_noise_control(view)
-    level = int(nc.ambient_level)
-    if nc.mode == C.NOISE_MODE_OFF:
-        mode = "off"
-    elif proto == C.PROTOCOL_V1:
-        mode = "nc" if level == C.NOISE_AMBIENT_LEVEL_V1_NOISE_CANCELLING else "amb"
-    else:
-        mode = "nc" if nc.mode == C.NOISE_MODE_CANCELLING else "amb"
-    return NoiseControl(mode, min(level, 20), bool(nc.focus_on_voice), bool(nc.adaptive_ambient))
+    mode = next((name for name, ident in NOISE_MODES.items() if ident == nc.mode), "unknown")
+    return NoiseControl(mode, int(nc.ambient_level), bool(nc.focus_on_voice), bool(nc.adaptive_ambient))
 
 
 def write_anc(hp: Headphones, proto: int, old: NoiseControl, new: NoiseControl) -> None:
@@ -426,17 +429,13 @@ def write_anc(hp: Headphones, proto: int, old: NoiseControl, new: NoiseControl)
         require(hp, C.FEATURE_NOISE_CANCELLING)
     if new.mode == "amb":
         require(hp, C.FEATURE_AMBIENT_SOUND)
+    if new.mode == "wind":
+        require(hp, C.FEATURE_WIND_NOISE_REDUCTION)
     if new.adaptive != old.adaptive:
         require(hp, C.FEATURE_ADAPTIVE_AMBIENT_SOUND)
-    v1 = proto == C.PROTOCOL_V1
     nc = hp.get_noise_control(DESIRED)
-    if new.mode == "off":
-        nc.mode = C.NOISE_MODE_OFF
-    elif v1:
-        nc.mode = C.NOISE_MODE_V1_ON
-    else:
-        nc.mode = C.NOISE_MODE_CANCELLING if new.mode == "nc" else C.NOISE_MODE_AMBIENT
-    nc.ambient_level = C.NOISE_AMBIENT_LEVEL_V1_NOISE_CANCELLING if v1 and new.mode == "nc" else new.level
+    nc.mode = NOISE_MODES[new.mode]
+    nc.ambient_level = new.level
     nc.focus_on_voice = flag(new.voice)
     nc.adaptive_ambient = flag(new.adaptive)
     nc.changing_asm_level = C.FALSE
@@ -502,6 +501,7 @@ def read_playback(hp: Headphones, proto: int, view: int) -> Playback:
         title=hp.get_text(C.TEXT_TRACK_TITLE),
         artist=hp.get_text(C.TEXT_TRACK_ARTIST),
         album=hp.get_text(C.TEXT_TRACK_ALBUM),
+        genre=hp.get_text(C.TEXT_TRACK_GENRE),
     )
 
 

libmdr_cli-0.1.1/src/libmdr_cli.egg-info/requires.txt

@@ -1,2 +0,0 @@
-libmdr==0.1.1
-libmdr-bt==0.1.1