From 1396b72c965caac56daf711a1eec9c94cffadc11 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 17 Dec 2013 12:00:25 +0100 Subject: [PATCH] [REF] Refactore prepare data for file document function + clear some code --- fetchmail.py | 4 +-- file_document.py | 71 ++++++++++++++++++++---------------------- file_document_view.xml | 8 ++--- 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/fetchmail.py b/fetchmail.py index be4082bb..989e2831 100644 --- a/fetchmail.py +++ b/fetchmail.py @@ -36,7 +36,7 @@ class fetchmail_server(orm.Model): 'file_type': fields.selection(_get_file_type, 'File Type', help='The file type will show some special option'), 'company_id': fields.many2one('res.company', 'Company', required=True),#Why this field do not exist by default? - 'file_document_condition_ids': fields.one2many('prepare.file.document', 'server_id', 'File Document ') + 'file_document_condition_ids': fields.one2many('file.document.condition', 'server_id', 'File Document ') } _defaults = { @@ -50,11 +50,9 @@ class fetchmail_server(orm.Model): else: ctx = context.copy() ctx['default_file_document_vals'] = {} - ctx['default_file_document_condition_ids'] = {} server = self.browse(cr, uid, server_id, context=context) ctx['default_company_id'] = server.company_id.id ctx['default_fetchmail_server_id'] = server_id - ctx['default_file_document_condition_ids'] = [cond.id for cond in server.file_document_condition_ids] return ctx def fetch_mail(self, cr, uid, ids, context=None): diff --git a/file_document.py b/file_document.py index 86024277..58892c99 100644 --- a/file_document.py +++ b/file_document.py @@ -62,13 +62,23 @@ class file_document(orm.Model): context=context, content_subtype=content_subtype, **kwargs) - - def custom_data_for_file_document(self, cr, uid, msg, context=None): - return {} - def add_more_fields(self, cr, uid, vals, msg, context=None): - return {} + def prepare_data_from_basic_condition(self, cr, uid, condition, msg, context=None): + vals = {} + if condition.from_email in msg['from'] and condition.mail_subject == msg['subject']: + for att in msg['attachments']: + if condition.file_extension in att[0]: + vals = { + 'name': msg['subject'], + 'direction': 'input', + 'date': msg['date'], + 'ext_id': msg['message_id'], + 'datas_fname': att[0], + 'datas': base64.b64encode(att[0][1]) + } + break + return vals def _prepare_data_for_file_document(self, cr, uid, msg, context=None): @@ -80,29 +90,17 @@ class file_document(orm.Model): :rtype: list """ res = [] - doc_file_condition_obj = self.pool.get('prepare.file.document') - cond_ids = context.get('default_file_document_condition_ids', False) - for cond in doc_file_condition_obj.browse(cr, uid, cond_ids): - vals = {} - if cond.type == 'normal': - if cond.from_email in msg['from'] and cond.mail_subject == msg['subject']: - vals = { - 'name': msg['subject'], - 'direction': 'input', - 'date': msg['date'], - 'ext_id': msg['message_id'], - } - #attachment_names = [att[0] for att in msg['attachments']] - for att in msg['attachments']: - if cond.file_extension in att[0]: - vals['datas_fname'] = att[0] - vals['datas'] = base64.b64encode(att[0][1]) - pass - vals.update(self.add_more_fields(cr, uid, vals, msg, context=context)) - else: - vals = eval('self.'+cond.type)(cr, uid, msg, context=context) - if 'datas_fname' in vals: - res.append(vals) + server_id = context.get('default_fetchmail_server_id', False) + doc_file_condition_obj = self.pool.get('file.document.condition') + cond_ids = doc_file_condition_obj.search(cr, uid, [('server_id', '=', server_id)]) + if cond_ids: + for cond in doc_file_condition_obj.browse(cr, uid, cond_ids): + if cond.type == 'normal': + vals = self.prepare_data_from_basic_condition(cr, uid, cond, msg, context=context) + else: + vals = getattr(self, cond.type)(cr, uid, cond, msg, context=context) + if vals: + res.append(vals) return res def message_new(self, cr, uid, msg, custom_values, context=None): @@ -122,20 +120,19 @@ class file_document(orm.Model): return None -class prepare_file_document(orm.Model): - _name = "prepare.file.document" - _description = "Prepare File Document" +class file_document_condition(orm.Model): + _name = "file.document.condition" + _description = "File Document Conditions" - def _get_prepare_file_document_type(self, cr, uid, context=None): - return self.get_prepare_file_document_type(cr, uid, context=context) - - def get_prepare_file_document_type(self, cr, uid, context=None): - return [('normal', 'Normal')] + def _get_file_document_condition_type(self, cr, uid, context=None): + return self.get_file_document_condition_type(cr, uid, context=context) + def get_file_document_condition_type(self, cr, uid, context=None): + return [('normal', 'Normal'), ('test', 'TEST')] _columns = { 'from_email': fields.char('Email', size=64), 'mail_subject': fields.char('Mail Subject', size=64), - 'type': fields.selection(_get_prepare_file_document_type, + 'type': fields.selection(_get_file_document_condition_type, 'Type', help="Create your own type if the normal type do not correspond to your need", required=True), 'file_extension' : fields.char('File Extension', size=64, help="File extension or file name", required=True), 'server_id': fields.many2one('fetchmail.server', 'Server Mail'), diff --git a/file_document_view.xml b/file_document_view.xml index adce9945..4690837c 100644 --- a/file_document_view.xml +++ b/file_document_view.xml @@ -16,9 +16,9 @@ - - view_prepare_file_document_tree - prepare.file.document + + view_file_document_condition_tree + file.document.condition @@ -32,7 +32,7 @@ Configuration - prepare.file.document + file.document.condition form tree,form