From 6c7a197f26844efdf9c4892f78d049d225a7ec7d Mon Sep 17 00:00:00 2001
From: chrys <chrys@linux-a11y.org>
Date: Mon, 4 Feb 2019 22:26:51 +0100
Subject: [PATCH] fix more issues

---
 src/fenrirscreenreader/core/vmenuManager.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/fenrirscreenreader/core/vmenuManager.py b/src/fenrirscreenreader/core/vmenuManager.py
index 50aa59a6..e088a0cd 100755
--- a/src/fenrirscreenreader/core/vmenuManager.py
+++ b/src/fenrirscreenreader/core/vmenuManager.py
@@ -91,8 +91,6 @@ class vmenuManager():
         try:
             r = self.getValueByPath(self.menuDict, self.currIndex +[0])
             print(r)
-            #if not r:
-            #    return
             if r == {}:
                 return
         except:
@@ -104,7 +102,7 @@ class vmenuManager():
             return
         if len(self.currIndex) == 1:
             return
-        self.currIndex.remove(len(self.currIndex) - 1)
+        self.currIndex = self.currIndex[:len(self.currIndex) - 1]
         print(self.currIndex)
     def nextIndex(self):
         if self.currIndex == None:
@@ -129,11 +127,15 @@ class vmenuManager():
         return self.getKeysByPath(self.menuDict, self.currIndex)[self.currIndex[-1]]
     def fs_tree_to_dict(self, 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:
                 try:
+                    fileName, fileExtension = os.path.splitext(f)
+                    fileName = fileName.split('/')[-1]
+                    if fileName.startswith('__'):
+                        continue
                     command = self.env['runtime']['commandManager'].loadFile(root + '/' + f)
-                    tree.update({f: command})
+                    tree.update({fileName + ' ' + _('Action'): command})
                 except Exception as e:
                     print(e)
             return tree  # note we discontinue iteration trough os.walk
@@ -157,7 +159,7 @@ class vmenuManager():
 
     def getValueByPath(self, complete, path):
         if not isinstance(complete, dict):
-            return None
+            return complete
         d = complete.copy()
         for i in path:
             d = d[list(d.keys())[i]]