Skip to content

Extensions: Fix options and allow passing functions to the end_command #48

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
jmwohl merged 2 commits into from
Sep 28, 2019
Merged

Extensions: Fix options and allow passing functions to the end_command #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ca5fa4
Adds option to pass functions to the `end_command` in extensions. Clo…
jvolker Sep 23, 2019
68cf360
Aligns artwork property name with database. Fixes #47
jvolker Sep 24, 2019
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
23 changes: 16 additions & 7 deletions src/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ fc.changeArtwork = function() {
function swapArt() {
debug('swapArt');
if (old_artwork) {
_endArt(old_format.end_command, old_artwork)
_endArt(old_format, old_artwork)
.then(function() {
_startArt(new_format, new_artwork).then(function() {
fc.current_artwork = new_artwork;
Expand Down Expand Up @@ -406,8 +406,8 @@ function _startArt(new_format, new_artwork) {

// we're passing artwork-specific args and tokens here, letting the format
// construct the command dynamically...
var settings = new_artwork.settings || {};
_command = _command.call(new_format, settings, tokens);
var options = new_artwork.options || {};
_command = _command.call(new_format, options, tokens);
}
var command = _replaceTokens(_command, tokens);

Expand All @@ -421,14 +421,23 @@ function _startArt(new_format, new_artwork) {

/**
* End a playing artwork.
* @param {string} _command
* @param {string} old_format
* @param {object} old_artwork
* @return {Promise} Resolves when command is complete.
*/
function _endArt(_command, old_artwork) {
function _endArt(old_format, old_artwork) {
debug('endArt');
var tokens = old_artwork.tokens || {},
command = _replaceTokens(_command, tokens);
var _command = old_format.end_command,
tokens = old_artwork.tokens || {};
if (typeof _command === 'function') {

// we're passing artwork-specific args and tokens here, letting the format
// construct the command dynamically...
var options = old_artwork.options || {};
_command = _command.call(old_format, options, tokens);
}
var command = _replaceTokens(_command, tokens);

return new Promise(function(resolve, reject) {
proc_man.exec(command, function(err) {
if (err) {
Expand Down