已存在直接切屁
This commit is contained in:
1 parent
2ce2000147
commit
db129b7f2c
2 files changed
+7
-1
No files matched your search
@@ -18,7 +18,7 @@ elif ENV == 'prod':
|
|||||||
def step1(versionId):
|
def step1(versionId):
|
||||||
|
|
||||||
# 下载json 文件 和 图片
|
# 下载json 文件 和 图片
|
||||||
dirName,machineInfo = downloadJsonAndJpgFileAndMoveToCorrectDir(versionId,currentDir)
|
dirName,machineInfo,isAlreadyExist = downloadJsonAndJpgFileAndMoveToCorrectDir(versionId,currentDir)
|
||||||
if not dirName:
|
if not dirName:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -26,6 +26,11 @@ def step1(versionId):
|
|||||||
isSmallMachine = False
|
isSmallMachine = False
|
||||||
if str(machineInfo["machine_type"]) == '1':
|
if str(machineInfo["machine_type"]) == '1':
|
||||||
isSmallMachine = True
|
isSmallMachine = True
|
||||||
|
if isAlreadyExist:
|
||||||
|
objFilePath = os.path.join(dirName, 'json')
|
||||||
|
keyValue = f'{versionId}_small_No{machineInfo["id"]}'
|
||||||
|
BeginSliceing(versionId,machineInfo["id"],objFilePath,keyValue)
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
#下载数据,转换数据
|
#下载数据,转换数据
|
||||||
|
|||||||
@@ -215,6 +215,7 @@ def downloadJsonAndJpgFileAndMoveToCorrectDir(versionId, currentDir):
|
|||||||
|
|
||||||
# 判断目录是否存在,存在就删除
|
# 判断目录是否存在,存在就删除
|
||||||
if os.path.exists(dirNewName):
|
if os.path.exists(dirNewName):
|
||||||
|
return dirNewName, machineInfo,True
|
||||||
shutil.rmtree(dirNewName)
|
shutil.rmtree(dirNewName)
|
||||||
# 创建目录
|
# 创建目录
|
||||||
os.makedirs(dirNewName)
|
os.makedirs(dirNewName)
|
||||||
|
|||||||
Reference in new issue
Block a user