Merge pull request #75 from sourcejs/operatino/file-tree-windows-fix

Fixing file-tree urls for windows

Author: robhrt7

core/file-tree/index.js

@@ -20,14 +20,16 @@ var config = {
     cronProd: true,
     cronRepeatTime: 60000,
     outputFile: path.join(global.pathToApp, 'core/api/data/pages_tree.json'),
-    specsRoot: path.join(global.pathToApp, globalOpts.common.pathToUser),
+    specsRoot: path.join(global.pathToApp, globalOpts.common.pathToUser).replace(/\\/g, '/'),
 
     // Files from parser get info
     infoFile: "info.json"
 };
 // Overwriting base options
 deepExtend(config, global.opts.core.fileTree);
 
+var normalizedPathToApp = global.pathToApp.replace(/\\/g, '/');
+
 var prepareExcludesRegex = function(){
     var dirsForRegExp = '';
     var i = 1;
@@ -61,13 +63,13 @@ var fileTree = function (dir) {
 
     // Adding paths to files in array
     for (var i = 0; dirContent.length > i; i++) {
-        dirContent[i] = path.join(dir, dirContent[i]);
+        dirContent[i] = path.join(dir, dirContent[i].replace(/\\/g, '/'));
     }
 
     //on first call we add includedDirs
     if (dir === config.specsRoot) {
         config.includedDirs.map(function (includedDir) {
-            dirContent.push(path.join(global.pathToApp, includedDir));
+            dirContent.push(path.join(normalizedPathToApp, includedDir));
         });
     }
 
@@ -78,10 +80,8 @@ var fileTree = function (dir) {
         var targetFile = path.basename(pathToFile);
         var baseName = path.basename(dir);
 
-        var urlToFile = pathToFile;
-
         // Normalizing path for windows
-        urlToFile = path.normalize(urlToFile).replace(/\\/g, '/');
+        var urlToFile = path.normalize(pathToFile).replace(/\\/g, '/');
 
         var urlFromHostRoot = urlToFile.replace('../', '/');
 
@@ -108,7 +108,7 @@ var fileTree = function (dir) {
                 urlForJson = urlFromHostRoot.replace(config.specsRoot, '');
             } else {
                 // Cleaning path for included folders
-                urlForJson = urlFromHostRoot.replace(global.pathToApp, '');
+                urlForJson = urlFromHostRoot.replace(normalizedPathToApp, '');
             }
 
             //Removing filename from path
@@ -128,8 +128,8 @@ var fileTree = function (dir) {
 
                 deepExtend(page, fileJSON);
             }
-            var thumbPath = dir + '/thumbnail.png';
 
+            var thumbPath = dir + '/thumbnail.png';
             if (fs.existsSync(thumbPath)) {
                 page.thumbnail = thumbPath.replace(config.specsRoot + '/','');
             }