Skip to content

Commit 17e8031

Browse files
authored
Merge branch 'dev' into l10n_dev
2 parents c851aa6 + 9b04989 commit 17e8031

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

.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/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ public string ColorScheme
172172
"dd', 'MMMM",
173173
"dd.MM.yy",
174174
"dd.MM.yyyy",
175-
"dd MMMM yyyy"
175+
"dd MMMM yyyy",
176+
"yyyy-MM-dd"
176177
};
177178

178179
public string TimeFormat

0 commit comments

Comments
 (0)