Merge pull request #8154 from jherico/stable-merge

Stable merge back to master

domain-server/src/DomainMetadata.cpp

@@ -60,6 +60,50 @@ const QString DomainMetadata::Descriptors::Hours::CLOSE = "close";
 //
 // it is meant to be sent to and consumed by an external API
 
+// merge delta into target
+// target should be of the form [ OpenTime, CloseTime ],
+// delta should be of the form [ { open: Time, close: Time } ]
+void parseHours(QVariant delta, QVariant& target) {
+    using Hours = DomainMetadata::Descriptors::Hours;
+
+    assert(target.canConvert<QVariantList>());
+    auto& targetList = *static_cast<QVariantList*>(target.data());
+
+    // if/when multiple ranges are allowed, this list will need to be iterated
+    assert(targetList[0].canConvert<QVariantList>());
+    auto& hours = *static_cast<QVariantList*>(targetList[0].data());
+
+    if (!delta.canConvert<QVariantList>()) {
+        return;
+    }
+
+    auto& deltaList = *static_cast<QVariantList*>(delta.data());
+    if (deltaList.isEmpty()) {
+        return;
+    }
+
+    auto& deltaHours = *static_cast<QVariantMap*>(deltaList.first().data());
+    if (deltaHours.isEmpty()) {
+        return;
+    }
+
+    // merge delta into base
+    static const int OPEN_INDEX = 0;
+    static const int CLOSE_INDEX = 1;
+    auto open = deltaHours.find(Hours::OPEN);
+    if (open != deltaHours.end()) {
+        hours[OPEN_INDEX] = open.value();
+    }
+    assert(hours[OPEN_INDEX].canConvert<QString>());
+
+    auto close = deltaHours.find(Hours::CLOSE);
+    if (close != deltaHours.end()) {
+        hours[CLOSE_INDEX] = close.value();
+    }
+    assert(hours[CLOSE_INDEX].canConvert<QString>());
+
+}
+
 DomainMetadata::DomainMetadata(QObject* domainServer) : QObject(domainServer) {
     // set up the structure necessary for casting during parsing (see parseHours, esp.)
     _metadata[USERS] = QVariantMap {};
@@ -100,45 +144,12 @@ QJsonObject DomainMetadata::get(const QString& group) {
     return QJsonObject::fromVariantMap(_metadata[group].toMap());
 }
 
-// merge delta into target
-// target should be of the form [ OpenTime, CloseTime ],
-// delta should be of the form [ { open: Time, close: Time } ]
-void parseHours(QVariant delta, QVariant& target) {
-    using Hours = DomainMetadata::Descriptors::Hours;
-
-    assert(target.canConvert<QVariantList>());
-    auto& targetList = *static_cast<QVariantList*>(target.data());
-
-    // if/when multiple ranges are allowed, this list will need to be iterated
-    assert(targetList[0].canConvert<QVariantList>());
-    auto& hours = *static_cast<QVariantList*>(targetList[0].data());
-
-    auto deltaHours = delta.toList()[0].toMap();
-    if (deltaHours.isEmpty()) {
-        return;
-    }
-
-    // merge delta into base
-    static const int OPEN_INDEX = 0;
-    static const int CLOSE_INDEX = 1;
-    auto open = deltaHours.find(Hours::OPEN);
-    if (open != deltaHours.end()) {
-        hours[OPEN_INDEX] = open.value();
-    }
-    assert(hours[OPEN_INDEX].canConvert<QString>());
-    auto close = deltaHours.find(Hours::CLOSE);
-    if (close != deltaHours.end()) {
-        hours[CLOSE_INDEX] = close.value();
-    }
-    assert(hours[CLOSE_INDEX].canConvert<QString>());
-}
-
 void DomainMetadata::descriptorsChanged() {
     // get descriptors
     assert(_metadata[DESCRIPTORS].canConvert<QVariantMap>());
     auto& state = *static_cast<QVariantMap*>(_metadata[DESCRIPTORS].data());
-    auto settings = static_cast<DomainServer*>(parent())->_settingsManager.getSettingsMap();
+    auto& settings = static_cast<DomainServer*>(parent())->_settingsManager.getSettingsMap();
-    auto descriptors = settings[DESCRIPTORS].toMap();
+    auto& descriptors = static_cast<DomainServer*>(parent())->_settingsManager.getDescriptorsMap();
 
     // copy simple descriptors (description/maturity)
     state[Descriptors::DESCRIPTION] = descriptors[Descriptors::DESCRIPTION]; 
@@ -149,20 +160,20 @@ void DomainMetadata::descriptorsChanged() {
     state[Descriptors::TAGS] = descriptors[Descriptors::TAGS].toList();
 
     // parse capacity
-    const QString CAPACITY = "security.maximum_user_capacity";
+    static const QString CAPACITY = "security.maximum_user_capacity";
     const QVariant* capacityVariant = valueForKeyPath(settings, CAPACITY);
     unsigned int capacity = capacityVariant ? capacityVariant->toUInt() : 0;
     state[Descriptors::CAPACITY] = capacity;
 
     // parse operating hours
-    const QString WEEKDAY_HOURS = "weekday_hours";
+    static const QString WEEKDAY_HOURS = "weekday_hours";
-    const QString WEEKEND_HOURS = "weekend_hours";
+    static const QString WEEKEND_HOURS = "weekend_hours";
-    const QString UTC_OFFSET = "utc_offset";
+    static const QString UTC_OFFSET = "utc_offset";
     assert(state[Descriptors::HOURS].canConvert<QVariantMap>());
     auto& hours = *static_cast<QVariantMap*>(state[Descriptors::HOURS].data());
-    parseHours(descriptors.take(WEEKDAY_HOURS), hours[Descriptors::Hours::WEEKDAY]);
-    parseHours(descriptors.take(WEEKEND_HOURS), hours[Descriptors::Hours::WEEKEND]);
     hours[Descriptors::Hours::UTC_OFFSET] = descriptors.take(UTC_OFFSET);
+    parseHours(descriptors[WEEKDAY_HOURS], hours[Descriptors::Hours::WEEKDAY]);
+    parseHours(descriptors[WEEKEND_HOURS], hours[Descriptors::Hours::WEEKEND]);
 
 #if DEV_BUILD || PR_BUILD
     qDebug() << "Domain metadata descriptors set:" << QJsonObject::fromVariantMap(_metadata[DESCRIPTORS].toMap());

domain-server/src/DomainServerSettingsManager.cpp

@@ -27,6 +27,7 @@
 #include <HifiConfigVariantMap.h>
 #include <HTTPConnection.h>
 #include <NLPacketList.h>
+#include <NumericalConstants.h>
 
 #include "DomainServerSettingsManager.h"
 
@@ -263,23 +264,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
         if (oldVersion < 1.5) {
             // This was prior to operating hours, so add default hours
-            static const QString WEEKDAY_HOURS{ "descriptors.weekday_hours" };
+            validateDescriptorsMap();
-            static const QString WEEKEND_HOURS{ "descriptors.weekend_hours" };
-            static const QString UTC_OFFSET{ "descriptors.utc_offset" };
-
-            QVariant* weekdayHours = valueForKeyPath(_configMap.getUserConfig(), WEEKDAY_HOURS, true);
-            QVariant* weekendHours = valueForKeyPath(_configMap.getUserConfig(), WEEKEND_HOURS, true);
-            QVariant* utcOffset = valueForKeyPath(_configMap.getUserConfig(), UTC_OFFSET, true);
-
-            *weekdayHours = QVariantList { QVariantMap{ { "open", QVariant("00:00") }, { "close", QVariant("23:59") } } };
-            *weekendHours = QVariantList { QVariantMap{ { "open", QVariant("00:00") }, { "close", QVariant("23:59") } } };
-            *utcOffset = QVariant(QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime()) / (float)3600);
-
-            // write the new settings to file
-            persistToFile();
-
-            // reload the master and user config so the merged config is correct
-            _configMap.loadMasterAndUserConfig(_argumentList);
         }
     }
 
@@ -289,6 +274,49 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
     appSettings.setValue(JSON_SETTINGS_VERSION_KEY, _descriptionVersion);
 }
 
+QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {
+    validateDescriptorsMap();
+
+    static const QString DESCRIPTORS{ "descriptors" };
+    return *static_cast<QVariantMap*>(getSettingsMap()[DESCRIPTORS].data());
+}
+
+void DomainServerSettingsManager::validateDescriptorsMap() {
+    static const QString WEEKDAY_HOURS{ "descriptors.weekday_hours" };
+    static const QString WEEKEND_HOURS{ "descriptors.weekend_hours" };
+    static const QString UTC_OFFSET{ "descriptors.utc_offset" };
+
+    QVariant* weekdayHours = valueForKeyPath(_configMap.getUserConfig(), WEEKDAY_HOURS, true);
+    QVariant* weekendHours = valueForKeyPath(_configMap.getUserConfig(), WEEKEND_HOURS, true);
+    QVariant* utcOffset = valueForKeyPath(_configMap.getUserConfig(), UTC_OFFSET, true);
+
+    static const QString OPEN{ "open" };
+    static const QString CLOSE{ "close" };
+    static const QString DEFAULT_OPEN{ "00:00" };
+    static const QString DEFAULT_CLOSE{ "23:59" };
+    bool wasMalformed = false;
+    if (weekdayHours->isNull()) {
+        *weekdayHours = QVariantList{ QVariantMap{ { OPEN, QVariant(DEFAULT_OPEN) }, { CLOSE, QVariant(DEFAULT_CLOSE) } } };
+        wasMalformed = true;
+    }
+    if (weekendHours->isNull()) {
+        *weekendHours = QVariantList{ QVariantMap{ { OPEN, QVariant(DEFAULT_OPEN) }, { CLOSE, QVariant(DEFAULT_CLOSE) } } };
+        wasMalformed = true;
+    }
+    if (utcOffset->isNull()) {
+        *utcOffset = QVariant(QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime()) / (float)SECS_PER_HOUR);
+        wasMalformed = true;
+    }
+
+    if (wasMalformed) {
+        // write the new settings to file
+        persistToFile();
+
+        // reload the master and user config so the merged config is correct
+        _configMap.loadMasterAndUserConfig(_argumentList);
+    }
+}
+
 void DomainServerSettingsManager::packPermissionsForMap(QString mapName,
                                                         NodePermissionsMap& agentPermissions,
                                                         QString keyPath) {

domain-server/src/DomainServerSettingsManager.h

@@ -41,6 +41,8 @@ public:
     QVariantMap& getUserSettingsMap() { return _configMap.getUserConfig(); }
     QVariantMap& getSettingsMap() { return _configMap.getMergedConfig(); }
 
+    QVariantMap& getDescriptorsMap();
+
     bool haveStandardPermissionsForName(const QString& name) const { return _standardAgentPermissions.contains(name); }
     bool havePermissionsForName(const QString& name) const { return _agentPermissions.contains(name); }
     NodePermissions getStandardPermissionsForName(const QString& name) const;
@@ -72,6 +74,8 @@ private:
 
     friend class DomainServer;
 
+    void validateDescriptorsMap();
+
     void packPermissionsForMap(QString mapName, NodePermissionsMap& agentPermissions, QString keyPath);
     void packPermissions();
     void unpackPermissions();

libraries/shared/src/NumericalConstants.h

@@ -39,6 +39,9 @@ const quint64 NSECS_PER_MSEC = 1000000;
 const quint64 USECS_PER_MSEC = 1000;
 const quint64 MSECS_PER_SECOND = 1000;
 const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND;
+const quint64 SECS_PER_MINUTE = 60;
+const quint64 MINS_PER_HOUR = 60;
+const quint64 SECS_PER_HOUR = SECS_PER_MINUTE * MINS_PER_HOUR;
 
 const int BITS_IN_BYTE = 8;
 const int BYTES_PER_KILOBYTE = 1000;