Skip to content

Offer to search Google when no search results are returned #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonstodle wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Offer to search Google when no search results are returned #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e764d
jonstodle Jan 27, 2018
b9af28b
jonstodle Jan 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Jarvis.Addin.Files/FileProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)
return await _index.Find(query.Raw?.Trim(), CancellationToken.None).ConfigureAwait(false);
}

protected override Task<IQueryResult> CreateFallbackResult(string query)
{
throw new NotImplementedException();

@reinismu reinismu Jan 29, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think this should be here

@jonstodle jonstodle Jan 29, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is a bit temporary (forgot to add a comment about that). Any suggestions on how to handle the cases where a provider is not global provider

}

protected override Task ExecuteAsync(FileResult result)
{
if (result.Path != null)
Expand Down
7 changes: 6 additions & 1 deletion src/Jarvis.Addin.Google/GoogleProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)

return queryResults.Any()
? queryResults.Select(x => GoogleResult.Create(query, x))
: new[] { GoogleResult.Create(query, description: $"Search Google for '{query.Argument}'") };
: new[] { await CreateFallbackResult(query.Argument) };
}
}
catch (Exception e)
Expand All @@ -81,6 +81,11 @@ public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)
return Enumerable.Empty<IQueryResult>();
}

protected override Task<IQueryResult> CreateFallbackResult(string query)
{
return Task.FromResult(GoogleResult.Create(new Query($"g {query}"), description: $"Search Google for '{query}'"));
}

protected override Task ExecuteAsync(GoogleResult result)
{
Process.Start(result.Uri.AbsoluteUri);
Expand Down
16 changes: 9 additions & 7 deletions src/Jarvis.Addin.Wikipedia/WikipediaProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,7 @@ public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)

if (!results.Any())
{
var fallbackUrl = new Uri($"https://en.wikipedia.org/wiki/{Encode(query.Argument)}");
return new[]
{
(IQueryResult)new WikipediaResult(
fallbackUrl, $"Search Wikipedia for '{query.Argument}'",
fallbackUrl.AbsoluteUri, 0, 0)
};
return new[] { await CreateFallbackResult(query.Argument) };
}

return results;
Expand All @@ -97,6 +91,14 @@ public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)
return Enumerable.Empty<IQueryResult>();
}

protected override Task<IQueryResult> CreateFallbackResult(string query)
{
var fallbackUrl = new Uri($"https://en.wikipedia.org/wiki/{Encode(query)}");
return Task.FromResult((IQueryResult)new WikipediaResult(
fallbackUrl, $"Search Wikipedia for '{query}'",
fallbackUrl.AbsoluteUri, 0, 0));
}

protected override Task ExecuteAsync(WikipediaResult result)
{
Process.Start(result.Uri.AbsoluteUri);
Expand Down
1 change: 1 addition & 0 deletions src/Jarvis.Core/IQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public interface IQueryProvider

Task<ImageSource> GetIconAsync(IQueryResult result);
Task<IEnumerable<IQueryResult>> QueryAsync(Query query);
Task<IQueryResult> CreateFallbackResult(string query);
Task ExecuteAsync(IQueryResult result);
}
}
6 changes: 6 additions & 0 deletions src/Jarvis.Core/QueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ Task IQueryProvider.ExecuteAsync(IQueryResult result)
return ExecuteAsync((TResult)result);
}

Task<IQueryResult> IQueryProvider.CreateFallbackResult(string query)
{
return CreateFallbackResult(query);
}

protected abstract Task<ImageSource> GetIconAsync(TResult result);
protected abstract Task ExecuteAsync(TResult result);
protected abstract Task<IQueryResult> CreateFallbackResult(string query);

public abstract Task<IEnumerable<IQueryResult>> QueryAsync(Query query);
}
Expand Down
7 changes: 7 additions & 0 deletions src/Jarvis/Services/QueryProviderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ public async Task Query(Query query, IList<IQueryResult> target)
});

await Task.WhenAll(tasks);

if (!target.Any())
{
// Default to Google now, but may be set by user in Settings in future
var provider = GetProviders(new Query($"g {query.Raw}")).First();
target.Add(await provider.CreateFallbackResult(query.Raw));
}
}

public async Task Execute(IQueryResult result)
Expand Down