@@ -12,31 +12,24 @@ var constants = require('../constants'),
12
12
13
13
var toStringFunction = Object . prototype . toString ;
14
14
15
- // load the rule(s) from a folder or file
16
15
function loadValidationRules ( fileOrDir , platforms , callback ) {
17
16
18
17
var stat = Q . nfbind ( fs . stat ) ;
19
18
20
- // list contents of the validation rules folder
21
19
return Q . nfcall ( fs . readdir , fileOrDir ) . then ( function ( files ) {
22
20
return Q . allSettled ( files . map ( function ( file ) {
23
21
var filePath = path . join ( fileOrDir , file ) ;
24
22
return stat ( filePath ) . then ( function ( info ) {
25
- // test if file system object is a directory or a file
26
23
if ( info . isDirectory ( ) ) {
27
- // ignore any directory that doesn't match one of the requested platforms
28
24
if ( platforms . indexOf ( file ) < 0 ) {
29
25
return Q . resolve ( ) ;
30
26
}
31
27
32
- // process the rules in the platform folder
33
28
return loadValidationRules ( filePath , [ ] ) ;
34
29
}
35
30
36
- // load the rules defined in the file
37
31
var rulePath = path . join ( fileOrDir , file ) ;
38
32
try {
39
- // load the rule from the file
40
33
return require ( rulePath ) ;
41
34
}
42
35
catch ( err ) {
@@ -45,7 +38,6 @@ function loadValidationRules(fileOrDir, platforms, callback) {
45
38
} ) ;
46
39
} ) )
47
40
. then ( function ( results ) {
48
- // verify the results and consolidate the loaded rules
49
41
return results . reduce ( function ( validationRules , result ) {
50
42
if ( result . state === 'fulfilled' ) {
51
43
if ( result . value ) {
@@ -70,7 +62,6 @@ function loadValidationRules(fileOrDir, platforms, callback) {
70
62
throw err ;
71
63
}
72
64
73
- // fileOrDir is a file
74
65
var rules = require ( fileOrDir ) ;
75
66
return Array . isArray ( rules ) ? rules : [ rules ] ;
76
67
} )
@@ -114,7 +105,6 @@ function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
114
105
var allResults = [ ] ;
115
106
116
107
function validateAllPlatforms ( ) {
117
- // load and run validation rules for "all platforms"
118
108
var validationRulesDir = path . join ( __dirname , 'validationRules' ) ;
119
109
return loadValidationRules ( validationRulesDir ) . then ( function ( rules ) {
120
110
return runValidationRules ( w3cManifestInfo , rules ) . then ( function ( results ) {
@@ -124,7 +114,6 @@ function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
124
114
}
125
115
126
116
function validatePlatform ( ) {
127
- // run platform-specific validation rules
128
117
var platformTasks = platformModules . map ( function ( platform ) {
129
118
return platform . getValidationRules ( platforms ) . then ( function ( rules ) {
130
119
return runValidationRules ( w3cManifestInfo , rules ) . then ( function ( results ) {
@@ -136,7 +125,6 @@ function applyValidationRules(w3cManifestInfo, platformModules, platforms) {
136
125
return Q . allSettled ( platformTasks ) ;
137
126
}
138
127
139
- // Only run the "All Platform" validations for W3C manifests
140
128
if ( w3cManifestInfo . format === constants . BASE_MANIFEST_FORMAT ) {
141
129
return validateAllPlatforms ( )
142
130
. then ( validatePlatform )
@@ -256,7 +244,6 @@ function validateAndNormalizeStartUrl(siteUrl, manifestInfo, callback) {
256
244
var parsedSiteUrl = url . parse ( siteUrl ) ;
257
245
var parsedManifestStartUrl = url . parse ( manifestInfo . content . start_url ) ;
258
246
if ( parsedManifestStartUrl . hostname && parsedSiteUrl . hostname !== parsedManifestStartUrl . hostname ) {
259
- // issue #88 - bis
260
247
var subDomainOfManifestStartUrlSplitted = parsedManifestStartUrl . hostname . split ( '.' ) ;
261
248
var lengthSubDomain = subDomainOfManifestStartUrlSplitted . length ;
262
249
var subDomainOfManifestStartUrl = null ;
0 commit comments