From 40fdb08a7db13c52c49026f8425bc40dac5a7696 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Mar 2014 09:53:43 +0100 Subject: [WIP] base_import_module bzr revid: fme@openerp.com-20140319085343-zkee3rmqc9dzpa7h --- addons/base_import_module/models/__init__.py | 2 ++ addons/base_import_module/models/ir_module.py | 49 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 addons/base_import_module/models/__init__.py create mode 100644 addons/base_import_module/models/ir_module.py (limited to 'addons/base_import_module/models') diff --git a/addons/base_import_module/models/__init__.py b/addons/base_import_module/models/__init__.py new file mode 100644 index 00000000000..a28c82fe5ba --- /dev/null +++ b/addons/base_import_module/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +import ir_module diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py new file mode 100644 index 00000000000..be03067972b --- /dev/null +++ b/addons/base_import_module/models/ir_module.py @@ -0,0 +1,49 @@ +import logging +from os.path import join as opj + +import openerp +from openerp.osv import osv, fields +from openerp.tools import convert_file + +_logger = logging.getLogger(__name__) + +class view(osv.osv): + _inherit = "ir.module.module" + _columns = { + 'is_theme': fields.boolean('Theme'), + } + _defaults = { + 'is_theme': False, + } + + def import_module(self, cr, uid, module, path, context=None): + known_mods = self.browse(cr, uid, self.search(cr, uid, [])) + known_mods_names = dict([(m.name, m) for m in known_mods]) + + mod = known_mods_names.get(module) + terp = openerp.modules.load_information_from_description_file(module, mod_path=path) + values = self.get_values_from_terp(terp) + + unmet_dependencies = set(terp['depends']).difference(known_mods_names.keys()) + if unmet_dependencies: + raise Exception("Unmet module dependencies: %s" % ', '.join(unmet_dependencies)) + + if mod: + self.write(cr, uid, mod.id, values) + mode = 'update' + else: + assert terp.get('installable', True), "Module not installable" + self.create(cr, uid, dict(name=module, state='uninstalled', **values)) + mode = 'init' + + for kind in ['data', 'init_xml', 'update_xml']: + for filename in terp[kind]: + _logger.info("module %s: loading %s", module, filename) + noupdate = False + if filename.endswith('.csv') and kind in ('init', 'init_xml'): + noupdate = True + pathname = opj(path, filename) + idref = {} + convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) + + return True -- cgit v1.2.3 From 5d107cfaa0946f81a7e584681467ac0d0f363272 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 20 Mar 2014 15:33:46 +0100 Subject: [IMP] static file injected in ir.attachment bzr revid: fme@openerp.com-20140320143346-nimxg7c61lm1253x --- addons/base_import_module/models/ir_module.py | 31 +++++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'addons/base_import_module/models') diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index be03067972b..318af923032 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -1,20 +1,16 @@ import logging +import os +import sys from os.path import join as opj import openerp -from openerp.osv import osv, fields +from openerp.osv import osv from openerp.tools import convert_file _logger = logging.getLogger(__name__) class view(osv.osv): _inherit = "ir.module.module" - _columns = { - 'is_theme': fields.boolean('Theme'), - } - _defaults = { - 'is_theme': False, - } def import_module(self, cr, uid, module, path, context=None): known_mods = self.browse(cr, uid, self.search(cr, uid, [])) @@ -46,4 +42,25 @@ class view(osv.osv): idref = {} convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) + path_static = opj(path, 'static') + if os.path.isdir(path_static): + for root, _, files in os.walk(path_static): + for static_file in files: + full_path = opj(root, static_file) + with open(full_path, 'r') as fp: + data = fp.read().encode('base64') + url_path = full_path.split(path)[1].replace(os.path.sep, '/') + url_path = url_path.decode(sys.getfilesystemencoding()) + filename = os.path.split(url_path)[1] + values = dict( + name=filename, + datas_fname=filename, + url=url_path, + res_model='ir.ui.view', + type='binary', + datas=data, + ) + self.pool['ir.attachment'].create(cr, uid, values, context=context) + return True + -- cgit v1.2.3 From 5e484ae892efc9a45ae66a01ac32d4fce193b4d7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 24 Mar 2014 16:17:11 +0100 Subject: [IMP] Properly import files bzr revid: fme@openerp.com-20140324151711-89mfg14573dpnh0p --- addons/base_import_module/models/ir_module.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'addons/base_import_module/models') diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index 318af923032..18e60f858da 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -43,13 +43,14 @@ class view(osv.osv): convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) path_static = opj(path, 'static') + ir_attach = self.pool['ir.attachment'] if os.path.isdir(path_static): for root, _, files in os.walk(path_static): for static_file in files: full_path = opj(root, static_file) with open(full_path, 'r') as fp: data = fp.read().encode('base64') - url_path = full_path.split(path)[1].replace(os.path.sep, '/') + url_path = '/%s%s' % (module, full_path.split(path)[1].replace(os.path.sep, '/')) url_path = url_path.decode(sys.getfilesystemencoding()) filename = os.path.split(url_path)[1] values = dict( @@ -60,7 +61,11 @@ class view(osv.osv): type='binary', datas=data, ) - self.pool['ir.attachment'].create(cr, uid, values, context=context) + att_id = ir_attach.search(cr, uid, [('url', '=', url_path), ('type', '=', 'binary'), ('res_model', '=', 'ir.ui.view')], context=context) + if att_id: + ir_attach.write(cr, uid, att_id, values, context=context) + else: + ir_attach.create(cr, uid, values, context=context) return True -- cgit v1.2.3