From 9ddaee9830336b672c55382f0c552253f705b7c1 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Fri, 12 Dec 2014 12:37:01 +0800 Subject: [PATCH] Remove unnecessary codes merged from v1.1.0 --- Wox.Test/MFTSearcherTest.cs | 48 ------------------------------------- Wox.Test/Wox.Test.csproj | 5 ---- Wox.sln | 16 +------------ Wox/Wox.csproj | 8 ++----- Wox/app.manifest | 15 ------------ 5 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 Wox.Test/MFTSearcherTest.cs delete mode 100644 Wox/app.manifest diff --git a/Wox.Test/MFTSearcherTest.cs b/Wox.Test/MFTSearcherTest.cs deleted file mode 100644 index 3e4992926b..0000000000 --- a/Wox.Test/MFTSearcherTest.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NUnit.Framework; -using Wox.Plugin.FindFile.MFTSearch; - -namespace Wox.Test -{ - [TestFixture] - public class MFTSearcherTest - { - [Test] - public void MatchTest() - { - var searchtimestart = DateTime.Now; - MFTSearcher.IndexAllVolumes(); - var searchtimeend = DateTime.Now; - Console.WriteLine(string.Format("{0} file indexed, {1}ms has spent.", MFTSearcher.IndexedFileCount, searchtimeend.Subtract(searchtimestart).TotalMilliseconds)); - - searchtimestart = DateTime.Now; - List mftSearchRecords = MFTSearcher.Search("q"); - searchtimeend = DateTime.Now; - Console.WriteLine(string.Format("{0} file searched, {1}ms has spent.", mftSearchRecords.Count, searchtimeend.Subtract(searchtimestart).TotalMilliseconds)); - - searchtimestart = DateTime.Now; - mftSearchRecords = MFTSearcher.Search("ss"); - searchtimeend = DateTime.Now; - Console.WriteLine(string.Format("{0} file searched, {1}ms has spent.", mftSearchRecords.Count, searchtimeend.Subtract(searchtimestart).TotalMilliseconds)); - } - - [Test] - public void MemoryTest() - { - long oldWorkingSet = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; - MFTSearcher.IndexAllVolumes(); - GC.Collect(); - long newWorkingSet = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; - Console.WriteLine(string.Format("Index: {0}M", (newWorkingSet - oldWorkingSet)/(1024*1024))); - - oldWorkingSet = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; - List mftSearchRecords = MFTSearcher.Search("q"); - newWorkingSet = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64; - Console.WriteLine(string.Format("Search: {0}M", (newWorkingSet - oldWorkingSet) / (1024 * 1024))); - Console.WriteLine(string.Format("Search results: {0}",mftSearchRecords.Count)); - } - } -} diff --git a/Wox.Test/Wox.Test.csproj b/Wox.Test/Wox.Test.csproj index c34a3ec954..a7f47b1002 100644 --- a/Wox.Test/Wox.Test.csproj +++ b/Wox.Test/Wox.Test.csproj @@ -44,7 +44,6 @@ - @@ -52,10 +51,6 @@ - - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81} - Wox.Plugin.FindFile - {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} Wox.Infrastructure diff --git a/Wox.sln b/Wox.sln index 5f2923c8bf..a8b3e304fe 100644 --- 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.30723.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 @@ -17,10 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Infrastructure", "Wox.I 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 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.FindFile", "Plugins\Wox.Plugin.FindFile\Wox.Plugin.FindFile.csproj", "{84EA88B4-71F2-4A3D-9771-D7B0244C0D81}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,21 +47,11 @@ 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 - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81}.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} - {84EA88B4-71F2-4A3D-9771-D7B0244C0D81} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} EndGlobalSection EndGlobal diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index 7f0b51fec7..26790c6004 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -53,7 +53,8 @@ 4 - app.ico + + Wox.App @@ -288,11 +289,6 @@ PreserveNewest - - - Always - - diff --git a/Wox/app.manifest b/Wox/app.manifest deleted file mode 100644 index 1eb9c6c494..0000000000 --- a/Wox/app.manifest +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - -