From 128724bbc892405a9668b4b1cc79935e393343b5 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Sun, 6 Mar 2016 11:11:01 +0100
Subject: [PATCH] simplify usage of exec

---
 swm.js | 48 ++++++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/swm.js b/swm.js
index 35bfe8a..259e053 100644
--- a/swm.js
+++ b/swm.js
@@ -3,18 +3,30 @@
 const xrandrParse = require('xrandr-parse');
 const exec = require('child_process').exec;
 
-function getDevices() {
+function executeCmd(cmd) {
     return new Promise((resolve, reject) => {
-        exec('xrandr', (err, stdout, stderr) => {
+        exec(cmd, (err, stdout, stderr) => {
             if (err || stderr) {
                 reject(err);
                 return;
             }
-            resolve(xrandrParse(stdout));
+            resolve(stdout);
         });
     });
 }
 
+function getDevices() {
+    return executeCmd('xrandr').then(stdout => xrandrParse(stdout));
+}
+
+function switchDevices(xrandrOptions) {
+    return executeCmd('xrandr ' + xrandrOptions);
+}
+
+function executePostCmd(postCmd) {
+    return executeCmd(postCmd);
+}
+
 function orderDeviceKeys(selectedDevices, devices) {
     let orderedDeviceKeys = Object.keys(devices).sort();
 
@@ -77,40 +89,12 @@ function generateXrandrOptions(selectedDevices, rawDevices) {
 
     // sanity check if at least one monitor is on
     if (xrandrOptions.indexOf('--auto') === -1) {
-        throw 'Non of the given monitors are connected, aborting...';
+        throw new Error('Non of the given monitors are connected, aborting...');
     }
 
     return xrandrOptions;
 }
 
-function switchDevices(xrandrOptions) {
-    return new Promise((resolve, reject) => {
-        const cmd = 'xrandr ' + xrandrOptions;
-        exec(cmd, (err, stdout, stderr) => {
-            if (err || stderr) {
-                reject(err);
-                return;
-            }
-            resolve();
-        });
-    });
-}
-
-function executePostCmd(postCmd) {
-    if (!postCmd) {
-        return;
-    }
-    return new Promise((resolve, reject) => {
-        exec(postCmd, (err, stdout, stderr) => {
-            if (err || stderr) {
-                reject(err);
-                return;
-            }
-            resolve();
-        });
-    });
-}
-
 module.exports.getDevices = getDevices;
 module.exports.generateXrandrOptions = generateXrandrOptions;
 module.exports.switchDevices = switchDevices;