diff --git a/plugins/eos/main.js b/plugins/eos/main.js
index 08eed38..e9d8c96 100644
--- a/plugins/eos/main.js
+++ b/plugins/eos/main.js
@@ -1,5 +1,6 @@
const _ = require('lodash');
const fs = require('fs');
+const path = require('path');
exports.defaultName = 'ETC Eos';
exports.connectionType = 'osc';
@@ -132,7 +133,7 @@ exports.data = function data(device, osc) {
};
-const cueTemplate = _.template(fs.readFileSync(`./plugins/eos/cue.ejs`));
+const cueTemplate = _.template(fs.readFileSync(path.join(__dirname, `cue.ejs`)));
exports.update = function update(device, doc, updateType, data){
diff --git a/plugins/eos/template.ejs b/plugins/eos/template.ejs
index b77c514..1b26c0d 100644
--- a/plugins/eos/template.ejs
+++ b/plugins/eos/template.ejs
@@ -5,7 +5,8 @@
<%
const fs = require('fs');
- let cueTemplate = _.template(fs.readFileSync(`./plugins/eos/cue.ejs`));
+ const path = require('path');
+ let cueTemplate = _.template(fs.readFileSync(path.join(__dirname, `/plugins/eos/cue.ejs`)));
%>
diff --git a/plugins/qlab/cue.ejs b/plugins/qlab/cue.ejs
index 970adb5..b887359 100644
--- a/plugins/qlab/cue.ejs
+++ b/plugins/qlab/cue.ejs
@@ -5,19 +5,19 @@
<% if(cue.broken){ %>
-
+
<% }else if(cue.running){ %>
-
+
<% }else if(cue.paused){ %>
-
+
<% }else if(cue.loaded){ %>
-
+
<% }else if(cue.flagged){ %>
-
+
<% }else{ %>
@@ -25,7 +25,7 @@
|
- .replace(' ','-') %>.png) |
+ .replace(' ','-') %>.png) |
<%= cue.number || " " %> |
diff --git a/plugins/qlab/main.js b/plugins/qlab/main.js
index c70f689..de6e009 100644
--- a/plugins/qlab/main.js
+++ b/plugins/qlab/main.js
@@ -1,5 +1,6 @@
const _ = require('lodash');
const fs = require('fs');
+const path = require('path');
let lastElapsedUpdate = Date.now();
@@ -267,9 +268,9 @@ exports.data = function data(device, oscData) {
};
-const cueTemplate = _.template(fs.readFileSync(`./plugins/qlab/cue.ejs`));
-const tileTemplate = _.template(fs.readFileSync(`./plugins/qlab/tile.ejs`));
-const cartTemplate = _.template(fs.readFileSync(`./plugins/qlab/cart.ejs`));
+const cueTemplate = _.template(fs.readFileSync(path.join(__dirname, `cue.ejs`)));
+const tileTemplate = _.template(fs.readFileSync(path.join(__dirname, `tile.ejs`)));
+const cartTemplate = _.template(fs.readFileSync(path.join(__dirname, `cart.ejs`)));
exports.update = function update(device, doc, updateType, data){
diff --git a/plugins/qlab/template.ejs b/plugins/qlab/template.ejs
index 427cb58..e15c56d 100644
--- a/plugins/qlab/template.ejs
+++ b/plugins/qlab/template.ejs
@@ -6,11 +6,12 @@
<%
const fs = require('fs');
let _ = require('lodash');
+ const path = require('path');
- let cueTemplate = _.template(fs.readFileSync(`./plugins/qlab/cue.ejs`));
- let tileTemplate = _.template(fs.readFileSync(`./plugins/qlab/tile.ejs`));
- let cartTemplate = _.template(fs.readFileSync(`./plugins/qlab/cart.ejs`));
- let listTemplate = _.template(fs.readFileSync(`./plugins/qlab/cuelist.ejs`));
+ let cueTemplate = _.template(fs.readFileSync(path.join(__dirname, `/plugins/qlab/cue.ejs`)));
+ let tileTemplate = _.template(fs.readFileSync(path.join(__dirname, `/plugins/qlab/tile.ejs`)));
+ let cartTemplate = _.template(fs.readFileSync(path.join(__dirname, `/plugins/qlab/cart.ejs`)));
+ let listTemplate = _.template(fs.readFileSync(path.join(__dirname, `/plugins/qlab/cuelist.ejs`)));
%>
diff --git a/src/plugins.js b/src/plugins.js
index df13a1b..794fcd6 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -1,6 +1,7 @@
/* eslint-disable global-require */
const fs = require('fs');
const _ = require('lodash');
+const path = require('path');
const DEVICE = require('./device.js');
const VIEW = require('./view.js');
@@ -9,9 +10,12 @@ const allPlugins = {};
module.exports.all = allPlugins;
module.exports.init = function init(callback) {
- console.log(`Loading plugin files... ${__dirname}/../plugins`);
- fs.readdir(`${__dirname}/../plugins`, (err, files) => {
+ let pluginDirectoryPath = path.normalize(path.join(__dirname, `../plugins`));
+
+ console.log(`Loading plugin files... ${pluginDirectoryPath}`);
+
+ fs.readdir(pluginDirectoryPath, (err, files) => {
files.forEach((plugin)=>{
if (plugin[0] !== '.') {
@@ -19,7 +23,7 @@ module.exports.init = function init(callback) {
console.log(`${plugin} started`);
// eslint-disable-next-line import/no-dynamic-require
- allPlugins[plugin] = require(`${__dirname}/../plugins/${plugin}/main.js`);
+ allPlugins[plugin] = require(path.join(pluginDirectoryPath, `/${plugin}/main.js`));
const p = allPlugins[plugin];
@@ -31,15 +35,13 @@ module.exports.init = function init(callback) {
};
p.template = _.template(
- fs.readFileSync(
- `${__dirname}/../plugins/${plugin}/template.ejs`,
+ fs.readFileSync(path.join(pluginDirectoryPath, `/${plugin}/template.ejs`),
'utf8'
)
);
p.info = _.template(
- fs.readFileSync(
- `${__dirname}/../plugins/${plugin}/info.html`,
+ fs.readFileSync(path.join(pluginDirectoryPath, `/${plugin}/info.html`),
'utf8'
)
);