status-im/spiff-arena
2
0
Fork 0
mirror of https://github.com/status-im/spiff-arena.git synced 2025-01-16 13:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

favor os.path.join over hardcoding slash w/ burnettk

Browse Source
This commit is contained in:
jasquat 2022-12-08 14:08:32 -05:00
parent cee726e8b0
commit 609abe8f16
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spiffworkflow-backend/src/spiffworkflow_backend/services/process_model_service.py
View File

@ -148,20 +148,18 @@ class ProcessModelService(FileSystemService):
error_code="existing_instances", error_code="existing_instances",
message=f"We cannot delete the model `{process_model_id}`, there are existing instances that depend on it.", message=f"We cannot delete the model `{process_model_id}`, there are existing instances that depend on it.",
) )
self.get_process_model(process_model_id) process_model = self.get_process_model(process_model_id)
# path = self.workflow_path(process_model) path = self.workflow_path(process_model)
path = f"{FileSystemService.root_path()}/{process_model_id}"
shutil.rmtree(path) shutil.rmtree(path)
def process_model_move( def process_model_move(
self, original_process_model_id: str, new_location: str self, original_process_model_id: str, new_location: str
) -> ProcessModelInfo: ) -> ProcessModelInfo:
"""Process_model_move.""" """Process_model_move."""
original_model_path = os.path.abspath( process_model = self.get_process_model(original_process_model_id)
os.path.join(FileSystemService.root_path(), original_process_model_id) original_model_path = self.workflow_path(process_model)
)
_, model_id = os.path.split(original_model_path) _, model_id = os.path.split(original_model_path)
new_relative_path = f"{new_location}/{model_id}" new_relative_path = os.path.join(new_location, model_id)
new_model_path = os.path.abspath( new_model_path = os.path.abspath(
os.path.join(FileSystemService.root_path(), new_relative_path) os.path.join(FileSystemService.root_path(), new_relative_path)
) )
@ -245,7 +243,7 @@ class ProcessModelService(FileSystemService):
if full_group_id_path is None: if full_group_id_path is None:
full_group_id_path = process_group_id_segment full_group_id_path = process_group_id_segment
else: else:
full_group_id_path = f"{full_group_id_path}/{process_group_id_segment}" # type: ignore full_group_id_path = os.path.join(full_group_id_path, process_group_id_segment) # type: ignore
parent_group = ProcessModelService.get_process_group(full_group_id_path) parent_group = ProcessModelService.get_process_group(full_group_id_path)
if parent_group: if parent_group:
parent_group_array.append( parent_group_array.append(
@ -307,8 +305,8 @@ class ProcessModelService(FileSystemService):
) -> ProcessGroup: ) -> ProcessGroup:
"""Process_group_move.""" """Process_group_move."""
original_group_path = self.process_group_path(original_process_group_id) original_group_path = self.process_group_path(original_process_group_id)
original_root, original_group_id = os.path.split(original_group_path) _, original_group_id = os.path.split(original_group_path)
new_root = f"{FileSystemService.root_path()}/{new_location}" new_root = os.path.join(FileSystemService.root_path(), new_location)
new_group_path = os.path.abspath( new_group_path = os.path.abspath(
os.path.join(FileSystemService.root_path(), new_root, original_group_id) os.path.join(FileSystemService.root_path(), new_root, original_group_id)
) )