refactored out bluetooth backend wrapper into new library btlewrap

ChristianKuehnel · Mar 10, 2018 · c6fce06 · c6fce06
1 parent 4cca1a2
commit c6fce06
Show file tree

Hide file tree

Showing 23 changed files with 19 additions and 753 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,4 +67,5 @@ target/
 #PyCharm project files
 .idea/
 .test_mac
-.pytest_cache/
+.pytest_cache/
+venv
diff --git a/demo.py b/demo.py
@@ -6,9 +6,11 @@
 import logging
 import sys
 
+from btlewrap import available_backends, BluepyBackend, GatttoolBackend, PygattBackend
+
 from miflora.miflora_poller import MiFloraPoller, \
     MI_CONDUCTIVITY, MI_MOISTURE, MI_LIGHT, MI_TEMPERATURE, MI_BATTERY
-from miflora import miflora_scanner, available_backends, BluepyBackend, GatttoolBackend, PygattBackend
+from miflora import miflora_scanner
 
 
 def valid_miflora_mac(mac, pat=re.compile(r"C4:7C:8D:[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}")):

diff --git a/miflora/__init__.py b/miflora/__init__.py
@@ -9,15 +9,3 @@
                          sys.version_info.major,
                          sys.version_info.minor,
                          sys.executable))
-
-
-from miflora.backends.bluepy import BluepyBackend  # noqa: E402 # pylint: disable=wrong-import-position
-from miflora.backends.gatttool import GatttoolBackend  # noqa: E402 # pylint: disable=wrong-import-position
-from miflora.backends.pygatt import PygattBackend  # noqa: E402 # pylint: disable=wrong-import-position
-from miflora.backends import BluetoothBackendException  # noqa: F401 E402 # pylint: disable=wrong-import-position
-_ALL_BACKENDS = [BluepyBackend, GatttoolBackend, PygattBackend]
-
-
-def available_backends():
-    """Returns a list of all available backends."""
-    return [b for b in _ALL_BACKENDS if b.check_backend()]
diff --git a/miflora/backends/__init__.py b/miflora/backends/__init__.py
diff --git a/miflora/backends/bluepy.py b/miflora/backends/bluepy.py