WIP - use xinitrc

Author: jmwohl

.gitignore

@@ -4,4 +4,5 @@ log/*
 artwork/
 npm-debug.log
 coverage/*
-player/*
+player/*
+test/.xinitrc

extension.js

@@ -1,5 +1,6 @@
 var pjson = require('./package.json'),
-    Extension = require('openframe-extension');
+    Extension = require('openframe-extension'),
+    execSync = require('child_process').execSync;
 
 /**
  * Extensions should expose an instance of the Extension class.
@@ -13,7 +14,36 @@ module.exports = new Extension({
         // this is what might get displayed to users (not currently used)
         'display_name': 'Website',
         'download': false,
-        'start_command': 'xinit /usr/bin/chromium --kiosk $url',
-        'end_command': 'sudo pkill -f chromium'
-    }
+        'start_command': function(args, tokens) {
+            // 1. replace tokens in .xinitrc
+            _replaceTokens(this.xinitrcPath, tokens);
+            // 2. return xinit
+            return 'xinit ' + this.xinitrcPath;
+        },
+        'end_command': 'sudo pkill -f chromium',
+        xinitrcPath: __dirname + '/scripts/.xinitrc'
+    },
 });
+
+/**
+ * Replace tokens in a file.
+ *
+ * @param  {string} _str
+ * @param  {object} tokens
+ * @return {string} The string with tokens replaced.
+ */
+function _replaceTokens(filePath, tokens) {
+
+    function replace(token, value) {
+        // tokens start with a $, oops
+        token = '\\' + token;
+        var cmd = 'sed -i "s,' + token + ',' + value + ',g" ' + filePath;
+        execSync(cmd);
+    }
+
+    var key;
+    for (key in tokens) {
+        // TODO: better token replacement (global replacement?
+        replace(key, tokens[key]);
+    }
+}

scripts/.end_command

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# cleanup chromium in case it dies unexpectedly
+sed -i 's/"exited_cleanly": false/"exited_cleanly": true/' ~/.config/chromium/Default/Preferences

scripts/.xinitrc

@@ -0,0 +1,7 @@
+xscreensaver -no-splash
+
+xset s off
+xset -dpms
+xset s noblank
+
+exec /usr/bin/chromium --noerrdialogs --kiosk --incognito $url

test/.xinitrc.spec

@@ -0,0 +1 @@
+exec /usr/bin/chromium --noerrdialogs --kiosk --incognito $url

test/extension.spec.js

@@ -1,4 +1,6 @@
 var assert = require('assert'),
+    exec = require('child_process').exec,
+    fs = require('fs'),
     Extension = require('openframe-extension'),
     WebsiteExtension = require('../extension');
 
@@ -9,6 +11,14 @@ describe('instantiation', function() {
 });
 
 describe('properties', function() {
+    before(function(done) {
+        exec('cp ' + __dirname + '/.xinitrc.spec ' + __dirname + '/.xinitrc', done);
+    });
+
+    after(function(done) {
+        exec('rm ' + __dirname + '/.xinitrc', done);
+    });
+
     it('should include all required format properties', function() {
         var format = WebsiteExtension.props.format;
 
@@ -31,4 +41,26 @@ describe('properties', function() {
         assert(format.end_command);
         assert(typeof format.end_command === 'string');
     });
+
+    it('start_command should update .xinitrc file with supplied token', function(done) {
+        var format = WebsiteExtension.props.format,
+            command,
+            expected = 'exec /usr/bin/chromium --noerrdialogs --kiosk --incognito http://test.com';
+
+        // use test .xinitrc
+        format.xinitrcPath = __dirname + '/.xinitrc';
+
+        // replace $url token with url string
+        command = format.start_command({}, {
+            $url: 'http://test.com'
+        });
+
+        assert(typeof command === 'string');
+
+        fs.readFile(format.xinitrcPath, 'utf8', function(err, data) {
+            if (err) throw err;
+            assert.equal(data, expected);
+            done();
+        });
+    });
 });