some fixes regarding massages
This commit is contained in:
@ -51,18 +51,21 @@ def copySources(config, destinationDirectory):
|
|||||||
# Distinguish between sources with explicit target and without
|
# Distinguish between sources with explicit target and without
|
||||||
if isinstance(source, dict):
|
if isinstance(source, dict):
|
||||||
sourcePath = source['source']
|
sourcePath = source['source']
|
||||||
#targetPath = os.path.join(destinationDirectory, source['target'])
|
|
||||||
checkTargetPath = source['target']
|
checkTargetPath = source['target']
|
||||||
|
|
||||||
# Check for absolute paths in target and correct them if necessary
|
# Check for absolute paths in target and correct them if necessary
|
||||||
if os.path.isabs(checkTargetPath):
|
if os.path.isabs(checkTargetPath):
|
||||||
targetPath = os.path.normpath(os.path.join(destinationDirectory, checkTargetPath.lstrip('./')))
|
targetPath = os.path.normpath(os.path.join(destinationDirectory, checkTargetPath.lstrip('./')))
|
||||||
raise ValueError(f"Absolute path incorrect: Corrected {checkTargetPath} to {targetPath}.")
|
raise ValueError(f"Absolute path incorrect: Corrected {checkTargetPath} to {targetPath}.")
|
||||||
|
else:
|
||||||
|
#targetPath = os.path.join(destinationDirectory, source['target']) # old code
|
||||||
|
targetPath = os.path.normpath(os.path.join(destinationDirectory, checkTargetPath))
|
||||||
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
sourcePath = source
|
sourcePath = source
|
||||||
#targetPath = os.path.join(destinationDirectory, os.path.basename(sourcePath))
|
#targetPath = os.path.join(destinationDirectory, os.path.basename(sourcePath)) # old code
|
||||||
targetPath = os.path.normpath(os.path.join(destinationDirectory, os.path.basename(sourcePath)))
|
targetPath = os.path.normpath(os.path.join(destinationDirectory, os.path.basename(sourcePath)))
|
||||||
|
|
||||||
# Check if source exists
|
# Check if source exists
|
||||||
@ -90,7 +93,7 @@ def copySources(config, destinationDirectory):
|
|||||||
if srcMtime <= destMtime:
|
if srcMtime <= destMtime:
|
||||||
print(f"Skipping {sourcePath}: Destination is up to date")
|
print(f"Skipping {sourcePath}: Destination is up to date")
|
||||||
break # Skip this source file/folder
|
break # Skip this source file/folder
|
||||||
else:
|
elif rule.get('mode') != 'update' and not os.path.exists(sourcePath):
|
||||||
print(f"Should update {sourcePath} to {targetPath}, but {sourcePath} is not (yet) existing.")
|
print(f"Should update {sourcePath} to {targetPath}, but {sourcePath} is not (yet) existing.")
|
||||||
|
|
||||||
# Copy files or directories
|
# Copy files or directories
|
||||||
@ -122,7 +125,7 @@ def copySources(config, destinationDirectory):
|
|||||||
errorList["copies"] += 1
|
errorList["copies"] += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
print("\nSource file & folder copy/replace process completed.\n")
|
print(f"\nSource file & folder copy/replace process completed with {errorList['copies']} errors.\n")
|
||||||
|
|
||||||
|
|
||||||
def modifyFiles(config, destinationDirectory):
|
def modifyFiles(config, destinationDirectory):
|
||||||
@ -182,7 +185,7 @@ def modifyFiles(config, destinationDirectory):
|
|||||||
errorList["modifications"] += 1
|
errorList["modifications"] += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
print("\nFile modification process completed.\n")
|
print(f"\nFile modification process completed with {errorList['modifications']} errors.\n")
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
Reference in New Issue
Block a user