From 870f2ff893fde64b092dfca4536f653bb69172cc Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Fri, 27 Feb 2015 11:38:03 +0530 Subject: [MIG] base_import_module: Migrated to new API --- addons/base_import_module/models/__init__.py | 2 +- .../models/base_import_module.py | 47 ++++++++--------- addons/base_import_module/models/ir_module.py | 59 +++++++++++----------- 3 files changed, 53 insertions(+), 55 deletions(-) (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 index 02b8831509a..07d35e729c2 100644 --- a/addons/base_import_module/models/__init__.py +++ b/addons/base_import_module/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -import ir_module import base_import_module +import ir_module diff --git a/addons/base_import_module/models/base_import_module.py b/addons/base_import_module/models/base_import_module.py index 6d0100a5696..b678a4fe0f0 100644 --- a/addons/base_import_module/models/base_import_module.py +++ b/addons/base_import_module/models/base_import_module.py @@ -1,49 +1,46 @@ +# -*- coding: utf-8 -*- import base64 -from StringIO import StringIO from io import BytesIO -from openerp.osv import osv, fields +from odoo import api, fields, models -class base_import_module(osv.TransientModel): + +class BaseImportModule(models.TransientModel): """ Import Module """ _name = "base.import.module" _description = "Import Module" - _columns = { - 'module_file': fields.binary('Module .ZIP file', required=True), - 'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True), - 'import_message': fields.char('Import message'), - 'force': fields.boolean('Force init', help="Force init mode even if installed. (will update `noupdate='1'` records)"), - } - - _defaults = { - 'state': 'init', - 'force': False, - } + module_file = fields.Binary(string='Module .ZIP file', required=True) + state = fields.Selection([('init', 'init'), ('done', 'done')], string='Status', readonly=True, default='init') + import_message = fields.Char() + force = fields.Boolean(string='Force init', help="Force init mode even if installed. (will update `noupdate='1'` records)") - def import_module(self, cr, uid, ids, context=None): - module_obj = self.pool.get('ir.module.module') - data = self.browse(cr, uid, ids[0] , context=context) - zip_data = base64.decodestring(data.module_file) + @api.multi + def import_module(self): + self.ensure_one() + IrModule = self.env['ir.module.module'] + zip_data = base64.decodestring(self.module_file) fp = BytesIO() fp.write(zip_data) - res = module_obj.import_zipfile(cr, uid, fp, force=data.force, context=context) - self.write(cr, uid, ids, {'state': 'done', 'import_message': res[0]}, context=context) - context = dict(context, module_name=res[1]) - # Return wizard otherwise it will close wizard and will not show result message to user. + res = IrModule.import_zipfile(fp, force=self.force) + self.write({'state': 'done', 'import_message': res[0]}) + context = dict(self.env.context, module_name=res[1]) + # Return wizard otherwise it will close wizard and will not show result message to user. return { 'name': 'Import Module', 'view_type': 'form', 'view_mode': 'form', 'target': 'new', - 'res_id': ids[0], + 'res_id': self.id, 'res_model': 'base.import.module', 'type': 'ir.actions.act_window', 'context': context, } - def action_module_open(self, cr, uid, ids, context): + @api.multi + def action_module_open(self): + self.ensure_one() return { - 'domain': [('name', 'in', context.get('module_name',[]))], + 'domain': [('name', 'in', self.env.context.get('module_name', []))], 'name': 'Modules', 'view_type': 'form', 'view_mode': 'tree,form', diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index cee635ca25c..230ffeb0f7f 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -1,45 +1,46 @@ +# -*- coding: utf-8 -*- import logging import os import sys import zipfile from os.path import join as opj -import openerp -from openerp import fields -from openerp.osv import osv -from openerp.tools import convert_file, exception_to_unicode -from openerp.tools.translate import _ -from openerp.exceptions import UserError +from odoo import api, fields, models, _ +from odoo.exceptions import UserError +from odoo.modules import load_information_from_description_file +from odoo.tools import convert_file, exception_to_unicode +from odoo.tools.osutil import tempdir _logger = logging.getLogger(__name__) -MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes +MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes -class ir_module_module(osv.osv): + +class IrModule(models.Model): _inherit = "ir.module.module" - imported = fields.Boolean(string="Imported Module", default=False) + imported = fields.Boolean(string="Imported Module") - def import_module(self, cr, uid, module, path, force=False, context=None): - known_mods = self.browse(cr, uid, self.search(cr, uid, [])) - known_mods_names = dict([(m.name, m) for m in known_mods]) + @api.multi + def import_module(self, module, path, force=False): + known_mods = self.search([]) + known_mods_names = {m.name: m for m in known_mods} installed_mods = [m.name for m in known_mods if m.state == 'installed'] - terp = openerp.modules.load_information_from_description_file(module, mod_path=path) + terp = load_information_from_description_file(module, mod_path=path) values = self.get_values_from_terp(terp) unmet_dependencies = set(terp['depends']).difference(installed_mods) if unmet_dependencies: - msg = _("Unmet module dependencies: %s") - raise UserError(msg % ', '.join(unmet_dependencies)) + raise UserError(_("Unmet module dependencies: %s") % ', '.join(unmet_dependencies)) mod = known_mods_names.get(module) if mod: - self.write(cr, uid, mod.id, dict(state='installed', **values)) + mod.write(dict(state='installed', **values)) mode = 'update' if not force else 'init' else: assert terp.get('installable', True), "Module not installable" - self.create(cr, uid, dict(name=module, state='installed', imported=True, **values)) + self.create(dict(name=module, state='installed', imported=True, **values)) mode = 'init' for kind in ['data', 'init_xml', 'update_xml']: @@ -50,10 +51,10 @@ class ir_module_module(osv.osv): noupdate = True pathname = opj(path, filename) idref = {} - convert_file(cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) + convert_file(self.env.cr, module, filename, idref, mode=mode, noupdate=noupdate, kind=kind, pathname=pathname) path_static = opj(path, 'static') - ir_attach = self.pool['ir.attachment'] + IrAttachment = self.env['ir.attachment'] if os.path.isdir(path_static): for root, dirs, files in os.walk(path_static): for static_file in files: @@ -71,17 +72,18 @@ class ir_module_module(osv.osv): type='binary', datas=data, ) - 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) + attachment = IrAttachment.search([('url', '=', url_path), ('type', '=', 'binary'), ('res_model', '=', 'ir.ui.view')]) + if attachment: + attachment.write(values) else: - ir_attach.create(cr, uid, values, context=context) + IrAttachment.create(values) return True - def import_zipfile(self, cr, uid, module_file, force=False, context=None): + @api.model + def import_zipfile(self, module_file, force=False): if not module_file: - raise Exception("No file sent.") + raise Exception(_("No file sent.")) if not zipfile.is_zipfile(module_file): raise UserError(_('File is not a zip file!')) @@ -91,10 +93,9 @@ class ir_module_module(osv.osv): with zipfile.ZipFile(module_file, "r") as z: for zf in z.filelist: if zf.file_size > MAX_FILE_SIZE: - msg = _("File '%s' exceed maximum allowed file size") - raise UserError(msg % zf.filename) + raise UserError(_("File '%s' exceed maximum allowed file size") % zf.filename) - with openerp.tools.osutil.tempdir() as module_dir: + with tempdir() as module_dir: z.extractall(module_dir) dirs = [d for d in os.listdir(module_dir) if os.path.isdir(opj(module_dir, d))] for mod_name in dirs: @@ -102,7 +103,7 @@ class ir_module_module(osv.osv): try: # assert mod_name.startswith('theme_') path = opj(module_dir, mod_name) - self.import_module(cr, uid, mod_name, path, force=force, context=context) + self.import_module(mod_name, path, force=force) success.append(mod_name) except Exception, e: _logger.exception('Error while importing module') -- cgit v1.2.3