重构?

第一版代码

import web
def newFolder(db,folderName,userId,pFolderId=0,isLeaf=1,projectId=0):
    try:
        
        web.debug("person")
        if _isRootFolderOfPerson(pFolderId,projectId):
            return _createRootFolderOfPerson(db,folderName,userId,pFolderId,isLeaf,projectId)
        
        web.debug("project")
        if _isRootFolderOfProject(pFolderId,projectId):
            return _createRootFolderOfProject(db,folderName,userId,pFolderId,isLeaf,projectId)
        
        web.debug("subFolder")
        if _isSubFolder(pFolderId,projectId):
            return _createSubFolder(db,folderName,userId,pFolderId,isLeaf,projectId)
        
        return (0,0)
    except:
        raise
    
def _isRootFolderOfPerson(pFolderId,projectId):
    return pFolderId == 0 and projectId == 0

def _isRootFolderOfProject(pFolderId,projectId):
    return pFolderId == 0 and  projectId>0

def _isSubFolder(pFolderId,projectId):
    return pFolderId > 0 and projectId == 0

def _getFolder(db,folderId):
    sql = "select * from Folder where folderId=$folderId and trash = 0"
    list = db.query(sql,vars=locals()).list()
    if len(list)>0:
        return list[0]
    return None
    

def _createRootFolderOfPerson(db,folderName,userId,pFolderId,isLeaf,projectId):
    sql = "select * from Folder where userId=$userId and projectId=$projectId and folderName=$folderName and isLeaf=$isLeaf and trash=0"
    list = db.query(sql,vars=locals()).list()
    if len(list)>0: return (0,0)
    deep = 0
    return _insertFolder(db,folderName,userId,pFolderId,projectId,isLeaf,deep)

def _createRootFolderOfProject(db,folderName,userId,pFolderId,isLeaf,projectId):
    sql = "select * from Folder where projectId=$projectId and folderName=$folderName and isLeaf=$isLeaf and trash=0"
    list = db.query(sql,vars=locals()).list()
    if len(list)>0: return (0,0)
    deep = -1
    return _insertFolder(db,folderName,userId,pFolderId,projectId,isLeaf,deep)

def _createSubFolder(db,folderName,userId,pFolderId,isLeaf,projectId):    
    fd = _getFolder(db,pFolderId)
    if fd == None:
        return (0,0)
    projectId = fd.projectId
    deep = fd.deep + 1
    sql = "select * from Folder where folderName=$folderName and projectId=projectId and isLeaf=$isLeaf and trash=0"
    list = db.query(sql,vars=locals()).list()
    if len(list)>0: return (0,0)
    return _insertFolder(db,folderName,userId,pFolderId,projectId,isLeaf,deep)
    
    
def _insertFolder(db,folderName,userId,pFolderId,projectId,isLeaf,deep):
    try:
        t = db.transaction()
        folderId=db.insert("Folder",folderName=folderName,userId=userId,trash=0,deep=deep,
            pFolderId=pFolderId,projectId=projectId,isLeaf=isLeaf,revision=util.new_revision(db,userId))
        import bll.priv.copypriv as copypriv
        copypriv.copyFolderPriv(db,pFolderId,folderId)
        copypriv.copyFolderUserPriv(db,pFolderId,folderId)
        t.commit()
        return folderId,deep
    except:
        t.rollback()
        raise