mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toastergui: improve toaster suggestion

Browse Source 
Improving the suggestions by ordering entries
based on position of the search string.

Speed improvements in suggestion calls.

[YOCTO #7152]

(Bitbake rev: 61b0f0e46a589af9d669e52d4cec656bbd0d0057)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexandru DAMIAN
2015-03-10 18:55:54 +00:00
committed by Richard Purdie
parent c4722084b6
commit e4ff3eadfa
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastergui/views.py
+20 -8
View File
@@ -2259,7 +2259,7 @@ if toastermain.settings.MANAGED:
# return all project settings # return all project settings
return HttpResponse(jsonfilter( { return HttpResponse(jsonfilter( {
"error": "ok", "error": "ok",
"layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.layer.pk,)), "branch" : { "name" : x.layercommit.get_vcs_reference(), "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")), "layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.pk,)), "branch" : { "name" : x.layercommit.get_vcs_reference(), "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")),
"builds" : _project_recent_build_list(prj), "builds" : _project_recent_build_list(prj),
"variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()), "variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()),
"machine": {"name": prj.projectvariable_set.get(name="MACHINE").value}, "machine": {"name": prj.projectvariable_set.get(name="MACHINE").value},
@@ -2356,11 +2356,13 @@ if toastermain.settings.MANAGED:
# returns targets provided by current project layers # returns targets provided by current project layers
if request.GET['type'] == "targets": if request.GET['type'] == "targets":
search_token = request.GET.get('value','') search_token = request.GET.get('value','')
queryset_all = Recipe.objects.filter(Q(name__icontains=search_token) | Q(layer_version__layer__name__icontains=search_token) ) queryset_all = Recipe.objects.filter(layer_version__layer__name__in = [x.layercommit.layer.name for x in prj.projectlayer_set.all().select_related("layercommit__layer")]).filter(Q(name__icontains=search_token) | Q(layer_version__layer__name__icontains=search_token))
layer_equivalent_set = []
for i in prj.projectlayer_set.all(): # layer_equivalent_set = []
layer_equivalent_set += i.layercommit.get_equivalents_wpriority(prj) # for i in prj.projectlayer_set.all().select_related("layercommit__up_branch", "layercommit__layer"):
queryset_all = queryset_all.filter(layer_version__in = layer_equivalent_set) # layer_equivalent_set += i.layercommit.get_equivalents_wpriority(prj)
# queryset_all = queryset_all.filter(layer_version__in = layer_equivalent_set)
# if we have more than one hit here (for distinct name and version), max the id it out # if we have more than one hit here (for distinct name and version), max the id it out
queryset_all_maxids = queryset_all.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id') queryset_all_maxids = queryset_all.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id')
@@ -2368,8 +2370,13 @@ if toastermain.settings.MANAGED:
return HttpResponse(jsonfilter({ "error":"ok", return HttpResponse(jsonfilter({ "error":"ok",
"list" : map ( lambda x: {"id": x.pk, "name": x.name, "detail":"[" + x.layer_version.layer.name +"]"}, "list" :
# 7152 - sort by token position
sorted (
map ( lambda x: {"id": x.pk, "name": x.name, "detail":"[" + x.layer_version.layer.name +"]"},
queryset_all[:8]), queryset_all[:8]),
key = lambda i: i["name"].find(search_token) if i["name"].find(search_token) > -1 else 9999,
)
}), content_type = "application/json") }), content_type = "application/json")
@@ -2383,7 +2390,12 @@ if toastermain.settings.MANAGED:
queryset_all = queryset_all.filter(Q(name__icontains=search_token) | Q(description__icontains=search_token)) queryset_all = queryset_all.filter(Q(name__icontains=search_token) | Q(description__icontains=search_token))
return HttpResponse(jsonfilter({ "error":"ok", return HttpResponse(jsonfilter({ "error":"ok",
"list" : map ( lambda x: {"id": x.pk, "name": x.name, "detail":"[" + x.layer_version.layer.name+ "]"}, queryset_all[:8]) "list" :
# 7152 - sort by the token position
sorted (
map ( lambda x: {"id": x.pk, "name": x.name, "detail":"[" + x.layer_version.layer.name+ "]"}, queryset_all[:8]),
key = lambda i: i["name"].find(search_token) if i["name"].find(search_token) > -1 else 9999,
)
}), content_type = "application/json") }), content_type = "application/json")
# returns all projects # returns all projects