-
-
Notifications
You must be signed in to change notification settings - Fork 21
Implement plugin filters #490
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
554f652
feat: display component icon in the plugin table
DropSnorz 07400ea
feat: add plugin side filters
DropSnorz 4309ec2
Add Ramiro in CONTRIBUTORS file
DropSnorz f44ac22
feat: register inactive component by default during plugin scan
DropSnorz 27cae7e
feat: add plugin type filter and mitigate change listener leaks
DropSnorz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ Philip Emery | |
| Christian Derr | ||
| Antti Aro | ||
| Kim T | ||
| Ramiro Montes De Oca | ||
This file contains hidden or 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
This file contains hidden or 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
114 changes: 114 additions & 0 deletions
114
owlplug-client/src/main/java/com/owlplug/plugin/components/PluginFilterState.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* OwlPlug | ||
| * Copyright (C) 2021 Arthur <dropsnorz@gmail.com> | ||
| * | ||
| * This file is part of OwlPlug. | ||
| * | ||
| * OwlPlug is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * OwlPlug is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with OwlPlug. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.owlplug.plugin.components; | ||
|
|
||
| import com.owlplug.plugin.model.IPlugin; | ||
| import com.owlplug.plugin.model.Plugin; | ||
| import com.owlplug.plugin.model.PluginComponent; | ||
| import com.owlplug.plugin.model.PluginFormat; | ||
| import com.owlplug.plugin.model.PluginType; | ||
| import java.util.function.Predicate; | ||
| import javafx.beans.binding.Bindings; | ||
| import javafx.beans.property.ObjectProperty; | ||
| import javafx.beans.property.SimpleObjectProperty; | ||
| import javafx.collections.FXCollections; | ||
| import javafx.collections.ObservableSet; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| public class PluginFilterState { | ||
|
|
||
| private final ObservableSet<PluginFormat> selectedFormats = FXCollections.observableSet(); | ||
| private final ObservableSet<PluginType> selectedTypes = FXCollections.observableSet(); | ||
| private final ObservableSet<String> selectedManufacturers = FXCollections.observableSet(); | ||
| private final ObservableSet<String> selectedCategories = FXCollections.observableSet(); | ||
| private final ObjectProperty<Predicate<IPlugin>> predicate = new SimpleObjectProperty<>(); | ||
|
|
||
| public PluginFilterState() { | ||
| predicate.bind(Bindings.createObjectBinding(this::buildPredicate, | ||
| selectedFormats, selectedTypes, selectedManufacturers, selectedCategories)); | ||
| } | ||
|
|
||
| private Predicate<IPlugin> buildPredicate() { | ||
| if (selectedFormats.isEmpty() && selectedTypes.isEmpty() | ||
| && selectedManufacturers.isEmpty() && selectedCategories.isEmpty()) { | ||
| return null; | ||
| } | ||
| return plugin -> { | ||
| if (plugin instanceof PluginComponent component) { | ||
| return matchesFormat(component.asPlugin().getFormat()) | ||
| && matchesType(component.getType()) | ||
| && matchesManufacturer(component.getManufacturerName()) | ||
| && matchesCategory(component.getCategory()); | ||
| } else { | ||
| Plugin p = (Plugin) plugin; | ||
| return matchesFormat(p.getFormat()) | ||
| && (matchesType(p.getType()) | ||
| || p.getComponents().stream().anyMatch(c -> matchesType(c.getType()))) | ||
| && (matchesManufacturer(p.getManufacturerName()) | ||
| || p.getComponents().stream().anyMatch(c -> matchesManufacturer(c.getManufacturerName()))) | ||
| && (matchesCategory(p.getCategory()) | ||
| || p.getComponents().stream().anyMatch(c -> matchesCategory(c.getCategory()))); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private boolean matchesFormat(PluginFormat format) { | ||
| return selectedFormats.isEmpty() || selectedFormats.contains(format); | ||
| } | ||
|
|
||
| private boolean matchesType(PluginType type) { | ||
| return selectedTypes.isEmpty() || selectedTypes.contains(type); | ||
| } | ||
|
|
||
| private boolean matchesManufacturer(String manufacturer) { | ||
| return selectedManufacturers.isEmpty() || selectedManufacturers.contains(manufacturer); | ||
| } | ||
|
|
||
| private boolean matchesCategory(String category) { | ||
| return selectedCategories.isEmpty() || selectedCategories.contains(category); | ||
| } | ||
|
|
||
| public ObservableSet<PluginFormat> getSelectedFormats() { | ||
| return selectedFormats; | ||
| } | ||
|
|
||
| public ObservableSet<PluginType> getSelectedTypes() { | ||
| return selectedTypes; | ||
| } | ||
|
|
||
| public ObservableSet<String> getSelectedManufacturers() { | ||
| return selectedManufacturers; | ||
| } | ||
|
|
||
| public ObservableSet<String> getSelectedCategories() { | ||
| return selectedCategories; | ||
| } | ||
|
|
||
| public ObjectProperty<Predicate<IPlugin>> predicateProperty() { | ||
| return predicate; | ||
| } | ||
|
|
||
| public void clearAll() { | ||
| selectedFormats.clear(); | ||
| selectedTypes.clear(); | ||
| selectedManufacturers.clear(); | ||
| selectedCategories.clear(); | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.