2011-11-16 18:11:05 -05:00
|
|
|
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
|
|
|
|
2019-02-08 22:21:36 -05:00
|
|
|
const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2013-11-04 10:07:44 -05:00
|
|
|
const FileUtils = imports.misc.fileUtils;
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2011-12-15 08:46:12 -05:00
|
|
|
const KEY_FILE_GROUP = 'Shell Search Provider';
|
|
|
|
|
2018-08-22 20:55:02 -04:00
|
|
|
const SearchProviderIface = `
|
|
|
|
<node>
|
|
|
|
<interface name="org.gnome.Shell.SearchProvider">
|
|
|
|
<method name="GetInitialResultSet">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="GetSubsearchResultSet">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="GetResultMetas">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="aa{sv}" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="ActivateResult">
|
|
|
|
<arg type="s" direction="in" />
|
|
|
|
</method>
|
|
|
|
</interface>
|
|
|
|
</node>`;
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2018-08-22 20:55:02 -04:00
|
|
|
const SearchProvider2Iface = `
|
|
|
|
<node>
|
|
|
|
<interface name="org.gnome.Shell.SearchProvider2">
|
|
|
|
<method name="GetInitialResultSet">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="GetSubsearchResultSet">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="as" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="GetResultMetas">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="aa{sv}" direction="out" />
|
|
|
|
</method>
|
|
|
|
<method name="ActivateResult">
|
|
|
|
<arg type="s" direction="in" />
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="u" direction="in" />
|
|
|
|
</method>
|
|
|
|
<method name="LaunchSearch">
|
|
|
|
<arg type="as" direction="in" />
|
|
|
|
<arg type="u" direction="in" />
|
|
|
|
</method>
|
|
|
|
</interface>
|
|
|
|
</node>`;
|
2012-12-05 17:20:22 -05:00
|
|
|
|
2013-09-26 07:22:22 -04:00
|
|
|
var SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
|
|
|
|
var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2015-03-20 02:58:19 -04:00
|
|
|
function loadRemoteSearchProviders(searchSettings, callback) {
|
2013-07-26 18:36:31 -04:00
|
|
|
let objectPaths = {};
|
|
|
|
let loadedProviders = [];
|
2012-06-22 11:44:15 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
function loadRemoteSearchProvider(file) {
|
|
|
|
let keyfile = new GLib.KeyFile();
|
|
|
|
let path = file.get_path();
|
2012-11-30 10:36:12 -05:00
|
|
|
|
|
|
|
try {
|
2013-07-26 18:36:31 -04:00
|
|
|
keyfile.load_from_file(path, 0);
|
2019-01-28 20:26:39 -05:00
|
|
|
} catch (e) {
|
2012-11-30 10:36:12 -05:00
|
|
|
return;
|
2011-12-15 08:46:12 -05:00
|
|
|
}
|
2012-11-01 15:55:41 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
if (!keyfile.has_group(KEY_FILE_GROUP))
|
|
|
|
return;
|
|
|
|
|
|
|
|
let remoteProvider;
|
2012-12-05 17:20:22 -05:00
|
|
|
try {
|
2013-07-26 18:36:31 -04:00
|
|
|
let group = KEY_FILE_GROUP;
|
|
|
|
let busName = keyfile.get_string(group, 'BusName');
|
|
|
|
let objectPath = keyfile.get_string(group, 'ObjectPath');
|
|
|
|
|
|
|
|
if (objectPaths[objectPath])
|
|
|
|
return;
|
|
|
|
|
|
|
|
let appInfo = null;
|
|
|
|
try {
|
|
|
|
let desktopId = keyfile.get_string(group, 'DesktopId');
|
|
|
|
appInfo = Gio.DesktopAppInfo.new(desktopId);
|
2017-11-09 12:01:58 -05:00
|
|
|
if (!appInfo.should_show())
|
|
|
|
return;
|
2013-07-26 18:36:31 -04:00
|
|
|
} catch (e) {
|
|
|
|
log('Ignoring search provider ' + path + ': missing DesktopId');
|
|
|
|
return;
|
|
|
|
}
|
2012-12-05 17:20:22 -05:00
|
|
|
|
2017-09-19 17:58:29 -04:00
|
|
|
let autoStart = true;
|
|
|
|
try {
|
|
|
|
autoStart = keyfile.get_boolean(group, 'AutoStart');
|
2019-01-28 20:26:39 -05:00
|
|
|
} catch (e) {
|
2017-09-19 17:58:29 -04:00
|
|
|
// ignore error
|
|
|
|
}
|
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
let version = '1';
|
|
|
|
try {
|
|
|
|
version = keyfile.get_string(group, 'Version');
|
|
|
|
} catch (e) {
|
|
|
|
// ignore error
|
|
|
|
}
|
2012-12-05 17:20:22 -05:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
if (version >= 2)
|
2017-09-19 17:58:29 -04:00
|
|
|
remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath, autoStart);
|
2013-07-26 18:36:31 -04:00
|
|
|
else
|
2017-09-19 17:58:29 -04:00
|
|
|
remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath, autoStart);
|
2013-07-26 18:36:31 -04:00
|
|
|
|
2014-08-01 07:35:31 -04:00
|
|
|
remoteProvider.defaultEnabled = true;
|
|
|
|
try {
|
|
|
|
remoteProvider.defaultEnabled = !keyfile.get_boolean(group, 'DefaultDisabled');
|
2019-01-28 20:26:39 -05:00
|
|
|
} catch (e) {
|
2014-08-01 07:35:31 -04:00
|
|
|
// ignore error
|
|
|
|
}
|
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
objectPaths[objectPath] = remoteProvider;
|
|
|
|
loadedProviders.push(remoteProvider);
|
2019-01-28 20:26:39 -05:00
|
|
|
} catch (e) {
|
2013-07-26 18:36:31 -04:00
|
|
|
log('Failed to add search provider %s: %s'.format(path, e.toString()));
|
|
|
|
}
|
2012-11-30 10:36:12 -05:00
|
|
|
}
|
2012-11-01 15:55:41 -04:00
|
|
|
|
2013-11-02 18:03:52 -04:00
|
|
|
if (searchSettings.get_boolean('disable-external')) {
|
|
|
|
callback([]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-04 10:07:44 -05:00
|
|
|
FileUtils.collectFromDatadirs('search-providers', false, loadRemoteSearchProvider);
|
2013-07-26 18:36:31 -04:00
|
|
|
|
2012-11-01 15:57:18 -04:00
|
|
|
let sortOrder = searchSettings.get_strv('sort-order');
|
2012-12-28 12:03:13 -05:00
|
|
|
|
|
|
|
// Special case gnome-control-center to be always active and always first
|
|
|
|
sortOrder.unshift('gnome-control-center.desktop');
|
|
|
|
|
2017-10-30 20:38:18 -04:00
|
|
|
loadedProviders = loadedProviders.filter(provider => {
|
2013-11-02 18:03:52 -04:00
|
|
|
let appId = provider.appInfo.get_id();
|
2014-08-01 07:35:31 -04:00
|
|
|
|
|
|
|
if (provider.defaultEnabled) {
|
|
|
|
let disabled = searchSettings.get_strv('disabled');
|
2018-07-14 16:56:22 -04:00
|
|
|
return !disabled.includes(appId);
|
2014-08-01 07:35:31 -04:00
|
|
|
} else {
|
|
|
|
let enabled = searchSettings.get_strv('enabled');
|
2018-07-14 16:56:22 -04:00
|
|
|
return enabled.includes(appId);
|
2014-08-01 07:35:31 -04:00
|
|
|
}
|
2013-11-02 18:03:52 -04:00
|
|
|
});
|
|
|
|
|
2017-10-30 20:38:18 -04:00
|
|
|
loadedProviders.sort((providerA, providerB) => {
|
2013-07-26 18:36:31 -04:00
|
|
|
let idxA, idxB;
|
|
|
|
let appIdA, appIdB;
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
appIdA = providerA.appInfo.get_id();
|
|
|
|
appIdB = providerB.appInfo.get_id();
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
idxA = sortOrder.indexOf(appIdA);
|
|
|
|
idxB = sortOrder.indexOf(appIdB);
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
// if no provider is found in the order, use alphabetical order
|
|
|
|
if ((idxA == -1) && (idxB == -1)) {
|
|
|
|
let nameA = providerA.appInfo.get_name();
|
|
|
|
let nameB = providerB.appInfo.get_name();
|
2013-01-28 12:04:59 -05:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
return GLib.utf8_collate(nameA, nameB);
|
|
|
|
}
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
// if providerA isn't found, it's sorted after providerB
|
|
|
|
if (idxA == -1)
|
|
|
|
return 1;
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
// if providerB isn't found, it's sorted after providerA
|
|
|
|
if (idxB == -1)
|
|
|
|
return -1;
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-07-26 18:36:31 -04:00
|
|
|
// finally, if both providers are found, return their order in the list
|
|
|
|
return (idxA - idxB);
|
|
|
|
});
|
2012-11-01 15:57:18 -04:00
|
|
|
|
2013-11-02 18:03:52 -04:00
|
|
|
callback(loadedProviders);
|
2012-11-01 15:55:41 -04:00
|
|
|
}
|
|
|
|
|
2017-10-30 21:19:44 -04:00
|
|
|
var RemoteSearchProvider = class {
|
|
|
|
constructor(appInfo, dbusName, dbusPath, autoStart, proxyInfo) {
|
2013-09-26 07:22:22 -04:00
|
|
|
if (!proxyInfo)
|
|
|
|
proxyInfo = SearchProviderProxyInfo;
|
2012-12-05 17:20:22 -05:00
|
|
|
|
2019-01-31 08:43:52 -05:00
|
|
|
let gFlags = Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES;
|
2017-09-19 17:58:29 -04:00
|
|
|
if (autoStart)
|
2019-01-31 08:43:52 -05:00
|
|
|
gFlags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION;
|
2017-08-24 07:06:45 -04:00
|
|
|
else
|
2019-01-31 08:43:52 -05:00
|
|
|
gFlags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START;
|
2017-08-24 07:06:45 -04:00
|
|
|
|
2013-09-26 07:22:22 -04:00
|
|
|
this.proxy = new Gio.DBusProxy({ g_bus_type: Gio.BusType.SESSION,
|
|
|
|
g_name: dbusName,
|
|
|
|
g_object_path: dbusPath,
|
|
|
|
g_interface_info: proxyInfo,
|
|
|
|
g_interface_name: proxyInfo.name,
|
2019-01-31 08:43:52 -05:00
|
|
|
gFlags });
|
2013-09-26 07:22:22 -04:00
|
|
|
this.proxy.init_async(GLib.PRIORITY_DEFAULT, null, null);
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2012-12-06 14:10:44 -05:00
|
|
|
this.appInfo = appInfo;
|
|
|
|
this.id = appInfo.get_id();
|
|
|
|
this.isRemoteProvider = true;
|
2017-06-12 22:24:12 -04:00
|
|
|
this.canLaunchSearch = false;
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
createIcon(size, meta) {
|
2013-12-06 06:56:43 -05:00
|
|
|
let gicon = null;
|
|
|
|
let icon = null;
|
|
|
|
|
2013-04-24 12:05:22 -04:00
|
|
|
if (meta['icon']) {
|
|
|
|
gicon = Gio.icon_deserialize(meta['icon']);
|
|
|
|
} else if (meta['gicon']) {
|
2013-01-02 09:31:50 -05:00
|
|
|
gicon = Gio.icon_new_for_string(meta['gicon']);
|
2011-11-16 18:11:05 -05:00
|
|
|
} else if (meta['icon-data']) {
|
|
|
|
let [width, height, rowStride, hasAlpha,
|
|
|
|
bitsPerSample, nChannels, data] = meta['icon-data'];
|
2013-01-02 09:31:50 -05:00
|
|
|
gicon = Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
|
|
|
|
bitsPerSample, width, height, rowStride);
|
2011-11-16 18:11:05 -05:00
|
|
|
}
|
|
|
|
|
2013-12-06 06:56:43 -05:00
|
|
|
if (gicon)
|
|
|
|
icon = new St.Icon({ gicon: gicon,
|
|
|
|
icon_size: size });
|
|
|
|
return icon;
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
filterResults(results, maxNumber) {
|
2013-05-29 16:48:30 -04:00
|
|
|
if (results.length <= maxNumber)
|
|
|
|
return results;
|
|
|
|
|
2017-10-30 20:38:18 -04:00
|
|
|
let regularResults = results.filter(r => !r.startsWith('special:'));
|
|
|
|
let specialResults = results.filter(r => r.startsWith('special:'));
|
2013-05-29 16:48:30 -04:00
|
|
|
|
|
|
|
return regularResults.slice(0, maxNumber).concat(specialResults.slice(0, maxNumber));
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2013-05-29 16:48:30 -04:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
_getResultsFinished(results, error, callback) {
|
2013-09-26 07:22:22 -04:00
|
|
|
if (error) {
|
RemoteSearch: don't complete a search that was cancelled
This closes a race between setTerms and a slow GetInitialResultSet.
The bug manifests as follows:
- initial search for a short string
- previous results === undefined, call GetInitialResultSet
- user types more, cancel previous search in setTerms()
- mainloop, then _gotResults([])
- previous results === [], !!previous results === true
- therefore call GetSubsearchResultSet with an empty list of results
- _gotResults() from GetSubsearchResultSet is empty
- much later, return from GetInitialResultSet is discarded by
cancellable
- user unhappy because what he searched for is not there
After this fix, the flow is:
- initial search for a short string
- previous results === undefined, call GetInitialResultSet
- user types more, cancel previous search in setTerms()
- mainloop, but no _gotResults
- previous results === undefined, call GetInitialResultSet again with
longer string
- some time later, return from first GetInitialResultSet is discarded
by cancellable
- soon after, return from second GetInitialResultSet comes with good
results
- user happy
https://bugzilla.gnome.org/show_bug.cgi?id=745861
2015-03-08 18:32:22 -04:00
|
|
|
if (error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
|
|
|
return;
|
|
|
|
|
|
|
|
log('Received error from DBus search provider %s: %s'.format(this.id, String(error)));
|
search: Make the internal search interface callback-based
Long ago, the search system worked in a synchronous manner: providers
were given a query, and results were collected in a single array of
[provider, results] pairs, and then the search display was updated
from that.
We introduced an asynchronous search system when we wanted to potentially
add a Zeitgeist search provider to the Shell in 3.2. For a while, search
providers were either async or sync, which worked by storing a dummy array
in the results, and adding a method for search providers to add results
later.
Later, we removed the search system entirely and ported the remaining
search providers to simply use the API to modify the empty array, but the
remains of the synchronous search system with its silly array still
lingered.
Finally, it's time to modernize. Promises^WCallbacks are the future.
Port the one remaining in-shell search engine (app search) to the new
callback based system, and simplify the remote search system in the
process.
2013-11-02 19:45:35 -04:00
|
|
|
callback([]);
|
|
|
|
return;
|
2013-09-26 07:22:22 -04:00
|
|
|
}
|
search: Make the internal search interface callback-based
Long ago, the search system worked in a synchronous manner: providers
were given a query, and results were collected in a single array of
[provider, results] pairs, and then the search display was updated
from that.
We introduced an asynchronous search system when we wanted to potentially
add a Zeitgeist search provider to the Shell in 3.2. For a while, search
providers were either async or sync, which worked by storing a dummy array
in the results, and adding a method for search providers to add results
later.
Later, we removed the search system entirely and ported the remaining
search providers to simply use the API to modify the empty array, but the
remains of the synchronous search system with its silly array still
lingered.
Finally, it's time to modernize. Promises^WCallbacks are the future.
Port the one remaining in-shell search engine (app search) to the new
callback based system, and simplify the remote search system in the
process.
2013-11-02 19:45:35 -04:00
|
|
|
|
|
|
|
callback(results[0]);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
getInitialResultSet(terms, callback, cancellable) {
|
2013-09-26 07:22:22 -04:00
|
|
|
this.proxy.GetInitialResultSetRemote(terms,
|
2017-12-01 19:27:35 -05:00
|
|
|
(results, error) => {
|
|
|
|
this._getResultsFinished(results, error, callback);
|
|
|
|
},
|
search: Make the internal search interface callback-based
Long ago, the search system worked in a synchronous manner: providers
were given a query, and results were collected in a single array of
[provider, results] pairs, and then the search display was updated
from that.
We introduced an asynchronous search system when we wanted to potentially
add a Zeitgeist search provider to the Shell in 3.2. For a while, search
providers were either async or sync, which worked by storing a dummy array
in the results, and adding a method for search providers to add results
later.
Later, we removed the search system entirely and ported the remaining
search providers to simply use the API to modify the empty array, but the
remains of the synchronous search system with its silly array still
lingered.
Finally, it's time to modernize. Promises^WCallbacks are the future.
Port the one remaining in-shell search engine (app search) to the new
callback based system, and simplify the remote search system in the
process.
2013-11-02 19:45:35 -04:00
|
|
|
cancellable);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
getSubsearchResultSet(previousResults, newTerms, callback, cancellable) {
|
2013-09-26 07:22:22 -04:00
|
|
|
this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
|
2017-12-01 19:27:35 -05:00
|
|
|
(results, error) => {
|
|
|
|
this._getResultsFinished(results, error, callback);
|
|
|
|
},
|
search: Make the internal search interface callback-based
Long ago, the search system worked in a synchronous manner: providers
were given a query, and results were collected in a single array of
[provider, results] pairs, and then the search display was updated
from that.
We introduced an asynchronous search system when we wanted to potentially
add a Zeitgeist search provider to the Shell in 3.2. For a while, search
providers were either async or sync, which worked by storing a dummy array
in the results, and adding a method for search providers to add results
later.
Later, we removed the search system entirely and ported the remaining
search providers to simply use the API to modify the empty array, but the
remains of the synchronous search system with its silly array still
lingered.
Finally, it's time to modernize. Promises^WCallbacks are the future.
Port the one remaining in-shell search engine (app search) to the new
callback based system, and simplify the remote search system in the
process.
2013-11-02 19:45:35 -04:00
|
|
|
cancellable);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
_getResultMetasFinished(results, error, callback) {
|
2011-11-16 18:11:05 -05:00
|
|
|
if (error) {
|
2013-09-26 07:22:22 -04:00
|
|
|
if (!error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
|
|
|
|
log('Received error from DBus search provider %s during GetResultMetas: %s'.format(this.id, String(error)));
|
2011-11-16 18:11:05 -05:00
|
|
|
callback([]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
let metas = results[0];
|
|
|
|
let resultMetas = [];
|
|
|
|
for (let i = 0; i < metas.length; i++) {
|
2013-04-24 12:05:22 -04:00
|
|
|
for (let prop in metas[i]) {
|
|
|
|
// we can use the serialized icon variant directly
|
|
|
|
if (prop != 'icon')
|
|
|
|
metas[i][prop] = metas[i][prop].deep_unpack();
|
|
|
|
}
|
|
|
|
|
2011-11-16 18:11:05 -05:00
|
|
|
resultMetas.push({ id: metas[i]['id'],
|
|
|
|
name: metas[i]['name'],
|
2013-02-27 11:54:09 -05:00
|
|
|
description: metas[i]['description'],
|
2017-12-01 19:27:35 -05:00
|
|
|
createIcon: size => {
|
2018-05-03 04:14:22 -04:00
|
|
|
return this.createIcon(size, metas[i]);
|
2017-12-01 19:27:35 -05:00
|
|
|
},
|
2017-05-03 04:28:31 -04:00
|
|
|
clipboardText: metas[i]['clipboardText'] });
|
2011-11-16 18:11:05 -05:00
|
|
|
}
|
|
|
|
callback(resultMetas);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
getResultMetas(ids, callback, cancellable) {
|
2013-09-26 07:22:22 -04:00
|
|
|
this.proxy.GetResultMetasRemote(ids,
|
2017-12-01 19:27:35 -05:00
|
|
|
(results, error) => {
|
|
|
|
this._getResultMetasFinished(results, error, callback);
|
|
|
|
},
|
search: Make the internal search interface callback-based
Long ago, the search system worked in a synchronous manner: providers
were given a query, and results were collected in a single array of
[provider, results] pairs, and then the search display was updated
from that.
We introduced an asynchronous search system when we wanted to potentially
add a Zeitgeist search provider to the Shell in 3.2. For a while, search
providers were either async or sync, which worked by storing a dummy array
in the results, and adding a method for search providers to add results
later.
Later, we removed the search system entirely and ported the remaining
search providers to simply use the API to modify the empty array, but the
remains of the synchronous search system with its silly array still
lingered.
Finally, it's time to modernize. Promises^WCallbacks are the future.
Port the one remaining in-shell search engine (app search) to the new
callback based system, and simplify the remote search system in the
process.
2013-11-02 19:45:35 -04:00
|
|
|
cancellable);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
activateResult(id) {
|
2012-12-05 17:20:22 -05:00
|
|
|
this.proxy.ActivateResultRemote(id);
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2012-11-26 16:55:25 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
launchSearch(terms) {
|
2012-11-26 16:55:25 -05:00
|
|
|
// the provider is not compatible with the new version of the interface, launch
|
|
|
|
// the app itself but warn so we can catch the error in logs
|
|
|
|
log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
|
2017-07-14 21:42:06 -04:00
|
|
|
this.appInfo.launch([], global.create_app_launch_context(0, -1));
|
2011-11-16 18:11:05 -05:00
|
|
|
}
|
2017-10-30 21:19:44 -04:00
|
|
|
};
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 21:19:44 -04:00
|
|
|
var RemoteSearchProvider2 = class extends RemoteSearchProvider {
|
|
|
|
constructor(appInfo, dbusName, dbusPath, autoStart) {
|
|
|
|
super(appInfo, dbusName, dbusPath, autoStart, SearchProvider2ProxyInfo);
|
2012-11-26 16:55:25 -05:00
|
|
|
|
|
|
|
this.canLaunchSearch = true;
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2011-11-16 18:11:05 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
activateResult(id, terms) {
|
2012-12-05 11:48:22 -05:00
|
|
|
this.proxy.ActivateResultRemote(id, terms, global.get_current_time());
|
2017-10-30 21:19:44 -04:00
|
|
|
}
|
2012-11-26 16:55:25 -05:00
|
|
|
|
2017-10-30 20:03:21 -04:00
|
|
|
launchSearch(terms) {
|
2012-12-10 15:47:25 -05:00
|
|
|
this.proxy.LaunchSearchRemote(terms, global.get_current_time());
|
2012-12-05 17:20:22 -05:00
|
|
|
}
|
2017-10-30 21:19:44 -04:00
|
|
|
};
|