sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rigo] enable fallback search only when in:installed and Set search are not triggered

Browse Source
This commit is contained in:
Fabio Erculiani
2012-07-31 10:27:41 +02:00
parent 7d5eb11c0c
commit 88844b3cb5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rigo/rigo/ui/gtk3/controllers/applications.py
View File

@@ -163,9 +163,11 @@ class ApplicationsViewController(GObject.Object):
self._entropy.rwsem().reader_acquire()
try:
matches = []
use_fallback = True
# in:installed [<search arg 1> ...]
if search_cmd == ApplicationsViewController.SHOW_INSTALLED_KEY:
use_fallback = False
inst_repo = self._entropy.installed_repository()
if not search_args:
for pkg_id in inst_repo.listAllPackageIds(
@@ -176,8 +178,10 @@ class ApplicationsViewController(GObject.Object):
for pkg_id in inst_repo.searchPackages(
search_arg.lower(), just_id=True):
matches.append((pkg_id, inst_repo.repository_id()))
# package set search
elif text.startswith(etpConst['packagesetprefix']):
elif search_cmd.startswith(etpConst['packagesetprefix']):
use_fallback = False
sets = self._entropy.Sets()
package_deps = sets.expand(text)
for package_dep in package_deps:
@@ -186,7 +190,8 @@ class ApplicationsViewController(GObject.Object):
if pkg_id != -1:
matches.append((pkg_id, pkg_repo))
if not matches:
# fallback search
if not matches and use_fallback:
# exact match
pkg_matches, rc = self._entropy.atom_match(
text, multi_match=True,