madden-franchise 2.5.0 → 2.5.4

package/FranchiseFile.js

@@ -175,39 +175,41 @@ class FranchiseFile extends EventEmitter {
     });
   };
 
-  save(outputFilePath) {
-    return this.packFile(outputFilePath);
+  save(outputFilePath, options) {
+    return this.packFile(outputFilePath, options);
   };
 
-  packFile(outputFilePath) {
+  packFile(outputFilePath, options) {
     const that = this;
     this.emit('saving');
 
     return new Promise((resolve, reject) => {
       this.unpackedFileContents = this.strategy.file.generateUnpackedContents(this.tables, this.unpackedFileContents);
-      // const changedTables = this.tables.filter((table) => { return table.isChanged; });
-  
-      //   for (let i = 0; i < changedTables.length; i++) {
-      //     let table = changedTables[i];
-      //     const header = that.unpackedFileContents.slice(0, table.offset);
-      //     const trailer = that.unpackedFileContents.slice(table.offset + table.data.length);
-      //     that.unpackedFileContents = Buffer.concat([header, table.hexData, trailer]);
-
-      //     table.isChanged = false;
-      //   }
 
       let destination = outputFilePath ? outputFilePath : this.filePath;
   
-      _packFile(this.unpackedFileContents).then((data) => {
+      _packFile(this.unpackedFileContents, options).then((data) => {
         const dataToSave = this.strategy.file.postPackFile(this.packedFileContents, data);
-        _save(destination, dataToSave, (err) => {
+
+        if (options && options.sync) {
+          _saveSync(destination, dataToSave);
+          postSaveActions();
+        }
+        else {
+          _save(destination, dataToSave, (err) => {
+            postSaveActions(err);
+          });
+        }
+
+        function postSaveActions(err) {
           if (err) {
             reject(err);
             that.emit('save-error');
           }
+
           resolve('saved');
           that.emit('saved');
-        });
+        }
       });
     });
   };
@@ -346,15 +348,24 @@ function unpackFile (data, type) {
   return zlib.inflateSync(data.slice(offset));
 };
 
-function _packFile (data) {
+function _packFile (data, options) {
   return new Promise((resolve, reject) => {
-    zlib.deflate(data, {
-      windowBits: 15
-    }, function (err, newData) {
-      if (err) reject(err);
-
+    if (options && options.sync) {
+      const newData = zlib.deflateSync(data, {
+        windowBits: 15
+      });
+      
       resolve(newData);
-    });
+    }
+    else {
+      zlib.deflate(data, {
+        windowBits: 15
+      }, function (err, newData) {
+        if (err) reject(err);
+  
+        resolve(newData);
+      });
+    }
   });
 };
 
@@ -362,6 +373,10 @@ function _save (destination, packedContents, callback) {
   fs.writeFile(destination, packedContents, callback);
 };
 
+function _saveSync (destination, packedContents) {
+  fs.writeFileSync(destination, packedContents);
+};
+
 function getFileType(data) {
   const isDataCompressed = isCompressed(data);
   const format = getFormat(data, isDataCompressed);

package/FranchiseSchema.js

@@ -46,6 +46,7 @@ class FranchiseSchema extends EventEmitter {
     this.meta = this.schema.meta;
     this.schemas = this.schema.schemas;
     this.schemaMap = {};
+    this.enumMap = {};
   
     for (let i = 0; i < this.schemas.length; i++) {
       const schema = this.schemas[i];
@@ -56,6 +57,7 @@ class FranchiseSchema extends EventEmitter {
   
         if (attribute.enum) {
           attribute.enum = new FranchiseEnum(attribute.enum);
+          this.enumMap[attribute.enum.name] = attribute.enum;
         } 
       }
     }
@@ -64,6 +66,11 @@ class FranchiseSchema extends EventEmitter {
     const extraSchemas = schemaGenerator.getExtraSchemas();
     extraSchemas.forEach((schema) => {
       if (!this.schemaMap[schema.name]) {
+        schema.attributes.forEach((attrib) => {
+          if (attrib.enum) {
+            attrib.enum = new FranchiseEnum(this.enumMap[attrib.enum]);
+          }
+        })
         this.schemas.unshift(schema);
         this.schemaMap[schema.name] = schema;
         addedExtraSchema = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madden-franchise",
-  "version": "2.5.0",
+  "version": "2.5.4",
   "description": "Tools to read a madden franchise file and get data from it",
   "main": "FranchiseFile.js",
   "scripts": {

package/services/schemaGenerator.js

@@ -6,7 +6,6 @@ const utilService = require('./utilService');
 const FranchiseEnum = require('../FranchiseEnum');
 const XmlParser = require('node-xml-stream-parser');
 const EventEmitter = require('events').EventEmitter;
-const extraSchemas = JSON.parse(JSON.stringify(require(path.join(__dirname, '../data/schemas/extra-schemas.json'))));
 
 let schemaGenerator = {};
 schemaGenerator.eventEmitter = new EventEmitter();
@@ -22,6 +21,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
   schemaGenerator.schemaMap = {};
   schemaGenerator.schemaMeta = {};
   schemaGenerator.enums = [];
+  const extraSchemas = schemaGenerator.getExtraSchemas();
 
   schemaGenerator.xml = new XmlParser();
 
@@ -33,7 +33,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
         console.error(err);
         throw err;
       }
-
+      
       schemaGenerator.enums.forEach((theEnum) => {
         theEnum.setMemberLength();
       });
@@ -159,7 +159,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
   function addExtraSchemas() {
     extraSchemas.forEach((schema) => {
       if (!schemaGenerator.schemaMap[schema.name]) {
-        schema.attributes.filter((attrib) => { 
+        schema.attributes.filter((attrib) => {
           return attrib.enum && !(attrib.enum instanceof FranchiseEnum);
         }).forEach((attrib) => {
           attrib.enum = getEnum(attrib.enum);
@@ -184,19 +184,7 @@ schemaGenerator.generateFromStream = (stream, showOutput, outputFile) => {
 };
 
 schemaGenerator.getExtraSchemas = () => {
-  let newSchemas = [];
-
-  extraSchemas.forEach((schema) => {
-    schema.attributes.filter((attrib) => { 
-      return attrib.enum && !(attrib.enum instanceof FranchiseEnum);
-    }).forEach((attrib) => {
-      attrib.enum = new FranchiseEnum(attrib.enum);
-    });
-
-    newSchemas.push(schema);
-  });
-
-  return newSchemas;
+  return JSON.parse(JSON.stringify(require(path.join(__dirname, '../data/schemas/extra-schemas.json'))));
 };
 
 schemaGenerator.calculateInheritedSchemas = (schemaList) => {