Revize 81980e82

Re #8160 new dataset

modules/crawler/Utilities/configure_functions.py

@@ -1 +1 @@
 import yaml
 import os
 from Utilities.Database import database_record_logs
+from Utilities.helpers import should_skip
 
 # Path to dataset configuration files
 CONFIG_FILES_PATH = "DatasetConfigs/"
@@ -41 +42 @@
         new_devices: list or set of new devices for dataset
     """
 
-    with open(CONFIG_FILES_PATH + dataset_name + CONFIG_FILE_TYPE, "a") as file:
+    with open(CONFIG_FILES_PATH + dataset_name + CONFIG_FILE_TYPE,
+              "a") as file:
         for device in new_devices:
-            file.write("  - "+device+":\n")
+            if device == "":
+                continue
+            file.write("  - " + device + ":\n")
             file.write("      x: UNKNOWN!\n")
             file.write("      y: UNKNOWN!\n")
             file.write("\n")
@@ -65 +69 @@
 
     for dataset in datasets:
         name = dataset.split('.')
-        if name[0] == dataset_name :
+        if name[0] == dataset_name:
             return True
 
     return False
 
+
 def return_dictionary_of_valid_devices(devices):
     """
     Iterates over all devices specified in config file
@@ -85 +90 @@
     valid_devices = dict()
 
     for device in devices.keys():
-        x = devices[device]['x']
-        y = devices[device]['y']
-        if not (x == "SKIP" or x == "UNKNOWN!" or y == "SKIP" or y == "UNKNOWN!"):
-            valid_devices[device] = {'name': device, 'x': x , 'y': y}
+        if not should_skip(devices[device]):
+            valid_devices[device] = {
+                'name': device,
+                'x': devices[device]['x'],
+                'y': devices[device]['y']
+            }
 
     return valid_devices