Skip to content

Minor code refactor for the plugins-service #672

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

Merged
Mitko-Kerezov merged 3 commits into from
Jan 16, 2015
Merged

Minor code refactor for the plugins-service #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4ec154
plugins-service code refactor
Jan 15, 2015
8e1ac74
fix function paramater name from `getPluginsWithoutOptions` to `opera…
Jan 16, 2015
ac993da
rebase with master
Jan 16, 2015
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
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 2 files
+0 −11 helpers.ts
+1 −1 options.ts
37 changes: 16 additions & 21 deletions lib/services/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,12 @@ export class PluginsService implements IPluginsService {
}

public getInstalledPlugins(): IPlugin[] {
var corePlugins: any = null;
if(options.debug || options.d) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug");
} else if(options.release || options.r) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release");
} else {
corePlugins = _.intersection(this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug"), this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release"));
}

return _.map(corePlugins, (pluginIdentifier: string) => this.identifierToPlugin[pluginIdentifier]);
return this.getAllInstalledPlugins({getPluginsWithoutOptions: _.intersection});
}

// return plugins that are enabled in one or more configurations
public getInstalledPluginsEnabledAtLeastInOneConfiguration(): IPlugin[] {
var corePlugins: any = null;
if(options.debug || options.d) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug");
} else if(options.release || options.r) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release");
} else {
corePlugins = _.union(this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug"), this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release"));
}

return _.map(corePlugins, (pluginIdentifier: string) => this.identifierToPlugin[pluginIdentifier]);
return this.getAllInstalledPlugins({getPluginsWithoutOptions: _.union});
}

public getAvailablePlugins(): IPlugin[] {
Expand Down Expand Up @@ -257,5 +239,18 @@ export class PluginsService implements IPluginsService {

return plugin;
}

private getAllInstalledPlugins(configuration: {operation: (...args: any[]) => any[]}): IPlugin[] {
var corePlugins: any = null;
if(options.debug || options.d) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug");
} else if(options.release || options.r) {
corePlugins = this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release");
} else {
corePlugins = configuration.operation(this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "debug"), this.$project.getProperty(PluginsService.CORE_PLUGINS_PROPERTY_NAME, "release"));
}

return _.map(corePlugins, (pluginIdentifier: string) => this.identifierToPlugin[pluginIdentifier]);
}
}
$injector.register("pluginsService", PluginsService);
$injector.register("pluginsService", PluginsService);