mirror of
https://github.com/infeeeee/dyn2py
synced 2025-12-16 22:16:18 +01:00
Compare commits
2 Commits
2a6c42829f
...
relative-p
| Author | SHA1 | Date | |
|---|---|---|---|
| bfcab5f46d | |||
| 0c2174525e |
@@ -199,7 +199,10 @@ def run(options: Options) -> None:
|
|||||||
|
|
||||||
elif f.is_python_file():
|
elif f.is_python_file():
|
||||||
logging.debug("Source is a Python file")
|
logging.debug("Source is a Python file")
|
||||||
|
try:
|
||||||
f.update_dynamo(options)
|
f.update_dynamo(options)
|
||||||
|
except FileNotFoundError:
|
||||||
|
logging.error(f"Source Dynamo file not found! {f.filepath}")
|
||||||
|
|
||||||
# Write files at the end:
|
# Write files at the end:
|
||||||
for f in DynamoFile.open_files | PythonFile.open_files:
|
for f in DynamoFile.open_files | PythonFile.open_files:
|
||||||
|
|||||||
@@ -410,10 +410,10 @@ class PythonFile(File):
|
|||||||
"Do not edit this section, if you want to update the Dynamo graph!"
|
"Do not edit this section, if you want to update the Dynamo graph!"
|
||||||
])
|
])
|
||||||
|
|
||||||
# Double escape path:
|
# Calculate relative path, change to forward slash
|
||||||
dyn_path_string = str(dynamo_file.realpath)
|
dyn_path_string = os.path.relpath(dynamo_file.filepath, self.dirpath)
|
||||||
if "\\" in dyn_path_string:
|
if "\\" in dyn_path_string:
|
||||||
dyn_path_string = dyn_path_string.replace("\\", "\\\\")
|
dyn_path_string = dyn_path_string.replace("\\", "/")
|
||||||
|
|
||||||
self.header_data = {
|
self.header_data = {
|
||||||
"dyn2py_version": METADATA["Version"],
|
"dyn2py_version": METADATA["Version"],
|
||||||
@@ -548,8 +548,16 @@ class PythonFile(File):
|
|||||||
# Open if it's the first time:
|
# Open if it's the first time:
|
||||||
if not dynamo_file:
|
if not dynamo_file:
|
||||||
|
|
||||||
dynamo_file = DynamoFile(
|
cwd = pathlib.Path(os.getcwd()).resolve()
|
||||||
pathlib.Path(self.header_data["dyn_path"]))
|
# Change to pythonfiles' dir:
|
||||||
|
os.chdir(self.dirpath)
|
||||||
|
|
||||||
|
dynpath = os.path.realpath(self.header_data["dyn_path"])
|
||||||
|
logging.debug(f"Resolved path: {dynpath}")
|
||||||
|
|
||||||
|
# Change back to the original path:
|
||||||
|
os.chdir(cwd)
|
||||||
|
dynamo_file = DynamoFile(pathlib.Path(dynpath))
|
||||||
|
|
||||||
# Check if uuid is ok:
|
# Check if uuid is ok:
|
||||||
if not dynamo_file.uuid == self.header_data["dyn_uuid"]:
|
if not dynamo_file.uuid == self.header_data["dyn_uuid"]:
|
||||||
|
|||||||
Reference in New Issue
Block a user