odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] zipped module import wizard improvements, courtesy of Boris Timokhin 

bzr revid: odo@openerp.com-20110919230538-mffhxr4e5y2jihk7
This commit is contained in:
Olivier Dony 2011-09-20 01:05:38 +02:00
parent 64d6989794 2632bb3d04
commit d66e4e6013
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
openerp/addons/base/module/wizard/base_module_import.py
View File

@ -28,6 +28,8 @@ import base64
from tools.translate import _ from tools.translate import _
from osv import osv, fields from osv import osv, fields
ADDONS_PATH = tools.config['addons_path'].split(",")[-1]
class base_module_import(osv.osv_memory): class base_module_import(osv.osv_memory):
""" Import Module """ """ Import Module """
@ -37,7 +39,8 @@ class base_module_import(osv.osv_memory):
_columns = { _columns = {
'module_file': fields.binary('Module .ZIP file', required=True), 'module_file': fields.binary('Module .ZIP file', required=True),
'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True), 'state':fields.selection([('init','init'),('done','done')],
'state', readonly=True),
'module_name': fields.char('Module Name', size=128), 'module_name': fields.char('Module Name', size=128),
} }
@ -48,26 +51,30 @@ class base_module_import(osv.osv_memory):
def importzip(self, cr, uid, ids, context): def importzip(self, cr, uid, ids, context):
(data,) = self.browse(cr, uid, ids , context=context) (data,) = self.browse(cr, uid, ids , context=context)
module_data = data.module_file module_data = data.module_file
zip_data = base64.decodestring(module_data)
val = base64.decodestring(module_data)
fp = StringIO() fp = StringIO()
fp.write(val) fp.write(zip_data)
fdata = zipfile.ZipFile(fp, 'r')
fname = fdata.namelist()[0]
module_name = os.path.split(fname)[0]
ad = tools.config['addons_path'].split(",")[-1]
fname = os.path.join(ad, module_name+'.zip')
try: try:
fp = file(fname, 'wb') file_data = zipfile.ZipFile(fp, 'r')
fp.write(val) except zipfile.BadZipfile:
fp.close() raise osv.except_osv(_('Error !'), _('File is not a zip file!'))
except IOError: init_file_name = sorted(file_data.namelist())[0]
raise osv.except_osv(_('Error !'), _('Can not create the module file: %s !') % (fname,) ) module_name = os.path.split(init_file_name)[0]
self.pool.get('ir.module.module').update_list(cr, uid, {'module_name': module_name,}) file_path = os.path.join(ADDONS_PATH, '%s.zip' % module_name)
self.write(cr, uid, ids, {'state':'done', 'module_name': module_name}, context) try:
zip_file = open(file_path, 'wb')
except IOError:
raise osv.except_osv(_('Error !'),
_('Can not create the module file: %s !') % \
(file_path,) )
zip_file.write(zip_data)
zip_file.close()
self.pool.get('ir.module.module').update_list(cr, uid,
{'module_name': module_name,})
self.write(cr, uid, ids, {'state':'done', 'module_name': module_name},
context)
return False return False
def action_module_open(self, cr, uid, ids, context): def action_module_open(self, cr, uid, ids, context):
@ -84,4 +91,4 @@ class base_module_import(osv.osv_memory):
base_module_import() base_module_import()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: