Name, blending ranges, mask data

lib/psd/file.coffee

@@ -37,5 +37,5 @@ module.exports = class File
 
   seek: (amt, rel = false) -> if rel then @pos += amt else @pos = amt
 
-  readString: (length) -> @read(length).toString()
+  readString: (length) -> @read(length).toString().replace /\u0000/g, ''
   readByte: -> @read(1)[0]
\ No newline at end of file

lib/psd/layer.coffee

@@ -5,6 +5,7 @@ module.exports = class Layer extends Module
   @includes require('./layer/blend_modes.coffee')
   @includes require('./layer/mask.coffee')
   @includes require('./layer/blending_ranges.coffee')
+  @includes require('./layer/name.coffee')
   # @includes require('./layer/channel_image.coffee')
 
   constructor: (@file, @header) ->
@@ -26,11 +27,13 @@ module.exports = class Layer extends Module
 
     @parseMaskData()
     @parseBlendingRanges()
+    @parseLegacyLayerName()
 
     @file.seek @layerEnd
     return @
 
   export: ->
+    name: @name
     top: @top
     right: @right
     bottom: @bottom

lib/psd/layer/blending_ranges.coffee

+module.exports =
+  parseBlendingRanges: ->
+    length = @file.readInt()
+
+    @blendingRanges.grey =
+      source:
+        black: [@file.readByte(), @file.readByte()]
+        white: [@file.readByte(), @file.readByte()]
+      dest:
+        black: [@file.readByte(), @file.readByte()]
+        white: [@file.readByte(), @file.readByte()]
+
+    numChannels = (length - 8) / 8
+    
+    @blendingRanges.channels = []
+    for i in [0...numChannels]
+      @blendingRanges.channels.push
+        source:
+          black: [@file.readByte(), @file.readByte()]
+          white: [@file.readByte(), @file.readByte()]
+        dest:
+          black: [@file.readByte(), @file.readByte()]
+          white: [@file.readByte(), @file.readByte()]
\ No newline at end of file

lib/psd/layer/mask.coffee

+Mask = require '../mask.coffee'
+
+module.exports =
+  parseMaskData: ->
+    @mask = new Mask(@file).parse()
\ No newline at end of file

lib/psd/layer/name.coffee

+Util = require '../util.coffee'
+
+module.exports =
+  parseLegacyLayerName: ->
+    len = Util.pad4 @file.readByte()
+    @legacyName = @file.readString(len)
+
+    Object.defineProperty @, 'name',
+      get: ->
+        if @adjustments['name']?
+          @adjustments['name'].data
+        else
+          @legacyName
\ No newline at end of file

lib/psd/mask.coffee

+module.exports = class Mask
+  constructor: (@file) ->
+    @top = 0
+    @right = 0
+    @bottom = 0
+    @left = 0
+
+  parse: ->
+    @size = @file.readInt()
+    return @ if @size is 0
+
+    maskEnd = @file.tell() + @size
+
+    @top = @file.readInt()
+    @left = @file.readInt()
+    @bottom = @file.readInt()
+    @right = @file.readInt()
+
+    @width = @right - @left
+    @height = @bottom - @top
+
+    @relative = (@flags & 0x01) > 0
+    @disabled = (@flags & (0x01 << 1)) > 0
+    @invert = (@flags & (0x01 << 2)) > 0
+
+    @defaultColor = @file.readByte()
+    @flags = @file.readByte()
+
+    @file.seek maskEnd
+    return @
+
+  export: ->
+    return {} if @size is 0
+
+    top: @top
+    left: @left
+    bottom: @bottom
+    right: @right
+    width: @width
+    height: @height
+    defaultColor: @defaultColor
+    relative: @relative
+    disabled: @disabled
+    invert: @invert
\ No newline at end of file