'Refactored by Sourcery' (#14)

Co-authored-by: Sourcery AI <>

Author: sourcery-ai[bot]

darkseid/comicarchive.py

@@ -201,18 +201,12 @@ def is_writable(self):
         if self.archive_type == self.ArchiveType.Unknown:
             return False
 
-        if not os.access(self.path, os.W_OK):
-            return False
-
-        return True
+        return bool(os.access(self.path, os.W_OK))
 
     def seems_to_be_a_comic_archive(self):
         """Returns a boolean as to whether the file is a comic archive"""
 
-        if (self.is_zip()) and (self.get_number_of_pages() > 0):
-            return True
-
-        return False
+        return bool((self.is_zip()) and (self.get_number_of_pages() > 0))
 
     def get_page(self, index):
         """Returns an image(page) from an archive"""
@@ -292,11 +286,13 @@ def read_metadata(self):
                 self.metadata = ComicInfoXml().metadata_from_string(raw_metadata)
 
             # validate the existing page list (make sure count is correct)
-            if len(self.metadata.pages) != 0:
-                if len(self.metadata.pages) != self.get_number_of_pages():
-                    # pages array doesn't match the actual number of images we're seeing
-                    # in the archive, so discard the data
-                    self.metadata.pages = []
+            if (
+                len(self.metadata.pages) != 0
+                and len(self.metadata.pages) != self.get_number_of_pages()
+            ):
+                # pages array doesn't match the actual number of images we're seeing
+                # in the archive, so discard the data
+                self.metadata.pages = []
 
             if len(self.metadata.pages) == 0:
                 self.metadata.set_default_page_list(self.get_number_of_pages())
@@ -316,19 +312,18 @@ def read_raw_metadata(self):
     def write_metadata(self, metadata):
         """Write the metadata to the archive"""
 
-        if metadata is not None:
-            self.apply_archive_info_to_metadata(metadata, calc_page_sizes=True)
-            md_string = ComicInfoXml().string_from_metadata(metadata)
-            write_success = self.archiver.write_archive_file(
-                self.ci_xml_filename, md_string
-            )
-            if write_success:
-                self.has_md = True
-                self.metadata = metadata
-            self.reset_cache()
-            return write_success
-
-        return False
+        if metadata is None:
+            return False
+        self.apply_archive_info_to_metadata(metadata, calc_page_sizes=True)
+        md_string = ComicInfoXml().string_from_metadata(metadata)
+        write_success = self.archiver.write_archive_file(
+            self.ci_xml_filename, md_string
+        )
+        if write_success:
+            self.has_md = True
+            self.metadata = metadata
+        self.reset_cache()
+        return write_success
 
     def remove_metadata(self):
         """Remove the metadata from the archive if present"""
@@ -347,12 +342,15 @@ def has_metadata(self):
 
         if self.has_md is None:
 
-            if not self.seems_to_be_a_comic_archive():
+            if (
+                not self.seems_to_be_a_comic_archive()
+                or self.seems_to_be_a_comic_archive()
+                and self.ci_xml_filename
+                not in self.archiver.get_archive_filename_list()
+            ):
                 self.has_md = False
-            elif self.ci_xml_filename in self.archiver.get_archive_filename_list():
-                self.has_md = True
             else:
-                self.has_md = False
+                self.has_md = True
         return self.has_md
 
     def apply_archive_info_to_metadata(self, metadata, calc_page_sizes=False):
@@ -362,12 +360,12 @@ def apply_archive_info_to_metadata(self, metadata, calc_page_sizes=False):
 
         if calc_page_sizes:
             for page in metadata.pages:
-                idx = int(page["Image"])
                 if (
                     "ImageSize" not in page
                     or "ImageHeight" not in page
                     or "ImageWidth" not in page
                 ):
+                    idx = int(page["Image"])
                     data = self.get_page(idx)
                     if data is not None:
                         try:
@@ -380,11 +378,6 @@ def apply_archive_info_to_metadata(self, metadata, calc_page_sizes=False):
                         except IOError:
                             page["ImageSize"] = str(len(data))
 
-                else:
-                    if "ImageSize" not in page:
-                        data = self.get_page(idx)
-                        page["ImageSize"] = str(len(data))
-
     def metadata_from_filename(self, parse_scan_info=True):
         """Attempts to get the metadata from the filename"""
 
@@ -403,9 +396,8 @@ def metadata_from_filename(self, parse_scan_info=True):
             metadata.year = fnp.year
         if fnp.issue_count != "":
             metadata.issueCount = fnp.issue_count
-        if parse_scan_info:
-            if fnp.remainder != "":
-                metadata.scanInfo = fnp.remainder
+        if parse_scan_info and fnp.remainder != "":
+            metadata.scanInfo = fnp.remainder
 
         metadata.isEmpty = False
 

darkseid/comicinfoxml.py

@@ -51,8 +51,7 @@ class ComicInfoXml:
     ]
 
     def get_parseable_credits(self):
-        parsable_credits = []
-        parsable_credits.extend(self.writer_synonyms)
+        parsable_credits = list(self.writer_synonyms)
         parsable_credits.extend(self.penciller_synonyms)
         parsable_credits.extend(self.inker_synonyms)
         parsable_credits.extend(self.colorist_synonyms)

darkseid/filenameparser.py

@@ -28,10 +28,7 @@ def repl(match):
     def fix_spaces(self, string, remove_dashes=True):
         """Returns a string with the spaces fixed"""
 
-        if remove_dashes:
-            placeholders = ["[-_]", "  +"]
-        else:
-            placeholders = ["[_]", "  +"]
+        placeholders = ["[-_]", "  +"] if remove_dashes else ["[_]", "  +"]
         for place_holder in placeholders:
             string = re.sub(place_holder, self.repl, string)
         return string  # .strip()

darkseid/genericmetadata.py

@@ -74,9 +74,9 @@ def __init__(self):
         self.teams = None
         self.locations = None
 
-        self.credits = list()
-        self.tags = list()
-        self.pages = list()
+        self.credits = []
+        self.tags = []
+        self.pages = []
 
         # Some CoMet-only items
         self.price = None
@@ -157,11 +157,7 @@ def assign(cur, new):
 
     def overlay_credits(self, new_credits):
         for credit in new_credits:
-            if "primary" in credit and credit["primary"]:
-                primary = True
-            else:
-                primary = False
-
+            primary = True if "primary" in credit and credit["primary"] else False
             # Remove credit role if person is blank
             if credit["person"] == "":
                 for r in reversed(self.credits):
@@ -174,8 +170,7 @@ def overlay_credits(self, new_credits):
     def set_default_page_list(self, count):
         # generate a default page list, with the first page marked as the cover
         for i in range(count):
-            page_dict = dict()
-            page_dict["Image"] = str(i)
+            page_dict = {"Image": str(i)}
             if i == 0:
                 page_dict["Type"] = PageType.FrontCover
             self.pages.append(page_dict)
@@ -190,21 +185,20 @@ def get_archive_page_index(self, pagenum):
 
     def get_cover_page_index_list(self):
         # return a list of archive page indices of cover pages
-        coverlist = []
-        for page in self.pages:
-            if "Type" in page and page["Type"] == PageType.FrontCover:
-                coverlist.append(int(page["Image"]))
+        coverlist = [
+            int(page["Image"])
+            for page in self.pages
+            if "Type" in page and page["Type"] == PageType.FrontCover
+        ]
 
-        if len(coverlist) == 0:
+        if not coverlist:
             coverlist.append(0)
 
         return coverlist
 
     def add_credit(self, person, role, primary=False):
 
-        credit = dict()
-        credit["person"] = person
-        credit["role"] = role
+        credit = {"person": person, "role": role}
         if primary:
             credit["primary"] = primary
 

darkseid/issuestring.py

@@ -31,11 +31,7 @@ def __init__(self, text):
         text = str(text)
 
         # skip the minus sign if it's first
-        if text[0] == "-":
-            start = 1
-        else:
-            start = 0
-
+        start = 1 if text[0] == "-" else 0
         # if it's still not numeric at start skip it
         if text[start].isdigit() or text[start] == ".":
             # walk through the string, look for split point (the first

tests/test_darkseid_comicarchive.py

@@ -38,9 +38,7 @@ def fake_comic(tmp_path):
     finally:
         zf.close()
 
-    comic = ComicArchive(z_file)
-
-    return comic
+    return ComicArchive(z_file)
 
 
 def test_zip_file_exists(fake_comic):

tests/test_darkseid_filenameparser.py

@@ -6,8 +6,7 @@
 
 @pytest.fixture()
 def comic_name():
-    comic = "Afterlife_With_Archie_V1_#002_(of_08)_(2013)"
-    return comic
+    return "Afterlife_With_Archie_V1_#002_(of_08)_(2013)"
 
 
 def test_special_format():

tests/test_darkseid_utils.py

@@ -28,11 +28,8 @@ def test_unique_name(tmp_path):
 
 def test_recursive_list_with_file(tmp_path):
     temp_file = tmp_path / "test.cbz"
-    expected_result = []
-    expected_result.append(temp_file)
-
-    file_list = []
-    file_list.append(temp_file)
+    expected_result = [temp_file]
+    file_list = [temp_file]
     result = utils.get_recursive_filelist(file_list)
 
     assert result == expected_result
@@ -49,13 +46,10 @@ def test_recursive_list_with_directory(tmp_path):
     temp_file_2 = temp_dir / "test-2.cbz"
     temp_file_2.write_text("content")
 
-    expected_result = []
-    expected_result.append(temp_file_2)
-    expected_result.append(temp_file_1)
+    expected_result = [temp_file_2, temp_file_1]
     expected_result = sorted(expected_result)
 
-    file_list = []
-    file_list.append(temp_dir)
+    file_list = [temp_dir]
     result = utils.get_recursive_filelist(file_list)
 
     assert result == expected_result