let sync version work

Author: jianglibo

index.js

@@ -1,11 +1,11 @@
 var TreeLine = require('./lib/tree-line');
 var AsciiTree = require('./lib/ascii-tree');
-var BufferFilter = require('./lib/buffer-filter');
+var BufferConvertor = require('./lib/buffer-convertor');
 var LineUtil = require('./lib/line-util');
 var Char = require('./lib/char');
 
 module.exports.TreeLine = TreeLine;
 module.exports.AsciiTree = AsciiTree;
-module.exports.BufferFilter = BufferFilter;
+module.exports.BufferConvertor = BufferConvertor;
 module.exports.LineUtil = LineUtil;
 module.exports.Char = Char;

lib/buffer-filter.js renamed to lib/buffer-convertor.js

@@ -1,42 +1,46 @@
 var BytesLine = require('./bytes-line');
+var AsciiTree = require('./ascii-tree');
 
-module.exports = BufferFilter;
+module.exports = BufferConvertor;
 
 /**
- * @constructor BufferFilter
+ * @constructor BufferConvertor
  * @param {(string|Buffer)} bufOrStr
+ * @param {string|Regex} startTag
+ * @param {string|Regex} endTag
  * @param {{string}} [enc=UTF-8] - encoding.
  */
-function BufferFilter(bufOrStr, enc) {
+function BufferConvertor(bufOrStr, startTag, endTag, enc) {
   if (typeof bufOrStr === 'string') {
     this.buf = enc ? new Buffer(bufOrStr, enc) : new Buffer(bufOrStr);
   } else {
     this.buf = bufOrStr;
   }
+  this.startTag = startTag;
+  this.endTag = endTag;
   this.enc = enc;
   this.mixedLines = [];
 }
 /**
  * process all AsciiTree in buffer.
  * @function filter
- * @return {BufferFilter} - return this.
+ * @return {BufferConvertor} - return this.
  */
 
-BufferFilter.prototype.filter = function() {
+BufferConvertor.prototype.convert = function() {
   var i = 0,
     allLines = BytesLine.getArray(this.buf),
     oneLine,
     lineArray = [],
     startTagReached = false,
     lineType;
-
   for (; i < allLines.length; i++) {
     oneLine = allLines[i];
-    lineType = oneLine.isTagLine(startTag, endTag);
+    lineType = oneLine.isTagLine(this.startTag, this.endTag);
     if (lineType === 'START') {
       startTagReached = true;
     } else if (lineType === 'END') {
-      this.mixedLines.push(lineArray);
+      this.mixedLines.push(new AsciiTree(lineArray).convert().toBytesLines());
       lineArray = [];
       startTagReached = false;
     } else {
@@ -57,23 +61,38 @@ BufferFilter.prototype.filter = function() {
  * @function toBufferArray
  * @return {Buffer[]} - flatted array of Buffer.
  */
-BufferFilter.prototype.toBufferArray = function() {
-  var flattedLines = this.mixedLines.reduce(function(val, it){
+BufferConvertor.prototype.toBufferArray = function() {
+  var flattedLines = this.mixedLines.reduce(function(val, it) {
     return val.concat(it);
   }, []);
-  return flattedLines.map(function(it){
+  
+  return flattedLines.map(function(it) {
     return it.toBuffer();
   });
 };
+/**
+ * @function toStringArray
+ * @return {string[]} - array of string.
+ */
+BufferConvertor.prototype.toStringArray = function() {
+  var enc = this.enc,
+    bufs = this.toBufferArray();
+  return bufs.map(function(it) {
+    return enc ? it.toString(enc) : it.toString();
+  });
+};
 
 /**
  * @function toBuffer
  * @return {Buffer} - whole buffer with asciitree converted.
  */
-BufferFilter.prototype.toBuffer = function() {
+BufferConvertor.prototype.toBuffer = function() {
   return Buffer.concat(this.toBufferArray());
 };
 
-BufferFilter.prototype.toString = function() {
-  return this.enc ? this.toBuffer().toString(this.enc) : this.toBuffer().toString();
+BufferConvertor.prototype.toString = function() {
+  var enc = this.enc,
+    buf = this.toBuffer();
+
+  return enc ? buf.toString(enc) : buf.toString();
 };

lib/bytes-line.js

@@ -119,7 +119,7 @@ BytesLine.getArray = function(src, enc) {
         crlf = [];
       }
       byteArray.push(code);
-      clrfReached = false;
+      crlfReached = false;
     }
   }
 

test/buffer-convertor.js

@@ -0,0 +1,28 @@
+var fs = require('fs');
+var assert = require('assert');
+var BytesLine = require('../lib/bytes-line');
+var BufferConvertor = require('../lib/buffer-convertor');
+var LineUtil = require('../lib/line-util');
+
+describe('BlockFilter', function() {
+  describe('#constructor', function() {
+    it('array push should work.', function(){
+      var a = [];
+      a.push([1, 2, 3]);
+      assert.equal(1, a.length);
+    });
+    it('should handle string', function() {
+      var s = "a\rxx\rbbbb\r-b1\ryy\rxx\raaa\r-uuuuu\ryy\r";
+      var lines = BytesLine.getArray(s);
+      assert.equal(9, lines.length);
+      var bufConvertor = new BufferConvertor(s, 'xx', 'yy').convert();
+      var bufArray = bufConvertor.toBufferArray();
+      assert.equal(5, bufArray.length);
+      console.log(bufArray);
+      var strArray = bufConvertor.toStringArray();
+      console.log(strArray);
+      assert.equal('└── bbbb\r', strArray[1]);
+
+    });
+  });
+});

test/buffer-filter.js

@@ -1,6 +1,5 @@
 var assert = require('assert');
 var through2 = require('through2');
-var FileFilter = require('../lib/buffer-filter');
 
 var splitterStream = require('../lib/splitter-stream');
 var blockStream = require('../lib/block-stream');
@@ -28,7 +27,6 @@ describe('FileFilter', function() {
         })).on('finish', function() {
           assert.equal(1, count);
           assert.equal(fixtures.stringArray.length, blocks[0].length);
-
           done();
         });
 

test/bytes-line.js

@@ -24,13 +24,13 @@ describe('BytesLine', function() {
 
   describe('#getArray()', function() {
     it("should handle string.", function() {
-      var lines = BytesLine.getArray("a\rb\rc\r\r\r");
+      var lines = BytesLine.getArray("a\rbbbbbbbb\rc\r\r\r");
       assert.equal(3, lines.length);
       assert.equal('a'.charCodeAt(0), lines[0].content[0]);
       assert.deepEqual([0x0D, 0x0D, 0x0D], lines[2].separator);
     });
     it("should handle buffer.", function() {
-      var lines = BytesLine.getArray(new Buffer("a\rb\rc\r\r\r"));
+      var lines = BytesLine.getArray(new Buffer("a\rb\rcccccccccccccc\r\r\r"));
       assert.equal(3, lines.length);
       assert.equal('a'.charCodeAt(0), lines[0].content[0]);
       assert.deepEqual([0x0D, 0x0D, 0x0D], lines[2].separator);

test/index.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 var AsciiTree = require('../index').AsciiTree;
-var BufferFilter = require('../index').BufferFilter;
+var BufferConvertor = require('../index').BufferConvertor;
 var TreeLine = require('../index').TreeLine;
 var LineUtil = require('../index').LineUtil;
 var Char = require('../index').Char;
@@ -10,7 +10,7 @@ describe('required', function() {
   describe('#require()', function() {
     it('should ok', function() {
       assert(AsciiTree, "AsciiTree should imported.");
-      assert(BufferFilter, "BufferFilter should imported.");
+      assert(BufferConvertor, "BufferConvertor should imported.");
       assert(TreeLine, "Line should imported.");
       assert(LineUtil, "LineUtil should imported.");
       assert(Char, "Char should imported.");