kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-11-03 20:55:29 +00:00
Code Issues Projects Releases Wiki Activity

Add module subfolder support.

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-01 17:35:29 +02:00
parent 671338425a
commit e4c54cc655
27 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/electron.js
View File

@@ -6,7 +6,7 @@ const fs = require('fs');
const Server = require(__dirname + '/server.js');
const spawn = require('child_process').spawn;
const electron = require('electron');
const defaultModules = require(__dirname + '/../modules/default/defaultmodules.js');
// Config
var config = {};
@@ -56,8 +56,18 @@ function loadConfig (callback) {
}
}
function loadModule(moduleName) {
var helperPath = __dirname + '/../modules/' + moduleName + '/node_helper.js';
function loadModule(module) {
var elements = module.split('/');
var moduleName = elements[elements.length - 1];
var moduleFolder = __dirname + '/../modules/' + module;
if (defaultModules.indexOf(moduleName) !== -1) {
moduleFolder = __dirname + '/../modules/default/' + module;
}
var helperPath = moduleFolder + '/node_helper.js';
var loadModule = true;
try {
fs.accessSync(helperPath, fs.R_OK);

14
js/loader.js
View File

@@ -79,12 +79,20 @@ var Loader = (function() {
var moduleData = modules[m];
var module = moduleData.module;
var elements = module.split('/');
var moduleName = elements[elements.length - 1];
var moduleFolder = config.paths.modules + '/' + module;
if (defaultModules.indexOf(moduleName) !== -1) {
moduleFolder = config.paths.modules + '/default/' + module;
}
moduleFiles.push({
index: m,
identifier: 'module_' + m + '_' + module,
name: module,
path: config.paths.modules + '/' + module,
file: module + '.js',
name: moduleName,
path: moduleFolder + '/' ,
file: moduleName + '.js',
position: moduleData.position,
header: moduleData.header,
config: moduleData.config,