Fix library whitelist, add library tests

This commit is contained in:
Luigi311
2023-03-08 23:17:54 -07:00
parent 5824e6c0cc
commit 3e15120e2a
4 changed files with 317 additions and 19 deletions

View File

@@ -11,7 +11,6 @@ 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,

View File

@@ -23,7 +23,6 @@ def check_skip_logic(
library_type,
blacklist_library,
blacklist_library_type,
library_mapping,
library_other,
)
skip_reason_white = check_whitelist_logic(
@@ -31,7 +30,6 @@ def check_skip_logic(
library_type,
whitelist_library,
whitelist_library_type,
library_mapping,
library_other,
)
@@ -53,7 +51,6 @@ def check_blacklist_logic(
library_type,
blacklist_library,
blacklist_library_type,
library_mapping=None,
library_other=None,
):
skip_reason = None
@@ -90,7 +87,6 @@ def check_whitelist_logic(
library_type,
whitelist_library,
whitelist_library_type,
library_mapping=None,
library_other=None,
):
skip_reason = None
@@ -107,26 +103,28 @@ def check_whitelist_logic(
# if whitelist is not empty and library is not in whitelist
if len(whitelist_library) > 0:
if library_title.lower() not in [x.lower() for x in whitelist_library]:
if skip_reason:
skip_reason = (
skip_reason
+ " and "
+ f"{library_title} is not in whitelist_library"
)
else:
skip_reason = f"{library_title} is not in whitelist_library"
if library_other:
if library_other.lower() not in [x.lower() for x in whitelist_library]:
if library_title.lower() not in [
x.lower() for x in whitelist_library
] and library_other.lower() not in [x.lower() for x in whitelist_library]:
if skip_reason:
skip_reason = (
skip_reason
+ " and "
+ f"{library_other} is not in whitelist_library"
+ f"{library_title} is not in whitelist_library"
)
else:
skip_reason = f"{library_other} is not in whitelist_library"
skip_reason = f"{library_title} is not in whitelist_library"
else:
if library_title.lower() not in [x.lower() for x in whitelist_library]:
if skip_reason:
skip_reason = (
skip_reason
+ " and "
+ f"{library_title} is not in whitelist_library"
)
else:
skip_reason = f"{library_title} is not in whitelist_library"
return skip_reason

View File

@@ -15,7 +15,6 @@ from src.library import (
)
# Bypass hostname validation for ssl. Taken from https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
class HostNameIgnoringAdapter(requests.adapters.HTTPAdapter):
def init_poolmanager(self, connections, maxsize, block=..., **pool_kwargs):