spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 01:14:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into modules

Browse Source 
# Conflicts:
#	fpakman/core/controller.py
This commit is contained in:
Vinicius Moreira
2019-07-30 11:44:32 -03:00
parent c70a3dcf4e bf272ec4f5
commit 056ece59bf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [0.4.3] ## [0.4.3]
### Improvements ### Improvements
- new environment variable / argument to enable / disable the tray icon and update-check daemon: FPAKMAN_TRAY (--tray) - new environment variable / argument to enable / disable the tray icon and update-check daemon: FPAKMAN_TRAY (--tray)
- search results sorting takes an average of 35% less time, reaching 60% in some scenarios
### Fixes: ### Fixes:
- replacing default app icons by null icons - replacing default app icons by null icons

6
fpakman/core/controller.py
View File

@@ -22,7 +22,7 @@ class GenericApplicationManager(ApplicationManager):
def _sort(self, apps: List[Application], word: str) -> List[Application]: def _sort(self, apps: List[Application], word: str) -> List[Application]:
exact_name_matches, contains_name_matches, desc_name_matches, others = [], [], [], [] exact_name_matches, contains_name_matches, others = [], [], []
for app in apps: for app in apps:
lower_name = app.base_data.name.lower() lower_name = app.base_data.name.lower()
@@ -31,13 +31,11 @@ class GenericApplicationManager(ApplicationManager):
exact_name_matches.append(app) exact_name_matches.append(app)
elif word in lower_name: elif word in lower_name:
contains_name_matches.append(app) contains_name_matches.append(app)
elif app.base_data.description and word in app.base_data.description.lower():
desc_name_matches.append(app)
else: else:
others.append(app) others.append(app)
res = [] res = []
for app_list in (exact_name_matches, contains_name_matches, desc_name_matches, others): for app_list in (exact_name_matches, contains_name_matches, others):
app_list.sort(key=lambda a: a.base_data.name.lower()) app_list.sort(key=lambda a: a.base_data.name.lower())
res.extend(app_list) res.extend(app_list)