afsapi 0.2.7__tar.gz → 0.2.9__tar.gz

afsapi-0.2.9/.github/workflows/python-publish.yml

@@ -0,0 +1,43 @@
+---
+name: Publish to PyPI
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  attestations: write
+  contents: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: hynek/build-and-inspect-python-package@v2
+        with:
+          attest-build-provenance-github: "true"
+
+  pypi-publish:
+    name: upload release to PyPI
+    runs-on: ubuntu-latest
+    needs: build
+    environment: pypi
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: Packages
+          path: dist
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+      - name: Create GitHub Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: Release ${{ github.ref }}

{afsapi-0.2.7 → afsapi-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: afsapi
-Version: 0.2.7
+Version: 0.2.9
 Summary: Asynchronous Implementation of the Frontier Silicon API
 Home-page: https://github.com/zhelev/python-afsapi.git
 Author: Krasimir Zhelev
@@ -19,8 +19,10 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.7
-Description-Content-Type: text/markdown; charset=UTF-8
+Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp<4,>=3.3.2
+Dynamic: license-file
 
 # python-afsapi
 

{afsapi-0.2.7 → afsapi-0.2.9}/afsapi/__init__.py

@@ -1,6 +1,13 @@
 from .api import AFSAPI  # noqa
-from .models import *  # noqa
-from .exceptions import *  # noqa
+from afsapi.exceptions import (
+    FSApiException,
+    InvalidPinException,
+    InvalidSessionException,
+    NotImplementedException,
+    OutOfRangeException,
+    ConnectionError,
+)
+from afsapi.models import Preset, Equaliser, PlayerMode, PlayControl, PlayState
 
 from importlib.metadata import version, PackageNotFoundError
 
@@ -16,3 +23,8 @@ except PackageNotFoundError:  # pragma: no cover
             "use the PyPI ones."
         )
 __version__ = VERSION
+
+__all__ = ['AFSAPI', 'PlayState', 'PlayControl', 'PlayerMode', 'Equaliser',
+           'Preset', 'FSApiException', 'NotImplementedException',
+           'ConnectionError', 'OutOfRangeException', 'InvalidPinException',
+           'InvalidSessionException']

{afsapi-0.2.7 → afsapi-0.2.9}/afsapi/api.py

@@ -49,6 +49,11 @@ API = {
     # sys
     "power": "netRemote.sys.power",
     "mode": "netRemote.sys.mode",
+    "wired_mac": "netRemote.sys.net.wired.macAddress",
+    "wired_active": "netRemote.sys.net.wired.interfaceEnable",
+    "wlan_mac": "netRemote.sys.net.wlan.macAddress",
+    "wlan_active": "netRemote.sys.net.wlan.interfaceEnable",
+    "rssi": "netRemote.sys.net.wlan.rssi",
     # sys.info
     "friendly_name": "netRemote.sys.info.friendlyName",
     "radio_id": "netRemote.sys.info.radioId",
@@ -217,7 +222,7 @@ class AFSAPI:
                     raise FSApiException(
                         f"Unexpected result {result.status}: {await result.text()}"
                     )
-                doc = ET.fromstring(await result.text(encoding="utf-8"))
+                doc = ET.fromstring(await result.text(encoding="utf-8", errors="replace"))
                 status = unpack_xml(doc, "status")
 
                 if status == "FS_OK" or status == "FS_LIST_END":
@@ -356,6 +361,27 @@ class AFSAPI:
         """Get the friendly name of the device."""
         return await self.handle_text(API["radio_id"])
 
+    async def get_mac(self) -> t.Optional[str]:
+        """Get the MAC address of the device."""
+        on_wlan = await self.handle_int(API["wlan_active"])
+        if bool(on_wlan):
+            return await self.handle_text(API["wlan_mac"])
+        else:
+            return await self.handle_text(API["wired_mac"])
+
+    async def get_rssi(self) -> t.Optional[int]:
+        """Get the current wlan Received Signal Strength Indication in dBm"""
+
+        # RSSI is returned as a percentage by the API, scaled linearly between
+        # -80dBm (0%) and -20dBm (100%).  100% indicates a wired
+        # connection.  This functions returns the dBm value of RSSI.
+
+        rssi = await self.handle_int(API["rssi"])
+        if rssi is not None:
+            return int(round(rssi * 0.6 - 80))
+        else:
+            return None
+
     async def get_power(self) -> t.Optional[bool]:
         """Check if the device is on."""
         power = await self.handle_int(API["power"])
@@ -491,6 +517,10 @@ class AFSAPI:
         """
         return await self.handle_set(API["control"], int(value))
 
+    async def stop(self) -> t.Optional[bool]:
+        """Stop (and Start) media."""
+        return await self.play_control(PlayControl.STOP)
+    
     async def play(self) -> t.Optional[bool]:
         """Play media."""
         return await self.play_control(PlayControl.PLAY)
@@ -609,7 +639,7 @@ class AFSAPI:
         """Check when and if the device is going to sleep."""
         return await self.handle_long(API["sleep"])
 
-    async def set_sleep(self, value: bool = False) -> t.Optional[bool]:
+    async def set_sleep(self, value: int = 0) -> t.Optional[bool]:
         """Set device sleep timer."""
         return await self.handle_set(API["sleep"], int(value))
 

{afsapi-0.2.7 → afsapi-0.2.9}/afsapi/models.py

@@ -11,6 +11,7 @@ class PlayState(IntEnum):
 
 
 class PlayControl(IntEnum):
+    STOP = 0
     PLAY = 1
     PAUSE = 2
     NEXT = 3

afsapi-0.2.9/afsapi/version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.2.9'
+__version_tuple__ = version_tuple = (0, 2, 9)
+
+__commit_id__ = commit_id = 'g26887da2b'

{afsapi-0.2.7 → afsapi-0.2.9}/afsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: afsapi
-Version: 0.2.7
+Version: 0.2.9
 Summary: Asynchronous Implementation of the Frontier Silicon API
 Home-page: https://github.com/zhelev/python-afsapi.git
 Author: Krasimir Zhelev
@@ -19,8 +19,10 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.7
-Description-Content-Type: text/markdown; charset=UTF-8
+Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp<4,>=3.3.2
+Dynamic: license-file
 
 # python-afsapi
 

{afsapi-0.2.7 → afsapi-0.2.9}/afsapi.egg-info/SOURCES.txt

@@ -7,8 +7,6 @@ requirements.txt
 setup.cfg
 setup.py
 .github/workflows/python-publish.yml
-.github/workflows/python.yml
-.github/workflows/yaml.yml
 afsapi/__init__.py
 afsapi/api.py
 afsapi/exceptions.py

{afsapi-0.2.7 → afsapi-0.2.9}/async_tests.py

@@ -10,7 +10,7 @@ PIN = 1234
 TIMEOUT = 2  # in seconds
 
 
-async def test_sys():
+async def test_sys() -> None:
     """Test sys functions."""
     try:
         afsapi = await AFSAPI.create(URL, PIN, TIMEOUT)
@@ -38,7 +38,7 @@ async def test_sys():
         logging.error(traceback.format_exc())
 
 
-async def test_volume():
+async def test_volume() -> None:
     """Test volume functions."""
     try:
         afsapi = await AFSAPI.create(URL, PIN, TIMEOUT)
@@ -70,7 +70,7 @@ async def test_volume():
         logging.error(traceback.format_exc())
 
 
-async def test_info():
+async def test_info() -> None:
     """Test info functions."""
     try:
         afsapi = await AFSAPI.create(URL, PIN, TIMEOUT)
@@ -83,6 +83,8 @@ async def test_info():
 
         print(f"Radio ID: {await afsapi.get_radio_id()}")
         print(f"Version: {await afsapi.get_version()}")
+        print(f"MAC: {await afsapi.get_mac()}")
+        print(f"RSSI: {await afsapi.get_rssi()} dBm")
 
         name = await afsapi.get_play_name()
         print("Name: %s" % name)
@@ -111,7 +113,7 @@ async def test_info():
         logging.error(traceback.format_exc())
 
 
-async def test_play():
+async def test_play() -> None:
     """Test play functions."""
     try:
         afsapi = await AFSAPI.create(URL, PIN, TIMEOUT)
@@ -119,21 +121,28 @@ async def test_play():
         status = await afsapi.get_play_status()
         print("Status: %s" % status)
 
+        pause = await afsapi.pause()
+        print("Start play succeeded? - %s" % pause)
+        await asyncio.sleep(2)
+
         start_play = await afsapi.play()
         print("Start play succeeded? - %s" % start_play)
-        await asyncio.sleep(1)
+        await asyncio.sleep(2)
 
         forward = await afsapi.forward()
         print("Next succeeded? - %s" % forward)
-        await asyncio.sleep(1)
+        await asyncio.sleep(2)
 
         rewind = await afsapi.rewind()
         print("Prev succeeded? - %s" % rewind)
 
+        stop = await afsapi.stop()
+        print("Stop play succeeded? - %s" % stop)
+        await asyncio.sleep(2)
+
     except Exception:
         logging.error(traceback.format_exc())
 
-
 loop = asyncio.new_event_loop()
 
 loop.run_until_complete(test_sys())

{afsapi-0.2.7 → afsapi-0.2.9}/pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "setuptools >= 48",
-    "setuptools_scm[toml] >= 4, <6",
+    "setuptools_scm[toml]",
     "setuptools_scm_git_archive",
     "wheel >= 0.29.0",
 ]
@@ -12,10 +12,8 @@ write_to = "afsapi/version.py"
 
 [tool.mypy]
 strict = true
-files=["afsapi"]
-exclude = [
-    "afsapi/__init__.py"
-]
+files = ["afsapi"]
+exclude = ["afsapi/__init__.py"]
 
 [pycodestyle]
 max_line_length = 120

{afsapi-0.2.7 → afsapi-0.2.9}/setup.cfg

@@ -2,7 +2,7 @@
 name = afsapi
 description = Asynchronous Implementation of the Frontier Silicon API
 long_description = file: README.md
-long_description_content_type = text/markdown; charset=UTF-8
+long_description_content_type = text/markdown
 url = https://github.com/zhelev/python-afsapi.git
 author = Krasimir Zhelev
 author_email = krasimir.zhelev@gmail.com
@@ -32,6 +32,7 @@ install_requires =
 python_requires = >=3.7
 setup_requires = 
 	setuptools_scm
+	setuptools
 
 [bdist_wheel]
 universal = 1

afsapi-0.2.7/.github/workflows/python-publish.yml

@@ -1,34 +0,0 @@
-name: Upload Python Package
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build
-      - name: Build package
-        run: python -m build
-
-      - uses: shogo82148/actions-upload-release-asset@v1
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: dist/*
-      - name: Publish package
-        uses: >-
-          pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
-        if: github.repository_owner == 'wlcrs'
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}

afsapi-0.2.7/.github/workflows/python.yml

@@ -1,53 +0,0 @@
----
-name: Python
-
-on: push
-
-jobs:
-  build-n-test:
-    name: Build and test Python code
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@master
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v1
-        with:
-          python-version: "3.10"
-
-      - name: flake8 Lint
-        uses: py-actions/flake8@v2
-        with:
-          max-line-length: "120"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-      - name: Install pypa/build
-        run: >-
-          python -m
-          pip install
-          build
-          --user
-      - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m
-          build
-          --sdist
-          --wheel
-          --outdir dist/
-          .
-
-      - name: Install Requirements (for Mypy analysis)
-        run: pip install -r requirements.txt
-
-      - name: Install Mypy
-        run: pip install mypy
-
-      - name: Mypy
-        run: mypy
-
-      - name: Save packages as artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: packages
-          path: dist/

afsapi-0.2.7/.github/workflows/yaml.yml

@@ -1,20 +0,0 @@
----
-name: Yaml Lint
-on:
-  push:
-    paths:
-      - '**.yml'
-      - '**.yaml'
-jobs:
-  lintAllTheThings:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: yaml-lint
-        uses: ibiqlik/action-yamllint@v3
-        with:
-          config_data: |
-            extends: default
-            rules:
-              truthy: disable
-...

afsapi-0.2.7/afsapi/version.py

@@ -1,5 +0,0 @@
-# coding: utf-8
-# file generated by setuptools_scm
-# don't change, don't track in version control
-version = '0.2.7'
-version_tuple = (0, 2, 7)