AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

macos: bring forward quartz search engine updates

Browse Source 
These were not cherry picked after GTK branched for 4 development.
This commit is contained in:
Christian Hergert 2020-11-17 09:36:01 -08:00
parent b76e514322
commit 33b07e4825
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtksearchenginequartz.c
View File

@ -73,12 +73,14 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
{
int i;
GList *hits = NULL;
/* The max was originally set to 1000 to mimic the Beagle backend. */
const unsigned int max_hits = 1000;
const unsigned int max_iter = submitted_hits + [ns_query resultCount];
/* The max was originally set to 1000 to mimic something called "the
* boogie backend". submitted_hits contains the number of hits we've
* processed in previous calls to this function.
*/
const unsigned int max_hits = 1000 - submitted_hits;
const unsigned int max_iter = [ns_query resultCount];
/* Here we submit hits "submitted_hits" to "resultCount" */
for (i = submitted_hits; i < max_iter && i < max_hits; ++i)
for (i = 0; i < max_iter && i < max_hits; ++i)
{
id result = [ns_query resultAtIndex:i];
const char *result_path;
@ -86,6 +88,10 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
GtkSearchHit *hit;
result_path = [[result valueForAttribute:@"kMDItemPath"] UTF8String];
if (result_path == NULL)
continue;
file = g_file_new_for_path (result_path);
hit = g_new (GtkSearchHit, 1);
@ -101,7 +107,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
if (max_iter >= max_hits)
[ns_query stopQuery];
submitted_hits = max_iter;
submitted_hits += max_iter;
}
- (void) queryUpdate:(id)sender
@ -190,6 +196,8 @@ gtk_search_engine_quartz_set_query (GtkSearchEngine *engine,
GtkQuery *query)
{
GtkSearchEngineQuartz *quartz;
const char* path = NULL;
GFile *location = NULL;
QUARTZ_POOL_ALLOC;
@ -202,11 +210,28 @@ gtk_search_engine_quartz_set_query (GtkSearchEngine *engine,
g_object_unref (quartz->priv->query);
quartz->priv->query = query;
location = gtk_query_get_location (query);
if (location)
path = g_file_peek_path (location);
/* We create a query to look for ".*text.*" in the text contents of
* all indexed files. (Should we also search for text in file and folder
* names?).
*/
if (path)
{
NSString *ns_path = [[NSString string] initWithUTF8String:path];
[quartz->priv->ns_query setSearchScopes:@[ns_path]];
}
else
{
[quartz->priv->ns_query setSearchScopes:@[NSMetadataQueryLocalComputerScope]];
}
[quartz->priv->ns_query setSearchItems:@[(NSString*)kMDItemTextContent,
(NSString*)kMDItemFSName]];
[quartz->priv->ns_query setPredicate:
[NSPredicate predicateWithFormat:
[NSString stringWithFormat:@"(kMDItemTextContent LIKE[cd] \"*%s*\")",