From c30740c4e307165dca1d46a7ce2096d1e5c98f03 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 16:33:04 +0200
Subject: [PATCH] add uhd and redpitaya device modules; switch driver detection
 to factories

---
 owrx/feature.py           | 38 +++++++++++++++++++++++++++++---------
 owrx/source/red_pitaya.py |  6 ++++++
 owrx/source/uhd.py        |  6 ++++++
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 owrx/source/red_pitaya.py
 create mode 100644 owrx/source/uhd.py

diff --git a/owrx/feature.py b/owrx/feature.py
index 09aa0c4..47ac631 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -32,6 +32,8 @@ class FeatureDetector(object):
         "fifi_sdr": ["alsa"],
         "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"],
         "soapy_remote": ["soapy_connector", "soapy_remote"],
+        "uhd": ["soapy_connector", "soapy_uhd"],
+        "red_pitaya": ["soapy_connector", "soapy_red_pitaya"],
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
@@ -244,14 +246,16 @@ class FeatureDetector(object):
     def _has_soapy_driver(self, driver):
         try:
             process = subprocess.Popen(["SoapySDRUtil", "--info"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-            driverRegex = re.compile("^Module found: .*lib(.*)Support.so")
+            factory_regex = re.compile("^Available factories\\.\\.\\. (.*)$")
 
-            def matchLine(line):
-                matches = driverRegex.match(line.decode())
-                return matches is not None and matches.group(1) == driver
+            drivers = []
+            for line in process.stdout:
+                matches = factory_regex.match(line.decode())
+                if matches:
+                    drivers = [s.strip() for s in matches[1].split(", ")]
+            logger.debug(drivers)
 
-            lines = [matchLine(line) for line in process.stdout]
-            return reduce(or_, lines, False)
+            return driver in drivers
         except FileNotFoundError:
             return False
 
@@ -270,7 +274,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/pothosware/SoapySDRPlay/wiki).
         """
-        return self._has_soapy_driver("sdrPlay")
+        return self._has_soapy_driver("sdrplay")
 
     def has_soapy_airspy(self):
         """
@@ -295,7 +299,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/myriadrf/LimeSuite).
         """
-        return self._has_soapy_driver("LMS7")
+        return self._has_soapy_driver("lime")
 
     def has_soapy_pluto_sdr(self):
         """
@@ -303,7 +307,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/photosware/SoapyPlutoSDR).
         """
-        return self._has_soapy_driver("PlutoSDR")
+        return self._has_soapy_driver("plutosdr")
 
     def has_soapy_remote(self):
         """
@@ -313,6 +317,22 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("remote")
 
+    def has_soapy_uhd(self):
+        """
+        The SoapyUHD module allows using UHD / USRP devices with SoapySDR.
+
+        You can get it [here](https://github.com/pothosware/SoapyUHD/wiki).
+        """
+        return self._has_soapy_driver("uhd")
+
+    def has_soapy_red_pitaya(self):
+        """
+        The SoapyRedPitaya allows Red Pitaya deviced to be used with SoapySDR.
+
+        You can get it [here](https://github.com/pothosware/SoapyRedPitaya/wiki).
+        """
+        return self._has_soapy_driver("redpitaya")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/red_pitaya.py b/owrx/source/red_pitaya.py
new file mode 100644
index 0000000..06431f0
--- /dev/null
+++ b/owrx/source/red_pitaya.py
@@ -0,0 +1,6 @@
+from .soapy import SoapyConnectorSource
+
+
+class RedPitayaSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "redpitaya"
diff --git a/owrx/source/uhd.py b/owrx/source/uhd.py
new file mode 100644
index 0000000..29e2909
--- /dev/null
+++ b/owrx/source/uhd.py
@@ -0,0 +1,6 @@
+from .soapy import SoapyConnectorSource
+
+
+class UhdSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "uhd"