N0VA/CLARA
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keywords and better commands search

Browse Source
This commit is contained in:
N0\A
2025-10-30 09:16:26 +01:00
parent 02755e7d63
commit aa3741e357
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/app_launcher.py
View File

@@ -8,9 +8,9 @@ import shlex
if platform.system() == "Windows": if platform.system() == "Windows":
try: try:
from win32com.client import Dispatch from win32com.client import Dispatch # type: ignore
import win32api import win32api # type: ignore
import win32con import win32con # type: ignore
except ImportError: except ImportError:
print("Windows specific functionality requires 'pywin32'. Please run 'pip install pywin32'.") print("Windows specific functionality requires 'pywin32'. Please run 'pip install pywin32'.")
Dispatch = None Dispatch = None
@@ -20,7 +20,7 @@ if platform.system() == "Windows":
_app_cache: Optional[list['App']] = None _app_cache: Optional[list['App']] = None
class App: class App:
def __init__(self, name: str, exec: str, icon: str = "", hidden: bool = False, generic_name: str = "", comment: str = "", command: str = ""): def __init__(self, name: str, exec: str, icon: str = "", hidden: bool = False, generic_name: str = "", comment: str = "", command: str = "", keywords: Optional[List[str]] = None):
self.name = name self.name = name
self.exec = exec self.exec = exec
self.icon = icon self.icon = icon
@@ -28,9 +28,10 @@ class App:
self.generic_name = generic_name self.generic_name = generic_name
self.comment = comment self.comment = comment
self.command = command if command else os.path.basename(exec.split(' ')[0]) self.command = command if command else os.path.basename(exec.split(' ')[0])
self.keywords = keywords if keywords is not None else []
def __str__(self): def __str__(self):
return f"App(name={self.name}, exec={self.exec}, command={self.command}, icon={self.icon}, hidden={self.hidden}, generic_name={self.generic_name}, comment={self.comment})" return f"App(name={self.name}, exec={self.exec}, command={self.command}, icon={self.icon}, hidden={self.hidden}, generic_name={self.generic_name}, comment={self.comment}, keywords={self.keywords})"
def get_desktop_dirs_linux(): def get_desktop_dirs_linux():
dirs = [ dirs = [
@@ -78,6 +79,9 @@ def parse_desktop_file(file_path: Path) -> list[App]:
if main_name and not is_hidden: if main_name and not is_hidden:
main_exec = main_entry.get('Exec') main_exec = main_entry.get('Exec')
keywords_str = main_entry.get('Keywords', '')
keywords = [k.strip() for k in keywords_str.split(';') if k.strip()]
if main_exec: if main_exec:
apps.append(App( apps.append(App(
name=main_name, name=main_name,
@@ -85,7 +89,8 @@ def parse_desktop_file(file_path: Path) -> list[App]:
icon=main_entry.get('Icon', ''), icon=main_entry.get('Icon', ''),
hidden=False, hidden=False,
generic_name=main_entry.get('GenericName', ''), generic_name=main_entry.get('GenericName', ''),
comment=main_entry.get('Comment', '') comment=main_entry.get('Comment', ''),
keywords=keywords
)) ))
if 'Actions' in main_entry: if 'Actions' in main_entry:
@@ -102,7 +107,8 @@ def parse_desktop_file(file_path: Path) -> list[App]:
apps.append(App( apps.append(App(
name=combined_name, name=combined_name,
exec=action_exec, exec=action_exec,
icon=main_entry.get('Icon', '') icon=main_entry.get('Icon', ''),
keywords=keywords
)) ))
return apps return apps

5
windows/app_launcher.py
View File

@@ -102,12 +102,15 @@ class AppLauncherDialog(QtWidgets.QDialog):
return return
text_lower = text.lower() text_lower = text.lower()
text_for_command = text_lower.replace(' ', '').replace('-', '').replace('_', '')
filtered_apps = [ filtered_apps = [
app for app in self.apps if app for app in self.apps if
text_lower in app.name.lower() or text_lower in app.name.lower() or
(app.generic_name and text_lower in app.generic_name.lower()) or (app.generic_name and text_lower in app.generic_name.lower()) or
(app.comment and text_lower in app.comment.lower()) or (app.comment and text_lower in app.comment.lower()) or
(app.command and text_lower in app.command.lower()) (app.command and text_for_command in app.command.lower().replace(' ', '').replace('-', '').replace('_', '')) or
(app.keywords and any(text_lower in keyword.lower() for keyword in app.keywords))
] ]
self.populate_list(filtered_apps) self.populate_list(filtered_apps)