Skip to content

Commit

Permalink
Merge branch 'release/0.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
patriksvensson committed Jan 10, 2018
2 parents cc4d8eb + 65e82d4 commit b0cd7d7
Show file tree
Hide file tree
Showing 58 changed files with 802 additions and 396 deletions.
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@
installer/chocolatey/chocolateyinstall.ps1

# Cake
tools/Cake/
tools/Cake.*/
tools/Cake.CoreCLR/
tools/Cake.Bakery/
tools/xunit.runners/
tools/xunit.runner.console/
tools/nuget.exe
tools/gitversion.commandline*
tools/wix.3.11.0/
tools/chocolatey.0.10.8/
tools/xunit.runner.console.2.3.1/
tools/wix.*/
tools/chocolatey.*/
tools/xunit.runner.console.*/
tools/Addins/
tools/packages.config.md5sum

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Jarvis is an [Alfred](https://www.alfredapp.com/) alternative for Windows 10.

Jarvis is currently under development, and all features are not there yet. Pull requests are currently only accepted for things like performance/memory optimizations and bugs at the moment until everything's more stabile. If there's a feature that you would like to see in Jarvis, then please submit an [issue](https://github.com/spectresystems/jarvis/issues).
Jarvis is currently under development, and all features are not there yet. Pull requests are currently only accepted for things like performance/memory optimizations and bugs at the moment until everything's more stable. If there's a feature that you would like to see in Jarvis, then please submit an [issue](https://github.com/spectresystems/jarvis/issues).

![Test](/docs/images/jarvis.gif)

Expand Down
26 changes: 26 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Build script
init:
- git config --global core.autocrlf true

# Build script
build_script:
- ps: .\build.ps1

# Tests
test: off

# Branches to build
branches:
# Whitelist
only:
- develop
- master
- /r/.*/
- /release/.*/
- /hotfix/.*/
- /feature/.*/

# Build cache
cache:
- tools -> build.cake
- packages -> build.cake
251 changes: 33 additions & 218 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,235 +1,50 @@
##########################################################################
# This is the Cake bootstrapper script for PowerShell.
# This file was downloaded from https://github.com/cake-build/resources
# Feel free to change this file to fit your needs.
##########################################################################

<#
.SYNOPSIS
This is a Powershell script to bootstrap a Cake build.
.DESCRIPTION
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
and execute your Cake build script with the parameters you provide.
.PARAMETER Script
The build script to execute.
.PARAMETER Target
The build script target to run.
.PARAMETER Configuration
The build configuration to use.
.PARAMETER Verbosity
Specifies the amount of information to be displayed.
.PARAMETER ShowDescription
Shows description about tasks.
.PARAMETER DryRun
Performs a dry run.
.PARAMETER Experimental
Uses the nightly builds of the Roslyn script engine.
.PARAMETER Mono
Uses the Mono Compiler rather than the Roslyn script engine.
.PARAMETER SkipToolPackageRestore
Skips restoring of packages.
.PARAMETER ScriptArgs
Remaining arguments are added here.
.LINK
https://cakebuild.net
#>

[CmdletBinding()]
Param(
[string]$Script = "build.cake",
[string]$Target,
[string]$Configuration,
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
[string]$Verbosity,
[switch]$ShowDescription,
[Alias("WhatIf", "Noop")]
[switch]$DryRun,
[switch]$Experimental,
[switch]$Mono,
[switch]$SkipToolPackageRestore,
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
[string[]]$ScriptArgs
)

[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
function MD5HashFile([string] $filePath)
{
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
{
return $null
}

[System.IO.Stream] $file = $null;
[System.Security.Cryptography.MD5] $md5 = $null;
try
{
$md5 = [System.Security.Cryptography.MD5]::Create()
$file = [System.IO.File]::OpenRead($filePath)
return [System.BitConverter]::ToString($md5.ComputeHash($file))
}
finally
{
if ($file -ne $null)
{
$file.Dispose()
}
}
}

function GetProxyEnabledWebClient
{
$wc = New-Object System.Net.WebClient
$proxy = [System.Net.WebRequest]::GetSystemWebProxy()
$proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
$wc.Proxy = $proxy
return $wc
}

Write-Host "Preparing to run build script..."

if(!$PSScriptRoot){
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
}

$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
$ENV:CAKE_NUGET_USEINPROCESSCLIENT='true'
$ToolPath = Join-Path $PSScriptRoot "tools"
$NugetPath = Join-Path $ToolPath "nuget.exe"
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$CakeVersion = "0.24.0"

# Make sure tools folder exists
if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
Write-Verbose -Message "Creating tools directory..."
New-Item -Path $TOOLS_DIR -Type directory | out-null
}

# Make sure that packages.config exist.
if (!(Test-Path $PACKAGES_CONFIG)) {
Write-Verbose -Message "Downloading packages.config..."
try {
$wc = GetProxyEnabledWebClient
$wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
Throw "Could not download packages.config."
}
}

# Try find NuGet.exe in path if not exists
if (!(Test-Path $NUGET_EXE)) {
Write-Verbose -Message "Trying to find nuget.exe in PATH..."
$existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
$NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
$NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
}
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
if (!(Test-Path $ToolPath)) {
Write-Verbose "Creating tools directory..."
New-Item -Path $ToolPath -Type directory | out-null
}

# Try download NuGet.exe if not exists
if (!(Test-Path $NUGET_EXE)) {
if (!(Test-Path $NugetPath)) {
Write-Verbose -Message "Downloading NuGet.exe..."
try {
$wc = GetProxyEnabledWebClient
$wc.DownloadFile($NUGET_URL, $NUGET_EXE)
} catch {
Throw "Could not download NuGet.exe."
}
}

# Save nuget.exe path to environment to be available to child processed
$ENV:NUGET_EXE = $NUGET_EXE

# Restore tools from NuGet?
if(-Not $SkipToolPackageRestore.IsPresent) {
Push-Location
Set-Location $TOOLS_DIR

# Check for changes in packages.config and remove installed tools if true.
[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
Write-Verbose -Message "Missing or changed package.config hash..."
Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
Remove-Item -Recurse
}

Write-Verbose -Message "Restoring tools from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet tools."
}
else
{
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
}
Write-Verbose -Message ($NuGetOutput | out-string)

Pop-Location
(New-Object System.Net.WebClient).DownloadFile($NugetUrl, $NugetPath)
}

# Restore addins from NuGet
if (Test-Path $ADDINS_PACKAGES_CONFIG) {
Push-Location
Set-Location $ADDINS_DIR
###########################################################################
# INSTALL CAKE
###########################################################################

Write-Verbose -Message "Restoring addins from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet addins."
}

Write-Verbose -Message ($NuGetOutput | out-string)
Add-Type -AssemblyName System.IO.Compression.FileSystem
Function Unzip
{
param([string]$zipfile, [string]$outpath)

Pop-Location
[System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath)
}

# Restore modules from NuGet
if (Test-Path $MODULES_PACKAGES_CONFIG) {
Push-Location
Set-Location $MODULES_DIR

Write-Verbose -Message "Restoring modules from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet modules."
}

Write-Verbose -Message ($NuGetOutput | out-string)
# Make sure Cake has been installed.
#https://www.nuget.org/api/v2/package
$NugetFeed = 'https://www.myget.org/F/cake/api/v2/package'

Pop-Location
$CakePath = Join-Path $ToolPath "cake.$CakeVersion/Cake.exe"
if (!(Test-Path $CakePath)) {
Write-Host "Installing Cake..."
(New-Object System.Net.WebClient).DownloadFile("$NugetFeed/Cake/$CakeVersion", "$ToolPath\Cake.zip")
Unzip "$ToolPath\Cake.zip" "$ToolPath/cake.$CakeVersion"
Remove-Item "$ToolPath\Cake.zip"
}

# Make sure that Cake has been installed.
if (!(Test-Path $CAKE_EXE)) {
Throw "Could not find Cake.exe at $CAKE_EXE"
}



# Build Cake arguments
$cakeArguments = @("$Script");
if ($Target) { $cakeArguments += "-target=$Target" }
if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
if ($ShowDescription) { $cakeArguments += "-showdescription" }
if ($DryRun) { $cakeArguments += "-dryrun" }
if ($Experimental) { $cakeArguments += "-experimental" }
if ($Mono) { $cakeArguments += "-mono" }
$cakeArguments += $ScriptArgs
###########################################################################
# RUN BUILD SCRIPT
###########################################################################

# Start Cake
Write-Host "Running build script..."
&$CAKE_EXE $cakeArguments
exit $LASTEXITCODE
&"$CakePath" $args
exit $LASTEXITCODE
10 changes: 1 addition & 9 deletions installer/wix/Jarvis.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Custom Action="WixCloseApplications" Before="InstallInitialize" />
</InstallExecuteSequence>

<util:CloseApplication Id="CloseApp" RebootPrompt="no" Target="Jarvis.exe" />
<util:CloseApplication Id="CloseApp" RebootPrompt="no" CloseMessage="yes" Target="Jarvis.exe" />

<Icon Id="Jarvis.exe" SourceFile="$(var.PublishDirectory)\Jarvis.exe" />
<Property Id="ARPPRODUCTICON" Value="Jarvis.exe" />
Expand Down Expand Up @@ -83,12 +83,6 @@
<Component Id="Microsoft.Threading.Tasks.Extensions.dll" Guid="8475143C-877E-4DF5-8D50-B6276817C1DB">
<File Id="Microsoft.Threading.Tasks.Extensions.dll" Source="$(var.PublishDirectory)\Microsoft.Threading.Tasks.Extensions.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="Nito.AsyncEx.dll" Guid="B27845EE-56BF-4463-A95C-1C91D95FC163">
<File Id="Nito.AsyncEx.dll" Source="$(var.PublishDirectory)\Nito.AsyncEx.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="Nito.AsyncEx.Enlightenment.dll" Guid="9305DC51-2DA3-418C-9FF6-3C469E80C868">
<File Id="Nito.AsyncEx.Enlightenment.dll" Source="$(var.PublishDirectory)\Nito.AsyncEx.Enlightenment.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="Serilog.dll" Guid="AB8EA697-03B4-46D6-ADCC-9B4FA51B4E6E">
<File Id="Serilog.dll" Source="$(var.PublishDirectory)\Serilog.dll" KeyPath="yes" Checksum="yes" />
</Component>
Expand Down Expand Up @@ -120,8 +114,6 @@
<ComponentRef Id="Microsoft.Threading.Tasks.dll" />
<ComponentRef Id="Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
<ComponentRef Id="Microsoft.Threading.Tasks.Extensions.dll" />
<ComponentRef Id="Nito.AsyncEx.dll" />
<ComponentRef Id="Nito.AsyncEx.Enlightenment.dll" />
<ComponentRef Id="Serilog.dll" />
<ComponentRef Id="Serilog.Sinks.File.dll" />
<ComponentRef Id="Spectre.System.dll" />
Expand Down
8 changes: 4 additions & 4 deletions src/Jarvis.Addin.Files/FileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ public FileProvider(IFileIndex index, IconLoader loader)
_loader = loader;
}

protected override async Task<ImageSource> GetIcon(FileResult result)
protected override async Task<ImageSource> GetIconAsync(FileResult result)
{
return await _loader.LoadAsync(result);
}

public override async Task<IEnumerable<IQueryResult>> Query(Query query, bool fallback)
public override async Task<IEnumerable<IQueryResult>> QueryAsync(Query query)
{
if (query.Raw?.Length <= 1 || fallback)
if (query.Raw?.Length <= 1)
{
return Enumerable.Empty<IQueryResult>();
}
return await _index.Find(query.Raw?.Trim(), CancellationToken.None).ConfigureAwait(false);
}

protected override Task Execute(FileResult result)
protected override Task ExecuteAsync(FileResult result)
{
if (result.Path != null)
{
Expand Down
Loading

0 comments on commit b0cd7d7

Please sign in to comment.