Refactoring Plugin.Feature

Plugins/Wox.Plugin.CMD/CMD.cs

@@ -8,7 +8,6 @@ using WindowsInput;
 using WindowsInput.Native;
 using Wox.Infrastructure.Hotkey;
 using Wox.Infrastructure.Logger;
-using Wox.Plugin.Features;
 using Control = System.Windows.Controls.Control;
 
 namespace Wox.Plugin.CMD

Plugins/Wox.Plugin.Everything/Main.cs

@@ -7,7 +7,6 @@ using System.Reflection;
 using System.ServiceProcess;
 using Wox.Infrastructure;
 using Wox.Plugin.Everything.Everything;
-using Wox.Plugin.Features;
 
 namespace Wox.Plugin.Everything
 {

Plugins/Wox.Plugin.Program/FileChangeWatcher.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.Program
 {

Plugins/Wox.Plugin.Program/Programs.cs

@@ -7,7 +7,6 @@ using System.Reflection;
 using System.Windows;
 using IWshRuntimeLibrary;
 using Wox.Infrastructure;
-using Wox.Plugin.Features;
 using Wox.Plugin.Program.ProgramSources;
 
 namespace Wox.Plugin.Program

Plugins/Wox.Plugin.WebSearch/WebQueryPlugin.cs

@@ -4,7 +4,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using Wox.Plugin.Features;
 using Wox.Plugin.WebSearch.SuggestionSources;
 
 namespace Wox.Plugin.WebSearch

Wox.Core/Plugin/PluginManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -12,7 +11,6 @@ using Wox.Core.UserSettings;
 using Wox.Infrastructure;
 using Wox.Infrastructure.Logger;
 using Wox.Plugin;
-using Wox.Plugin.Features;
 
 namespace Wox.Core.Plugin
 {
@@ -229,7 +227,7 @@ namespace Wox.Core.Plugin
             return AllPlugins.FirstOrDefault(o => o.Metadata.ID == id);
         }
 
-        public static IEnumerable<PluginPair> GetPlugins<T>() where T : class
+        public static IEnumerable<PluginPair> GetPlugins<T>() where T : IFeatures
         {
             return from p in AllPlugins where p.Plugin is T select p;
         }

Wox.Core/UI/ResourceMerger.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Windows;
 using Wox.Core.i18n;
 using Wox.Core.Plugin;
-using Wox.Infrastructure;
 using Wox.Plugin;
 
 namespace Wox.Core.UI

Wox.Plugin/Feature.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+
+namespace Wox.Plugin
+{
+    public interface IFeatures { }
+
+    public interface IContextMenu : IFeatures
+    {
+        List<Result> LoadContextMenus(Result selectedResult);
+    }
+
+    public interface IExclusiveQuery : IFeatures
+    {
+        bool IsExclusiveQuery(Query query);
+    }
+
+    /// <summary>
+    /// Represent plugin query will be executed in UI thread directly. Don't do long-running operation in Query method if you implement this interface
+    /// <remarks>This will improve the performance of instant search like websearch or cmd plugin</remarks>
+    /// </summary>
+    public interface IInstantQuery : IFeatures
+    {
+        bool IsInstantQuery(string query);
+    }
+
+    /// <summary>
+    /// Represent plugins that support internationalization
+    /// </summary>
+    public interface IPluginI18n : IFeatures
+    {
+        string GetLanguagesFolder();
+
+        string GetTranslatedPluginTitle();
+
+        string GetTranslatedPluginDescription();
+    }
+}

Wox.Plugin/Features/IContextMenu.cs

@@ -1,9 +1,8 @@
-using System.Collections.Generic;
-
+using System;
 namespace Wox.Plugin.Features
 {
-    public interface IContextMenu
-    {
-        List<Result> LoadContextMenus(Result selectedResult);
-    }
+    [Obsolete("Delete Wox.Plugin.Features using directive, " +
+              "and use Wox.Plugin.Feature.IContextMenu instead, " +
+              "this method will be removed in v1.3.0")]
+    public interface IContextMenu { }
 }

Wox.Plugin/Features/IExclusiveQuery.cs

@@ -1,7 +1,9 @@
-namespace Wox.Plugin.Features
+using System;
+
+namespace Wox.Plugin.Features
 {
-    public interface IExclusiveQuery
-    {
-        bool IsExclusiveQuery(Query query);
-    }
+    [Obsolete("Delete Wox.Plugin.Features using directive, " +
+              "and use Wox.Plugin.Feature.IInstantQuery instead, " +
+              "this method will be removed in v1.3.0")]
+    public interface IExclusiveQuery { }
 }

Wox.Plugin/Features/IInstantQuery.cs

@@ -1,11 +1,9 @@
-namespace Wox.Plugin.Features
+using System;
+
+namespace Wox.Plugin.Features
 {
-    /// <summary>
-    /// Represent plugin query will be executed in UI thread directly. Don't do long-running operation in Query method if you implement this interface
-    /// <remarks>This will improve the performance of instant search like websearch or cmd plugin</remarks>
-    /// </summary>
-    public interface IInstantQuery
-    {
-        bool IsInstantQuery(string query);
-    }
+    [Obsolete("Delete Wox.Plugin.Features using directive, " +
+              "and use Wox.Plugin.Feature.IInstantQuery instead, " +
+              "this method will be removed in v1.3.0")]
+    public interface IInstantQuery { }
 }

Wox.Plugin/IPluginI18n.cs

@@ -1,14 +0,0 @@
-namespace Wox.Plugin
-{
-    /// <summary>
-    /// Represent plugins that support internationalization
-    /// </summary>
-    public interface IPluginI18n
-    {
-        string GetLanguagesFolder();
-
-        string GetTranslatedPluginTitle();
-
-        string GetTranslatedPluginDescription();
-    }
-}

Wox.Plugin/Wox.Plugin.csproj

@@ -40,11 +40,11 @@
   <ItemGroup>
     <Compile Include="AllowedLanguage.cs" />
     <Compile Include="EventHandler.cs" />
+    <Compile Include="Feature.cs" />
     <Compile Include="Features\IContextMenu.cs" />
     <Compile Include="Features\IExclusiveQuery.cs" />
     <Compile Include="Features\IInstantQuery.cs" />
     <Compile Include="IHttpProxy.cs" />
-    <Compile Include="IPluginI18n.cs" />
     <Compile Include="IPlugin.cs" />
     <Compile Include="IPublicAPI.cs" />
     <Compile Include="ISettingProvider.cs" />
@@ -59,6 +59,7 @@
   <ItemGroup>
     <None Include="README.md" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.