Skip to content

roadmap.domain now support array config. #16

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

Open
dsonet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

roadmap.domain now support array config. #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 36 additions & 12 deletions lib/file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,46 @@ function getDomainsByPath(path){
if(typeof domain === 'string'){
value = domain.split(/\s*,\s*/);
} else if(fis.util.is(domain, 'Array')) {
value = domain;
} else {
fis.util.map(domain, function(pattern, domain){
if((pattern === 'image' && fis.util.isImageFile(path)) || fis.util.glob(pattern, path)){
if(typeof domain === 'string'){
value = domain.split(/\s*,\s*/);
} else if(fis.util.is(domain, 'Array')){
value = domain;
if(typeof domain[0] === 'string') {
value = domain;
} else {
var matched = domain.some(function(element, index, array) {
var reg = element.reg, url = element.url, matched;
if(fis.util.is(reg, 'RegExp')){
if(reg.test(path)) {
if(typeof url === 'string'){
value = url.split(/\s*,\s*/);
} else if(fis.util.is(url, 'Array')){
value = url;
} else {
fis.log.warning('invalid domain [' + url + '] of [roadmap.domain.' + index + ']');
}
return true;
}
} else {
fis.log.warning('invalid domain [' + domain + '] of [roadmap.domain.' + pattern + ']');
if(testPath(reg, url)) {
return true;
}
}
return true;
}
});
});
}
} else {
fis.util.map(domain, testPath);
}
return value;

function testPath(pattern, domain){
if((pattern === 'image' && fis.util.isImageFile(path)) || fis.util.glob(pattern, path)){
if(typeof domain === 'string'){
value = domain.split(/\s*,\s*/);
} else if(fis.util.is(domain, 'Array')){
value = domain;
} else {
fis.log.warning('invalid domain [' + domain + '] of [roadmap.domain.' + pattern + ']');
}
return true;
}
}
}


Expand Down