Skip to content

Commit 45bb6e9

Browse files
authored
Merge branch 'dev' into url_open_enhancement
2 parents 3f6bebd + b898c46 commit 45bb6e9

File tree

37 files changed

+216
-169
lines changed

37 files changed

+216
-169
lines changed

.github/workflows/default_plugins.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- 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 }}

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
4343
if (results.Count == 0)
4444
return false;
4545

46-
lastFetchedAt = DateTime.Now;
47-
4846
var updatedPluginResults = new List<UserPlugin>();
4947
var appVersion = SemanticVersioning.Version.Parse(Constant.Version);
5048

@@ -56,6 +54,8 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
5654

5755
UserPlugins = updatedPluginResults;
5856

57+
lastFetchedAt = DateTime.Now;
58+
5959
return true;
6060
}
6161
}
@@ -73,10 +73,22 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
7373

7474
private static bool IsMinimumAppVersionSatisfied(UserPlugin plugin, SemanticVersioning.Version appVersion)
7575
{
76-
if (string.IsNullOrEmpty(plugin.MinimumAppVersion) || appVersion >= SemanticVersioning.Version.Parse(plugin.MinimumAppVersion))
76+
if (string.IsNullOrEmpty(plugin.MinimumAppVersion))
7777
return true;
7878

79-
API.LogDebug(ClassName, $"Plugin {plugin.Name} requires minimum Flow Launcher version {plugin.MinimumAppVersion}, "
79+
try
80+
{
81+
if (appVersion >= SemanticVersioning.Version.Parse(plugin.MinimumAppVersion))
82+
return true;
83+
}
84+
catch (Exception e)
85+
{
86+
API.LogException(ClassName, $"Failed to parse the minimum app version {plugin.MinimumAppVersion} for plugin {plugin.Name}. "
87+
+ "Plugin excluded from manifest", e);
88+
return false;
89+
}
90+
91+
API.LogInfo(ClassName, $"Plugin {plugin.Name} requires minimum Flow Launcher version {plugin.MinimumAppVersion}, "
8092
+ $"but current version is {Constant.Version}. Plugin excluded from manifest.");
8193

8294
return false;

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<Version>4.7.0</Version>
19-
<PackageVersion>4.7.0</PackageVersion>
20-
<AssemblyVersion>4.7.0</AssemblyVersion>
21-
<FileVersion>4.7.0</FileVersion>
18+
<Version>5.0.0</Version>
19+
<PackageVersion>5.0.0</PackageVersion>
20+
<AssemblyVersion>5.0.0</AssemblyVersion>
21+
<FileVersion>5.0.0</FileVersion>
2222
<PackageId>Flow.Launcher.Plugin</PackageId>
2323
<Authors>Flow-Launcher</Authors>
2424
<PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher/Languages/ar.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">مفتاح الاختصار</system:String>

Flow.Launcher/Languages/cs.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Klávesová zkratka</system:String>

Flow.Launcher/Languages/da.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Genvejstast</system:String>

Flow.Launcher/Languages/de.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@
332332
<system:String x:Key="PlaceholderTextTip">Platzhaltertext ändern. Eingabe leer wird verwendet: {0}</system:String>
333333
<system:String x:Key="KeepMaxResults">Festgelegte Fenstergröße</system:String>
334334
<system:String x:Key="KeepMaxResultsToolTip">Die Fenstergröße ist durch Ziehen nicht anpassbar.</system:String>
335+
<system:String x:Key="MaxShowResultsCannotWorkWithAlwaysPreview">Since Always Preview is on, maximum results shown may not take effect because preview panel requires a certain minimum height</system:String>
335336

336337
<!-- Setting Hotkey -->
337338
<system:String x:Key="hotkey">Hotkey</system:String>

0 commit comments

Comments
 (0)