From d350e47382bbe5748f92225ec3465fccb16f71aa Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 16 Jun 2020 12:19:32 -0400
Subject: [PATCH] Track connections by name only, not by type as well.

Also rename getAvailableSerialPorts for clarity.
---
 oscar/SleepLib/deviceconnection.cpp | 27 +++++++++++++--------------
 oscar/SleepLib/deviceconnection.h   |  4 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/oscar/SleepLib/deviceconnection.cpp b/oscar/SleepLib/deviceconnection.cpp
index 56d9a4e9..c3352c7e 100644
--- a/oscar/SleepLib/deviceconnection.cpp
+++ b/oscar/SleepLib/deviceconnection.cpp
@@ -379,15 +379,15 @@ DeviceConnection* DeviceConnectionManager::openConnection(const QString & type,
         qWarning() << "Unknown device connection type:" << type;
         return nullptr;
     }
-    if (m_connections[type].contains(name)) {
-        qWarning() << type << "connection to" << name << "already open";
+    if (m_connections.contains(name)) {
+        qWarning() << "connection to" << name << "already open";
         return nullptr;
     }
 
     DeviceConnection* conn = s_factories[type](name, m_record, m_replay);
     if (conn) {
         if (conn->open()) {
-            m_connections[type][name] = conn;
+            m_connections[name] = conn;
         } else {
             qWarning().noquote() << "unable to open" << type << "connection to" << name;
             delete conn;
@@ -406,12 +406,11 @@ void DeviceConnectionManager::connectionClosed(DeviceConnection* conn)
     const QString & type = conn->type();
     const QString & name = conn->name();
 
-    Q_ASSERT(s_factories.contains(type));
-    if (m_connections[type].contains(name)) {
-        if (m_connections[type][name] == conn) {
-            m_connections[type].remove(name);
+    if (m_connections.contains(name)) {
+        if (m_connections[name] == conn) {
+            m_connections.remove(name);
         } else {
-            qWarning() << type << "connection to" << name << "not created by openConnection!";
+            qWarning() << "connection to" << name << "not created by openConnection!";
         }
     } else {
         qWarning() << type << "connection to" << name << "missing";
@@ -446,7 +445,7 @@ DeviceConnection* T::createInstance(const QString & name, XmlRecorder* record, X
 // MARK: -
 // MARK: Device manager events
 
-class GetAvailablePortsEvent : public XmlReplayBase<GetAvailablePortsEvent>
+class GetAvailableSerialPortsEvent : public XmlReplayBase<GetAvailableSerialPortsEvent>
 {
 public:
     QList<SerialPortInfo> m_ports;
@@ -461,19 +460,19 @@ protected:
         xml >> m_ports;
     }
 };
-REGISTER_XMLREPLAYEVENT("getAvailablePorts", GetAvailablePortsEvent);
+REGISTER_XMLREPLAYEVENT("getAvailableSerialPorts", GetAvailableSerialPortsEvent);
 
 
-QList<SerialPortInfo> DeviceConnectionManager::getAvailablePorts()
+QList<SerialPortInfo> DeviceConnectionManager::getAvailableSerialPorts()
 {
-    GetAvailablePortsEvent event;
+    GetAvailableSerialPortsEvent event;
 
     if (!m_replay) {
         for (auto & info : QSerialPortInfo::availablePorts()) {
             event.m_ports.append(SerialPortInfo(info));
         }
     } else {
-        auto replayEvent = m_replay->getNextEvent<GetAvailablePortsEvent>();
+        auto replayEvent = m_replay->getNextEvent<GetAvailableSerialPortsEvent>();
         if (replayEvent) {
             event.m_ports = replayEvent->m_ports;
         } else {
@@ -527,7 +526,7 @@ SerialPortInfo::SerialPortInfo()
 // TODO: This is a temporary wrapper until we begin refactoring.
 QList<SerialPortInfo> SerialPortInfo::availablePorts()
 {
-    return DeviceConnectionManager::getInstance().getAvailablePorts();
+    return DeviceConnectionManager::getInstance().getAvailableSerialPorts();
 }
 
 QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info)
diff --git a/oscar/SleepLib/deviceconnection.h b/oscar/SleepLib/deviceconnection.h
index 21c7fac6..c4196ede 100644
--- a/oscar/SleepLib/deviceconnection.h
+++ b/oscar/SleepLib/deviceconnection.h
@@ -63,14 +63,14 @@ private:
         m_serialPorts.clear();
     }
 
-    QHash<QString,QHash<QString,DeviceConnection*>> m_connections;
+    QHash<QString,DeviceConnection*> m_connections;
 
 public:
     static DeviceConnectionManager & getInstance();
     class DeviceConnection* openConnection(const QString & type, const QString & name);
     static class SerialPortConnection* openSerialPortConnection(const QString & portName);  // temporary
 
-    QList<class SerialPortInfo> getAvailablePorts();
+    QList<class SerialPortInfo> getAvailableSerialPorts();
     // TODO: method to start a polling thread that maintains the list of ports
     // TODO: emit signal when new port is detected