Merge pull request #68 from Nicba1010/refactor-black-white

Refactor black/whitelist processing

src/black_white.py

@@ -11,18 +11,20 @@ def setup_black_white_lists(
     library_mapping=None,
     user_mapping=None,
 ):
-    blacklist_library, blacklist_library_type, blacklist_users = setup_black_lists(
+    blacklist_library, blacklist_library_type, blacklist_users = setup_x_lists(
         blacklist_library,
         blacklist_library_type,
         blacklist_users,
+        "White",
         library_mapping,
         user_mapping,
     )
 
-    whitelist_library, whitelist_library_type, whitelist_users = setup_white_lists(
+    whitelist_library, whitelist_library_type, whitelist_users = setup_x_lists(
         whitelist_library,
         whitelist_library_type,
         whitelist_users,
+        "Black",
         library_mapping,
         user_mapping,
     )
@@ -36,104 +38,93 @@ def setup_black_white_lists(
         whitelist_users,
     )
 
-
+def setup_x_lists(
-def setup_black_lists(
+    xlist_library,
-    blacklist_library,
+    xlist_library_type,
-    blacklist_library_type,
+    xlist_users,
-    blacklist_users,
+    xlist_type,
     library_mapping=None,
     user_mapping=None,
 ):
-    if blacklist_library:
+    if xlist_library:
-        if len(blacklist_library) > 0:
+        if len(xlist_library) > 0:
-            blacklist_library = blacklist_library.split(",")
+            xlist_library = xlist_library.split(",")
-            blacklist_library = [x.strip() for x in blacklist_library]
+            xlist_library = [x.strip() for x in xlist_library]
             if library_mapping:
                 temp_library = []
-                for library in blacklist_library:
+                for library in xlist_library:
                     library_other = search_mapping(library_mapping, library)
                     if library_other:
                         temp_library.append(library_other)
 
-                blacklist_library = blacklist_library + temp_library
+                xlist_library = xlist_library + temp_library
     else:
-        blacklist_library = []
+        xlist_library = []
-    logger(f"Blacklist Library: {blacklist_library}", 1)
+    logger(f"{xlist_type}list Library: {xlist_library}", 1)
 
-    if blacklist_library_type:
+    if xlist_library_type:
-        if len(blacklist_library_type) > 0:
+        if len(xlist_library_type) > 0:
-            blacklist_library_type = blacklist_library_type.split(",")
+            xlist_library_type = xlist_library_type.split(",")
-            blacklist_library_type = [x.lower().strip() for x in blacklist_library_type]
+            xlist_library_type = [x.lower().strip() for x in xlist_library_type]
     else:
-        blacklist_library_type = []
+        xlist_library_type = []
-    logger(f"Blacklist Library Type: {blacklist_library_type}", 1)
+    logger(f"{xlist_type}list Library Type: {xlist_library_type}", 1)
 
-    if blacklist_users:
+    if xlist_users:
-        if len(blacklist_users) > 0:
+        if len(xlist_users) > 0:
-            blacklist_users = blacklist_users.split(",")
+            xlist_users = xlist_users.split(",")
-            blacklist_users = [x.lower().strip() for x in blacklist_users]
+            xlist_users = [x.lower().strip() for x in xlist_users]
             if user_mapping:
                 temp_users = []
-                for user in blacklist_users:
+                for user in xlist_users:
                     user_other = search_mapping(user_mapping, user)
                     if user_other:
                         temp_users.append(user_other)
 
-                blacklist_users = blacklist_users + temp_users
+                xlist_users = xlist_users + temp_users
-    else:
-        blacklist_users = []
-    logger(f"Blacklist Users: {blacklist_users}", 1)
-
-    return blacklist_library, blacklist_library_type, blacklist_users
-
-
-def setup_white_lists(
-    whitelist_library,
-    whitelist_library_type,
-    whitelist_users,
-    library_mapping=None,
-    user_mapping=None,
-):
-    if whitelist_library:
-        if len(whitelist_library) > 0:
-            whitelist_library = whitelist_library.split(",")
-            whitelist_library = [x.strip() for x in whitelist_library]
-            if library_mapping:
-                temp_library = []
-                for library in whitelist_library:
-                    library_other = search_mapping(library_mapping, library)
-                    if library_other:
-                        temp_library.append(library_other)
-
-                whitelist_library = whitelist_library + temp_library
-    else:
-        whitelist_library = []
-    logger(f"Whitelist Library: {whitelist_library}", 1)
-
-    if whitelist_library_type:
-        if len(whitelist_library_type) > 0:
-            whitelist_library_type = whitelist_library_type.split(",")
-            whitelist_library_type = [x.lower().strip() for x in whitelist_library_type]
-    else:
-        whitelist_library_type = []
-    logger(f"Whitelist Library Type: {whitelist_library_type}", 1)
-
-    if whitelist_users:
-        if len(whitelist_users) > 0:
-            whitelist_users = whitelist_users.split(",")
-            whitelist_users = [x.lower().strip() for x in whitelist_users]
-            if user_mapping:
-                temp_users = []
-                for user in whitelist_users:
-                    user_other = search_mapping(user_mapping, user)
-                    if user_other:
-                        temp_users.append(user_other)
-
-                whitelist_users = whitelist_users + temp_users
         else:
-            whitelist_users = []
+            xlist_users = []
     else:
-        whitelist_users = []
+        xlist_users = []
-    logger(f"Whitelist Users: {whitelist_users}", 1)
+    logger(f"{xlist_type}list Users: {xlist_users}", 1)
+
+    return xlist_library, xlist_library_type, xlist_users
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-    return whitelist_library, whitelist_library_type, whitelist_users