Skip library before erroring for multiple types.
This commit is contained in:
@@ -168,6 +168,11 @@ def check_skip_logic(
|
|||||||
):
|
):
|
||||||
skip_reason = None
|
skip_reason = None
|
||||||
|
|
||||||
|
if type(library_type) in [list, tuple, set]:
|
||||||
|
for library_type_item in library_type:
|
||||||
|
if library_type_item.lower() in blacklist_library_type:
|
||||||
|
skip_reason = "is blacklist_library_type"
|
||||||
|
else:
|
||||||
if library_type.lower() in blacklist_library_type:
|
if library_type.lower() in blacklist_library_type:
|
||||||
skip_reason = "is blacklist_library_type"
|
skip_reason = "is blacklist_library_type"
|
||||||
|
|
||||||
@@ -182,6 +187,11 @@ def check_skip_logic(
|
|||||||
skip_reason = "is blacklist_library"
|
skip_reason = "is blacklist_library"
|
||||||
|
|
||||||
if len(whitelist_library_type) > 0:
|
if len(whitelist_library_type) > 0:
|
||||||
|
if type(library_type) in [list, tuple, set]:
|
||||||
|
for library_type_item in library_type:
|
||||||
|
if library_type_item.lower() not in whitelist_library_type:
|
||||||
|
skip_reason = "is not whitelist_library_type"
|
||||||
|
else:
|
||||||
if library_type.lower() not in whitelist_library_type:
|
if library_type.lower() not in whitelist_library_type:
|
||||||
skip_reason = "is not whitelist_library_type"
|
skip_reason = "is not whitelist_library_type"
|
||||||
|
|
||||||
|
|||||||
@@ -366,16 +366,9 @@ class Jellyfin:
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
# If there are multiple types in library raise error
|
|
||||||
if len(types) > 1:
|
|
||||||
raise Exception(
|
|
||||||
f"Jellyfin: Library {library_title} has multiple types: {types}"
|
|
||||||
)
|
|
||||||
library_type = types.pop()
|
|
||||||
|
|
||||||
skip_reason = check_skip_logic(
|
skip_reason = check_skip_logic(
|
||||||
library_title,
|
library_title,
|
||||||
library_type,
|
types,
|
||||||
blacklist_library,
|
blacklist_library,
|
||||||
whitelist_library,
|
whitelist_library,
|
||||||
blacklist_library_type,
|
blacklist_library_type,
|
||||||
@@ -390,6 +383,13 @@ class Jellyfin:
|
|||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# If there are multiple types in library raise error
|
||||||
|
if len(types) > 1:
|
||||||
|
raise Exception(
|
||||||
|
f"Jellyfin: Library {library_title} has multiple types: {types}"
|
||||||
|
)
|
||||||
|
library_type = types.pop()
|
||||||
|
|
||||||
# Get watched for user
|
# Get watched for user
|
||||||
task = asyncio.ensure_future(
|
task = asyncio.ensure_future(
|
||||||
self.get_user_library_watched(
|
self.get_user_library_watched(
|
||||||
|
|||||||
Reference in New Issue
Block a user