make list checks consistent

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 422353a90495f11a9dce1b8f82b95b1c8005892f..61f0b9419953881751acfa58b754484a92275af6 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -79,12 +79,10 @@ def barcode_reader(image) -> list:
     # Decode the barcode image
     detected_barcodes = pyzbar.decode(image)
 
-    if not detected_barcodes:
-        logger.debug("No barcode detected")
-    else:
+    if detected_barcodes:
         # Traverse through all the detected barcodes in image
         for barcode in detected_barcodes:
-            if barcode.data != "":
+            if barcode.data:
                 barcodes.append(str(barcode.data))
                 logger.debug(
                     f"Barcode of type {str(barcode.type)} found: {str(barcode.data)}",
@@ -122,7 +120,7 @@ def separate_pages(filepath: str, pages_to_split_on: list) -> list:
     pdf = Pdf.open(filepath)
     document_paths = []
     logger.debug(f"Temp dir is {str(tempdir)}")
-    if len(pages_to_split_on) <= 0:
+    if not pages_to_split_on:
         logger.warning("No pages to split on!")
     else:
         # go from the first page to the first separator page
@@ -188,14 +186,10 @@ def consume_file(
     if settings.CONSUMER_ENABLE_BARCODES:
         separators = scan_file_for_separating_barcodes(path)
     document_list = []
-    if separators == []:
-        pass
-    else:
+    if separators:
         logger.debug(f"Pages with separators found in: {str(path)}")
         document_list = separate_pages(path, separators)
-    if document_list == []:
-        pass
-    else:
+    if document_list:
         for n, document in enumerate(document_list):
             # save to consumption dir
             # rename it to the original filename  with number prefix

diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py
index 3e019b51ec45794d37515f409584706df0e2e18e..9ac8c5fae27d07e2346dc761650c112228599b41 100644 (file)
--- a/src/documents/tests/test_tasks.py
+++ b/src/documents/tests/test_tasks.py
@@ -187,9 +187,9 @@ class TestTasks(DirectoriesMixin, TestCase):
         )
         tempdir = tempfile.mkdtemp(prefix="paperless-", dir=settings.SCRATCH_DIR)
         separators = tasks.scan_file_for_separating_barcodes(test_file)
-        self.assertTrue(separators != [])
+        self.assertTrue(separators)
         document_list = tasks.separate_pages(test_file, separators)
-        self.assertTrue(document_list != [])
+        self.assertTrue(document_list)
         for document in document_list:
             tasks.save_to_dir(document, target_dir=tempdir)
         target_file1 = os.path.join(tempdir, "patch-code-t-middle_document_0.pdf")