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

[IMP] Use requests for http requests. python does not provide multipart encoding 

bzr revid: fme@openerp.com-20140326150842-h33yuiwsnrm8gmbk
This commit is contained in:
Fabien Meghazi 2014-03-26 16:08:42 +01:00
parent 0dd65c6af8
commit 62a5632aec
2 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
addons/base_import_module/bin/oe_module_deploy.py
View File

@ -3,34 +3,58 @@ import argparse
import os
import sys
import tempfile
import urllib
import urllib2
import zipfile
try:
import requests
except ImportError:
# no multipart encoding in stdlib and this script is temporary
sys.exit("This script requires the 'requests' module. ( pip install requests )")
session = requests.session()
def deploy_module(module_path, url, login, password, db=None):
if url.endswith('/'):
url = url[:-1]
authenticate(url, login, password, db)
check_import(url)
module_file = zip_module(module_path)
cookie = authenticate(url, login, password, db)
upload_module(url, module_file, cookie)
try:
return upload_module(url, module_file)
finally:
os.remove(module_file)
def upload_module(server, module_file, cookie):
pass
def check_import(server):
url = server +'/base_import_module/check'
res = session.get(url)
if res.status_code == 404:
raise Exception("The server %r does not have the 'base_import_module' installed." % server)
elif res.status_code != 200:
raise Exception("Server %r returned %s http error.", (server, res.status_code))
def upload_module(server, module_file):
print("Uploading module file...")
url = server + '/base_import_module/upload'
files = dict(mod_file=open(module_file, 'rb'))
res = session.post(url, files=files)
if res.status_code != 200:
raise Exception("Could not authenticate on server %r" % server)
return res.text
def authenticate(server, login, password, db):
print("Connecting to server %r" % server)
print("Waiting for server authentication...")
if db:
url = server + '/login'
args = dict(db=db, login=login, key=password)
url = server + '/login?' + urllib.urlencode(args)
req = urllib2.Request(url)
res = session.get(url, params=args)
else:
url = server + '/web/login'
args = dict(login=login, password=password)
req = urllib2.Request(url, urllib.urlencode(args))
response = urllib2.urlopen(req)
if response.code != 200:
res = session.post(url, args)
if res.status_code != 200:
raise Exception("Could not authenticate to OpenERP server %r" % server)
cookie = response.headers.get('Set-Cookie')
return cookie
def zip_module(path):
path = os.path.abspath(path)
@ -38,13 +62,17 @@ def zip_module(path):
raise Exception("Could not find module directory %r" % path)
container, module_name = os.path.split(path)
temp = tempfile.mktemp(suffix='.zip')
temp = '/tmp/1/test.zip'
with zipfile.ZipFile(temp, 'w') as zfile:
for root, dirs, files in os.walk(path):
for file in files:
file_path = os.path.join(root, file)
zfile.write(file_path, file_path.split(container).pop())
return temp
try:
print("Zipping module directory...")
with zipfile.ZipFile(temp, 'w') as zfile:
for root, dirs, files in os.walk(path):
for file in files:
file_path = os.path.join(root, file)
zfile.write(file_path, file_path.split(container).pop())
return temp
except Exception:
os.remove(temp)
raise
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.')
@ -54,12 +82,10 @@ if __name__ == '__main__':
parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)')
parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)')
if len(sys.argv) == 1:
parser.print_help()
sys.exit(1)
sys.exit(parser.print_help())
args = parser.parse_args()
deploy_module(args.path, args.url, args.login, args.password, args.database)
# try:
# deploy_module(args.path, args.url, args.login, args.password, args.database)
# except Exception, e:
# print(e)
# sys.exit(1)
try:
result = deploy_module(args.path, args.url, args.login, args.password, args.database)
print(result)
except Exception, e:
sys.exit("ERROR: %s" % e)

28
addons/base_import_module/controllers/main.py
View File

@ -10,10 +10,16 @@ MAX_FILE_SIZE = 100 * 1024 * 1024 # in megabytes
class ImportModule(Controller):
@route('/base_import_module/upload', type='http', auth='none')
@route('/base_import_module/check', type='http', auth='user', methods=['GET'])
def check(self):
assert request.db # TODO: custom ensure_db?
assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group
return 'ok'
@route('/base_import_module/upload', type='http', auth='user', methods=['POST'])
def upload(self, mod_file=None, **kw):
assert request.db # TODO: custom ensure_db?
request.uid = openerp.SUPERUSER_ID # TODO: proper security
assert request.uid == openerp.SUPERUSER_ID # TODO: check admin group
imm = request.registry['ir.module.module']
@ -22,6 +28,8 @@ class ImportModule(Controller):
if not zipfile.is_zipfile(mod_file):
raise Exception("Not a zipfile.")
success = []
errors = dict()
with zipfile.ZipFile(mod_file, "r") as z:
for zf in z.filelist:
if zf.file_size > MAX_FILE_SIZE:
@ -31,8 +39,14 @@ class ImportModule(Controller):
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:
# assert mod_name.startswith('theme_')
path = opj(module_dir, mod_name)
imm.import_module(request.cr, request.uid, mod_name, path, context=request.context)
return 'ok'
try:
# assert mod_name.startswith('theme_')
path = opj(module_dir, mod_name)
imm.import_module(request.cr, request.uid, mod_name, path, context=request.context)
success.append(mod_name)
except Exception, e:
errors[mod_name] = str(e)
r = ["Successfully imported module %r" % mod for mod in success]
for mod, error in errors.items():
r.append("Error while importing module %r: %r" % (mod, error))
return '\n'.join(r)