Revize 2f227a6c

Feature Re #8156 show all datasets

modules/crawler/Utilities/Database/database_loader.py

@@ -1 +1 @@
 from Utilities.Database import database_data_line, database_record_logs
 from Utilities import configure_functions
-from Utilities.helpers import should_skip
+from Utilities.helpers import should_skip, detect_change
 import pymongo
 import re
 
@@ -24 +24 @@
 def create_database_connection():
     """
     Creates connection to mongoDB
-    
+
     Returns:
         Connection to mongoDB
     """
@@ -116 +116 @@
         config: loaded configuration file of dataset
     """
     # collection where are specified aviable datasets
+    compareKeys = ['display-name',
+                   'display-color']
     collection_datasets = database_connection[MONGODB_DATASET_COLLECTION]
 
-    dataset_name = config['dataset-name']
-    display_name = config['display-name']
-
-    query = {'key-name': dataset_name}
+    query = {'key-name': config['dataset-name']}
 
     # check if newly added data already have a dataset specified in collection
-    dataset_present = collection_datasets.find_one(query)
+    current_dataset = collection_datasets.find_one(query)
 
-    if dataset_present is None:
+    if current_dataset is None:
         collection_datasets.insert_one({
-            'key-name': dataset_name,
-            'display-name': display_name,
+            'key-name': config['dataset-name'],
+            'display-name': config['display-name'],
+            'display-color': config['display-color'],
             'updated': 0
         })
-    elif dataset_present['display-name'] != display_name:
-        newvalues = {"$set": {'display-name': display_name}}
-        collection_datasets.update_one(query, newvalues)
+    elif detect_change(current_dataset, config, compareKeys):
+        newVal = {}
+        for key in compareKeys:
+            newVal[key] = config[key]
+        collection_datasets.update_one(query, {"$set": newVal})
 
 
 def update_devices_collection(config):
@@ -252 +254 @@
             mydb[name].drop()
             print("Dropping: " + name)
 
-    database_record_logs.reset_ignore_set_loaded(dataset_name)
+    database_record_logs.reset_ignore_set_loaded(dataset_name)