Deduping results for program plugin #2375
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…m/microsoft/PowerToys into dev/crutkas/LauncherProgramTweaks
crutkas
added
the
Product-PowerToys Run
| @@ -462,7 +470,15 @@ public static Win32[] All(Settings settings) | |||
| programs = programs.Concat(startMenu); | |||
| } | |||
|
|
|||
| return programs.ToArray(); | |||
| var programsWithoutLnk = programs.Where(x => string.IsNullOrEmpty(x.LnkResolvedPath)); | |||
There was a problem hiding this comment.
Just for clarity could you comment about what causes LnkResolvedPath to be null or empty?
There was a problem hiding this comment.
i added this in to another thread. Only time Lnk path is filled is when it was pulled from LNK
ryanbodrug-microsoft
suggested changes
Apr 24, 2020
src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs
Outdated
Show resolved
Hide resolved
ryanbodrug-microsoft
approved these changes
Apr 24, 2020
traies
added a commit
that referenced
this pull request
Apr 28, 2020
* minor modifications in README * Added launcher project and changed references to common * Added the code to launch another process * added shellapi header * Added launcher to runner * added functions to remove the abstract class error * added the wox launcher dll * Readded the reference to common * modified the additional include directories for the release version * changed the name to be displayed from Wox.Launcher to Launcher * Localized the strings of Launcher * Added a SearchResult Helper class * Created a helper class to use indexer and return search results * Added the main and settings file which declare most of the plugin interfaces * Added references and renamed a class * Added the images folder which contains the windows indexer icon * Added the image * Added the plugin.json file * Minor changes in project files * Added plugin.json to the project * Modified the output paths to create the dll for the plugin in the correct location * Refactored the code to make it unit testable * Made the code unit testable and added unit tests for the indexer plugin * Removed commented out code * Code to terminate wox when we exit PowerToys * Copy from Jeremy's fork PR * Removed unnecessary plugins from source tree * add missing files * Fix postbuild event * Added x64 for all Wox project - Debug mode * Removed the AnyCPU config - Debug * Added the build paths for release x64 (removed AnyCPU) * Set warning level to 4 : Release * Set warning level 4 : Debug * set optimize code to false * Removed notify icon component * Removed setting UI XAML file and references * Readded necessary callback functions * Removed python path and python plugin functions * Removed UI related to python path and the bindings related to that * Remove python bindings * Removed the localized string translations from pythonDirectory and SelectPythonDirectory * Manually resolving conflicts * Fix Wox build in project settings * deleting unused project files * Undo change internal * Fix internal variable * All wox exceptions in debug are getting rethrown, and thus causing the app to crash. This change removes the debug specific code and allows exceptions to be handled the same was as release. * Ported Indexer plugin to .net core 3 * Added the test project back * Removed the .net framework indexer folder * readding the plugin.json file * Changed the anyCPU config to x64 for windows indexer plugin * Adding dependency to wox project on the runner. This should make sure the wox.exe can be build and launched by the runner so wox can run as a background process. * Updating build dependencies. Wox.Launcher wasn't built as part of the F5 Experience, and nor were the plugins * removing locks from the ResultListBox code behind file. All callbacks are accessed from the Main/UI thread. * Remove anyCPU config and changed it to x64 * Removed anycpu of test proj * Adding dependency * Renaming executable to PowerLauncher. Replaceing icons with placeholder. Deleting Docs folder * Renaming AppData directory from 'Wox' to 'PowerLauncher'. Also replacing issue link with powertoys github. * adding support for xaml islands * Added Neils UI code * Replace Niels Code references * Added assets and behaviours * Add missing reference * Add main view model binding * Using proper executable name when closing 'PowerLauncher' process * changed x:bind to Binding to avoid reference * Updated bindings for launcher * Added binding on searchBox * Adding Directory.Build.targets file to kill the PowerLauncher pprocess on Build or Clean operations of all 'Launcher' projects. * Fixed exception preventing result display * Fixed issue with wpf marshalling events to a non UI thread * Optimised result binding by inserting search result from multiple plugin in parallel * copy resource files to output folder * Corrected the output path for the indexer plugin * windows indexer plugin is working * Remove console print statement * Added callback function for mouse click on search result * Working App execution * Cherry picked pinyin performance changes from jjw24's master branch * change nuget package to msft for winrt compat * Working up/down arrow key * updating references and removing a few that seem uneeded for how stuff is referenced * adding two back in * Removing Squirrel dll. unsure on updating so i kept that logic in * Updated functionality on suggestion chosen in autosuggestbox * Added the <useWPF> tag to remove the warning * Removed an unnecessary <useWindowsForms> tag * Removed the item group for properties from calculator plugin * Removed the item group for properties from folder plugin * Removed the item group for properties from indexer, program and shell plugin * Removed itemgrp from wox.core and wox.test csprojs * Removed the unnecessary wox files to clean up codebase * Renamed Wox.Plugin.Indexer to Microsoft.Plugin.Indexer * Renamed Wox.Launcher to Microsoft.Launcher * To avoid DBNull to String typecast exception * Added query submitted event to handle default action on clicking a list view item * Merge pull request #42 from microsoft/AddPinyinPerformance Cherry picked pinyin performance changes from jjw24's master branch (cherry picked from commit b9e437c) * Rectyfying title display * Title display working correctly * Removed .yml files * adding checks * Making wox.csproj build wox assembly instead of powerlauncher * Removing update logic from PowerLuanch App.xaml.cs as was done in Wox project. * Making Query internals visible to wox. * Update Powerlauncher nuget packages to be same version as wox.csproj. Note: FoxyWeavers.xsd change is automatically done as part of nuget package update. * Updating build dependencies to so that wox.launcher depends on powerlauncher.csproj not wox.csproj * Removing 'Wox' branded logos from powerlauncher.csproj as was done previously or wox.csproj * Downgraded the library to the latest stable version * single thread execution of the indexer plugin and InvalidOperationException due to connection being closed on ExecuteReader, handled separately * Modified the test, the connection need not be null after being disposed. There is no direct way of checking if an object has been disposed other than to throw the InvalidOperationException * Removing x86,ARM,ARM64, build configurations, as these were added accidentally when adding xaml island support. * Removed STAThread * Modified the output folder produced * Renamed the dll produced * Added dependency on PowerLauncher to the Microsoft.Launcher project * modified the name of the dll in the indexer plugin * Ignoring 128 errors from taskkill, as this means the process isn't running. We don't want htis to show up in the warnings list on build * Added fix for closing wox on pressing escape and app execution (#75) * adding useWPF to get rid of warning * Launcher resize issue on selecting search result (#77) * Added fix for closing wox on pressing escape and app execution * Added fix to prevent autosuggestbox resize * Fixing xaml catastrophic failure, based on Miguels suggestion here: CommunityToolkit/Microsoft.Toolkit.Win32#210 * suggested fix * removing unused mutex string * Searches for keyword only in title and not content to improve the quality of results * Display the title from System.Title directly instead of extracting it from the path * Removed additional README instructions before moving to the powerToys repo * Fix Query builder test (#86) * Revert base viewModel class to fix tests. * Removing unused post build and deploy scripts. * tweaked url * Update plugin.json * Update README.md * removed unused dep (#2080) * removed reference to everything (#2133) * SearchIndexer - Modifying QueryContentProperties and QuerySelectColumns to use System.FileName * Search result thumbnail for PowerLauncher (#2124) * Replace WPF Imaging library with UWP * Removed UWP and WPF namespace conflicting files from Wox * Removed Image hashing as it wasn't used anywhere * Updated formatting * Set MainViewModel visibility to hidden on startup * Enable CI build on PowerLauncher Branch (#2181) * Enable CI build on PowerLauncher Branch * Updated Nuget restore to latest and added AssetTargetFallback property * tweak text (#2177) * [Window Walker] Migrate to Launcher (#2093) * Copy the existing calc. plugin foldeR * Blindly rename a bunch of things to Window Walker * Update the solution to reference the new plugin * Get basic Yo returned * Remove all the languages except english * Lower quality of icon as well as test showing it * Add the core non-ui parts to the plugin * Delete calculator png * Get it to compile * Added the actual code which apparently doesn't work * Finally start showing results * Fix up strings * Switch working * Remove unused classes * Remove unneeded async * Added MSI support for Launcher (#2242) * Fixed typo in output folder of calculator plugin * Calculator plugin works * Modified the name of the image to remove space as space is assumed to be a separator in wcx file * Fixed typo in calculator dll * Fixed typo in calculator plugin * Shell, Program, Folde and indexer plugin working * Added the ww plugin * Fixed typos in the calculator plugin * Delete file that was added unintentionally * revert calculator rename changes * Reverted other files changed * Reverted renaming of file with space * Pull changes from master to dev/powerLauncher (#2255) * Dpi unaware placement bug (#2121) Fix for bug when placing dpi unaware window such as Notepad++ in left of right part of monitor. In that application gap of about 7px was left or right. This fixes only single-monitor scenario It skips correction for dpi unaware window that leaves a gap * Move markdown parsing logic outside control thread (#2099) * Move markdown parsing logic outside control thread * Update MarkdownPreviewHandlerControl.cs * Remove trailing whitespace. That'll teach me for trying to make an edit from the GitHub page. * Migrate power rename MRU lists from registry to JSON (#2090) * Handle most recently used search/replace strings within settings. * Check for last modified time of json file and reload it if needed. * Handle changes in MRU search / replace lists size. * Improve handling of changes in MRU list size. * Don't check for last modified time in every getter method. Load only when starting application. * Add const identifier to getter methods. * Address PR comments: Add const to reg and json file paths and set them in constructor initializer. Check pushIdx validity. Move implementation to cpp of PowerRenameUI constructor. * Add error checking when getting values from registry. * Implementing changes suggested in #1992 (#2116) * Implementing changes suggested in #1992 * Update Product.wxs Co-authored-by: Ebenezer Ewumi <ebenezer.ewumi@wsu.edu> * Fix for issue #1532 - [PowerToys tray icon] Show version on tooltip (#2117) * Fix for issue #1532 [PowerToys] Show version on tooltip * Update src/runner/tray_icon.cpp Co-Authored-By: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com> Co-authored-by: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com> * FZ editor: Splitted zones positioning (#2158) * Added a mutex to ZoneWindow, ensured no data races occur (#2154) * Added a mutex to ZoneWindow, ensured no data races occur * Protected draggedWindow* members with a mutex * Ensured that critical reads happen in a single transaction * Dpi unaware placement bug - multimontior with same DPI settings fix (#2156) * Dpi unaware placement bug - multimontior with same DPI settings fix * Using different enumerating method * Changed AllMonitorHaveSameDpiScaling method * Removed accidental file * small rename * Changed some methods to CamelCase * Review comments fixes Co-authored-by: PrzemyslawTusinski <61138537+PrzemyslawTusinski@users.noreply.github.com> Co-authored-by: Ben Randall <veleek@gmail.com> Co-authored-by: vldmr11080 <57061786+vldmr11080@users.noreply.github.com> Co-authored-by: eduardodextil <55205162+eduardodextil@users.noreply.github.com> Co-authored-by: Ebenezer Ewumi <ebenezer.ewumi@wsu.edu> Co-authored-by: Nghia M. Luong <32159519+sqrlmn@users.noreply.github.com> Co-authored-by: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com> Co-authored-by: Seraphima Zykova <zykovas91@gmail.com> Co-authored-by: Ivan Stošić <ivan100sic@gmail.com> * Somil55/merge custom ui into launcher (#2271) * Remove Autosuggest box (#2192) * Update Settings.Designer.cs * Revert "Update Settings.Designer.cs" This reverts commit a1bc0dd. * Updated LauncherControl XAML to add textbox and listview * List View displayed * Hooking up execution on the selected index, removing two way binding on selection, and experimenting with popup that doesn't work * Updated MainViewModel to Remove context menu and history * Added Resultist XAML Island project * Updated SelectedItem and SelectedList Binding. Issues : List box doesn't open when query is written for first time but opens in subsequent queries. * 1. Mouse Click working 2. List View is can't be focused 3. Fixed width of Launcher * Removed two way QueryText box binding * Removed SelectedItem two way binding and replaced with a callback * [Cleaning] Remove redundant UWP project * [Cleaning] Updated files to keep only atomic changes against dev/powerLauncher * Thmbnail fixed for NEW UI * Removed PreviewMouseDown function required by older WOX code Co-authored-by: ryanbodrug-microsoft <56318517+ryanbodrug-microsoft@users.noreply.github.com> * Added the auto-complete feature * Removing ContextMenuPluginInfo, and ContextMenuTopMost as these commands are not used int the new design. * Fixed merge conflicts * Set only when index is 0 * One way binding * Removed unnecessary binding * Deleting unused (commented out code) that was legacy from wox project. * Binding Buttons to appropriate context menu commands. 1. Buttons are dynamically loaded in a listview based on the actions supported be each plugin. This change also deletes unused commands. Note: Most button events don't seem to be getting routed to the Selected Item. Currently using 'PointerEntered' to validate the behavior. The actions should be trigged by the button command property in the future. * manually handling tab in mainwindow * Loading context buttons on Selecting a suggestion list item * Allowing hover event to load content menu items and display them as well. * Adding context buttons to Indexer plugin. This allows for the following: 1. [Files] Open Containing folder 2. [Folders/Files] Copy Path * Remove White background of list (#2218) * Remove white background of list * Removed comments * Changed to ContainerContentChanging event * add const variables instead of numbers * Added comment before the updatelistSize function * Search box UI (#2224) * Added backdrop and rounded corner * Fix for two alt+space press to bring searchbox issue * Fixed merge conflict * Clean Mainwindow.xaml code * Fix for textbox focus on first visible * Allowing users to tab between the context buttons for the selected resut. Also allowing users to press 'enter' to action on the selected items. * Renaming SelectedIndex to ContextMenuSelectedIndex * Enabling key accelerators on context buttons. 1. Add new object ContextMenuResult instead instead of reusing Result for both query results and context menu results. 2. Binding KeyboardAccelerator keys to contextmenuitemviewmodel 3. Enabling and disabling contextmenu items when selecting or deselecting each row. Because we are manually maintaining selectionwe can't use ScopeOwners as the textbox is really the only item ever in focus. * Launching explorer instead of the UWP application when selecting 'open file location'. * Added fix for border showing up when result count is zero * Updated fix for border on no result * Adding visibility after clearing result in MainViewmodel * Launcher Light/Dark mode (#2235) * Fixed issue with list view background not updating with Windows theme change * Added theme change for WPF * updated ShadowDepth for dropshadow * Updated border thicknes of searchbox and listview * Diff issue with ResultList.xaml * Removed change in result delay * Added code to pull colors from UWP * Updated border resource to use system based SystemControlHighlightAccentBrush * Updated corner radius in dark mode * Updated Launcher description text Co-authored-by: ryanbodrug-microsoft <56318517+ryanbodrug-microsoft@users.noreply.github.com> Co-authored-by: Alekhya Reddy <reddykalekhya@gmail.com> * Changed to SystemChromeLow from Accent brush (#2272) * Removed ListView animations * Positioning ContextButtons and adding background. * Disabling scrollbars for gridview items. * Removed folder plugin * removed deployment for uwp apps (#2298) * Simulating Win+backspace key press, instead of Win+Control as it was launching WW (#2250) * text is selected whenever launcher gets hidden and is then set to visible (#2315) * Update nuget packages across solution to latest (#2334) * simplifying the xaml and making things tighter (#2327) * Setting runcommand as the default execution method, and turning off run as admin by default. * Opening explorer if the user has types a file path. * Enable PowerLauncher toggle * Launcher MSI - Added a required dll and removed folder plugin (#2355) * Modified the product.wxs file * Added the x64 config * Modify scoring algorithm for fuzzy search (#2361) * Modify scoring * modified to if else * Fixes race conditions with PointerEnter/Exit events conflicting with Selection and unselection. This change provides better encapsulation of the logic to enable a selected item for accelerator (hotkey) events, and allow mouse input on results where the pointer is over. * Fixes an issue where PointerExit would hide the selected context buttons. * Result List - Bad rebase overwrote margin and translation fields. * Fixed process executing on clicking enter if no text in search box * Codeflow cleanup when selectedItem is not null * adjusting how programs are displayed. (#2369) * Removing description from title * adjusting subtitle * removing accidently paste * removing desc for uwp apps * Revert "Removed folder plugin" This reverts commit 064d638. We will use the folder plugin to better mimic the way the start menu and run prompt deal with directories * Updating JetBrains.Annotations to 2020.1.0 to be consistent with other projects. * Replacing submenu text with full path as 'Ctrl-Enter' doesn't do anything. Also reducing the String of CreateOpenCurrentResult to fit in one line. * - Making Open Directory subtitle fixed, and the title as the current directory. * Adding back binding to QueryText and updating the cursor position similar to how wox originally did it. * Add the folder plugin wxs back in (#2374) * Deduping results for program plugin (#2375) * Removing description from title * adjusting subtitle * removing accidently paste * removing desc for uwp apps * Getting dups removed from list if LNK exists * adjusting subtitle * removing accidently paste * Getting dups removed from list if LNK exists * changed to normal forloop * Removing WinR (#2381) * Updated program execution to call action on background thread. (#2370) * PowerLauncher Settings integration * Added cold start fix (#2385) * - Fixes cursor jumping around issue. - Seperating the ability to set the text from initiating a query. - Plugins have to explicitly request the query be updated. - Updating Folder plugin to explicty update the query on folder selection. - Removing unused changes from 'Wox' that don't compile. * Fixing gap in logic where query was triggering when programatically setting text. Updating the binding and settext both will trigger the TextChanged event on a seperate event dispatcher. For this reason we dynamically detect which eventhandler is most approapriate on the textchanging event. * Updating the QueryText to the selected item when navigating up/down with the arrow keys. * Removing action on folder result, and displaying folder path on selecting a folder result from the folder plugin. * Making folder results from the search indexer plugin behave like folder results from folder plugin. * Folder Results open the explorer window when selected. * The Open Current Folder result shouldn't change the query text to 'Open {folder path}' when selecting the results. * Initializing query text strings. * Defensive check for QueryText being empty * Adding file watchers for UWP detecting when apps are installed or deleted and reindexing the uwp apps * Removing unused namespace. * Looking at files and not filtering is better because the timer is more likely to reset while an install is happening, preventing uneeded indexing * Fix project references * Fix MaxResultsToShow * Fix Alt + Space display * Fix settings defaults Co-authored-by: Alekhya Reddy Kommuru <reddykalekhya@gmail.com> Co-authored-by: bkudiess <bakudies@microsoft.com> Co-authored-by: Divyansh <somm14divi@gmail.com> Co-authored-by: ryanbodrug-microsoft <56318517+ryanbodrug-microsoft@users.noreply.github.com> Co-authored-by: Barbara Kudiess <bkudiess@me.com> Co-authored-by: Jeremy Wu <jeremy24wu@gmail.com> Co-authored-by: Clint Rutkas <clint@rutkas.com> Co-authored-by: udit3333 <udit3333@gmail.com> Co-authored-by: Betsegaw (Beta) Tadele <betsegaw.ta@gmail.com> Co-authored-by: PrzemyslawTusinski <61138537+PrzemyslawTusinski@users.noreply.github.com> Co-authored-by: Ben Randall <veleek@gmail.com> Co-authored-by: vldmr11080 <57061786+vldmr11080@users.noreply.github.com> Co-authored-by: eduardodextil <55205162+eduardodextil@users.noreply.github.com> Co-authored-by: Ebenezer Ewumi <ebenezer.ewumi@wsu.edu> Co-authored-by: Nghia M. Luong <32159519+sqrlmn@users.noreply.github.com> Co-authored-by: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com> Co-authored-by: Seraphima Zykova <zykovas91@gmail.com> Co-authored-by: Ivan Stošić <ivan100sic@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note the LNKs here are being pulled from the search plugin, not the program plugin