Skip to content

refactor: Remove ixml refs in CommandCall #103

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
abmusse merged 1 commit into from
Feb 21, 2020
Merged

refactor: Remove ixml refs in CommandCall #103

Show file tree
Hide file tree
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
51 changes: 18 additions & 33 deletions lib/CommandCall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

const {
iXmlNodeCmdOpen,
iXmlNodeCmdClose,
iXmlNodeQshOpen,
iXmlNodeQshClose,
iXmlNodeShOpen,
iXmlNodeShClose,
} = require('./ixml');

const availableCommands = ['sh', 'cl', 'qsh'];

class CommandCall {
Expand All @@ -44,7 +35,7 @@ class CommandCall {

this.command = config.command;
this.type = config.type;
this.options = config.options || null;
this.options = config.options || {};
this.xml = '';
}

Expand All @@ -53,32 +44,26 @@ class CommandCall {
* @returns {string}
*/
toXML() {
if (this.type === 'sh') {
if (this.options) {
this.xml = iXmlNodeShOpen(this.options.rows, this.options.hex, this.options.before,
this.options.after, this.options.error)
+ this.command + iXmlNodeShClose();
} else {
this.xml = iXmlNodeShOpen('', '', '', '', '') + this.command + iXmlNodeShClose();
}
} else if (this.type === 'cl') {
const exec = (this.command.indexOf('?') > 0) ? 'rexx' : 'cmd';
if (!availableCommands.includes(this.type)) {
throw new Error(`Invalid command type (${this.type}). Valid types: (${availableCommands.join(', ')})`);
}

const type = this.type === 'cl' ? 'cmd' : this.type;
this.xml = `<${type}`;

if (this.options) {
this.xml = iXmlNodeCmdOpen(this.options.exec, this.options.hex, this.options.before,
this.options.after, this.options.error) + this.command + iXmlNodeCmdClose();
} else {
this.xml = iXmlNodeCmdOpen(exec, '', '', '', '', '') + this.command + iXmlNodeCmdClose();
}
} else if (this.type === 'qsh') {
if (this.options) {
this.xml = iXmlNodeQshOpen(this.options.rows, this.options.hex, this.options.before,
this.options.after, this.options.error) + this.command + iXmlNodeQshClose();
} else {
this.xml = iXmlNodeQshOpen('', '', '', '', '') + this.command + iXmlNodeQshClose();
}
if (this.type === 'cl') {
const defaultExec = (this.command.indexOf('?') > 0) ? 'rexx' : 'cmd';
this.xml += ` exec='${this.options.exec || defaultExec}'`;
}

// append optional values if set
if (this.options.rows) this.xml += ` rows='${this.options.rows}'`;
if (this.options.hex) this.xml += ` hex='${this.options.hex}'`;
if (this.options.before) this.xml += ` before='${this.options.before}'`;
if (this.options.after) this.xml += ` after='${this.options.after}'`;

this.xml += ` error='${this.options.error || 'fast'}'>${this.command}</${type}>`;

return this.xml;
}
}
Expand Down
6 changes: 0 additions & 6 deletions lib/ixml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,11 @@ module.exports.iXmlNodeDataOpen = (xtype, options) => {

module.exports.iXmlNodeDataClose = () => '</data>';

module.exports.iXmlNodeCmdOpen = (xexec, xhex, xbefore, xafter, xerror) => `<cmd${iXmlAttrDefault('exec', xexec, 'system')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodeCmdClose = () => '</cmd>';

module.exports.iXmlNodeShOpen = (xrows, xhex, xbefore, xafter, xerror) => `<sh${iXmlAttrDefault('rows', xrows, '')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodeShClose = () => '</sh>';

module.exports.iXmlNodeQshOpen = (xrows, xhex, xbefore, xafter, xerror) => `<qsh${iXmlAttrDefault('rows', xrows, '')}${iXmlAttrDefault('hex', xhex, '')}${iXmlAttrDefault('before', xbefore, '')}${iXmlAttrDefault('after', xafter, '')}${iXmlAttrDefault('error', xerror, 'fast')}>`;

module.exports.iXmlNodeQshClose = () => '</qsh>';



Expand Down