fix getitem folder with subfolders

This commit is contained in:
fluzzi 2022-04-05 18:31:19 -03:00
parent fa250e2ae3
commit 118ca1d14e
2 changed files with 21 additions and 6 deletions

View File

@ -155,9 +155,14 @@ class configfile:
folder = self.connections[uniques["folder"]]
newfolder = folder.copy()
newfolder.pop("type")
for node in newfolder.keys():
for node in folder.keys():
if node == "type":
continue
if "type" in newfolder[node].keys():
newfolder[node].pop("type")
if newfolder[node]["type"] == "subfolder":
newfolder.pop(node)
else:
newfolder[node].pop("type")
if keys == None:
return newfolder
else:

View File

@ -458,9 +458,14 @@ __pdoc__ = {
folder = self.connections[uniques["folder"]]
newfolder = folder.copy()
newfolder.pop("type")
for node in newfolder.keys():
for node in folder.keys():
if node == "type":
continue
if "type" in newfolder[node].keys():
newfolder[node].pop("type")
if newfolder[node]["type"] == "subfolder":
newfolder.pop(node)
else:
newfolder[node].pop("type")
if keys == None:
return newfolder
else:
@ -575,9 +580,14 @@ __pdoc__ = {
folder = self.connections[uniques["folder"]]
newfolder = folder.copy()
newfolder.pop("type")
for node in newfolder.keys():
for node in folder.keys():
if node == "type":
continue
if "type" in newfolder[node].keys():
newfolder[node].pop("type")
if newfolder[node]["type"] == "subfolder":
newfolder.pop(node)
else:
newfolder[node].pop("type")
if keys == None:
return newfolder
else: