{body}
'
-
- if show_metadata:
- # Add metadata at the top
- body = metadata_html + body
-
- # Always sanitize HTML
- body = html_sanitize(
- body, sanitize_tags=False, sanitize_attributes=False, sanitize_style=False
- )
-
- html_part = MIMEText(body, "html")
- email_msg.attach(html_part)
- else:
- html_part = MIMEText("", "html")
- email_msg.attach(html_part)
-
- # Add attachments
- for attachment in msg_file.attachments:
- if not hasattr(attachment, "data") or not attachment.data:
- continue
+ body = html_sanitize(msg_file.body)
+ email_msg.attach(MIMEText(body, "html"))
+ # Process attachments
+ for att in msg_file.attachments:
try:
- filename = attachment.getFilename()
- except AttributeError:
- filename = "unknown.bin"
+ filename = att.longFilename or att.shortFilename
+ if filename:
+ part = MIMEBase("application", "octet-stream")
+ part.set_payload(att.data)
+ encoders.encode_base64(part)
+ part.add_header(
+ "Content-Disposition",
+ f"attachment; filename={filename}",
+ )
+ email_msg.attach(part)
+ except Exception as e:
_logger.warning(
- "Could not get filename for attachment, using default: %s",
+ "Failed to process attachment %s: %s - Attachment data type: %s, Content: %s",
filename,
+ str(e),
+ type(att.data),
+ str(att.data)[:100] if att.data else "None"
)
-
- if hasattr(attachment, "contentId") and attachment.contentId:
- # Image avec CID - utiliser MIMEImage
- maintype, subtype = (attachment.mimetype or "image/jpeg").split(
- "/", 1
- )
- if maintype == "image":
- mime_part = MIMEImage(attachment.data, _subtype=subtype)
- mime_part.add_header(
- "Content-ID", f"<{attachment.contentId.strip('<>')}>"
- )
- mime_part.add_header(
- "Content-Disposition", "inline", filename=filename
- )
- _logger.debug(
- "Adding inline image with CID: %s, filename: %s",
- attachment.contentId,
- filename,
- )
- else:
- # Fallback pour les non-images avec CID
- mime_part = MIMEBase(maintype, subtype)
- mime_part.set_payload(attachment.data)
- encoders.encode_base64(mime_part)
- mime_part.add_header(
- "Content-ID", f"<{attachment.contentId.strip('<>')}>"
- )
- mime_part.add_header(
- "Content-Disposition", "inline", filename=filename
- )
- else:
- # Pièce jointe normale
- maintype, subtype = (
- attachment.mimetype or "application/octet-stream"
- ).split("/", 1)
- mime_part = MIMEBase(maintype, subtype)
- mime_part.set_payload(attachment.data)
- encoders.encode_base64(mime_part)
- mime_part.add_header(
- "Content-Disposition", "attachment", filename=filename
- )
-
- email_msg.attach(mime_part)
+ # Move problematic attachment to review directory
+ self._move_to_review_dir('msg_conversion')
return email_msg.as_string()
except Exception as e:
- _msg_import_logger.error(
- "Error converting MSG to EML: %s", str(e), exc_info=True
- )
+ _logger.error("Error converting MSG to EML: %s", str(e))
raise
+ def _get_review_dir(self, error_type):
+ """
+ Get the review directory path.
+
+ Args:
+ error_type (str): Type of error encountered
+
+ Returns:
+ str: Path to the review directory
+ """
+ # Get Odoo's data directory
+ data_dir = config.get('data_dir', os.path.dirname(self._full_path(self.store_fname)))
+
+ # Create a specific directory for review files
+ review_base = os.path.join(data_dir, 'review_files')
+
+ # Create subdirectory for specific error type
+ review_dir = os.path.join(review_base, error_type)
+
+ return review_dir
+
+ def _move_to_review_dir(self, error_type):
+ """
+ Move problematic files to a review directory.
+
+ Args:
+ error_type (str): Type of error encountered (e.g., 'pdf_page_count', 'msg_conversion')
+ """
+ self.ensure_one()
+ try:
+ if not self.store_fname:
+ _logger.warning("[%s] No stored file to move", self.name or 'Unknown')
+ return
+
+ # Get review directory
+ review_dir = self._get_review_dir(error_type)
+ os.makedirs(review_dir, exist_ok=True)
+
+ # Move file to review directory
+ src_path = self._full_path(self.store_fname)
+ if os.path.exists(src_path):
+ # Create a subdirectory for the current date
+ date_dir = os.path.join(review_dir, fields.Date.today().strftime('%Y%m%d'))
+ os.makedirs(date_dir, exist_ok=True)
+
+ # Add timestamp to filename to avoid conflicts
+ timestamp = fields.Datetime.now().strftime('%H%M%S')
+ filename = f"{timestamp}_{self.id}_{self.name}"
+ dst_path = os.path.join(date_dir, filename)
+
+ # Copy file instead of moving to preserve original
+ shutil.copy2(src_path, dst_path)
+
+ # Log the action
+ _logger.info(
+ "File %s moved to review directory due to %s error. New location: %s",
+ self.name or 'Unknown', error_type, dst_path
+ )
+
+ # Update attachment record
+ self.write({
+ 'description': f"{self.description or ''}\nMoved to review directory due to {error_type} error on {fields.Datetime.now()}"
+ })
+
+ except Exception as e:
+ _logger.error("[%s] Failed to move file to review directory: %s", self.name or 'Unknown', str(e))
+
def process_msg_as_email(self):
"""
Convert MSG file to EML and process it using Odoo's mail module.
@@ -422,31 +303,40 @@ class IrAttachment(models.Model):
Returns:
bool: True if successful, False otherwise
"""
- self.ensure_one()
- _logger.debug(
- "Starting MSG processing for file: %s (model: %s, res_id: %s)",
- self.name,
- self.res_model,
- self.res_id,
- )
-
- if not self._is_msg_file():
- log_errors = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_msg_error', 'False').lower() == 'true'
- log_file = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_file_path')
- error_msg = f"Invalid MSG file: {self.name} (model: {self.res_model}, res_id: {self.res_id})"
- if log_errors and log_file:
- _msg_import_logger.error(error_msg)
- self._notify_error(
- "Invalid File", _("The selected file is not a valid MSG file")
- )
- return False
-
try:
- # Convert MSG to EML
- msg_data = base64.b64decode(self.datas)
- eml_content = self._msg_to_eml(msg_data)
+ self.ensure_one()
- # Process using Odoo's standard mail handling
+ if not self._is_msg_file():
+ _logger.warning("File is not a valid MSG file: %s", self.name)
+ return False
+
+ if not self.datas:
+ _logger.warning("No data found in MSG file: %s", self.name)
+ return False
+
+ if self.msg_processed:
+ _logger.debug("MSG file already processed: %s", self.name)
+ return True
+
+ try:
+ # Convert base64 to bytes with validation
+ msg_data = base64.b64decode(self.datas)
+ if not isinstance(msg_data, bytes):
+ raise ValueError(f"Expected bytes after b64decode, got {type(msg_data)}")
+
+ eml_content = self._msg_to_eml(msg_data)
+ if not isinstance(eml_content, str):
+ raise ValueError(f"Expected string EML content, got {type(eml_content)}")
+
+ except (ValueError, TypeError) as e:
+ _logger.error("Data conversion error for %s: %s", self.name, str(e))
+ return False
+
+ if not eml_content:
+ _logger.error("Failed to convert MSG to EML: %s", self.name)
+ return False
+
+ # Get thread model based on res_model
thread_model = (
self.env[self.res_model] if self.res_model else self.env["mail.thread"]
)
@@ -461,45 +351,78 @@ class IrAttachment(models.Model):
"mail_notify_force_send": False,
"mail_create_force_model": self.res_model,
"mail_thread_quote": False,
+ "mail_create_skip_followers": True,
+ "mail_auto_subscribe_no_notify": True, # Prevent auto-subscription notifications
+ "no_auto_thread": True # Prevent automatic thread creation
}
- # Process the EML using Odoo's standard message_process
- thread_id = thread_model.with_context(**context).message_process(
- model=self.res_model,
- message=eml_content,
- custom_values={
- "res_id": self.res_id,
- "model": self.res_model,
- "msg_attachment_id": self.id,
- },
- thread_id=self.res_id,
- )
+ try:
+ with self.env.cr.savepoint(): # Use savepoint for transaction management
+ # Process the EML using Odoo's standard message_process
+ thread_id = thread_model.with_context(**context).message_process(
+ model=self.res_model,
+ message=eml_content,
+ custom_values={
+ "res_id": self.res_id,
+ "model": self.res_model,
+ "msg_attachment_id": self.id,
+ },
+ thread_id=self.res_id,
+ )
- if thread_id:
- _logger.debug(
- "Message processed successfully, thread_id: %s", thread_id
- )
- self.write(
- {
- "description": _("Processed as email on %s")
- % fields.Datetime.now(),
- "msg_processed": True,
- }
- )
- return thread_id
- else:
- log_errors = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_msg_error', 'False').lower() == 'true'
- log_file = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_file_path')
+ if thread_id:
+ _logger.debug(
+ "Message processed successfully, thread_id: %s", thread_id
+ )
+ self.write(
+ {
+ "description": _("Processed as email on %s")
+ % fields.Datetime.now(),
+ "msg_processed": True,
+ }
+ )
+ return thread_id
+
+ except psycopg2.IntegrityError as e:
+ if "mail_followers_mail_followers_res_partner_res_model_id_uniq" in str(e):
+ _logger.warning("Follower already exists, skipping: %s", str(e))
+ return thread_id if 'thread_id' in locals() else False
+ raise
+
+ except Exception as e:
+ _logger.error("Error processing MSG file %s: %s", self.name, str(e), exc_info=True)
+ if not self.env.context.get('skip_msg_processing_on_error'):
+ raise
+
+ # Get error logging preference safely
+ try:
+ with self.env.cr.savepoint():
+ log_errors = self.env['ir.config_parameter'].sudo().get_param(
+ 'msg_attachments.log_msg_error', 'False'
+ ).lower() == 'true'
+ except Exception:
+ log_errors = False # Default to False if parameter can't be read
+
+ # Si thread_id est False, on log l'erreur si configuré
+ if log_errors:
error_msg = f"Failed to process MSG file: {self.name} - message_process failed to create thread_id"
_msg_import_logger.error(error_msg, exc_info=True)
- return False
+
+ return False
except Exception as e:
- log_errors = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_msg_error', 'False').lower() == 'true'
- log_file = self.env['ir.config_parameter'].sudo().get_param('msg_attachments.log_file_path')
- error_msg = f"Error processing MSG file: {self.name} - {str(e)}"
- if log_errors and log_file:
+ if not self.env.context.get('skip_msg_processing_on_error'):
+ raise
+
+ # Log l'erreur si configuré
+ log_errors = self.env['ir.config_parameter'].sudo().get_param(
+ 'msg_attachments.log_msg_error', 'False'
+ ).lower() == 'true'
+
+ if log_errors:
+ error_msg = f"Error processing MSG file: {self.name} - {str(e)}"
_msg_import_logger.error(error_msg, exc_info=True)
+
self._notify_error(
"Processing Error", _("Could not process the MSG file: %s") % str(e)
)
@@ -529,8 +452,72 @@ class IrAttachment(models.Model):
@api.model_create_multi
def create(self, vals_list):
+ """Override create to handle problematic files."""
+ if not isinstance(vals_list, list):
+ vals_list = [vals_list]
+
attachments = super().create(vals_list)
+
for attachment in attachments:
- if attachment._is_msg_file():
- attachment.process_msg_as_email()
+ try:
+ # Check if it's a PDF file
+ if attachment.mimetype == 'application/pdf' and attachment.store_fname:
+ # Try to open and read the PDF
+ try:
+ import PyPDF2
+ with open(attachment._full_path(attachment.store_fname), 'rb') as pdf_file:
+ try:
+ pdf_reader = PyPDF2.PdfReader(pdf_file)
+ num_pages = len(pdf_reader.pages)
+ _logger.info("[%s] PDF processed successfully, pages: %d", attachment.name or 'Unknown', num_pages)
+ except Exception as e:
+ _logger.warning(
+ "[%s] Failed to process PDF: %s",
+ attachment.name or 'Unknown', str(e)
+ )
+ attachment._move_to_review_dir('pdf_error')
+ except Exception as e:
+ _logger.error("[%s] Error accessing PDF file: %s", attachment.name or 'Unknown', str(e))
+
+ # Process MSG files
+ if attachment._is_msg_file():
+ attachment.process_msg_as_email()
+
+ except Exception as e:
+ _logger.error("[%s] Error processing attachment: %s", attachment.name or 'Unknown', str(e))
+
return attachments
+
+ def write(self, vals):
+ """Override write to handle problematic files on update."""
+ res = super().write(vals)
+
+ if 'datas' in vals:
+ for attachment in self:
+ try:
+ # Check if it's a PDF file
+ if attachment.mimetype == 'application/pdf' and attachment.store_fname:
+ try:
+ import PyPDF2
+ with open(attachment._full_path(attachment.store_fname), 'rb') as pdf_file:
+ try:
+ pdf_reader = PyPDF2.PdfReader(pdf_file)
+ num_pages = len(pdf_reader.pages)
+ _logger.info("[%s] PDF processed successfully, pages: %d", attachment.name or 'Unknown', num_pages)
+ except Exception as e:
+ _logger.warning(
+ "[%s] Failed to process PDF: %s",
+ attachment.name or 'Unknown', str(e)
+ )
+ attachment._move_to_review_dir('pdf_error')
+ except Exception as e:
+ _logger.error("[%s] Error accessing PDF file: %s", attachment.name or 'Unknown', str(e))
+
+ # Process MSG files
+ if attachment._is_msg_file():
+ attachment.process_msg_as_email()
+
+ except Exception as e:
+ _logger.error("[%s] Error processing attachment: %s", attachment.name or 'Unknown', str(e))
+
+ return res