isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

search: survive the provider reporting the wrong number of metas

Browse Source 
If a provider crashes during GetResultMetas, or returns the wrong
number of metas, report it as failing but don't cause a JS exception.

https://bugzilla.gnome.org/show_bug.cgi?id=725020
This commit is contained in:
Giovanni Campagna 2014-02-24 17:24:42 +01:00
parent b78e00f372
commit 492558a2d2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/search.js
View File

@ -340,12 +340,22 @@ const SearchResultsBase = new Lang.Class({
})); }));
if (metasNeeded.length === 0) { if (metasNeeded.length === 0) {
callback(); callback(true);
} else { } else {
this._cancellable.cancel(); this._cancellable.cancel();
this._cancellable.reset(); this._cancellable.reset();
this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) { this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
if (metas.length == 0) {
callback(false);
return;
}
if (metas.length != metasNeeded.length) {
log('Wrong number of result metas returned by search provider');
callback(false);
return;
}
metasNeeded.forEach(Lang.bind(this, function(resultId, i) { metasNeeded.forEach(Lang.bind(this, function(resultId, i) {
let meta = metas[i]; let meta = metas[i];
let display = this._createResultDisplay(meta); let display = this._createResultDisplay(meta);
@ -353,7 +363,7 @@ const SearchResultsBase = new Lang.Class({
display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn)); display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
this._resultDisplays[resultId] = display; this._resultDisplays[resultId] = display;
})); }));
callback(); callback(true);
}), this._cancellable); }), this._cancellable);
} }
}, },
@ -370,8 +380,10 @@ const SearchResultsBase = new Lang.Class({
let results = this.provider.filterResults(providerResults, maxResults); let results = this.provider.filterResults(providerResults, maxResults);
let hasMoreResults = results.length < providerResults.length; let hasMoreResults = results.length < providerResults.length;
this._ensureResultActors(results, Lang.bind(this, function() { this._ensureResultActors(results, Lang.bind(this, function(successful) {
this._clearResultDisplay(); this._clearResultDisplay();
if (!successful)
return;
// To avoid CSS transitions causing flickering when // To avoid CSS transitions causing flickering when
// the first search result stays the same, we hide the // the first search result stays the same, we hide the