|
|
|
@ -3314,8 +3314,6 @@ re.M|re.S)
|
|
|
|
|
ret = True
|
|
|
|
|
if not prefix:
|
|
|
|
|
prefix = os.path.join(scanDir,"")[:-1]
|
|
|
|
|
# Флаг - не пропускать шаблоны
|
|
|
|
|
flagNoSkipTemplates = True
|
|
|
|
|
if not flagDir:
|
|
|
|
|
# проверка корневой директории
|
|
|
|
|
retDir = self.processingDirectory(scanDir, scanDir, optDir)
|
|
|
|
@ -3329,18 +3327,14 @@ re.M|re.S)
|
|
|
|
|
# Установка опции пропуска директории
|
|
|
|
|
optDir["skip"] = True
|
|
|
|
|
if flagDir or stat.S_ISDIR(os.lstat(scanDir)[stat.ST_MODE]):
|
|
|
|
|
if optDir.get("skip"):
|
|
|
|
|
flagNoSkipTemplates = False
|
|
|
|
|
for fileOrDir in sorted(os.listdir(scanDir)):
|
|
|
|
|
absPath = os.path.join(scanDir,fileOrDir)
|
|
|
|
|
stInfo = os.lstat(absPath)
|
|
|
|
|
statInfo = stInfo[stat.ST_MODE]
|
|
|
|
|
if stat.S_ISREG(statInfo):
|
|
|
|
|
if flagNoSkipTemplates:
|
|
|
|
|
# Обработка файла
|
|
|
|
|
if not self.processingFile(absPath, prefix, optDir):
|
|
|
|
|
ret = False
|
|
|
|
|
break
|
|
|
|
|
if not self.processingFile(absPath, prefix, optDir):
|
|
|
|
|
ret = False
|
|
|
|
|
break
|
|
|
|
|
elif stat.S_ISDIR(statInfo):
|
|
|
|
|
# Обработка директории
|
|
|
|
|
retDir = self.processingDirectory(absPath, prefix,
|
|
|
|
|