Skip to content

Commit e23c8d8

Browse files
authored
Merge branch 'dev' into improve_update
2 parents a545a40 + b898c46 commit e23c8d8

File tree

290 files changed

+8660
-2119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+8660
-2119
lines changed

.github/actions/spelling/allow.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ ssh
44
ubuntu
55
runcount
66
Firefox
7+
Português
8+
Português (Brasil)
9+
favicons
10+
moz
711
workaround

.github/actions/spelling/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,7 @@ metadatas
104104
WMP
105105
VSTHRD
106106
CJK
107+
Msix
108+
dummyprofile
109+
browserbookmark
110+
copyurl

.github/actions/spelling/patterns.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
# version suffix <word>v#
125125
(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
126126

127+
# Non-English
128+
[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
129+
130+
127131
\bjjw24\b
128132
\bappref-ms\b
129133
\bTobiasSekan\b
@@ -143,3 +147,4 @@
143147
\bXing\s*Kong\s*Jian\s*Dao\b
144148
\bDa\s*Niu\b
145149
\bXiao\s*Lang\b
150+
\b[Ss]ettings [Ss]ettings\b

.github/workflows/default_plugins.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: windows-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v4
15+
uses: actions/setup-dotnet@v5
1616
with:
1717
dotnet-version: 9.0.x
1818

.github/workflows/dotnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
NUGET_CERT_REVOCATION_MODE: offline
2121
BUILD_NUMBER: ${{ github.run_number }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Set Flow.Launcher.csproj version
2525
id: update
2626
uses: vers-one/[email protected]
@@ -29,7 +29,7 @@ jobs:
2929
"**/SolutionAssemblyInfo.cs"
3030
version: ${{ env.FlowVersion }}.${{ env.BUILD_NUMBER }}
3131
- name: Setup .NET
32-
uses: actions/setup-dotnet@v4
32+
uses: actions/setup-dotnet@v5
3333
with:
3434
dotnet-version: 9.0.x
3535
# cache: true

.github/workflows/release_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
update-pr:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

16-
- uses: actions/setup-python@v5
16+
- uses: actions/setup-python@v6
1717
with:
1818
python-version: "3.x"
1919

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
issues: write
1919
pull-requests: write
2020
steps:
21-
- uses: actions/stale@v9
21+
- uses: actions/stale@v10
2222
with:
2323
stale-issue-message: 'This issue is stale because it has been open ${{ env.days-before-stale }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.days-before-stale }} days.\n\nAlternatively this issue can be kept open by adding one of the following labels:\n${{ env.exempt-issue-labels }}'
2424
days-before-stale: ${{ env.days-before-stale }}

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
4+
<!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
5+
<CETCompat>false</CETCompat>
46
</PropertyGroup>
57
</Project>

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
1111
{
1212
internal class PythonEnvironment : AbstractPluginEnvironment
1313
{
14+
private static readonly string ClassName = nameof(PythonEnvironment);
15+
1416
internal override string Language => AllowedLanguage.Python;
1517

1618
internal override string EnvName => DataLocation.PythonEnvironmentName;
@@ -39,9 +41,20 @@ internal override void InstallEnvironment()
3941

4042
// Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
4143
// uses Python plugin they need to custom install and use v3.8.9
42-
JTF.Run(() => DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath));
44+
JTF.Run(async () =>
45+
{
46+
try
47+
{
48+
await DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath);
4349

44-
PluginsSettingsFilePath = ExecutablePath;
50+
PluginsSettingsFilePath = ExecutablePath;
51+
}
52+
catch (System.Exception e)
53+
{
54+
API.ShowMsgError(API.GetTranslation("failToInstallPythonEnv"));
55+
API.LogException(ClassName, "Failed to install Python environment", e);
56+
}
57+
});
4558
}
4659

4760
internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)

Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptEnvironment.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ namespace Flow.Launcher.Core.ExternalPlugins.Environments
1111
{
1212
internal class TypeScriptEnvironment : AbstractPluginEnvironment
1313
{
14+
private static readonly string ClassName = nameof(TypeScriptEnvironment);
15+
1416
internal override string Language => AllowedLanguage.TypeScript;
1517

1618
internal override string EnvName => DataLocation.NodeEnvironmentName;
@@ -34,9 +36,20 @@ internal override void InstallEnvironment()
3436
{
3537
FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
3638

37-
JTF.Run(() => DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath));
39+
JTF.Run(async () =>
40+
{
41+
try
42+
{
43+
await DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath);
3844

39-
PluginsSettingsFilePath = ExecutablePath;
45+
PluginsSettingsFilePath = ExecutablePath;
46+
}
47+
catch (System.Exception e)
48+
{
49+
API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
50+
API.LogException(ClassName, "Failed to install TypeScript environment", e);
51+
}
52+
});
4053
}
4154

4255
internal override PluginPair CreatePluginPair(string filePath, PluginMetadata metadata)

0 commit comments

Comments
 (0)