[IMP] avoid duplicated code and use the method defined in addons/__init__.py

bzr revid: christophe@cobalt-20090102144453-m47r6cad30yy4olu

addons/base_module_publish/wizard/module_zip.py

@@ -19,31 +19,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import wizard
-import osv
 import pooler
-import os
-import tools
-
-from zipfile import PyZipFile, ZIP_DEFLATED
-import StringIO
-import base64
-
-def _zippy(archive, fromurl, path, src=True):
-    url = os.path.join(fromurl, path)
-    if os.path.isdir(url):
-        if path.split('/')[-1].startswith('.'):
-            return False
-        for fname in os.listdir(url):
-            _zippy(archive, fromurl, path and os.path.join(path, fname) or fname, src=src)
-    else:
-        if src:
-            exclude = ['pyo', 'pyc']
-        else:
-            exclude = ['py','pyo','pyc']
-        if (path.split('.')[-1] not in exclude) or (os.path.basename(path)=='__terp__.py'):
-            archive.write(os.path.join(fromurl, path).encode('utf8'), path.encode('utf8'))
-    return True
+import addons
 
 def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
     pool = pooler.get_pool(cr.dbname)
@@ -54,24 +31,10 @@ def createzip(cr, uid, moduleid, context, b64enc=True, src=True):
     if module.state != 'installed':
         raise wizard.except_wizard(_('Error'),
                 _('Can not export module that is not installed!'))
+    
+    val = addons.get_module_as_zip(module.name, b64enc=b64enc, src=src)
 
-    ad = tools.config['addons_path']
-    name = str(module.name)
-    if os.path.isdir(os.path.join(ad, name)):
-        archname = StringIO.StringIO('wb')
-        archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-        archive.writepy(os.path.join(ad, name).encode('utf8'))
-        _zippy(archive, ad, name, src=src)
-        archive.close()
-        val =archname.getvalue()
-        archname.close()
-    elif os.path.isfile(os.path.join(ad, name + '.zip')):
-        val = file(os.path.join(ad, name + '.zip'), 'rb').read()
-    else:
-        raise wizard.except_wizard(_('Error'), _('Could not find the module to export!'))
-    if b64enc:
-        val =base64.encodestring(val)
-    return {'module_file':val, 'module_filename': name + '-' + \
+    return {'module_file': val, 'module_filename': str(module.name) + '-' + \
             (module.installed_version or '0') + '.zip'}