From 5fc5a14bd9559d8a695255c02af7991f1fb79fa2 Mon Sep 17 00:00:00 2001 From: Mizaki Date: Tue, 29 Nov 2022 16:59:05 +0000 Subject: [PATCH] Wider catch of series and issue_number being empty --- comictaggerlib/issueidentifier.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/comictaggerlib/issueidentifier.py b/comictaggerlib/issueidentifier.py index 0828ad0..54aa34d 100644 --- a/comictaggerlib/issueidentifier.py +++ b/comictaggerlib/issueidentifier.py @@ -177,8 +177,6 @@ class IssueIdentifier: ca = self.comic_archive - if ca is None: - return None search_keys: SearchKeys if self.only_use_additional_meta_data: search_keys = SearchKeys( @@ -350,17 +348,14 @@ class IssueIdentifier: narrow_cover_hash = self.calculate_hash(right_side_image_data) keys = self.get_search_keys() - if keys is None: - return [] - - # we need, at minimum, a series and issue number - if keys["series"] is None or keys["issue_number"] is None: - self.log_msg("Not enough info for a search!") - return [] - # normalize the issue number, None will return as "" keys["issue_number"] = IssueString(keys["issue_number"]).as_string() + # we need, at minimum, a series and issue number + if not (keys["series"] and keys["issue_number"]): + self.log_msg("Not enough info for a search!") + return [] + self.log_msg("Going to search for:") self.log_msg("\tSeries: " + keys["series"]) self.log_msg("\tIssue: " + keys["issue_number"])