Fixed fix me stuff.
This commit is contained in:
parent
868b075bd5
commit
2eb94a567e
|
|
@ -23,16 +23,16 @@ class Main(Context):
|
|||
Initialize it all...
|
||||
"""
|
||||
super().__init__(args)
|
||||
HOME_APPS = os.path.expanduser('~') + "/.local/share/applications/"
|
||||
paths = ["/opt/", "/usr/share/applications/", HOME_APPS]
|
||||
query = ""
|
||||
|
||||
while True:
|
||||
self.clear()
|
||||
if not self.menuData:
|
||||
HOME = os.path.expanduser('~') + "/.local/share/applications/"
|
||||
paths = ["/usr/share/applications/", HOME]
|
||||
self.menuData = self.getDesktopFilesInfo(paths)
|
||||
|
||||
group = self.call_method("mainMenu")["group"]
|
||||
query = ""
|
||||
if "[ Search ]" in group:
|
||||
query = self.call_method("searchMenu")["query"]
|
||||
if "[ Exit ]" in group:
|
||||
|
|
@ -68,10 +68,22 @@ class Main(Context):
|
|||
}
|
||||
|
||||
for path in paths:
|
||||
if not "/opt/" in path:
|
||||
self.listAndUpdateDesktopFiles(path, menuObjs);
|
||||
else:
|
||||
for folder in listdir(path):
|
||||
try:
|
||||
fPath = path + folder + "/"
|
||||
self.listAndUpdateDesktopFiles(fPath, menuObjs);
|
||||
except Exception as e:
|
||||
self.logger.debug(e)
|
||||
|
||||
return menuObjs
|
||||
|
||||
def listAndUpdateDesktopFiles(self, path, menuObjs):
|
||||
for f in listdir(path):
|
||||
fPath = path + f
|
||||
flags = ["mimeinfo.cache", "defaults.list"]
|
||||
if not f in flags and isfile(fPath):
|
||||
if isfile(fPath) and f.endswith(".desktop"):
|
||||
xdgObj = DesktopEntry(fPath)
|
||||
|
||||
title = xdgObj.getName()
|
||||
|
|
@ -110,27 +122,21 @@ class Main(Context):
|
|||
"tryExec": tryExec, "fileName": f
|
||||
})
|
||||
|
||||
return menuObjs
|
||||
|
||||
|
||||
|
||||
def getSubgroup(self, group, query = ""):
|
||||
"""
|
||||
Need to refactor and pull out the sub logic that is used in both cases...
|
||||
"""
|
||||
desktopObjs = []
|
||||
if "[ Search ]" in group:
|
||||
gkeys = self.menuData.keys()
|
||||
for gkey in gkeys:
|
||||
for opt in self.menuData[gkey]:
|
||||
keys = opt.keys()
|
||||
|
||||
if "comment" in keys and len(opt["comment"]) > 0 :
|
||||
if query.lower() in opt["comment"].lower():
|
||||
desktopObjs.append( opt["title"] + " || " + opt["comment"] )
|
||||
continue
|
||||
|
||||
if query.lower() in opt["title"].lower() or \
|
||||
query.lower() in opt["fileName"].lower():
|
||||
if query.lower() in opt["title"].lower() or query.lower() in opt["fileName"].lower():
|
||||
desktopObjs.append( opt["title"] + " || " + opt["fileName"].replace(".desktop", "") )
|
||||
else:
|
||||
for opt in self.menuData[group]:
|
||||
|
|
@ -144,9 +150,6 @@ class Main(Context):
|
|||
|
||||
|
||||
def executeProgram(self, group, entry):
|
||||
"""
|
||||
Need to refactor and pull out the sub loop that is used in both cases...
|
||||
"""
|
||||
parts = entry.split("||")
|
||||
program = parts[0].strip()
|
||||
comment = parts[1].strip()
|
||||
|
|
@ -154,52 +157,32 @@ class Main(Context):
|
|||
if "[ Search ]" in group:
|
||||
gkeys = self.menuData.keys()
|
||||
for gkey in gkeys:
|
||||
for opt in self.menuData[gkey]:
|
||||
if program in opt["title"]:
|
||||
keys = opt.keys()
|
||||
if comment in opt["comment"] or comment in opt["fileName"]:
|
||||
DEVNULL = open(os.devnull, 'w')
|
||||
execFailed = False
|
||||
try:
|
||||
command = opt["tryExec"].split("%")[0]
|
||||
self.logger.debug(command)
|
||||
subprocess.Popen(command.split(), start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
|
||||
break
|
||||
except Exception as e:
|
||||
execFailed = True
|
||||
|
||||
if execFailed:
|
||||
try:
|
||||
if "exec" in keys and len(opt["exec"]):
|
||||
command = opt["exec"].split("%")[0]
|
||||
self.logger.debug(command)
|
||||
subprocess.Popen(command.split(), start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
|
||||
break
|
||||
except Exception as e:
|
||||
self.logger.debug(e)
|
||||
self.pre_execute(self.menuData[gkey], program, comment)
|
||||
else:
|
||||
for opt in self.menuData[group]:
|
||||
self.pre_execute(self.menuData[group], program, comment)
|
||||
|
||||
|
||||
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"]:
|
||||
DEVNULL = open(os.devnull, 'w')
|
||||
execFailed = False
|
||||
try:
|
||||
command = opt["tryExec"].split("%")[0]
|
||||
self.logger.debug(command)
|
||||
subprocess.Popen(command.split(), start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
|
||||
self.execute(opt["tryExec"])
|
||||
except Exception as e:
|
||||
execFailed = True
|
||||
|
||||
if execFailed:
|
||||
try:
|
||||
if "exec" in keys and len(opt["exec"]):
|
||||
command = opt["exec"].split("%")[0]
|
||||
self.logger.debug(command)
|
||||
subprocess.Popen(command.split(), start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
|
||||
self.execute(opt["exec"])
|
||||
except Exception as e:
|
||||
self.logger.debug(e)
|
||||
|
||||
|
||||
def execute(self, option):
|
||||
DEVNULL = open(os.devnull, 'w')
|
||||
command = option.split("%")[0]
|
||||
self.logger.debug(command)
|
||||
subprocess.Popen(command.split(), start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
|
||||
|
||||
|
||||
def clear(self):
|
||||
os.system('cls' if os.name == 'nt' else 'clear')
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ class Logger:
|
|||
chLogLevel = logging.CRITICAL # Prety musch the only one we change ever
|
||||
fhLogLevel = logging.DEBUG
|
||||
log = logging.getLogger(loggerName)
|
||||
log.setLevel(globalLogLvl)
|
||||
|
||||
# Set our log output styles
|
||||
fFormatter = logging.Formatter('[%(asctime)s] %(pathname)s:%(lineno)d %(levelname)s - %(message)s', '%m-%d %H:%M:%S')
|
||||
|
|
|
|||
Loading…
Reference in New Issue