diff --git a/utils/modularize.js b/utils/modularize.js index 381aed9c49555158fdfbef0669418c39f2a32cd7..8737ebc02b939bdcc58da6a25568bc8ed4f5e368 100644 --- a/utils/modularize.js +++ b/utils/modularize.js @@ -144,4 +144,4 @@ function convert( path, ignoreList ) { fs.writeFileSync( dstFolder + path, output, 'utf-8' ); -}; +} diff --git a/utils/packLDrawModel.js b/utils/packLDrawModel.js index 7299f5e46e2434dc2b831e70ece60411444dc329..fa3009e7b6b9f42a81a8feb898f3374a26178b43 100644 --- a/utils/packLDrawModel.js +++ b/utils/packLDrawModel.js @@ -26,8 +26,10 @@ var fs = require( 'fs' ); var path = require( 'path' ); if ( process.argv.length !== 3 ) { + console.log( "Usage: node packLDrawModel " ); - exit ( 0 ); + exit( 0 ); + } var fileName = process.argv[ 2 ]; @@ -61,14 +63,18 @@ for ( var i = 0; i < listOfNotFound.length; i ++ ) { } if ( someNotFound ) { + console.log( "Some files were not found, aborting." ); - process.exit( -1 ); + process.exit( - 1 ); + } // Obtain packed content var packedContent = materialsContent + "\n"; for ( var i = objectsPaths.length - 1; i >= 0; i -- ) { + packedContent += objectsContents[ i ]; + } packedContent += "\n"; @@ -92,7 +98,7 @@ function parseObject( fileName, isRoot ) { var prefix = ""; var objectContent = null; - for ( var attempt = 0; attempt < 2; attempt ++ ) { + for ( var attempt = 0; attempt < 2; attempt ++ ) { prefix = ""; @@ -106,8 +112,7 @@ function parseObject( fileName, isRoot ) { prefix = "p/"; - } - else if ( fileName.startsWith( 's/' ) ) { + } else if ( fileName.startsWith( 's/' ) ) { prefix = "parts/"; @@ -120,8 +125,7 @@ function parseObject( fileName, isRoot ) { objectContent = fs.readFileSync( absoluteObjectPath, { encoding: "utf8" } ); break; - } - catch ( e ) { + } catch ( e ) { prefix = "parts/"; absoluteObjectPath = path.join( ldrawPath, prefix, fileName ); @@ -131,8 +135,7 @@ function parseObject( fileName, isRoot ) { objectContent = fs.readFileSync( absoluteObjectPath, { encoding: "utf8" } ); break; - } - catch ( e ) { + } catch ( e ) { prefix = "p/"; absoluteObjectPath = path.join( ldrawPath, prefix, fileName ); @@ -142,8 +145,7 @@ function parseObject( fileName, isRoot ) { objectContent = fs.readFileSync( absoluteObjectPath, { encoding: "utf8" } ); break; - } - catch ( e ) { + } catch ( e ) { try { @@ -153,8 +155,8 @@ function parseObject( fileName, isRoot ) { objectContent = fs.readFileSync( absoluteObjectPath, { encoding: "utf8" } ); break; - } - catch ( e ) { + } catch ( e ) { + if ( attempt === 1 ) { // The file has not been found, add to list of not found @@ -184,7 +186,7 @@ function parseObject( fileName, isRoot ) { if ( objectContent.indexOf( '\r\n' ) !== - 1 ) { // This is faster than String.split with regex that splits on both - objectContent= objectContent.replace( /\r\n/g, '\n' ); + objectContent = objectContent.replace( /\r\n/g, '\n' ); } @@ -201,7 +203,7 @@ function parseObject( fileName, isRoot ) { var charIndex = 0; while ( ( line.charAt( charIndex ) === ' ' || line.charAt( charIndex ) === '\t' ) && charIndex < lineLength ) { - charIndex++; + charIndex ++; } line = line.substring( charIndex ); @@ -209,7 +211,7 @@ function parseObject( fileName, isRoot ) { charIndex = 0; - if ( line.startsWith( '0 FILE ') ) { + if ( line.startsWith( '0 FILE ' ) ) { if ( i === 0 ) { @@ -238,6 +240,7 @@ function parseObject( fileName, isRoot ) { } if ( line.startsWith( '1 ' ) ) { + // Subobject, add it charIndex = 2; @@ -247,14 +250,14 @@ function parseObject( fileName, isRoot ) { // Skip token while ( line.charAt( charIndex ) !== ' ' && line.charAt( charIndex ) !== '\t' && charIndex < lineLength ) { - charIndex++; + charIndex ++; } // Skip spaces/tabs while ( ( line.charAt( charIndex ) === ' ' || line.charAt( charIndex ) === '\t' ) && charIndex < lineLength ) { - charIndex++; + charIndex ++; } @@ -280,8 +283,7 @@ function parseObject( fileName, isRoot ) { } - } - else { + } else { processedObjectContent += line + "\n"; @@ -297,4 +299,5 @@ function parseObject( fileName, isRoot ) { } return objectPath; + }