From a4c13bfc53dd0020348c52c6f5cd4c13659f5e40 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Mon, 24 Jan 2022 23:10:06 -0600
Subject: [PATCH] Refactoring fixes

---
 src/signal_classes/Controller.py            | 32 ++++++++++-----------
 src/signal_classes/mixins/ProcessorMixin.py | 14 ++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/signal_classes/Controller.py b/src/signal_classes/Controller.py
index c4dae7e..82229d9 100644
--- a/src/signal_classes/Controller.py
+++ b/src/signal_classes/Controller.py
@@ -42,10 +42,10 @@ class Controller(ProcessorMixin, Menu, Controller_Data):
                     programs_list       = self.get_sub_group("Search...", "")
                     fixed_programs_list = []
 
-                    for prog in programs_list:
-                        fixed_programs_list.append({'name': prog})
+                    for program in programs_list:
+                        fixed_programs_list.append({'name': program})
 
-                    self.favorites = self.call_method("set_favorites_menu", [fixed_programs_list])["setFaves"]
+                    self.favorites = self.call_method("set_favorites_menu", [fixed_programs_list])["set_faves"]
                     self.save_faves(self.favorites)
                     continue
                 if "[ Exit ]" in group:
@@ -60,7 +60,7 @@ class Controller(ProcessorMixin, Menu, Controller_Data):
                     self.logger.info(f"[Executing Program] Group: {group} Entry: {entry}")
                     self.execute_program(group, entry)
             except Exception as e:
-                self.logger.error(e)
+                self.logger.error(e.printStackTrace())
 
 
 
@@ -150,22 +150,22 @@ class Controller(ProcessorMixin, Menu, Controller_Data):
         if "Search..." in group:
             group_keys = self.menu_data.keys()
             for group_key in group_keys:
-                for opt in self.menu_data[group_key]:
-                    keys = opt.keys()
-                    if "comment" in keys and len(opt["comment"]) > 0 :
-                        if query.lower() in opt["comment"].lower():
-                            desktop_objects.append( opt["title"] + " || " + opt["comment"] )
-                    if query.lower() in opt["title"].lower() or query.lower() in opt["fileName"].lower():
-                            desktop_objects.append( opt["title"] + " || " + opt["fileName"].replace(".desktop", "") )
+                for option in self.menu_data[group_key]:
+                    keys = option.keys()
+                    if "comment" in keys and len(option["comment"]) > 0 :
+                        if query.lower() in option["comment"].lower():
+                            desktop_objects.append( option["title"] + " || " + option["comment"] )
+                    if query.lower() in option["title"].lower() or query.lower() in option["fileName"].lower():
+                            desktop_objects.append( option["title"] + " || " + option["fileName"].replace(".desktop", "") )
         elif "Favorites" in group:
             desktop_objects = self.favorites
         else:
-            for opt in self.menu_data[group]:
-                keys = opt.keys()
-                if "comment" in keys and len(opt["comment"]) > 0 :
-                    desktop_objects.append( opt["title"] + " || " + opt["comment"] )
+            for option in self.menu_data[group]:
+                keys = option.keys()
+                if "comment" in keys and len(option["comment"]) > 0 :
+                    desktop_objects.append( option["title"] + " || " + option["comment"] )
                 else:
-                    desktop_objects.append( opt["title"] + " || " + opt["fileName"].replace(".desktop", "") )
+                    desktop_objects.append( option["title"] + " || " + option["fileName"].replace(".desktop", "") )
 
         return desktop_objects
 
diff --git a/src/signal_classes/mixins/ProcessorMixin.py b/src/signal_classes/mixins/ProcessorMixin.py
index e81138b..804d770 100644
--- a/src/signal_classes/mixins/ProcessorMixin.py
+++ b/src/signal_classes/mixins/ProcessorMixin.py
@@ -13,7 +13,7 @@ class ProcessorMixin:
         program = parts[0].strip()
         comment = parts[1].strip()
 
-        if "Search..." in group or "Favorites" in group:
+        if group in ["Search...", "Favorites"]:
             group_keys = self.menu_data.keys()
             for group_key in group_keys:
                 self.pre_execute(self.menu_data[group_key], program, comment)
@@ -22,16 +22,16 @@ class ProcessorMixin:
 
 
     def pre_execute(self, options, program, comment):
-        for opt in options:
-            if program in opt["title"]:
-                keys = opt.keys()
-                if comment in opt["comment"] or comment in opt["fileName"]:
+        for option in options:
+            if program in option["title"]:
+                keys = option.keys()
+                if comment in [option["comment"], option["fileName"]]:
                     try:
                         self.execute(opt["tryExec"])
                     except Exception as e:
                         try:
-                            if "exec" in keys and len(opt["exec"]):
-                                self.execute(opt["exec"])
+                            if "exec" in keys and len(option["exec"]):
+                                self.execute(option["exec"])
                         except Exception as e:
                             self.logger.debug(e)