diff --git a/pyengine/engine/controller/meta_manager.py b/pyengine/engine/controller/meta_manager.py index 83280b123ffd456ea9d1c059c690d99c51c9dd0b..ab556387e11de800b50033d4f6690889ee17195b 100644 --- a/pyengine/engine/controller/meta_manager.py +++ b/pyengine/engine/controller/meta_manager.py @@ -1,24 +1,23 @@ from engine.model.group_table import GroupTable from engine.model.file_table import FileTable from engine.controller.error_code import ErrorCode +from engine import db class MetaManager(object): - def Sync(self): + @staticmethod + def Sync(): db.session.commit() - def AddGroup(self, group_name, dimension): - group = GroupTable.query.filter(GroupTable.group_name==group_id).first() - if group: - return ErrorCode.ALREADY_EXIST, group_name - else: - new_group = GroupTable(group_name, dimension) - GroupHandler.CreateGroupDirectory(group_id) + @staticmethod + def AddGroup(group_name, dimension): + new_group = GroupTable(group_name, dimension) + + # add into database + db.session.add(new_group) + db.session.commit() - # add into database - db.session.add(new_group) - self.Sync() - return ErrorCode.SUCCESS_CODE, group_name + return ErrorCode.SUCCESS_CODE, group_name @staticmethod def GetGroup(group_name): diff --git a/pyengine/engine/controller/storage_manager.py b/pyengine/engine/controller/storage_manager.py index f01f5b44a33ef3f3e736bc2a7c22a213f541e85b..450d1b75f184498c6b930280fb2cff5b7c0460ec 100644 --- a/pyengine/engine/controller/storage_manager.py +++ b/pyengine/engine/controller/storage_manager.py @@ -3,7 +3,7 @@ from engine.settings import DATABASE_DIRECTORY class StorageManager(object): @staticmethod - def CreateGroup(group_name): + def AddGroup(group_name): path = StorageManager.GetGroupDirectory(group_name) path = path.strip() path=path.rstrip("\\") diff --git a/pyengine/engine/controller/vector_engine.py b/pyengine/engine/controller/vector_engine.py index 73f599c233d1159479d1c3f39f6531041034261b..91719cb3d5671c5932ecc68a4969f368f1002009 100644 --- a/pyengine/engine/controller/vector_engine.py +++ b/pyengine/engine/controller/vector_engine.py @@ -27,12 +27,8 @@ class VectorEngine(object): if(error == ErrorCode.SUCCESS_CODE): return ErrorCode.FAULT_CODE, group_name else: - StorageManager.CreateGroup(group_name) - new_group = GroupTable(group_name, dimension) - - # add into database - db.session.add(new_group) - db.session.commit() + StorageManager.AddGroup(group_name) + MetaManager.AddGroup(group_name, dimension) return VectorEngine.SUCCESS_CODE, group_name