[IMP] mail,website: improve update_notification

diff --git a/addons/mail/update.py b/addons/mail/update.py
index a76c54f..165f724 100644 (file)
--- a/addons/mail/update.py
+++ b/addons/mail/update.py
@@ -1,79 +1,74 @@
 # -*- coding: utf-8 -*-
+from ast import literal_eval
 import datetime
+from functools import partial
 import logging
-import sys
 import werkzeug.urls
 import urllib2
 
-import openerp
 from openerp import release, SUPERUSER_ID
+from openerp.models import AbstractModel
 from openerp.osv import osv
 from openerp.tools.translate import _
-from openerp.tools.safe_eval import safe_eval
 from openerp.tools.config import config
 from openerp.tools import misc
 
 _logger = logging.getLogger(__name__)
 
-"""
-Time interval that will be used to determine up to which date we will
-check the logs to see if a message we just received was already logged.
-@type: datetime.timedelta
-"""
-_PREVIOUS_LOG_CHECK = datetime.timedelta(days=365)
-
-def get_sys_logs(self, cr, uid):
-    """
-    Utility method to send a publisher warranty get logs messages.
-    """
-    pool = openerp.registry(cr.dbname)
+class publisher_warranty_contract(AbstractModel):
+    _name = "publisher_warranty.contract"
 
-    dbuuid = pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-    db_create_date = pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'database.create_date')
-    limit_date = datetime.datetime.now()
-    limit_date = limit_date - datetime.timedelta(15)
-    limit_date_str = limit_date.strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
-    nbr_users = pool.get("res.users").search(cr, uid, [], count=True)
-    nbr_active_users = pool.get("res.users").search(cr, uid, [("login_date", ">=", limit_date_str)], count=True)
-    nbr_share_users = False
-    nbr_active_share_users = False
-    if "share" in pool.get("res.users")._all_columns:
-        nbr_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True)], count=True)
-        nbr_active_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True), ("login_date", ">=", limit_date_str)], count=True)
-    user = pool.get("res.users").browse(cr, uid, uid)
+    def _get_message(self, cr, uid):
+        Users = self.pool['res.users']
+        user_count = partial(Users.search_count, cr, uid)
+        get_param = partial(self.pool['ir.config_parameter'].get_param, cr, SUPERUSER_ID)
 
-    web_base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', 'False')
-    msg = {
-        "dbuuid": dbuuid,
-        "nbr_users": nbr_users,
-        "nbr_active_users": nbr_active_users,
-        "nbr_share_users": nbr_share_users,
-        "nbr_active_share_users": nbr_active_share_users,
-        "dbname": cr.dbname,
-        "db_create_date": db_create_date,
-        "version": release.version,
-        "language": user.lang,
-        "web_base_url": web_base_url,
-    }
-    msg.update(pool.get("res.company").read(cr,uid,[1],["name","email","phone"])[0])
+        dbuuid = get_param('database.uuid')
+        db_create_date = get_param('database.create_date')
+        limit_date = datetime.datetime.now()
+        limit_date = limit_date - datetime.timedelta(15)
+        limit_date_str = limit_date.strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
+        nbr_users = user_count([])
+        nbr_active_users = user_count([("login_date", ">=", limit_date_str)])
+        nbr_share_users = 0
+        nbr_active_share_users = 0
+        if "share" in Users._all_columns:
+            nbr_share_users = user_count([("share", "=", True)])
+            nbr_active_share_users = user_count([("share", "=", True), ("login_date", ">=", limit_date_str)])
+        user = Users.browse(cr, uid, uid)
 
-    add_arg = {"timeout":30} if sys.version_info >= (2,6) else {}
-    arguments = {'arg0': msg, "action": "update",}
-    arguments_raw = werkzeug.urls.url_encode(arguments)
+        web_base_url = get_param('web.base.url')
+        msg = {
+            "dbuuid": dbuuid,
+            "nbr_users": nbr_users,
+            "nbr_active_users": nbr_active_users,
+            "nbr_share_users": nbr_share_users,
+            "nbr_active_share_users": nbr_active_share_users,
+            "dbname": cr.dbname,
+            "db_create_date": db_create_date,
+            "version": release.version,
+            "language": user.lang,
+            "web_base_url": web_base_url,
+        }
+        msg.update(self.pool.get("res.company").read(cr, uid, [1], ["name", "email", "phone"])[0])
+        return msg
 
-    url = config.get("publisher_warranty_url")
+    def _get_sys_logs(self, cr, uid):
+        """
+        Utility method to send a publisher warranty get logs messages.
+        """
+        msg = self._get_message(cr, uid)
+        arguments = {'arg0': msg, "action": "update"}
+        arguments_raw = werkzeug.urls.url_encode(arguments)
 
-    uo = urllib2.urlopen(url, arguments_raw, **add_arg)
-    result = {}
-    try:
-        submit_result = uo.read()
-        result = safe_eval(submit_result)
-    finally:
-        uo.close()
-    return result
+        url = config.get("publisher_warranty_url")
 
-class publisher_warranty_contract(osv.osv):
-    _name = "publisher_warranty.contract"
+        uo = urllib2.urlopen(url, arguments_raw, timeout=30)
+        try:
+            submit_result = uo.read()
+            return literal_eval(submit_result)
+        finally:
+            uo.close()
 
     def update_notification(self, cr, uid, ids, cron_mode=True, context=None):
         """
@@ -85,9 +80,9 @@ class publisher_warranty_contract(osv.osv):
         """
         try:
             try:
-                result = get_sys_logs(self, cr, uid)
+                result = self._get_sys_logs(cr, uid)
             except Exception:
-                if cron_mode: # we don't want to see any stack trace in cron
+                if cron_mode:   # we don't want to see any stack trace in cron
                     return False
                 _logger.debug("Exception while sending a get logs messages", exc_info=1)
                 raise osv.except_osv(_("Error"), _("Error during communication with the publisher warranty server."))
@@ -106,10 +101,9 @@ class publisher_warranty_contract(osv.osv):
                     _logger.warning('Cannot send ping message', exc_info=True)
         except Exception:
             if cron_mode:
-                return False # we don't want to see any stack trace in cron
+                return False    # we don't want to see any stack trace in cron
             else:
                 raise
         return True
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index da3c232..8db2a40 100644 (file)
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8:noqa
 
 import ir_actions
 import ir_ui_view
@@ -6,5 +7,6 @@ import website
 import ir_qweb
 import ir_http
 import res_config
+import update
 
 import test_models

diff --git a/addons/website/models/update.py b/addons/website/models/update.py
new file mode 100644 (file)
index 0000000..924d300
--- /dev/null
+++ b/addons/website/models/update.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from openerp.models import AbstractModel
+
+class publisher_warranty_contract(AbstractModel):
+    _inherit = "publisher_warranty.contract"
+
+    def _get_message(self, cr, uid):
+        msg = super(publisher_warranty_contract, self)._get_message(cr, uid)
+        msg['website'] = True
+        return msg