Make Device::enumerate static

Device::enumerate does not need any instance data, therefore it is made
static.  Note that this not only changes the public API by making the
method static.  We also return all connected Nitrokey devices instead of
only Storage devices.

The NitrokeyManager method list_devices_by_cpuID is changed to check the
device type so that they still only return Storage devices.  The
list_device method now returns both Storage and Pro devices.

1 files changed, 5 insertions, 5 deletions

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 8ca4698..3b57ba6 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -108,8 +108,7 @@ using nitrokey::misc::strcpyT;
     std::vector<DeviceInfo> NitrokeyManager::list_devices(){
         std::lock_guard<std::mutex> lock(mex_dev_com_manager);
 
-        auto p = make_shared<Stick20>();
-        return p->enumerate();
+        return Device::enumerate();
     }
 
     std::vector<std::string> NitrokeyManager::list_devices_by_cpuID(){
@@ -127,12 +126,13 @@ using nitrokey::misc::strcpyT;
 
         LOGD1("Enumerating devices");
         std::vector<std::string> res;
-        auto d = make_shared<Stick20>();
-        const auto v = d->enumerate();
+        const auto v = Device::enumerate();
         LOGD1("Discovering IDs");
         for (auto & i: v){
+            if (i.m_deviceModel != DeviceModel::STORAGE)
+                continue;
             auto p = i.m_path;
-            d = make_shared<Stick20>();
+            auto d = make_shared<Stick20>();
             LOGD1( std::string("Found: ") + p );
             d->set_path(p);
             try{