Merge lp:~openerp-dev/openobject-server/trunk-load-virtual-mod-pna into lp:openobject-server

[Harry (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-load-virtual-mod-pna]

5141. By Pinakin Nayi (OpenERP) on 2014-03-21

[IMP]store module name and file name to make it compatible to apps

Unmerged revisions

5141. By Pinakin Nayi (OpenERP) on 2014-03-21

[IMP]store module name and file name to make it compatible to apps

5140. By Pinakin Nayi (OpenERP) on 2014-03-21

[IMP]check module if virtual then append in manifest list

5139. By Pinakin Nayi (OpenERP) on 2014-03-20

[IMP]small improvement

5138. By Pinakin Nayi (OpenERP) on 2014-03-19

[IMP]check files at the time of apps install and if type virtual then store in attachment(static files)

5137. By Pinakin Nayi (OpenERP) on 2014-03-18

[IMP]create new type and check if virtual then save in attachemnt

=== modified file 'openerp/addons/base/base.sql'
--- openerp/addons/base/base.sql	2013-12-02 15:08:56 +0000
+++ openerp/addons/base/base.sql	2014-03-21 08:18:29 +0000
@@ -286,6 +286,7 @@
     license character varying(32),
     sequence integer DEFAULT 100,
     auto_install boolean default False,
+    type character varying(32),
     primary key(id)
 );
 ALTER TABLE ir_module_module add constraint name_uniq unique (name);

=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py	2014-02-11 10:55:25 +0000
+++ openerp/addons/base/module/module.py	2014-03-21 08:18:29 +0000
@@ -34,6 +34,7 @@
 import zipfile
 import zipimport
 import lxml.html
+import base64
 
 try:
     from cStringIO import StringIO
@@ -294,6 +295,10 @@
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
+        'type': fields.selection([
+            ('virtual', 'Virtual'),
+            ('physical', 'Physical'),
+        ], string='Type', readonly=True),
     }
 
     _defaults = {
@@ -301,6 +306,7 @@
         'sequence': 100,
         'demo': False,
         'license': 'AGPL-3',
+        'type': 'physical',
     }
     _order = 'sequence,name'
 
@@ -660,6 +666,7 @@
         _logger.debug('Install from url: %r', urls)
         try:
             # 1. Download & unzip missing modules
+            ir_attach = self.pool.get('ir.attachment')
             for module_name, url in urls.items():
                 if not url:
                     continue    # nothing to download, local version is already the last one
@@ -671,7 +678,29 @@
                     raise osv.except_osv(_('Module not found'),
                                          _('The `%s` module appears to be unavailable at the moment, please try again later.') % module_name)
                 else:
-                    zipfile.ZipFile(StringIO(content)).extractall(tmp)
+                    with zipfile.ZipFile(StringIO(content)) as zip_file:
+                        #get __openerp__.py information
+                        module_info = zip_file.open(module_name+'/__openerp__.py')
+                        info = {
+                                'name' : "",
+                                'type' : "physical",
+                                }
+                        info.update(eval(module_info.read()))
+                        #loop check files and extract
+                        for f_name in zip_file.namelist():
+                            if f_name.startswith(module_name+"/static/") and info.get('type') == "virtual":
+                                if not os.path.isdir(f_name):
+                                    source = zip_file.open(f_name).read()
+                                    result = base64.b64encode(source)
+                                    ir_attach.create(cr, uid, {
+                                           'name': module_name,
+                                           'db_datas': result,
+                                           'datas_fname': f_name,
+                                           'res_model': module_name,
+                                           'type': "binary",
+                                    }, context=context)
+                            else:
+                                zip_file.extract(f_name, tmp)
                     assert os.path.isdir(os.path.join(tmp, module_name))
 
             # 2a. Copy/Replace module source in addons path

=== modified file 'openerp/http.py'
--- openerp/http.py	2014-03-19 23:51:17 +0000
+++ openerp/http.py	2014-03-21 08:18:29 +0000
@@ -1109,6 +1109,17 @@
                         addons_module[module] = m
                         addons_manifest[module] = manifest
                         statics['/%s/static' % module] = path_static
+                    else :
+                        if os.path.isfile(manifest_path):
+                            manifest = ast.literal_eval(open(manifest_path).read())
+                            if manifest.get('type') == "virtual" :
+                                manifest['addons_path'] = addons_path
+                                _logger.debug("Loading %s", module)
+                                if 'openerp.addons' in sys.modules:
+                                    m = __import__('openerp.addons.' + module)
+                                addons_module[module] = m
+                                addons_manifest[module] = manifest
+                                statics['/%s/static' % module] = path_static
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, statics)
         self.dispatch = DisableCacheMiddleware(app)

=== modified file 'openerp/modules/db.py'
--- openerp/modules/db.py	2012-11-28 18:37:01 +0000
+++ openerp/modules/db.py	2014-03-21 08:18:29 +0000
@@ -74,8 +74,8 @@
 
         cr.execute('INSERT INTO ir_module_module \
                 (author, website, name, shortdesc, description, \
-                    category_id, auto_install, state, web, license, application, icon, sequence, summary) \
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+                    category_id, auto_install, state, web, license, application, icon, sequence, summary, type) \
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
             info['author'],
             info['website'], i, info['name'],
             info['description'], category_id,
@@ -83,7 +83,8 @@
             info['web'],
             info['license'],
             info['application'], info['icon'],
-            info['sequence'], info['summary']))
+            info['sequence'], info['summary'],
+            info['type']))
         id = cr.fetchone()[0]
         cr.execute('INSERT INTO ir_model_data \
             (name,model,module, res_id, noupdate) VALUES (%s,%s,%s,%s,%s)', (

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2014-03-17 15:18:10 +0000
+++ openerp/modules/loading.py	2014-03-21 08:18:29 +0000
@@ -29,6 +29,7 @@
 import os
 import sys
 import threading
+import base64
 
 import openerp
 import openerp.modules.db
@@ -41,7 +42,7 @@
 
 from openerp.tools.translate import _
 from openerp.modules.module import initialize_sys_path, \
-    load_openerp_module, init_module_models, adapt_version
+    load_openerp_module, init_module_models, adapt_version, get_module_path
 
 _logger = logging.getLogger(__name__)
 _test_logger = logging.getLogger('openerp.tests')
@@ -73,7 +74,26 @@
                 # avoid keeping stale xml_id, etc. in cache 
                 openerp.modules.registry.RegistryManager.clear_caches(cr.dbname)
 
+    def create_virtual_attachment(cr, module_name, mod_file):
+        try:
+            mod_path = get_module_path(module_name)
+            path = mod_path+'/'+mod_file
+            with open(path) as f:
+                content = f.read()
+            
+            f_name = module_name + '/' + mod_file
+            result = base64.b64encode(content)
+            cr.execute('INSERT INTO ir_attachment (name, db_datas, datas_fname, res_model, type) values (%s, %s, %s, %s, %s)', (module_name, result, f_name, module_name, 'binary'))
+        except Exception:
+            cr.rollback()
 
+    def _get_files_of_static_kind(cr):
+        kind = ['js', 'css', 'qweb']
+        for k in kind:
+            if package.data.get(k):
+                for f in package.data[k]:
+                    create_virtual_attachment(cr, package.name, f)
+    
     def _get_files_of_kind(kind):
         if kind == 'demo':
             kind = ['demo_xml', 'demo']
@@ -108,6 +128,11 @@
         try:
             if kind in ('demo', 'test'):
                 threading.currentThread().testing = True
+            
+            # if virtual file then save in attachment
+            if package.data['type'] == "virtual":
+                _get_files_of_static_kind(cr)
+            
             for filename in _get_files_of_kind(kind):
                 _logger.info("module %s: loading %s", module_name, filename)
                 noupdate = False

=== modified file 'openerp/modules/module.py'
--- openerp/modules/module.py	2014-03-17 02:13:17 +0000
+++ openerp/modules/module.py	2014-03-21 08:18:29 +0000
@@ -197,6 +197,7 @@
                 'website': '',
                 'sequence': 100,
                 'summary': '',
+                'type': 'physical',
             }
             info.update(itertools.izip(
                 'depends data demo test init_xml update_xml demo_xml'.split(),