From b931b05bb902efca78fa0df363dda1ff29d5bf3a Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 7 Feb 2011 11:03:04 +0530 Subject: [IMP] replace mailgate_message to email_message in crm, fetchamil and project_issue module. bzr revid: ysa@tinyerp.com-20110207053304-yak3ruc2os2lah7t --- addons/fetchmail/fetchmail.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index a1209492490..3fae834b045 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -110,7 +110,7 @@ class email_server(osv.osv): def set_draft(self, cr, uid, ids, context=None): self.write(cr, uid, ids , {'state':'draft'}) return True - + def button_confirm_login(self, cr, uid, ids, context=None): if context is None: context = {} @@ -127,7 +127,7 @@ class email_server(osv.osv): imap_server.login(server.user, server.password) ret_server = imap_server - + elif server.type == 'pop': pop_server = None if server.is_ssl: @@ -140,7 +140,7 @@ class email_server(osv.osv): pop_server.user(server.user) pop_server.pass_(server.password) ret_server = pop_server - + self.write(cr, uid, [server.id], {'state':'done'}) if context.get('get_server',False): return ret_server @@ -207,9 +207,9 @@ class email_server(osv.osv): email_server() -class mailgate_message(osv.osv): +class email_message(osv.osv): - _inherit = "mailgate.message" + _inherit = "email.message" _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), @@ -229,7 +229,7 @@ class mailgate_message(osv.osv): values['server_id'] = server_id if server_type: values['server_type'] = server_type - res = super(mailgate_message,self).create(cr, uid, values, context=context) + res = super(email_message,self).create(cr, uid, values, context=context) return res def write(self, cr, uid, ids, values, context=None): @@ -241,9 +241,9 @@ class mailgate_message(osv.osv): values['server_id'] = server_id if server_type: values['server_type'] = server_type - res = super(mailgate_message,self).write(cr, uid, ids, values, context=context) + res = super(email_message,self).write(cr, uid, ids, values, context=context) return res -mailgate_message() +email_message() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 0c7876ac291b720b787f97834ded983b21c30025 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 7 Feb 2011 11:21:57 +0530 Subject: [IMP] replace mailgate.message to email.message in addons module. bzr revid: ysa@tinyerp.com-20110207055157-yr9co24w84kv0yvy --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 3fae834b045..7ebb9198a92 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -61,7 +61,7 @@ class email_server(osv.osv): 'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"), 'user_id':fields.many2one('res.users', 'User', required=False), - 'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True), + 'message_ids': fields.one2many('email.message', 'server_id', 'Messages', readonly=True), } _defaults = { 'state': lambda *a: "draft", -- cgit v1.2.3 From 0d5cc2663c9fc664f129ba72fe92d2caa17cfc3f Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 28 Feb 2011 14:33:44 +0530 Subject: [IMP] fetchmail :- imap and pop server fetchmail keep in try and server quit in finally block. bzr revid: ysa@tinyerp.com-20110228090344-uf965sg7hvkrv7o2 --- addons/fetchmail/fetchmail.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 892313c0102..bcd4448beca 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -167,8 +167,8 @@ class email_server(osv.osv): for server in self.browse(cr, uid, ids, context=context): count = 0 user = server.user_id.id or uid - try: - if server.type == 'imap': + if server.type == 'imap': + try: imap_server = self.button_confirm_login(cr, uid, [server.id], context=context) imap_server.select() result, data = imap_server.search(None, '(UNSEEN)') @@ -182,12 +182,17 @@ class email_server(osv.osv): count += 1 logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name)) + except Exception, e: + logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) + + finally: imap_server.close() imap_server.logout() - elif server.type == 'pop': + elif server.type == 'pop': + try: pop_server = self.button_confirm_login(cr, uid, [server.id], context=context) - pop_server.list() (numMsgs, totalSize) = pop_server.stat() + pop_server.list() for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) @@ -196,14 +201,12 @@ class email_server(osv.osv): action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) pop_server.dele(num) - - pop_server.quit() - logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) + except Exception, e: + logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) - except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) - + finally: + pop_server.quit() return True email_server() -- cgit v1.2.3 From 062c57e4b0f6532ae1e80f2fbf2d0b27e2f020f2 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 1 Mar 2011 16:13:05 +0530 Subject: [REMOVE] fetchmail :- remove server_type in email.message object. bzr revid: ysa@tinyerp.com-20110301104305-qtfqy8fkr8xifime --- addons/fetchmail/fetchmail.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index e69bbdf87a2..296d592396a 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -117,7 +117,7 @@ class email_server(osv.osv): context = {} for server in self.browse(cr, uid, ids, context=context): logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) - context.update({'server_id': server.id, 'server_type': server.type}) + context.update({'server_id': server.id}) try: if server.type == 'imap': imap_server = None @@ -215,22 +215,14 @@ class email_message(osv.osv): _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), - 'server_type':fields.selection([ - ('pop', 'POP Server'), - ('imap', 'IMAP Server'), - ], 'Server Type', select=True, readonly=True), } - _order = 'id desc' def create(self, cr, uid, values, context=None): if context is None: context={} server_id = context.get('server_id',False) - server_type = context.get('server_type',False) if server_id: values['server_id'] = server_id - if server_type: - values['server_type'] = server_type res = super(email_message,self).create(cr, uid, values, context=context) return res @@ -238,11 +230,8 @@ class email_message(osv.osv): if context is None: context={} server_id = context.get('server_id',False) - server_type = context.get('server_type',False) if server_id: values['server_id'] = server_id - if server_type: - values['server_type'] = server_type res = super(email_message,self).write(cr, uid, ids, values, context=context) return res -- cgit v1.2.3 From 4ff5f75912df44cba5465a1db3f41ae88a9faccc Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Thu, 3 Mar 2011 16:07:40 +0530 Subject: [FIX] fetchmail: fix bzr revid: hmo@tinyerp.com-20110303103740-rza71diijr9hlysf --- addons/fetchmail/fetchmail.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 296d592396a..4b2b44a5414 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -185,8 +185,9 @@ class email_server(osv.osv): except Exception, e: logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) finally: - imap_server.close() - imap_server.logout() + if imap_server: + imap_server.close() + imap_server.logout() elif server.type == 'pop': try: pop_server = self.button_confirm_login(cr, uid, [server.id], context=context) @@ -204,7 +205,8 @@ class email_server(osv.osv): except Exception, e: logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) finally: - pop_server.quit() + if pop_server: + pop_server.quit() return True email_server() -- cgit v1.2.3 From 455fb2d6b349df99449e1b8655349be8ce2869db Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Fri, 18 Mar 2011 19:14:19 +0530 Subject: [IMP] email: email cleanup bzr revid: rha@tinyerp.com-20110318134419-78qmipdipsryqgnz --- addons/fetchmail/fetchmail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 4b2b44a5414..7e514141fea 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -161,7 +161,7 @@ class email_server(osv.osv): def fetch_mail(self, cr, uid, ids, context=None): if context is None: context = {} - email_tool = self.pool.get('email.server.tools') + thread_pool = self.pool.get('email.thread') action_pool = self.pool.get('ir.actions.server') context.update({'get_server': True}) for server in self.browse(cr, uid, ids, context=context): @@ -174,7 +174,7 @@ class email_server(osv.osv): result, data = imap_server.search(None, '(UNSEEN)') for num in data[0].split(): result, data = imap_server.fetch(num, '(RFC822)') - res_id = email_tool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context) + res_id = thread_pool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context) if res_id and server.action_id: action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) @@ -196,7 +196,7 @@ class email_server(osv.osv): for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) - res_id = email_tool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context) + res_id = thread_pool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context) if res_id and server.action_id: action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) -- cgit v1.2.3 From 47a85e9f8f0fadf16d679a2f1fdbef0ef1c59440 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Mon, 4 Apr 2011 15:15:52 +0530 Subject: [IMP] mail: rename module email to mail because of parsing error bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn --- addons/fetchmail/fetchmail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 7e514141fea..5749fd423ca 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -146,7 +146,7 @@ class email_server(osv.osv): if context.get('get_server',False): return ret_server except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e)) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (e)) return True def button_fetch_mail(self, cr, uid, ids, context=None): @@ -183,7 +183,7 @@ class email_server(osv.osv): logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name)) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) finally: if imap_server: imap_server.close() @@ -203,7 +203,7 @@ class email_server(osv.osv): pop_server.dele(num) logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) + logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) finally: if pop_server: pop_server.quit() -- cgit v1.2.3 From 131daf04aadf22a35f11e81ceb8725debd475f9f Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Wed, 6 Apr 2011 10:07:52 +0530 Subject: [FIX] mail: In email.therad, fixed message_new and message_update method bzr revid: hmo@tinyerp.com-20110406043752-nqpgav3h6f0rk8v1 --- addons/fetchmail/fetchmail.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 5749fd423ca..3e479b76e3d 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -82,21 +82,9 @@ class email_server(osv.osv): return False return True - def check_model(self, cr, uid, ids, context = None): - if context is None: - context = {} - current_rec = self.read(cr, uid, ids, context) - if current_rec: - current_rec = current_rec[0] - model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model - model = self.pool.get(model_name) - if hasattr(model, 'message_new'): - return True - return False - _constraints = [ (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']), - (check_model, 'Warning! Record for selected Model can not be created\nPlease choose valid Model', ['object_id']) + ] def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False): -- cgit v1.2.3 From 84ab33f772b7a60ef143e748749eb55c51d04f2c Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 9 May 2011 10:43:27 +0530 Subject: [IMP]Fetchmail:add tooltip on user - change label of model to object to create bzr revid: aag@tinyerp.co.in-20110509051327-wl60urxkcce3l7yw --- addons/fetchmail/fetchmail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 41f84cfdedd..9aeddd7ba9b 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -59,9 +59,9 @@ class email_server(osv.osv): 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}), 'note': fields.text('Description'), 'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."), - 'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model.\nSelect Object with message_new attrbutes."), + 'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"), - 'user_id':fields.many2one('res.users', 'User', required=False), + 'user_id':fields.many2one('res.users', 'User', required=False, help="This is the user that runs the cron"), 'message_ids': fields.one2many('mailgate.message', 'server_id', 'Messages', readonly=True), } _defaults = { -- cgit v1.2.3 From ca2598f997dbea98d9d9bad5f890cf3e872e129e Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Fri, 17 Jun 2011 12:09:14 +0530 Subject: [IMP]: fetchmail: improve the log message bzr revid: sbh@tinyerp.com-20110617063914-lue87brktmevt9a8 --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 41f84cfdedd..58a580d79c3 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -199,7 +199,7 @@ class email_server(osv.osv): pop_server.quit() - logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) + logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) except Exception, e: logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e))) -- cgit v1.2.3 From 6df880e9a4a092b1614154a68ef5f5eb31e1bf67 Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Fri, 17 Jun 2011 13:57:38 +0530 Subject: [IMP]: fetchmail: improve the log message bzr revid: sbh@tinyerp.com-20110617082738-i0umdo9cptek6l4j --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 58a580d79c3..386b48f1546 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -116,7 +116,7 @@ class email_server(osv.osv): if context is None: context = {} for server in self.browse(cr, uid, ids, context=context): - logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) + logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) context.update({'server_id': server.id, 'server_type': server.type}) try: if server.type == 'imap': -- cgit v1.2.3 From 8f9f45ea948d1ffecb79601e860d522fc6686c2d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 22 Aug 2011 19:16:59 +0200 Subject: [IMP] all: next pass of review/renaming for new mail API bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q --- addons/fetchmail/fetchmail.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 3fe296c50bf..f201ff7560d 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -149,7 +149,7 @@ class email_server(osv.osv): def fetch_mail(self, cr, uid, ids, context=None): if context is None: context = {} - thread_pool = self.pool.get('email.thread') + thread_pool = self.pool.get('mail.thread') action_pool = self.pool.get('ir.actions.server') context.update({'get_server': True}) for server in self.browse(cr, uid, ids, context=context): @@ -201,9 +201,9 @@ class email_server(osv.osv): email_server() -class email_message(osv.osv): +class mail_message(osv.osv): - _inherit = "email.message" + _inherit = "mail.message" _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), @@ -215,7 +215,7 @@ class email_message(osv.osv): server_id = context.get('server_id',False) if server_id: values['server_id'] = server_id - res = super(email_message,self).create(cr, uid, values, context=context) + res = super(mail_message,self).create(cr, uid, values, context=context) return res def write(self, cr, uid, ids, values, context=None): @@ -224,9 +224,8 @@ class email_message(osv.osv): server_id = context.get('server_id',False) if server_id: values['server_id'] = server_id - res = super(email_message,self).write(cr, uid, ids, values, context=context) + res = super(mail_message,self).write(cr, uid, ids, values, context=context) return res -email_message() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From b0bed63351956455a23cdc960292e104af53f67a Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 23 Aug 2011 19:58:09 +0200 Subject: [IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh --- addons/fetchmail/fetchmail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index f201ff7560d..584de80b198 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -162,7 +162,7 @@ class email_server(osv.osv): result, data = imap_server.search(None, '(UNSEEN)') for num in data[0].split(): result, data = imap_server.fetch(num, '(RFC822)') - res_id = thread_pool.process_email(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context) + res_id = thread_pool.message_process(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context) if res_id and server.action_id: action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) @@ -184,7 +184,7 @@ class email_server(osv.osv): for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) - res_id = thread_pool.process_email(cr, user, server.object_id.model, msg, attach=server.attach, context=context) + res_id = thread_pool.message_process(cr, user, server.object_id.model, msg, attach=server.attach, context=context) if res_id and server.action_id: action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) -- cgit v1.2.3 From d81f1cd942b0678fe9d4b63c3e0755654755e79c Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 8 Sep 2011 03:07:00 +0200 Subject: [IMP] fetchmail: review+cleanup bzr revid: odo@openerp.com-20110908010700-n7fk9hzwb60v80cq --- addons/fetchmail/fetchmail.py | 175 +++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 89 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 584de80b198..46f10f69ff5 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -19,8 +19,8 @@ # ############################################################################## +import logging import time - from imaplib import IMAP4 from imaplib import IMAP4_SSL from poplib import POP3 @@ -30,63 +30,54 @@ import netsvc from osv import osv, fields import tools -logger = netsvc.Logger() +logger = logging.getLogger('fetchmail') class email_server(osv.osv): _name = 'email.server' _description = "POP/IMAP Server" + _order = 'priority' _columns = { 'name':fields.char('Name', size=256, required=True, readonly=False), 'active':fields.boolean('Active', required=False), 'state':fields.selection([ ('draft', 'Not Confirmed'), - ('waiting', 'Waiting for Verification'), ('done', 'Confirmed'), ], 'State', select=True, readonly=True), - 'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}), + 'server' : fields.char('Server Name', size=256, required=True, readonly=True, help="Hostname or IP of the mail server", states={'draft':[('readonly', False)]}), 'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}), 'type':fields.selection([ ('pop', 'POP Server'), ('imap', 'IMAP Server'), - ], 'Server Type', select=True, readonly=False), - 'is_ssl':fields.boolean('SSL ?', required=False), - 'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches mail with attachments if true."), - 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}), - 'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}), - 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}), + ], 'Server Type', select=True, required=True, readonly=False), + 'is_ssl':fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP3S=995)"), + 'attach':fields.boolean('Keep Attachments', help="Whether attachments should be downloaded. " + "If not enabled, incoming emails will be stripped of any attachments before being processed"), + 'original':fields.boolean('Keep Original', help="Whether a full original copy of each email should be kept for reference" + "and attached to each processed message. This will usually double the size of your message database."), + 'date': fields.datetime('Last Fetch Date', readonly=True), + 'user' : fields.char('Username', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}), + 'password' : fields.char('Password', size=1024, required=True, readonly=True, states={'draft':[('readonly', False)]}), 'note': fields.text('Description'), - 'action_id':fields.many2one('ir.actions.server', 'Email Server Action', required=False, domain="[('state','=','email')]", help="An Email Server Action. It will be run whenever an e-mail is fetched from server."), - 'object_id': fields.many2one('ir.model', "Object To Create", required=True, help="Whenever an email arrives, it automatically creates the object of this type with all the information attached."), - 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"), - 'user_id':fields.many2one('res.users', 'User', required=False, help="This is the user that runs the cron"), + 'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, " + "on the record that was created or updated by this mail"), + 'object_id': fields.many2one('ir.model', "Target document type", required=True, help="Process each incoming mail as part of a conversation " + "corresponding to this document type. This will create " + "new documents for new conversations, or attach follow-up " + "emails to the existing conversations (documents)."), + 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, " + "lower values mean higher priority"), 'message_ids': fields.one2many('mail.message', 'server_id', 'Messages', readonly=True), } _defaults = { - 'state': lambda *a: "draft", - 'active': lambda *a: True, - 'priority': lambda *a: 5, - 'date': lambda *a: time.strftime('%Y-%m-%d'), - 'user_id': lambda self, cr, uid, ctx: uid, + 'state': "draft", + 'active': True, + 'priority': 5, + 'attach': True, } - def check_duplicate(self, cr, uid, ids, context=None): - # RFC *-* Why this limitation? why not in SQL constraint? - vals = self.read(cr, uid, ids, ['user', 'password'], context=context)[0] - cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password'])) - res = cr.fetchone() - if res: - if res[0] > 1: - return False - return True - - _constraints = [ - (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password']), - - ] - def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False): port = 0 if server_type == 'pop': @@ -100,113 +91,119 @@ class email_server(osv.osv): self.write(cr, uid, ids , {'state':'draft'}) return True + def connect(self, cr, uid, server_id, context=None): + if isinstance(server_id, (list,tuple)): + server_id = server_id[0] + server = self.browse(cr, uid, server_id, context) + if server.type == 'imap': + if server.is_ssl: + connection = IMAP4_SSL(server.server, int(server.port)) + else: + connection = IMAP4(server.server, int(server.port)) + connection.login(server.user, server.password) + elif server.type == 'pop': + if server.is_ssl: + connection = POP3_SSL(server.server, int(server.port)) + else: + connection = POP3(server.server, int(server.port)) + #TODO: use this to remove only unread messages + #connection.user("recent:"+server.user) + connection.user(server.user) + connection.pass_(server.password) + return connection + def button_confirm_login(self, cr, uid, ids, context=None): if context is None: context = {} for server in self.browse(cr, uid, ids, context=context): - logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) - context.update({'server_id': server.id, 'server_type': server.type}) try: - if server.type == 'imap': - imap_server = None - if server.is_ssl: - imap_server = IMAP4_SSL(server.server, int(server.port)) - else: - imap_server = IMAP4(server.server, int(server.port)) - - imap_server.login(server.user, server.password) - ret_server = imap_server - - elif server.type == 'pop': - pop_server = None - if server.is_ssl: - pop_server = POP3_SSL(server.server, int(server.port)) - else: - pop_server = POP3(server.server, int(server.port)) - - #TODO: use this to remove only unread messages - #pop_server.user("recent:"+server.user) - pop_server.user(server.user) - pop_server.pass_(server.password) - ret_server = pop_server - - self.write(cr, uid, [server.id], {'state':'done'}) - if context.get('get_server',False): - return ret_server + connection = server.connect() + server.write({'state':'done'}) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (e)) - return True - - def button_fetch_mail(self, cr, uid, ids, context=None): - self.fetch_mail(cr, uid, ids, context=context) + logger.exception("Failed to connect to %s server %s", server.type, server.name) + raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % e) + finally: + try: + if connection: + if server.type == 'imap': + connection.close() + elif server.type == 'pop': + connection.quit() + except Exception: + # ignored, just a consequence of the previous exception + pass return True def _fetch_mails(self, cr, uid, ids=False, context=None): if not ids: - ids = self.search(cr, uid, []) + ids = self.search(cr, uid, [('state','=','done')]) return self.fetch_mail(cr, uid, ids, context=context) def fetch_mail(self, cr, uid, ids, context=None): + """WARNING: meant for cron usage only - will commit() after each email!""" if context is None: context = {} - thread_pool = self.pool.get('mail.thread') + mail_thread = self.pool.get('mail.thread') action_pool = self.pool.get('ir.actions.server') - context.update({'get_server': True}) for server in self.browse(cr, uid, ids, context=context): + logger.info('start checking for new emails on %s server %s', server.type, server.name) + context.update({'server_id': server.id, 'server_type': server.type}) count = 0 - user = server.user_id.id or uid if server.type == 'imap': try: - imap_server = self.button_confirm_login(cr, uid, [server.id], context=context) + imap_server = server.connect() imap_server.select() result, data = imap_server.search(None, '(UNSEEN)') for num in data[0].split(): result, data = imap_server.fetch(num, '(RFC822)') - res_id = thread_pool.message_process(cr, user, server.object_id.model, data[0][1], attach=server.attach, context=context) + res_id = mail_thread.message_process(cr, uid, server.object_id.model, data[0][1], + save_original=server.original, + strip_attachments=(not server.attach), + context=context) if res_id and server.action_id: - action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) - + action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) imap_server.store(num, '+FLAGS', '\\Seen') + cr.commit() count += 1 - logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name)) - + logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) + logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) finally: if imap_server: imap_server.close() imap_server.logout() elif server.type == 'pop': try: - pop_server = self.button_confirm_login(cr, uid, [server.id], context=context) + pop_server = server.connect() (numMsgs, totalSize) = pop_server.stat() pop_server.list() for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) - res_id = thread_pool.message_process(cr, user, server.object_id.model, msg, attach=server.attach, context=context) + res_id = mail_thread.message_process(cr, uid, server.object_id.model, + msg, + save_original=server.original, + strip_attachments=(not server.attach), + context=context) if res_id and server.action_id: - action_pool.run(cr, user, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) - + action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) pop_server.dele(num) - - pop_server.quit() - logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name)) + cr.commit() + logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name) except Exception, e: - logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e))) + logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) finally: if pop_server: pop_server.quit() + server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}) return True -email_server() - class mail_message(osv.osv): _inherit = "mail.message" _columns = { - 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), + 'server_id': fields.many2one('email.server', "Inbound Mail Server", readonly=True, select=True), } def create(self, cr, uid, values, context=None): -- cgit v1.2.3 From 32a892cbbba6345d0ae4a4cacbae117225463d72 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 8 Sep 2011 16:19:41 +0200 Subject: [IMP] fetchmail: cleanup - improve names bzr revid: odo@openerp.com-20110908141941-vsd21wfb13z5tywa --- addons/fetchmail/fetchmail.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 46f10f69ff5..8aaff197d47 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -29,13 +29,13 @@ from poplib import POP3_SSL import netsvc from osv import osv, fields import tools +from tools.translate import _ logger = logging.getLogger('fetchmail') - -class email_server(osv.osv): - - _name = 'email.server' +class fetchmail_server(osv.osv): + """Incoming POP/IMAP mail server account""" + _name = 'fetchmail.server' _description = "POP/IMAP Server" _order = 'priority' @@ -69,7 +69,7 @@ class email_server(osv.osv): "emails to the existing conversations (documents)."), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, " "lower values mean higher priority"), - 'message_ids': fields.one2many('mail.message', 'server_id', 'Messages', readonly=True), + 'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True), } _defaults = { 'state': "draft", @@ -84,7 +84,6 @@ class email_server(osv.osv): port = ssl and 995 or 110 elif server_type == 'imap': port = ssl and 993 or 143 - return {'value':{'port':port}} def set_draft(self, cr, uid, ids, context=None): @@ -147,7 +146,7 @@ class email_server(osv.osv): action_pool = self.pool.get('ir.actions.server') for server in self.browse(cr, uid, ids, context=context): logger.info('start checking for new emails on %s server %s', server.type, server.name) - context.update({'server_id': server.id, 'server_type': server.type}) + context.update({'fetchmail_server_id': server.id, 'server_type': server.type}) count = 0 if server.type == 'imap': try: @@ -199,28 +198,29 @@ class email_server(osv.osv): return True class mail_message(osv.osv): - _inherit = "mail.message" - _columns = { - 'server_id': fields.many2one('email.server', "Inbound Mail Server", readonly=True, select=True), + 'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server", + readonly=True, + select=True, + oldname='server_id'), } def create(self, cr, uid, values, context=None): if context is None: context={} - server_id = context.get('server_id',False) - if server_id: - values['server_id'] = server_id + fetchmail_server_id = context.get('fetchmail_server_id') + if fetchmail_server_id: + values['fetchmail_server_id'] = fetchmail_server_id res = super(mail_message,self).create(cr, uid, values, context=context) return res def write(self, cr, uid, ids, values, context=None): if context is None: context={} - server_id = context.get('server_id',False) - if server_id: - values['server_id'] = server_id + fetchmail_server_id = context.get('fetchmail_server_id') + if fetchmail_server_id: + values['fetchmail_server_id'] = server_id res = super(mail_message,self).write(cr, uid, ids, values, context=context) return res -- cgit v1.2.3 From 6289ce38f9a4e1c7d0aee7a3d565f883f8e0e27c Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 14 Sep 2011 14:07:53 +0200 Subject: [FIX] fetchmail.server: care for non-ascii connection error message bzr revid: odo@openerp.com-20110914120753-tt1x0kr8b1noj84j --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/fetchmail/fetchmail.py') diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 8aaff197d47..b7460965c3b 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -120,7 +120,7 @@ class fetchmail_server(osv.osv): server.write({'state':'done'}) except Exception, e: logger.exception("Failed to connect to %s server %s", server.type, server.name) - raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % e) + raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e)) finally: try: if connection: -- cgit v1.2.3