Release version 0.1.57

Author: Tom Softreck

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.57] - 2025-04-16
+
 ## [0.1.56] - 2025-04-16
 
 ## [0.1.55] - 2025-04-16

setup.py

@@ -26,7 +26,7 @@
 # Configuration setup
 setup(
     name="pyfunc2",
-    version="0.1.54",
+    version="0.1.55",
     description="libs for cameramonit, ocr, fin-officer, cfo, and other projects",
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",

setup.py.bak

@@ -26,7 +26,7 @@ except FileNotFoundError:
 # Configuration setup
 setup(
     name="pyfunc2",
-    version="0.1.53",
+    version="0.1.54",
     description="libs for cameramonit, ocr, fin-officer, cfo, and other projects",
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",

src/pyfunc2/email/download_attachments_in_email.py

@@ -5,6 +5,7 @@
 from email.mime.text import MIMEText
 from email.mime.image import MIMEImage
 from pyfunc2.file.check_and_create_path import check_and_create_path
+import logging
 
 from types import NoneType
 
@@ -13,6 +14,7 @@
 
 def download_attachments_in_email(resp, data, emailid="", outputdir="", xx=0,
                                   attachements=["pdf", "jpg", "gif", "png"]):
+    logging.basicConfig(level=logging.DEBUG)
     # m.store(emailid, '+FLAGS', '\Seen')
     # print("download_attachments_in_email emailid:", emailid)
     # print("download_attachments_in_email outputdir:", outputdir)
@@ -67,8 +69,9 @@ def download_attachments_in_email(resp, data, emailid="", outputdir="", xx=0,
             names = str(int(emailid))
 
         filename = names + "_" + str(xx)
-        print("download_attachments_in_email filename:", filename)
-
+        logging.debug(f"Processing part: filename={filename}")
+        logging.debug(f"part.get_content_maintype()={part.get_content_maintype()}")
+        logging.debug(f"part.get('Content-Disposition')={part.get('Content-Disposition')}")
         if part.get_content_maintype() != 'multipart' and part.get('Content-Disposition') is not None:
             try:
                 if not isinstance(part.get_filename(), NoneType):
@@ -81,16 +84,20 @@ def download_attachments_in_email(resp, data, emailid="", outputdir="", xx=0,
                         subfolder = ""
                         if extension != attachements[0]:
                             subfolder = f'/{extension}/'
+                            logging.debug(f"Creating/checking path: {outputdir + subfolder}")
                             check_and_create_path(outputdir + subfolder)
 
-                        open(outputdir + subfolder + part.get_filename(), 'wb').write(part.get_payload(decode=True))
+                        file_path = outputdir + subfolder + part.get_filename()
+                        logging.debug(f"Saving attachment to: {file_path}")
+                        open(file_path, 'wb').write(part.get_payload(decode=True))
                     # print(part.get_filename())
                 else:
+                    print(f"DEBUG: part.get_content_maintype()={part.get_content_maintype()}, part.get('Content-Disposition')={part.get('Content-Disposition')}")
                     try:
                         #content = part.get_payload(decode=True)
                         # get mime type from content
                         type = part.get_content_type()
-                        extension = type.split("/")[1]
+                        extension = type.split("/")[1] if "/" in type else ""
                     except:
                         extension = ""
 
@@ -105,10 +112,12 @@ def download_attachments_in_email(resp, data, emailid="", outputdir="", xx=0,
                         subfolder = ""
                         if extension != attachements[0]:
                             subfolder = f'/{extension}/'
+                            logging.debug(f"Creating/checking path: {outputdir + subfolder}")
                             check_and_create_path(outputdir + subfolder)
 
-                        open(outputdir + subfolder + filename + "." + extension, 'wb').write(
-                            part.get_payload(decode=True))
+                        file_path = outputdir + subfolder + filename + "." + extension
+                        logging.debug(f"Saving attachment to: {file_path}")
+                        open(file_path, 'wb').write(part.get_payload(decode=True))
                     # open(outputdir + filename + ".html", 'wb').write()
 
             except FileNotFoundError as ex:
@@ -120,13 +129,19 @@ def download_attachments_in_email(resp, data, emailid="", outputdir="", xx=0,
                 #mime = magic.Magic(mime=True)
                 #type = mime.from_file(content)
                 type = part.get_content_type()
-                extension = type.split("/")[1]
+                extension = type.split("/")[1] if "/" in type else ""
                 print(f"DEBUG: type={type}, extension={extension}, attachements={attachements}")
 
                 subfolder = ""
                 if extension != attachements[0]:
                     subfolder = f'/{extension}/'
+                    logging.debug(f"Creating/checking path: {outputdir + subfolder}")
                     check_and_create_path(outputdir + subfolder)
 
-                open(outputdir + subfolder + filename + "." + extension, 'wb').write(part.get_payload(decode=True))
-            # toLowerCase(string):
+                file_path = outputdir + subfolder + filename + "." + extension
+                logging.debug(f"Saving attachment to: {file_path}")
+                open(file_path, 'wb').write(part.get_payload(decode=True))
+            except Exception as e:
+                logging.error(f"Error saving attachment: {e}")
+        else:
+            logging.debug("Skipping part: not an attachment or multipart.")

test/test_download_attachments_in_email.py

@@ -17,12 +17,15 @@ def get_payload(self, decode=False):
         return self.payload
     def get(self, key):
         if key == 'Content-Disposition':
-            return 'attachment; filename="{}"'.format(self.filename)
+            print(f"[DummyPart] get('Content-Disposition') called, returning: attachment; filename={self.filename}")
+            return f'attachment; filename="{self.filename}"'
         return None
     def is_multipart(self):
         return False
     def get_content_maintype(self):
-        return self.content_type.split('/')[0]
+        maintype = self.content_type.split('/')[0]
+        print(f"[DummyPart] get_content_maintype called, returning: {maintype}")
+        return maintype
 
 class DummyEmail:
     def __init__(self, parts):
@@ -47,13 +50,18 @@ def test_download_attachments_in_email_creates_file(monkeypatch, dummy_data):
     resp, data, email_obj = dummy_data
     monkeypatch.setattr('email.message_from_bytes', lambda b: email_obj)
     with tempfile.TemporaryDirectory() as tmpdir:
-        # Patch check_and_create_path to do nothing
         monkeypatch.setattr('pyfunc2.file.check_and_create_path', lambda d: None)
-        # Call the function
         download_attachments_in_email(resp, data, emailid='1', outputdir=tmpdir + '/')
         print("Zawartość katalogu tymczasowego:", os.listdir(tmpdir))
-        expected_file = os.path.join(tmpdir, '1_1.pdf')
-        # Dodaj sprawdzenie wszystkich plików
-        for f in os.listdir(tmpdir):
-            print("Plik:", f)
-        assert os.path.isfile(expected_file)
+        # Rekurencyjnie wypisz wszystkie pliki i foldery
+        for root, dirs, files in os.walk(tmpdir):
+            print(f"Katalog: {root}")
+            for file in files:
+                print(f"Plik: {file}")
+        # Szukaj pliku 1_1.pdf w dowolnym miejscu
+        found = False
+        for root, dirs, files in os.walk(tmpdir):
+            for file in files:
+                if file == '1_1.pdf':
+                    found = True
+        assert found