diff --git a/config.py b/config.py index 52de75c..97a993d 100644 --- a/config.py +++ b/config.py @@ -4,7 +4,7 @@ import os APPDIR = os.path.dirname( os.path.realpath(__file__) ) DATADIR = '%s/datas' % APPDIR CONFDIR = '%s/config' % APPDIR -FOLDER = DATADIR +# FOLDER = DATADIR MODEL_IGNORE = [] with open(".modelignore", "r") as file: diff --git a/remote.py b/remote.py index 0d9bdca..3e12a33 100755 --- a/remote.py +++ b/remote.py @@ -90,7 +90,7 @@ def get_schema( name ): #jlog( fields ) obj['field_id'] = fields jlog( transform_model(obj) ) - eprint( "%s/schemas/%s.json" % ( FOLDER, model.model ) ) + eprint( "%s/schemas/%s.json" % ( DATADIR, model.model ) ) def transform_model( obj ): return { "name": obj['model'], "modules": obj['modules'], 'fields': [ {} for field in obj['field_id'] ] } @@ -358,12 +358,12 @@ def export_json( model, domains ): return Model = odoo.env[model] ids = Model.search( domains ) - ensure_dir( "%s/%s" % (FOLDER, model) ) + ensure_dir( "%s/%s" % (DATADIR, model) ) rfields = rel_fields( model ) eprint( rfields ) for inst in Model.browse( ids ): data = inst.read()[0] - filename = "%s/%s/%s.json" % ( FOLDER, model, inst.id ) + filename = "%s/%s/%s.json" % ( DATADIR, model, inst.id ) if filename in current_exports: continue @@ -395,7 +395,7 @@ def export_json( model, domains ): if field.ttype == 'one2many': for id in data[field.name]: - _filename = "%s/%s/%s.json" % ( FOLDER, field.relation, id ) + _filename = "%s/%s/%s.json" % ( DATADIR, field.relation, id ) print( field.ttype, field.relation, id, _filename ) if not os.path.exists( _filename ): export_json( field.relation, [('id','=',id)] ) diff --git a/utils.py b/utils.py index c800e9f..3ae7a0c 100644 --- a/utils.py +++ b/utils.py @@ -47,10 +47,10 @@ def args2domains( list ): def file_path( muid, format ): - return "%s/%s.%s" % ( FOLDER, muid, format ) + return "%s/%s.%s" % ( DATADIR, muid, format ) def json_path( model, id ): - return "%s/%s.json" % ( FOLDER, Muid(model, id) ) + return "%s/%s.json" % ( DATADIR, Muid(model, id) ) def Muid( model, id ): return "%s/%s" % ( model, id )