Skip to content

Commit a55e85d

Browse files
committed
removed unused nameIdMap
1 parent 061ce8e commit a55e85d

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

Server/Controller/Api.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -565,11 +565,11 @@ def gdriveDrives(service, fields = ['nextPageToken', 'drives(id, name)']):
565565

566566
return items
567567

568-
def gdriveSearchTree(pathBits, nameIdMap, children, id = None, roots = None):
568+
def gdriveSearchTree(pathBits, children, id = None, roots = None):
569569
if id is None:
570570
for name, id in roots.items():
571571
if name == pathBits[0]:
572-
r = gdriveSearchTree(pathBits[1:], nameIdMap, children[id] if id in children else [], id, roots)
572+
r = gdriveSearchTree(pathBits[1:], children[id] if id in children else [], id, roots)
573573
if r is not None:
574574
return r
575575
return None
@@ -588,7 +588,7 @@ def gdriveSearchTree(pathBits, nameIdMap, children, id = None, roots = None):
588588

589589
if folderId in children:
590590
for newChildren in children[folderId]:
591-
r = gdriveSearchTree(pathBits[1:], nameIdMap, newChildren, folderId, roots)
591+
r = gdriveSearchTree(pathBits[1:], newChildren, folderId, roots)
592592

593593
if r is not None:
594594
return r
@@ -627,8 +627,7 @@ def gdriveGetFolderId(service, path):
627627
items = []
628628

629629
children = {'root': []}
630-
names = {}
631-
roots = {}
630+
roots = {}
632631

633632
rootId = None
634633
teamDriveId = None
@@ -665,14 +664,9 @@ def gdriveGetFolderId(service, path):
665664
children[parentId] = []
666665
children[parentId].append(item)
667666
else:
668-
children['root'].append(item)
669-
670-
if not item['name'] in names:
671-
names[item['name']] = []
672-
names[item['name']].append(item['id'])
673-
667+
children['root'].append(item)
674668

675-
return gdriveSearchTree(bits[1:], names, children, None, roots)
669+
return gdriveSearchTree(bits[1:], children, None, roots)
676670

677671
def getFileInfo(service, path):
678672
try:

0 commit comments

Comments
 (0)