|
|
|
@ -2610,9 +2610,6 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
cl_base.exit(1)
|
|
|
|
|
if len(terms) == 1:
|
|
|
|
|
fileName = terms[0].strip()
|
|
|
|
|
if fileName[0] != "/":
|
|
|
|
|
path = os.path.split(nameSystemFile)[0]
|
|
|
|
|
fileName=os.path.join(path,fileName)
|
|
|
|
|
# Если домашняя директория
|
|
|
|
|
if fileName[0] == "~":
|
|
|
|
|
# Получаем информацию о пользователе
|
|
|
|
@ -2620,11 +2617,11 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
# Получаем директорию пользователя
|
|
|
|
|
fileName = os.path.join(homeDir, fileName.partition("/")[2],
|
|
|
|
|
"")[:-1]
|
|
|
|
|
else:
|
|
|
|
|
fileName = terms[1].strip()
|
|
|
|
|
if fileName[1] != "/":
|
|
|
|
|
elif fileName[0] != "/":
|
|
|
|
|
path = os.path.split(nameSystemFile)[0]
|
|
|
|
|
fileName=os.path.join(path,fileName)
|
|
|
|
|
else:
|
|
|
|
|
fileName = terms[1].strip()
|
|
|
|
|
# Если домашняя директория
|
|
|
|
|
if fileName[0] == "~":
|
|
|
|
|
# Получаем информацию о пользователе
|
|
|
|
@ -2632,6 +2629,9 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
# Получаем директорию пользователя
|
|
|
|
|
fileName = os.path.join(homeDir, fileName.partition("/")[2],
|
|
|
|
|
"")[:-1]
|
|
|
|
|
elif fileName[1] != "/":
|
|
|
|
|
path = os.path.split(nameSystemFile)[0]
|
|
|
|
|
fileName=os.path.join(path,fileName)
|
|
|
|
|
replace = ""
|
|
|
|
|
if os.path.exists(fileName):
|
|
|
|
|
FD = open(fileName)
|
|
|
|
@ -3274,6 +3274,12 @@ class profile(_file, _terms, xmlShare, processingTemplates):
|
|
|
|
|
else:
|
|
|
|
|
tmpDirsProfiles.append(False)
|
|
|
|
|
dirsProfiles = tmpDirsProfiles
|
|
|
|
|
#scanObj = processingTemplates()
|
|
|
|
|
|
|
|
|
|
#scanObj.processingFile = lambda *x: x[1]
|
|
|
|
|
# Считаем количество файлов
|
|
|
|
|
#for dirTemplate in dirsProfiles:
|
|
|
|
|
|
|
|
|
|
# тестовое значение количества профилей
|
|
|
|
|
numberAllProfiles = 1000
|
|
|
|
|
self.numberAllProfiles(numberAllProfiles)
|
|
|
|
|