storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more issues

Browse Source
This commit is contained in:
chrys 2019-02-04 22:26:51 +01:00
parent 53f5c3edee
commit 6c7a197f26
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fenrirscreenreader/core/vmenuManager.py
View File

@ -91,8 +91,6 @@ class vmenuManager():
try: try:
r = self.getValueByPath(self.menuDict, self.currIndex +[0]) r = self.getValueByPath(self.menuDict, self.currIndex +[0])
print(r) print(r)
#if not r:
# return
if r == {}: if r == {}:
return return
except: except:
@ -104,7 +102,7 @@ class vmenuManager():
return return
if len(self.currIndex) == 1: if len(self.currIndex) == 1:
return return
self.currIndex.remove(len(self.currIndex) - 1) self.currIndex = self.currIndex[:len(self.currIndex) - 1]
print(self.currIndex) print(self.currIndex)
def nextIndex(self): def nextIndex(self):
if self.currIndex == None: if self.currIndex == None:
@ -129,11 +127,15 @@ class vmenuManager():
return self.getKeysByPath(self.menuDict, self.currIndex)[self.currIndex[-1]] return self.getKeysByPath(self.menuDict, self.currIndex)[self.currIndex[-1]]
def fs_tree_to_dict(self, path_): def fs_tree_to_dict(self, path_):
for root, dirs, files in os.walk(path_): for root, dirs, files in os.walk(path_):
tree = {d: self.fs_tree_to_dict(os.path.join(root, d)) for d in dirs} tree = {d + ' ' + _('Menu'): self.fs_tree_to_dict(os.path.join(root, d)) for d in dirs if not d.startswith('__')}
for f in files: for f in files:
try: try:
fileName, fileExtension = os.path.splitext(f)
fileName = fileName.split('/')[-1]
if fileName.startswith('__'):
continue
command = self.env['runtime']['commandManager'].loadFile(root + '/' + f) command = self.env['runtime']['commandManager'].loadFile(root + '/' + f)
tree.update({f: command}) tree.update({fileName + ' ' + _('Action'): command})
except Exception as e: except Exception as e:
print(e) print(e)
return tree # note we discontinue iteration trough os.walk return tree # note we discontinue iteration trough os.walk
@ -157,7 +159,7 @@ class vmenuManager():
def getValueByPath(self, complete, path): def getValueByPath(self, complete, path):
if not isinstance(complete, dict): if not isinstance(complete, dict):
return None return complete
d = complete.copy() d = complete.copy()
for i in path: for i in path:
d = d[list(d.keys())[i]] d = d[list(d.keys())[i]]