Skip to content
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.

Sign up for GitHub

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

Jump to bottom

GPII-4511 Adding solution id list and filter to avoid having them cap… #209

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GPII-4511 Adding solution id list and filter to avoid having them cap… #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/main/dialogs/captureToolDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ fluid.defaults("gpii.app.captureTool", {
isKeyedIn: false,
keyedInUserToken: null,
preferences: {},
flatSolutionsRegistry: {}
flatSolutionsRegistry: {},

// Solutions to ignore. This is a runtime configurable variable with ID's of
// solutions to exclude from the capture process.
solutionsToExclude: [
"net.gpii.test.speechControl",
"net.gpii.explode"
]
},
/*
* Raw options to be passed to the Electron `BrowserWindow` that is created.
Expand Down Expand Up @@ -216,7 +223,7 @@ fluid.defaults("gpii.app.captureTool", {
},
getAllSolutionsCapture: {
funcName: "gpii.app.captureTool.channelGetAllSolutionsCapture",
args: ["{captureTool}.channelNotifier", "{flowManager}", "{arguments}.0"]
args: ["{captureTool}.model.solutionsToExclude", "{captureTool}.channelNotifier", "{flowManager}", "{arguments}.0"]
},
captureDoneButton: {
func: "{captureTool}.close"
Expand Down Expand Up @@ -410,18 +417,24 @@ gpii.app.captureTool.safelyGetSolutionsCapture = function (flowManager, solution
/**
* Fetches the entire system capture and sends it to the renderer over the `channelNotifier`.
*
* @param {Array<String>} solutionsToExclude - Array of Solution IDs to exclude from capture.
* @param {gpii.app.channelNotifier} channelNotifier - The channel notifier to the renderer process.
* @param {gpii.flowManager.local} flowManager - The local flow manager.
* @param {Object} args - Optional object contains an array `solutionsList` of solution ID's to capture.
*/
gpii.app.captureTool.channelGetAllSolutionsCapture = function (channelNotifier, flowManager, args) {
gpii.app.captureTool.channelGetAllSolutionsCapture = function (solutionsToExclude, channelNotifier, flowManager, args) {
var options = {
solutionsList: []
};
if (args.solutionsList) {
options.solutionsList = args.solutionsList;
}

// Filter out excluded solutions (usually ridiculous ones like net.gpii.explode)
fluid.remove_if(options.solutionsList, function (val) {
return solutionsToExclude.indexOf(val) >= 0;
});

var result = gpii.app.captureTool.safelyGetSolutionsCapture(flowManager, options.solutionsList);
result.then(function (data) {
channelNotifier.events.sendingAllSolutionsCapture.fire(data);
Expand Down