fix up stuff

src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py

@@ -17,7 +17,10 @@ class command():
         return _('get current v menu entry')
     def run(self):
         print('CURR MENU')
+        try:
             text = self.env['runtime']['vmenuManager'].getCurrentEntry()
             self.env['runtime']['outputManager'].presentText(text, interrupt=True)
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py

@@ -17,8 +17,11 @@ class command():
         return _('leave v menu submenu')
     def run(self):
         print('DEC LEVEL')
+        try:
             self.env['runtime']['vmenuManager'].decLevel()
             text = self.env['runtime']['vmenuManager'].getCurrentEntry()
             self.env['runtime']['outputManager'].presentText(text, interrupt=True)
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py

@@ -17,7 +17,9 @@ class command():
         return _('execute v menu entry')
     def run(self):
         print('EXEC ENTRY')
-        
+        try:
             self.env['runtime']['vmenuManager'].executeMenu()
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py

@@ -17,9 +17,11 @@ class command():
         return _('enter v menu submenu')
     def run(self):
         print('INC LEVEL')
-        
+        try:
             self.env['runtime']['vmenuManager'].incLevel()
             text = self.env['runtime']['vmenuManager'].getCurrentEntry()
             self.env['runtime']['outputManager'].presentText(text, interrupt=True)
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py

@@ -17,8 +17,11 @@ class command():
         return _('get next v menu entry')
     def run(self):
         print('NEXT MENU')
+        try:
             self.env['runtime']['vmenuManager'].nextIndex()
             text = self.env['runtime']['vmenuManager'].getCurrentEntry()
             self.env['runtime']['outputManager'].presentText(text, interrupt=True)
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py

@@ -17,9 +17,11 @@ class command():
         return _('get prev v menu entry')
     def run(self):
         print('PREV MENU')
-        
+        try:
             self.env['runtime']['vmenuManager'].prevIndex()
             text = self.env['runtime']['vmenuManager'].getCurrentEntry()
             self.env['runtime']['outputManager'].presentText(text, interrupt=True)
+        except Exception as e:
+            print(e)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/core/vmenuManager.py

@@ -6,9 +6,10 @@
 
 from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import module_utils
+import os, inspect
 
-import os
+currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
+fenrirPath = os.path.dirname(currentdir)
 
 class vmenuManager():
     def __init__(self):
@@ -16,6 +17,7 @@ class vmenuManager():
         self.currIndex = None
         self.currMenu = ''
         self.active = False
+        self.defaultVMenuPath = fenrirPath+ "/commands/vmenu-profiles/KEY"
     def initialize(self, environment):
         self.env = environment
     def shutdown(self):
@@ -37,7 +39,6 @@ class vmenuManager():
         self.setActive(not self.getActive())
     def setActive(self, active):
         self.active = active
-        print('drin')
         if self.active:
             #try:
             self.createMenuTree()
@@ -67,11 +68,9 @@ class vmenuManager():
                 del(self.env['bindings'][str([1, ['KEY_ENTER']])])
             except:
                 pass
-        print(self.env['bindings'])
-    
     def createMenuTree(self):
         self.currIndex = None
-        menu = self.fs_tree_to_dict( '/home/chrys/Projekte/fenrir/src/fenrirscreenreader/commands/vmenu-profiles/KEY')
+        menu = self.fs_tree_to_dict( self.defaultVMenuPath)
         if menu:
             self.menuDict = menu
             if len(self.menuDict) > 0:
@@ -79,6 +78,10 @@ class vmenuManager():
     def executeMenu(self):
         if self.currIndex == None:
             return
+        try:
+            pass
+        except:
+            self.incLevel()
     def incLevel(self):
         if self.currIndex == None:
             return
@@ -93,33 +96,51 @@ class vmenuManager():
         except:
             return
         self.currIndex.append(0)
+        print(self.currIndex)
     def decLevel(self):
         if self.currIndex == None:
             return
         if len(self.currIndex) == 1:
             return
         self.currIndex.remove(len(self.currIndex) - 1)
+        print(self.currIndex)
     def nextIndex(self):
         if self.currIndex == None:
             return
-        self.currIndex[len(self.currIndex) - 1] += 1
+        if self.currIndex[len(self.currIndex) - 1] + 1 >= len(self.getNestedByPath(self.menuDict, self.currIndex[:-1])):
-        if self.currIndex[len(self.currIndex) - 1] >= len(self.getNestedByPath(self.menuDict, self.currIndex[:-1])):
            self.currIndex[len(self.currIndex) - 1] = 0 
+        else:
+            self.currIndex[len(self.currIndex) - 1] += 1
+        print(self.currIndex)
+
     def prevIndex(self):
         if self.currIndex == None:
             return
-        if len(self.currIndex) - 1 < self.currLevel:
+        if self.currIndex[len(self.currIndex) - 1] == 0:
-            return
-        self.currIndex[len(self.currIndex) - 1] -= 1
-        if self.currIndex[len(self.currIndex) - 1] < 0:
            self.currIndex[len(self.currIndex) - 1] = len(self.getNestedByPath(self.menuDict, self.currIndex[:-1])) - 1
+        else:
+            self.currIndex[len(self.currIndex) - 1] -= 1
+        print(self.currIndex)
+
     def getCurrentEntry(self):
+        print( 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_):
         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.update({f: root + '/' + f for f in files})
             return tree  # note we discontinue iteration trough os.walk
+    def getNestedByPath(self, complete, path):
+        path = path.copy()
+        if path != []:
+            index = list(complete.keys())[path[0]]
+            print(path)
+            path.remove(0)
+            nested = self.getNestedByPath(complete[index], path)
+            return nested
+        else:
+            return complete
+
 
     def getKeysByPath(self, complete, path):
         if not isinstance(complete, dict):