From b63719af5ce08a917790111cf15d03343b2d1717 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 23 Apr 2020 22:12:20 +1000 Subject: [PATCH 01/11] Update Roaming folder name to Flow Launcher from Flow.Launcher --- Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs index f6837bda2..defad35a4 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs @@ -12,7 +12,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public const string PortableFolderName = "UserData"; public const string DeletionIndicatorFile = ".dead"; public static string PortableDataPath = Path.Combine(Constant.ProgramDirectory, PortableFolderName); - public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Constant.FlowLauncher); + public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Flow Launcher"); public static string DataDirectory() { if (PortableDataLocationInUse()) From 9070e41ae27c605ee10dc4bcca79c299fd130794 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 23 Apr 2020 22:18:49 +1000 Subject: [PATCH 02/11] Update version text --- Flow.Launcher/SettingWindow.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index fc9c44201..be87e4f52 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -387,7 +387,7 @@ - + From c7fd64aff0704237990d20987142b62ff4ad16f7 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 23 Apr 2020 22:28:58 +1000 Subject: [PATCH 03/11] Rename url and file name --- Plugins/HelloWorldPython/plugin.json | 2 +- Scripts/{wox.nuspec => flowlauncher.nuspec} | 0 Scripts/{wox.plugin.nuspec => flowlauncher.plugin.nuspec} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename Scripts/{wox.nuspec => flowlauncher.nuspec} (100%) rename Scripts/{wox.plugin.nuspec => flowlauncher.plugin.nuspec} (100%) diff --git a/Plugins/HelloWorldPython/plugin.json b/Plugins/HelloWorldPython/plugin.json index 459868b8e..6aa2fee56 100644 --- a/Plugins/HelloWorldPython/plugin.json +++ b/Plugins/HelloWorldPython/plugin.json @@ -6,7 +6,7 @@ "Author":"happlebao", "Version":"1.0", "Language":"python", - "Website":"https://github.com/wox-launcher/wox", + "Website":"https://github.com/Flow-Launcher/Flow.Launcher", "IcoPath":"Images\\app.png", "ExecuteFileName":"main.py" } diff --git a/Scripts/wox.nuspec b/Scripts/flowlauncher.nuspec similarity index 100% rename from Scripts/wox.nuspec rename to Scripts/flowlauncher.nuspec diff --git a/Scripts/wox.plugin.nuspec b/Scripts/flowlauncher.plugin.nuspec similarity index 100% rename from Scripts/wox.plugin.nuspec rename to Scripts/flowlauncher.plugin.nuspec From 51ab1e658695a9c9c4c5794c1d60eb2316ddf932 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 23 Apr 2020 22:32:06 +1000 Subject: [PATCH 04/11] Rename post build script --- Scripts/flowlauncher.nuspec | 2 +- Scripts/post_build.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec index 530aabf3f..ba42c77f3 100644 --- a/Scripts/flowlauncher.nuspec +++ b/Scripts/flowlauncher.nuspec @@ -1,7 +1,7 @@ - Flow.Launcher-JJW24 + Flow.Launcher Flow Launcher $version$ happlebao, Jeremy Wu diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1 index f9889df04..9b5b433c5 100644 --- a/Scripts/post_build.ps1 +++ b/Scripts/post_build.ps1 @@ -74,7 +74,7 @@ function Zip-Release ($path, $version, $output) { $input = "$path\Output\Release" Write-Host "Input path: $input" - $file = "$output\Flow.Launcher-JJW24-$version.zip" + $file = "$output\Flow.Launcher-$version.zip" Write-Host "Filename: $file" [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") @@ -93,7 +93,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) { Write-Host "Input path: $input" Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory $output - $nupkg = "$output\Flow.Launcher-JJW24.$version.nupkg" + $nupkg = "$output\Flow.Launcher.$version.nupkg" Write-Host "nupkg path: $nupkg" $icon = "$path\Flow.Launcher\Resources\app.ico" Write-Host "icon: $icon" @@ -107,7 +107,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) { Move-Item $temp\* $output -Force Remove-Item $temp - $file = "$output\Flow.Launcher-JJW24-$version.exe" + $file = "$output\Flow.Launcher-$version.exe" Write-Host "Filename: $file" Move-Item "$output\Setup.exe" $file -Force From 8c519cf412ede1f9070509785b8ad57800026545 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 23 Apr 2020 22:45:53 +1000 Subject: [PATCH 05/11] Reset version --- SolutionAssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs index 297f69cf6..1482bce9e 100644 --- a/SolutionAssemblyInfo.cs +++ b/SolutionAssemblyInfo.cs @@ -16,6 +16,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.0.0")] -[assembly: AssemblyFileVersion("2.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyFileVersion("1.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0")] \ No newline at end of file From 5a45591550cde4b4843d9b8d3b68d9f519becf4e Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 24 Apr 2020 07:49:16 +1000 Subject: [PATCH 06/11] Fix python plugin template names --- Plugins/HelloWorldPython/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/HelloWorldPython/main.py b/Plugins/HelloWorldPython/main.py index 7855966c0..6fa1b86ee 100644 --- a/Plugins/HelloWorldPython/main.py +++ b/Plugins/HelloWorldPython/main.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -from flowlauncher import Flow.Launcher +from flow.launcher import Flow.Launcher -class HelloWorld(Flow.Launcher): +class HelloWorld(FlowLauncher): def query(self, query): results = [] From a60b840837ea475ac32923f37f5137c2cabef546 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 24 Apr 2020 12:15:23 +1000 Subject: [PATCH 07/11] Update- remove dot. Directory name will be FlowLauncher when nuget pack ignores the dot so instead of getting Flow.Launcher as parent directory name we get Flow --- Scripts/flowlauncher.nuspec | 2 +- Scripts/post_build.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec index ba42c77f3..cfac20b06 100644 --- a/Scripts/flowlauncher.nuspec +++ b/Scripts/flowlauncher.nuspec @@ -1,7 +1,7 @@ - Flow.Launcher + FlowLauncher Flow Launcher $version$ happlebao, Jeremy Wu diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1 index 9b5b433c5..14faf82b1 100644 --- a/Scripts/post_build.ps1 +++ b/Scripts/post_build.ps1 @@ -93,7 +93,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) { Write-Host "Input path: $input" Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory $output - $nupkg = "$output\Flow.Launcher.$version.nupkg" + $nupkg = "$output\FlowLauncher.$version.nupkg" Write-Host "nupkg path: $nupkg" $icon = "$path\Flow.Launcher\Resources\app.ico" Write-Host "icon: $icon" @@ -107,7 +107,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) { Move-Item $temp\* $output -Force Remove-Item $temp - $file = "$output\Flow.Launcher-$version.exe" + $file = "$output\Flow Launcher-$version.exe" Write-Host "Filename: $file" Move-Item "$output\Setup.exe" $file -Force From 7775837c49de25e68f78dd479781a32ecf46505a Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 24 Apr 2020 12:15:49 +1000 Subject: [PATCH 08/11] Update roaming directory name to be consistent with parent --- Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs index defad35a4..310c1e33a 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs @@ -12,7 +12,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public const string PortableFolderName = "UserData"; public const string DeletionIndicatorFile = ".dead"; public static string PortableDataPath = Path.Combine(Constant.ProgramDirectory, PortableFolderName); - public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Flow Launcher"); + public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher"); public static string DataDirectory() { if (PortableDataLocationInUse()) From b786b1cadbd1a2c904fa6cb97471c91289468920 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 24 Apr 2020 18:43:01 +1000 Subject: [PATCH 09/11] Update portable's roaming folder string to be consistent --- Flow.Launcher.Core/Configuration/Portable.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs index 421754c1e..f239bec0d 100644 --- a/Flow.Launcher.Core/Configuration/Portable.cs +++ b/Flow.Launcher.Core/Configuration/Portable.cs @@ -148,7 +148,7 @@ namespace Flow.Launcher.Core.Configuration { // Specify here so this method does not rely on other environment variables to initialise var portableDataPath = Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location.NonNull()).ToString(), "UserData"); - var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Flow.Launcher"); + var roamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher"); bool DataLocationPortableDeleteRequired = false; bool DataLocationRoamingDeleteRequired = false; From ee5345a34683fbf4124451b49509fdcff7b64616 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Fri, 24 Apr 2020 18:49:24 +1000 Subject: [PATCH 10/11] Change to get application folder name dynamically so this is that the portable version can have the folder name changed to anything else and will still work --- Flow.Launcher.Core/Configuration/Portable.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs index f239bec0d..d08c9ae2c 100644 --- a/Flow.Launcher.Core/Configuration/Portable.cs +++ b/Flow.Launcher.Core/Configuration/Portable.cs @@ -8,6 +8,7 @@ using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure.Logger; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin.SharedCommands; +using System.Linq; namespace Flow.Launcher.Core.Configuration { @@ -19,7 +20,11 @@ namespace Flow.Launcher.Core.Configuration /// private UpdateManager NewUpdateManager() { - return new UpdateManager(string.Empty, Constant.FlowLauncher, Constant.RootDirectory); + var applicationFolderName = Constant.ApplicationDirectory + .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None) + .Last(); + + return new UpdateManager(string.Empty, applicationFolderName, Constant.RootDirectory); } public void DisablePortableMode() From 8f31670f3d86605e54775af05a140f6c09ed6b5e Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sat, 25 Apr 2020 12:40:14 +1000 Subject: [PATCH 11/11] rename- Fix python class names --- JsonRPC/wox.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JsonRPC/wox.py b/JsonRPC/wox.py index 4f5fb939b..1beaa1d7e 100644 --- a/JsonRPC/wox.py +++ b/JsonRPC/wox.py @@ -4,7 +4,7 @@ import json import sys import inspect -class Flow.Launcher(object): +class FlowLauncher(object): """ Flow.Launcher python plugin base """ @@ -42,7 +42,7 @@ class Flow.Launcher(object): print("DEBUG:{}".format(msg)) sys.exit() -class Flow.LauncherAPI(object): +class FlowLauncherAPI(object): @classmethod def change_query(cls,query,requery = False):