#94 and close #91. Make bookmark as plugin.

2024-12-12 18:29:24 +08:00 · 2014-06-30 18:05:42 +08:00 · 2014-06-30 18:05:42 +08:00 · d23eb291f7
commit d23eb291f7
parent 7aca726c33
11 changed files with 237 additions and 82 deletions
--- a/Plugins/Wox.Plugin.BrowserBookmark/Bookmark.cs
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Bookmark.cs
@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Wox.Infrastructure;
+
+namespace Wox.Plugin.BrowserBookmark
+{
+    public class Bookmark : IEquatable<Bookmark>, IEqualityComparer<Bookmark>
+    {
+        private string m_Name;
+        public string Name
+        {
+            get
+            {
+                return m_Name;
+            }
+            set
+            {
+                m_Name = value;
+                PinyinName = m_Name.Unidecode();
+            }
+        }
+        public string PinyinName { get; private set; }
+        public string Url { get; set; }
+        public string Source { get; set; }
+        public int Score { get; set; }
+
+        /* TODO: since Source maybe unimportant, we just need to compare Name and Url */
+        public bool Equals(Bookmark other)
+        {
+            return Equals(this, other);
+        }
+
+        public bool Equals(Bookmark x, Bookmark y)
+        {
+            if (Object.ReferenceEquals(x, y)) return true;
+            if (Object.ReferenceEquals(x, null) || Object.ReferenceEquals(y, null))
+                return false;
+
+            return x.Name == y.Name && x.Url == y.Url;
+        }
+
+        public int GetHashCode(Bookmark bookmark)
+        {
+            if (Object.ReferenceEquals(bookmark, null)) return 0;
+            int hashName = bookmark.Name == null ? 0 : bookmark.Name.GetHashCode();
+            int hashUrl = bookmark.Url == null ? 0 : bookmark.Url.GetHashCode();
+            return hashName ^ hashUrl;
+        }
+
+        public override int GetHashCode()
+        {
+            return GetHashCode(this);
+        }
+    }
+}
--- a/Plugins/Wox.Plugin.BrowserBookmark/Images/bookmark.png
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Images/bookmark.png
--- a/Plugins/Wox.Plugin.BrowserBookmark/Images/plugin.png
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Images/plugin.png
--- a/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs
+++ b/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs
@ -1,25 +1,52 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Windows.Forms;
-using Newtonsoft.Json;
 using Wox.Infrastructure;

-namespace Wox.Plugin.SystemPlugins
+namespace Wox.Plugin.BrowserBookmark
 {
-    public class BrowserBookmarks : BaseSystemPlugin
+    public class Main : IPlugin
    {
        private PluginInitContext context;
        private List<Bookmark> bookmarks = new List<Bookmark>();

-        protected override List<Result> QueryInternal(Query query)
+
+        public void Init(PluginInitContext context)
        {
-            if (query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List<Result>();
+            if (!Wox.Infrastructure.Storage.UserSettings.UserSettingStorage.Instance.EnableBookmarkPlugin)
+            {
+                return;
+            }
+
+            bookmarks.Clear();
+            LoadChromeBookmarks();
+
+            bookmarks = bookmarks.Distinct().ToList();
+            this.context = context;
+        }
+
+        public List<Result> Query(Query query)
+        {
+            if (query.ActionParameters.Count == 0)
+            {
+                return bookmarks.Select(c => new Result()
+                {
+                    Title = c.Name,
+                    SubTitle = "Bookmark: " + c.Url,
+                    IcoPath = @"Images\bookmark.png",
+                    Score = 5,
+                    Action = (e) =>
+                    {
+                        context.HideApp();
+                        context.ShellRun(c.Url);
+                        return true;
+                    }
+                }).ToList();
+            }
+

            var fuzzyMather = FuzzyMatcher.Create(query.RawQuery);
            List<Bookmark> returnList = bookmarks.Where(o => MatchProgram(o, fuzzyMather)).ToList();
@ -28,7 +55,7 @@ namespace Wox.Plugin.SystemPlugins
            {
                Title = c.Name,
                SubTitle = "Bookmark: " + c.Url,
-                IcoPath = Path.GetDirectoryName(Application.ExecutablePath) + @"\Images\bookmark.png",
+                IcoPath = @"Images\bookmark.png",
                Score = 5,
                Action = (e) =>
                {
@ -38,6 +65,7 @@ namespace Wox.Plugin.SystemPlugins
                }
            }).ToList();
        }
+
        private bool MatchProgram(Bookmark bookmark, FuzzyMatcher matcher)
        {
            if ((bookmark.Score = matcher.Evaluate(bookmark.Name).Score) > 0) return true;
@ -47,20 +75,6 @@ namespace Wox.Plugin.SystemPlugins
            return false;
        }

-        protected override void InitInternal(PluginInitContext context)
-        {
-			if (!Wox.Infrastructure.Storage.UserSettings.UserSettingStorage.Instance.EnableBookmarkPlugin) 
-			{
-				return;
-			}
-
-            bookmarks.Clear();
-            LoadChromeBookmarks();
-         
-            bookmarks = bookmarks.Distinct().ToList();
-            this.context = context;
-        }
-
        private void ParseChromeBookmarks(String path, string source)
        {
            if (!File.Exists(path)) return;
@ -127,66 +141,20 @@ namespace Wox.Plugin.SystemPlugins
            return reg.Replace(dataStr, m => ((char)Convert.ToInt32(m.Groups[1].Value, 16)).ToString());
        }

-        public override string Name
+        public string Name
        {
            get { return "Bookmarks"; }
        }

-        public override string IcoPath
+        public string IcoPath
        {
            get { return @"Images\bookmark.png"; }
        }

-        public override string Description
+        public string Description
        {
-            get { return base.Description; }
-        }
-    }
-
-    public class Bookmark : IEquatable<Bookmark>, IEqualityComparer<Bookmark>
-    {
-        private string m_Name;
-        public string Name { 
-            get{
-                return m_Name;
-            }
-            set
-            {
-                m_Name = value;
-                PinyinName = m_Name.Unidecode();
-            }
-        }
-        public string PinyinName { get; private set; }
-        public string Url { get; set; }
-        public string Source { get; set; }
-        public int Score { get; set; }
-
-        /* TODO: since Source maybe unimportant, we just need to compare Name and Url */
-        public bool Equals(Bookmark other)
-        {
-            return Equals(this, other);
+            get { return "System workflow"; }
        }

-        public bool Equals(Bookmark x, Bookmark y)
-        {
-            if (Object.ReferenceEquals(x, y)) return true;
-            if (Object.ReferenceEquals(x, null) || Object.ReferenceEquals(y, null))
-                return false;
-
-            return x.Name == y.Name && x.Url == y.Url;
-        }
-
-        public int GetHashCode(Bookmark bookmark)
-        {
-            if (Object.ReferenceEquals(bookmark, null)) return 0;
-            int hashName = bookmark.Name == null ? 0 : bookmark.Name.GetHashCode();
-            int hashUrl = bookmark.Url == null ? 0 : bookmark.Url.GetHashCode();
-            return hashName ^ hashUrl;
-        }
-
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
    }
 }
--- a/Plugins/Wox.Plugin.BrowserBookmark/Properties/AssemblyInfo.cs
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Properties/AssemblyInfo.cs
@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Wox.Plugin.BrowserBookmark")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Oracle Corporation")]
+[assembly: AssemblyProduct("Wox.Plugin.BrowserBookmark")]
+[assembly: AssemblyCopyright("Copyright © Oracle Corporation 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7dd2e33e-d029-4661-8f1d-594e82cef077")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Wox.Plugin.BrowserBookmark</RootNamespace>
+    <AssemblyName>Wox.Plugin.BrowserBookmark</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Output\Debug\Plugins\Wox.Plugin.BrowserBookmark\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.BrowserBookmark\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Bookmark.cs" />
+    <Compile Include="Main.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
+      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
+      <Name>Wox.Infrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
+      <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
+      <Name>Wox.Plugin</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\bookmark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\plugin.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/Plugins/Wox.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Wox.Plugin.BrowserBookmark/plugin.json
@ -0,0 +1,12 @@
+{
+    "ID":"0ECADE17459B49F587BF81DC3A125110",
+    "ActionKeyword":"b",
+    "Name":"Browser Bookmark",
+    "Description":"Search your browser bookmarks",
+    "Author":"qianlifeng",
+    "Version":"1.0",
+    "Language":"csharp",
+    "Website":"http://www.getwox.com/plugin",
+    "ExecuteFileName":"Wox.Plugin.browserBookmark.dll",
+    "IcoPath":"Images\\plugin.png"
+}
--- a/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj
+++ b/Wox.Plugin.SystemPlugins/Wox.Plugin.SystemPlugins.csproj
@ -70,7 +70,6 @@
    <Compile Include="Program\ProgramSources\PortableAppsProgramSource.cs" />
    <Compile Include="Program\IProgramSource.cs" />
    <Compile Include="BaseSystemPlugin.cs" />
-    <Compile Include="BrowserBookmarks.cs" />
    <Compile Include="Calculator.cs" />
    <Compile Include="Program\ProgramSources\FileSystemProgramSource.cs" />
    <Compile Include="Program\ProgramSources\UserStartMenuProgramSource.cs" />
--- a/Wox.sln
+++ b/Wox.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
 EndProject
@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.UAC", "Wox.UAC\Wox.UAC.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.PluginManagement", "Plugins\Wox.Plugin.PluginManagement\Wox.Plugin.PluginManagement.csproj", "{049490F0-ECD2-4148-9B39-2135EC346EBE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.BrowserBookmark", "Plugins\Wox.Plugin.BrowserBookmark\Wox.Plugin.BrowserBookmark.csproj", "{9B130CC5-14FB-41FF-B310-0A95B6894C37}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -59,11 +61,16 @@ Global
 		{049490F0-ECD2-4148-9B39-2135EC346EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{049490F0-ECD2-4148-9B39-2135EC346EBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{049490F0-ECD2-4148-9B39-2135EC346EBE} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
 	EndGlobalSection
 EndGlobal
--- a/Wox/ResultPanel.xaml
+++ b/Wox/ResultPanel.xaml
@ -5,9 +5,6 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:converters="clr-namespace:Wox.Converters"
             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100">
-    <UserControl.Resources>
-        <converters:ImagePathConverter x:Key="ImagePathConverter"/>
-    </UserControl.Resources>

    <!-- set max height of listbox to allow 6 results showed at once -->
    <ListBox x:Name="lbResults" MaxHeight="300" PreviewMouseDown="LbResults_OnPreviewMouseDown" Style="{DynamicResource BaseListboxStyle}" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
@ -26,8 +23,11 @@
                        <ColumnDefinition/>
                    </Grid.ColumnDefinitions>
                    <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" >
+                        <Image.Resources>
+                            <converters:ImagePathConverter x:Key="ImageConverter"/>
+                        </Image.Resources>
                        <Image.Source>
-                            <MultiBinding Converter="{StaticResource ImagePathConverter}">
+                            <MultiBinding Converter="{StaticResource ImageConverter}">
                                <MultiBinding.Bindings>
                                    <Binding Path="IcoPath" />
                                    <Binding Path="PluginDirectory" />
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@ -308,9 +308,6 @@
    <Resource Include="Images\app.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Resource>
-    <Resource Include="Images\bookmark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
    <Resource Include="Images\close.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Resource>