[MIG] base_dav: Migration to 17.0

base_dav/README.rst

@@ -75,6 +75,9 @@ to Odoo via odoorpc. It should be possible to recycle most of the code
 from this addon, which actually implements those plugins, but then
 within Odoo.
 
+In order to install this module and use it make sure you use right version of `radicale==2.1.12` library.
+
+
 Bug Tracker
 ===========
 

base_dav/__manifest__.py

@@ -3,11 +3,12 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Caldav and Carddav support",
-    "version": "11.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "initOS GmbH,Therp BV,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Extra Tools",
     "summary": "Access Odoo data as calendar or address book",
+    "website": "https://github.com/OCA/server-backend",
     "depends": [
         "base",
     ],
@@ -19,6 +20,6 @@
         "security/ir.model.access.csv",
     ],
     "external_dependencies": {
-        "python": ["radicale"],
+        "python": ["radicale==2.1.12"],
     },
 }

base_dav/controllers/main.py

@@ -11,6 +11,7 @@
 
 try:
     import radicale
+    # from radicale import config
 except ImportError:
     radicale = None
 

base_dav/demo/dav_collection.xml

@@ -8,27 +8,27 @@
     </record>
     <record id="field_mapping_addressbook_n" model="dav.collection.field_mapping">
         <field name="name">N</field>
-        <field name="field_id" ref="base.field_res_partner_name" />
+        <field name="field_id" ref="base.field_res_partner__name" />
         <field name="collection_id" ref="collection_addressbook" />
     </record>
     <record id="field_mapping_addressbook_fn" model="dav.collection.field_mapping">
         <field name="name">FN</field>
-        <field name="field_id" ref="base.field_res_partner_display_name" />
+        <field name="field_id" ref="base.field_res_partner__display_name" />
         <field name="collection_id" ref="collection_addressbook" />
     </record>
     <record id="field_mapping_addressbook_photo" model="dav.collection.field_mapping">
         <field name="name">photo</field>
-        <field name="field_id" ref="base.field_res_partner_image" />
+        <field name="field_id" ref="base.field_res_partner__image_1920" />
         <field name="collection_id" ref="collection_addressbook" />
     </record>
     <record id="field_mapping_addressbook_email" model="dav.collection.field_mapping">
         <field name="name">email</field>
-        <field name="field_id" ref="base.field_res_partner_email" />
+        <field name="field_id" ref="base.field_res_partner__email" />
         <field name="collection_id" ref="collection_addressbook" />
     </record>
     <record id="field_mapping_addressbook_tel" model="dav.collection.field_mapping">
         <field name="name">tel</field>
-        <field name="field_id" ref="base.field_res_partner_phone" />
+        <field name="field_id" ref="base.field_res_partner__phone" />
         <field name="collection_id" ref="collection_addressbook" />
     </record>
 </odoo>

base_dav/models/dav_collection.py

@@ -1,19 +1,20 @@
 # Copyright 2019 Therp BV <https://therp.nl>
 # Copyright 2019-2020 initOS GmbH <https://initos.com>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-
 import os
 import time
 from operator import itemgetter
 from urllib.parse import quote_plus
 
 import vobject
 
-from odoo import api, fields, models, tools
+from odoo import SUPERUSER_ID, api, fields, models
+from odoo.tools.safe_eval import safe_eval
+
+from odoo.addons.base_dav.radicale.collection import Collection, FileItem, Item
 
 # pylint: disable=missing-import-error
 from ..controllers.main import PREFIX
-from ..radicale.collection import Collection, FileItem, Item
 
 
 class DavCollection(models.Model):
@@ -46,6 +47,7 @@ class DavCollection(models.Model):
         string="Model",
         required=True,
         domain=[("transient", "=", False)],
+        ondelete="cascade",
     )
     domain = fields.Char(
         required=True,
@@ -59,24 +61,17 @@ class DavCollection(models.Model):
     )
     url = fields.Char(compute="_compute_url")
 
-    @api.multi
     def _compute_tag(self):
         for this in self:
             if this.dav_type == "calendar":
                 this.tag = "VCALENDAR"
             elif this.dav_type == "addressbook":
                 this.tag = "VADDRESSBOOK"
 
-    @api.multi
     def _compute_url(self):
         base_url = self.env["ir.config_parameter"].get_param("web.base.url")
         for this in self:
-            this.url = "%s%s/%s/%s" % (
-                base_url,
-                PREFIX,
-                self.env.user.login,
-                this.id,
-            )
+            this.url = f"{base_url}{PREFIX}/{self.env.user.login}/{this.id}"
 
     @api.constrains("domain")
     def _check_domain(self):
@@ -88,28 +83,26 @@ def _eval_context(self):
             "user": self.env.user,
         }
 
-    @api.multi
     def _eval_domain(self):
         self.ensure_one()
-        return list(tools.safe_eval(self.domain, self._eval_context()))
+        return list(safe_eval(self.domain, self._eval_context()))
 
-    @api.multi
     def eval(self):
         if not self:
             return self.env["unknown"]
         self.ensure_one()
+        self = self.with_user(SUPERUSER_ID)
         return self.env[self.model_id.model].search(self._eval_domain())
 
-    @api.multi
     def get_record(self, components):
         self.ensure_one()
+        self = self.with_user(SUPERUSER_ID)
         collection_model = self.env[self.model_id.model]
 
         field_name = self.field_uuid.name or "id"
         domain = [(field_name, "=", components[-1])] + self._eval_domain()
         return collection_model.search(domain, limit=1)
 
-    @api.multi
     def from_vobject(self, item):
         self.ensure_one()
 
@@ -136,9 +129,9 @@ def from_vobject(self, item):
 
         return result
 
-    @api.multi
     def to_vobject(self, record):
         self.ensure_one()
+        self = self.with_user(SUPERUSER_ID)
         result = None
         vobj = None
         if self.dav_type == "calendar":
@@ -153,16 +146,20 @@ def to_vobject(self, record):
                 vobj.add(mapping.name).value = value
 
         if "uid" not in vobj.contents:
-            vobj.add("uid").value = "%s,%s" % (record._name, record.id)
+            vobj.add("uid").value = f"{record._name},{record.id}"
         if "rev" not in vobj.contents and "write_date" in record._fields:
             vobj.add("rev").value = (
-                record.write_date.replace(":", "").replace(" ", "T").replace(".", "")
+                str(record.write_date)
+                .replace(":", "")
+                .replace(" ", "T")
+                .replace(".", "")
                 + "Z"
             )
         return result
 
     @api.model
     def _odoo_to_http_datetime(self, value):
+        value = str(value).split(".")[0]
         return time.strftime(
             "%a, %d %b %Y %H:%M:%S GMT",
             time.strptime(value, "%Y-%m-%d %H:%M:%S"),
@@ -172,7 +169,6 @@ def _odoo_to_http_datetime(self, value):
     def _split_path(self, path):
         return list(filter(None, os.path.normpath(path or "").strip("/").split("/")))
 
-    @api.multi
     def dav_list(self, collection, path_components):
         self.ensure_one()
 
@@ -217,7 +213,6 @@ def dav_list(self, collection, path_components):
             result.append("/" + "/".join(path_components + [uuid]))
         return result
 
-    @api.multi
     def dav_delete(self, collection, components):
         self.ensure_one()
 
@@ -227,7 +222,6 @@ def dav_delete(self, collection, components):
         else:
             self.get_record(components).unlink()
 
-    @api.multi
     def dav_upload(self, collection, href, item):
         self.ensure_one()
 
@@ -246,7 +240,7 @@ def dav_upload(self, collection, href, item):
 
             record = collection_model.create(data)
             uuid = components[-1] if self.field_uuid else record.id
-            href = "%s/%s" % (href, uuid)
+            href = f"{href}/{uuid}"
         else:
             record.write(data)
 
@@ -257,7 +251,6 @@ def dav_upload(self, collection, href, item):
             last_modified=self._odoo_to_http_datetime(record.write_date),
         )
 
-    @api.multi
     def dav_get(self, collection, href):
         self.ensure_one()
 

base_dav/models/dav_collection_field_mapping.py

@@ -9,6 +9,7 @@
 from dateutil import tz
 
 from odoo import api, fields, models, tools
+from odoo.tools import safe_eval
 
 
 class DavCollectionFieldMapping(models.Model):
@@ -36,10 +37,10 @@ class DavCollectionFieldMapping(models.Model):
         "ir.model.fields",
         required=True,
         help="Field of the model the values are mapped to",
+        ondelete="cascade",
     )
     model_id = fields.Many2one(
-        "ir.model",
-        related="collection_id.model_id",
+        "ir.model", related="collection_id.model_id", ondelete="cascade"
     )
     import_code = fields.Text(
         help="Code to import the value from a vobject. Use the variable "
@@ -50,35 +51,32 @@ class DavCollectionFieldMapping(models.Model):
         "result for the output of the value and record as input"
     )
 
-    @api.multi
     def from_vobject(self, child):
         self.ensure_one()
         if self.mapping_type == "code":
             return self._from_vobject_code(child)
         return self._from_vobject_simple(child)
 
-    @api.multi
     def _from_vobject_code(self, child):
         self.ensure_one()
         context = {
-            "datetime": datetime,
-            "dateutil": dateutil,
+            "datetime": safe_eval.datetime,
+            "dateutil": safe_eval.dateutil,
             "item": child,
             "result": None,
-            "tools": tools,
-            "tz": tz,
-            "vobject": vobject,
+            # "tools": tools,
+            # "tz": tz,
+            # "vobject": vobject,
         }
-        tools.safe_eval(self.import_code, context, mode="exec", nocopy=True)
+        safe_eval.safe_eval(self.import_code, context, mode="exec", nocopy=True)
         return context.get("result", {})
 
-    @api.multi
     def _from_vobject_simple(self, child):
         self.ensure_one()
         name = self.name.lower()
         conversion_funcs = [
-            "_from_vobject_%s_%s" % (self.field_id.ttype, name),
-            "_from_vobject_%s" % self.field_id.ttype,
+            f"_from_vobject_{self.field_id.ttype}_{name}",
+            f"_from_vobject_{self.field_id.ttype}",
         ]
 
         for conversion_func in conversion_funcs:
@@ -115,7 +113,6 @@ def _from_vobject_binary(self, item):
     def _from_vobject_char_n(self, item):
         return item.family
 
-    @api.multi
     def to_vobject(self, record):
         self.ensure_one()
         if self.mapping_type == "code":
@@ -127,27 +124,25 @@ def to_vobject(self, record):
             return result.replace(tzinfo=tz.UTC)
         return result
 
-    @api.multi
     def _to_vobject_code(self, record):
         self.ensure_one()
         context = {
-            "datetime": datetime,
-            "dateutil": dateutil,
+            "datetime": safe_eval.datetime,
+            "dateutil": safe_eval.dateutil,
             "record": record,
             "result": None,
-            "tools": tools,
-            "tz": tz,
-            "vobject": vobject,
+            # "tools": tools,
+            # "tz": tz,
+            # "vobject": vobject,
         }
-        tools.safe_eval(self.export_code, context, mode="exec", nocopy=True)
+        safe_eval.safe_eval(self.export_code, context, mode="exec", nocopy=True)
         return context.get("result", None)
 
-    @api.multi
     def _to_vobject_simple(self, record):
         self.ensure_one()
         conversion_funcs = [
-            "_to_vobject_%s_%s" % (self.field_id.ttype, self.name.lower()),
-            "_to_vobject_%s" % self.field_id.ttype,
+            f"_to_vobject_{self.field_id.ttype}_{self.name.lower()}",
+            f"_to_vobject_{self.field_id.ttype}",
         ]
         value = record[self.field_id.name]
         for conversion_func in conversion_funcs:

base_dav/radicale/auth.py

@@ -12,7 +12,9 @@
 class Auth(BaseAuth):
     def is_authenticated2(self, login, user, password):
         env = request.env
-        uid = env["res.users"]._login(env.cr.dbname, user, password)
+        uid = env["res.users"]._login(
+            env.cr.dbname, user, password, user_agent_env={"interactive": True}
+        )
         if uid:
             request._env = env(user=uid)
         return bool(uid)

base_dav/radicale/collection.py

@@ -93,6 +93,7 @@ def __init__(self, path):
             )
 
     def _odoo_to_http_datetime(self, value):
+        value = str(value).split(".")[0]
         return time.strftime(
             "%a, %d %b %Y %H:%M:%S GMT",
             time.strptime(value, "%Y-%m-%d %H:%M:%S"),

base_dav/readme/CONFIGURE.rst

@@ -0,0 +1,5 @@
+To configure this module, you need to:
+
+#. go to `Settings / WebDAV Collections` and create or edit your collections. There, you'll also see the URL to point your clients to.
+
+Note that you need to configure a dbfilter if you use multiple databases.

base_dav/readme/CONTRIBUTORS.rst

@@ -0,0 +1,2 @@
+* Holger Brunn <[email protected]>
+* Florian Kantelberg <[email protected]>

base_dav/readme/CREDITS.rst

@@ -0,0 +1,2 @@
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_
+* All the actual work is done by `Radicale <https://radicale.org>`_

base_dav/readme/DESCRIPTION.rst

@@ -0,0 +1,3 @@
+This module adds WebDAV support to Odoo, specifically CalDAV and CardDAV.
+
+You can configure arbitrary objects as a calendar or an address book, thus make arbitrary information accessible in external systems or your mobile.

base_dav/readme/ROADMAP.rst

@@ -0,0 +1,7 @@
+* much better UX for configuring collections (probably provide a group that sees the current fully flexible field mappings, and by default show some dumbed down version where you can select some preselected vobject fields)
+* support todo lists and journals
+* support configuring default field mappings per model
+* support plain WebDAV collections to make some model's records accessible as folders, and the records' attachments as files (r/w)
+* support configuring lists of calendars so that you can have a calendar for every project and appointments are tasks, or a calendar for every sales team and appointments are sale orders. Lots of possibilities
+
+Backporting this to <=v10 will be tricky because radicale only supports python3. Probably it will be quite a hassle to backport the relevant code, so it might be more sensible to just backport the configuration part, and implement the rest as radicale auth/storage plugin that talks to Odoo via odoorpc. It should be possible to recycle most of the code from this addon, which actually implements those plugins, but then within Odoo.

base_dav/static/description/index.html

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>