prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use ISavable and add obsolete message

Browse source
This commit is contained in:
Jeremy Wu 2021-06-21 21:56:20 +10:00
parent 0387bfbb64
commit 644be7977c
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher.Core/Plugin/PluginManager.cs
View file

@ -7,9 +7,9 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure;
using Flow.Launcher.Infrastructure.Logger; using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin; using Flow.Launcher.Plugin;
using ISavable = Flow.Launcher.Plugin.ISavable;
namespace Flow.Launcher.Core.Plugin namespace Flow.Launcher.Core.Plugin
{ {
@ -48,7 +48,7 @@ namespace Flow.Launcher.Core.Plugin
{ {
foreach (var plugin in AllPlugins) foreach (var plugin in AllPlugins)
{ {
var savable = plugin.Plugin as ISettingsSavable; var savable = plugin.Plugin as ISavable;
savable?.Save(); savable?.Save();
} }

10
Flow.Launcher.Infrastructure/Storage/ISavable.cs
View file

@ -1,10 +1,8 @@
using Flow.Launcher.Plugin; using System;
namespace Flow.Launcher.Infrastructure.Storage namespace Flow.Launcher.Infrastructure.Storage
{ {
/// <summary> [Obsolete("Deprecated as of Flow Launcher v1.8.0, on 2021.06.21. " +
/// Save plugin settings/cache, "This is used only for Everything plugin v1.4.9 or below backwards compatibility")]
/// todo should be merged into a abstract class intead of seperate interface public interface ISavable : Plugin.ISavable { }
/// </summary>
public interface ISavable : ISettingsSavable { }
} }

2
Flow.Launcher.Infrastructure/Storage/JsonStorage.cs
View file

@ -88,5 +88,7 @@ namespace Flow.Launcher.Infrastructure.Storage
} }
} }
[Obsolete("Deprecated as of Flow Launcher v1.8.0, on 2021.06.21. " +
"This is used only for Everything plugin v1.4.9 or below backwards compatibility")]
public class JsonStrorage<T> : JsonStorage<T> where T : new() { } public class JsonStrorage<T> : JsonStorage<T> where T : new() { }
} }

2
Flow.Launcher.Plugin/Interfaces/ISettingsSavable.cs → Flow.Launcher.Plugin/Interfaces/ISavable.cs
View file

@ -5,7 +5,7 @@
/// Otherwise if LoadSettingJsonStorage or SaveSettingJsonStorage has been callded, /// Otherwise if LoadSettingJsonStorage or SaveSettingJsonStorage has been callded,
/// plugin settings will be automatically saved (see Flow.Launcher/PublicAPIInstance.SavePluginSettings) by Flow /// plugin settings will be automatically saved (see Flow.Launcher/PublicAPIInstance.SavePluginSettings) by Flow
/// </summary> /// </summary>
public interface ISettingsSavable public interface ISavable
{ {
void Save(); void Save();
} }

3
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -20,10 +20,11 @@ using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Storage; using Flow.Launcher.Storage;
using Flow.Launcher.Infrastructure.Logger; using Flow.Launcher.Infrastructure.Logger;
using System.Threading.Channels; using System.Threading.Channels;
using ISavable = Flow.Launcher.Plugin.ISavable;
namespace Flow.Launcher.ViewModel namespace Flow.Launcher.ViewModel
{ {
public class MainViewModel : BaseModel, ISettingsSavable public class MainViewModel : BaseModel, ISavable
{ {
#region Private Fields #region Private Fields

2
Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file

@ -13,7 +13,7 @@ using Stopwatch = Flow.Launcher.Infrastructure.Stopwatch;
namespace Flow.Launcher.Plugin.Program namespace Flow.Launcher.Plugin.Program
{ {
public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, ISettingsSavable, IAsyncReloadable public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, ISavable, IAsyncReloadable
{ {
internal static Win32[] _win32s { get; set; } internal static Win32[] _win32s { get; set; }
internal static UWP.Application[] _uwps { get; set; } internal static UWP.Application[] _uwps { get; set; }