Skip to content

Commit 9b8c1c4

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into net9
2 parents d59ed32 + d400cda commit 9b8c1c4

File tree

11 files changed

+54
-39
lines changed

11 files changed

+54
-39
lines changed

‎.github/actions/spelling/allow.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ ssh
44
ubuntu
55
runcount
66
Firefox
7-
Português
8-
Português (Brasil)
7+
workaround

‎.github/actions/spelling/expect.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,3 @@ metadatas
104104
WMP
105105
VSTHRD
106106
CJK
107-
XiaoHe
108-
ZiRanMa
109-
WeiRuan
110-
ZhiNengABC
111-
ZiGuangPinYin
112-
PinYinJiaJia
113-
XingKongJianDao
114-
DaNiu
115-
XiaoLang

‎.github/actions/spelling/patterns.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,12 @@
134134
\bčeština\b
135135
\bPortuguês\b
136136
\bIoc\b
137+
\bXiao\s*He\b
138+
\bZi\s*Ran\s*Ma\b
139+
\bWei\s*Ruan\b
140+
\bZhi\s*Neng\s*ABC\b
141+
\bZi\s*Guang\s*Pin\s*Yin\b
142+
\bPin\s*Yin\s*Jia\s*Jia\b
143+
\bXing\s*Kong\s*Jian\s*Dao\b
144+
\bDa\s*Niu\b
145+
\bXiao\s*Lang\b

‎.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
runs-on: windows-latest
1818
env:
19-
FlowVersion: 1.19.5
19+
FlowVersion: 1.20.2
2020
NUGET_CERT_REVOCATION_MODE: offline
2121
BUILD_NUMBER: ${{ github.run_number }}
2222
steps:

‎.github/workflows/spelling.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
- name: check-spelling
7474
id: spelling
75-
uses: check-spelling/check-spelling@prerelease
75+
uses: check-spelling/check-spelling@v0.0.25
7676
with:
7777
suppress_push_for_open_pull_request: 1
7878
checkout: true
@@ -128,7 +128,7 @@ jobs:
128128
if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
129129
steps:
130130
- name: comment
131-
uses: check-spelling/check-spelling@prerelease
131+
uses: check-spelling/check-spelling@v0.0.25
132132
with:
133133
checkout: true
134134
spell_check_this: check-spelling/spell-check-this@main

‎Flow.Launcher.Core/Flow.Launcher.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<PackageReference Include="FSharp.Core" Version="9.0.201" />
5959
<PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
6060
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
61+
<PackageReference Include="SemanticVersioning" Version="3.0.0" />
6162
<PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
6263
<PackageReference Include="StreamJsonRpc" Version="2.21.10" />
6364
</ItemGroup>

‎Flow.Launcher.Core/Updater.cs

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
4949
// UpdateApp CheckForUpdate will return value only if the app is squirrel installed
5050
var newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
5151

52-
var newReleaseVersion = Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
53-
var currentVersion = Version.Parse(Constant.Version);
52+
var newReleaseVersion =
53+
SemanticVersioning.Version.Parse(newUpdateInfo.FutureReleaseEntry.Version.ToString());
54+
var currentVersion = SemanticVersioning.Version.Parse(Constant.Version);
5455

5556
_api.LogInfo(ClassName, $"Future Release <{Formatted(newUpdateInfo.FutureReleaseEntry)}>");
5657

@@ -71,10 +72,13 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
7172

7273
if (DataLocation.PortableDataLocationInUse())
7374
{
74-
var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion}\\{DataLocation.PortableFolderName}";
75+
var targetDestination = updateManager.RootAppDirectory +
76+
$"\\app-{newReleaseVersion}\\{DataLocation.PortableFolderName}";
7577
FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination, (s) => _api.ShowMsgBox(s));
76-
if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination, (s) => _api.ShowMsgBox(s)))
77-
_api.ShowMsgBox(string.Format(_api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
78+
if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination,
79+
(s) => _api.ShowMsgBox(s)))
80+
_api.ShowMsgBox(string.Format(
81+
_api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
7882
DataLocation.PortableDataPath,
7983
targetDestination));
8084
}
@@ -87,22 +91,25 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
8791

8892
_api.LogInfo(ClassName, $"Update success:{newVersionTips}");
8993

90-
if (_api.ShowMsgBox(newVersionTips, _api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
94+
if (_api.ShowMsgBox(newVersionTips, _api.GetTranslation("update_flowlauncher_new_update"),
95+
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
9196
{
9297
UpdateManager.RestartApp(Constant.ApplicationFileName);
9398
}
9499
}
95100
catch (Exception e)
96101
{
97-
if (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
102+
if (e is HttpRequestException or WebException or SocketException ||
103+
e.InnerException is TimeoutException)
98104
{
99-
_api.LogException(ClassName, $"Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
105+
_api.LogException(ClassName,
106+
$"Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
100107
}
101108
else
102109
{
103110
_api.LogException(ClassName, $"Error Occurred", e);
104111
}
105-
112+
106113
if (!silentUpdate)
107114
_api.ShowMsg(_api.GetTranslation("update_flowlauncher_fail"),
108115
_api.GetTranslation("update_flowlauncher_check_connection"));
@@ -116,14 +123,11 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
116123
[UsedImplicitly]
117124
private class GithubRelease
118125
{
119-
[JsonPropertyName("prerelease")]
120-
public bool Prerelease { get; [UsedImplicitly] set; }
126+
[JsonPropertyName("prerelease")] public bool Prerelease { get; [UsedImplicitly] set; }
121127

122-
[JsonPropertyName("published_at")]
123-
public DateTime PublishedAt { get; [UsedImplicitly] set; }
128+
[JsonPropertyName("published_at")] public DateTime PublishedAt { get; [UsedImplicitly] set; }
124129

125-
[JsonPropertyName("html_url")]
126-
public string HtmlUrl { get; [UsedImplicitly] set; }
130+
[JsonPropertyName("html_url")] public string HtmlUrl { get; [UsedImplicitly] set; }
127131
}
128132

129133
// https://github.com/Squirrel/Squirrel.Windows/blob/master/src/Squirrel/UpdateManager.Factory.cs
@@ -138,10 +142,7 @@ private static async Task<UpdateManager> GitHubUpdateManagerAsync(string reposit
138142
var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
139143
var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
140144

141-
var client = new WebClient
142-
{
143-
Proxy = Http.WebProxy
144-
};
145+
var client = new WebClient { Proxy = Http.WebProxy };
145146
var downloader = new FileDownloader(client);
146147

147148
var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
@@ -158,10 +159,7 @@ private string NewVersionTips(string version)
158159

159160
private static string Formatted<T>(T t)
160161
{
161-
var formatted = JsonSerializer.Serialize(t, new JsonSerializerOptions
162-
{
163-
WriteIndented = true
164-
});
162+
var formatted = JsonSerializer.Serialize(t, new JsonSerializerOptions { WriteIndented = true });
165163

166164
return formatted;
167165
}

‎Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<system:String x:Key="ShouldUsePinyin">Search with Pinyin</system:String>
108108
<system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.</system:String>
109109
<system:String x:Key="ShouldUseDoublePinyin">Use Double Pinyin</system:String>
110-
<system:String x:Key="ShouldUseDoublePinyinToolTip">Allows using Double Pinyin to search. Double Pinyin is a variation of Pinyin that uses two characters.</system:String>
110+
<system:String x:Key="ShouldUseDoublePinyinToolTip">Use Double Pinyin instead of Full Pinyin to search.</system:String>
111111
<system:String x:Key="DoublePinyinSchema">Double Pinyin Schema</system:String>
112112
<system:String x:Key="DoublePinyinSchemasXiaoHe">Xiao He</system:String>
113113
<system:String x:Key="DoublePinyinSchemasZiRanMa">Zi Ran Ma</system:String>

‎Flow.Launcher/MessageBoxEx.xaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ public static MessageBoxResult Show(
3737
try
3838
{
3939
msgBox = new MessageBoxEx(button);
40-
if (caption == string.Empty && button == MessageBoxButton.OK && icon == MessageBoxImage.None)
40+
if (caption == string.Empty && icon == MessageBoxImage.None)
4141
{
42+
// If there is no caption and no icon, use DescOnlyTextBlock for vertically centered text
4243
msgBox.Title = messageBoxText;
4344
msgBox.DescOnlyTextBlock.Visibility = Visibility.Visible;
4445
msgBox.DescOnlyTextBlock.Text = messageBoxText;

‎Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<system:String x:Key="plugin_explorer_make_selection_warning">Please make a selection first</system:String>
88
<system:String x:Key="plugin_explorer_quick_access_link_no_folder_selected">Please select a folder path.</system:String>
99
<system:String x:Key="plugin_explorer_quick_access_link_path_already_exists">Please choose a different name or folder path.</system:String>
10+
<system:String x:Key="plugin_explorer_delete_quick_access_link">Are you sure you want to delete this quick access link?</system:String>
11+
<system:String x:Key="plugin_explorer_delete_index_search_excluded_path">Are you sure you want to delete this index search excluded path?</system:String>
1012
<system:String x:Key="plugin_explorer_select_folder_link_warning">Please select a folder link</system:String>
1113
<system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
1214
<system:String x:Key="plugin_explorer_deletefileconfirm">Are you sure you want to permanently delete this file?</system:String>

0 commit comments

Comments
 (0)