Skip to content

Fixing file-tree urls for windows #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robhrt7 merged 2 commits into from
Nov 23, 2014
Merged

Fixing file-tree urls for windows #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f11c7fd
Windows specific bug fix in file-tree #74
robhrt7 Nov 23, 2014
03e45c8
Fixing excluded paths normalizing for windows at filet-tree
robhrt7 Nov 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions core/file-tree/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
});
}

Expand All @@ -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('../', '/');

Expand All @@ -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
Expand All @@ -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 + '/','');
}
Expand Down