Skip to content

Commit f806fc4

Browse files
Fix folder move/copy for API v2 parent field handling
1 parent 9f2e308 commit f806fc4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

fossology/folders.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ def create_folder(
112112
logger.info(
113113
f"Folder '{name}' already exists under the folder {parent.name} ({parent.id})"
114114
)
115-
# Folder names with similar letter but different cases
116-
# are not allowed in Fossology, compare with lower case
115+
self.folders = self.list_folders()
117116
existing_folder = [
118117
folder
119118
for folder in self.folders
@@ -206,6 +205,8 @@ def _put_folder(self, action: str, folder: Folder, parent: Folder):
206205
response = self.session.put(f"{self.api}/folders/{folder.id}", headers=headers)
207206
if response.status_code == 202:
208207
logger.info(f"Folder {folder.name} has been {action}d to {parent.name}")
208+
if action == "move":
209+
folder.parent = parent.id
209210
return self.detail_folder(folder.id)
210211
else:
211212
description = f"Unable to {action} folder {folder.name} to {parent.name}"

fossology/obj.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def from_json_v2(cls, json_dict):
250250
description=json_dict.get("description"),
251251
# Check 'parent' first, fallback to 'parentId' if V2 changes keys
252252
parent=json_dict.get("parent") or json_dict.get("parentId"),
253-
**json_dict
253+
254254
)
255255

256256
class Findings(object):

0 commit comments

Comments
 (0)