Make layer comps easier to access

examples/parse.rb

@@ -8,6 +8,11 @@
   psd.parse!
 end
 
+if psd.resources[:layer_comps]
+  puts "\nLayer Comps:\n===================="
+  puts psd.resources[:layer_comps].data.names
+end
+
 puts "\nVisible Layers:\n===================="
 psd.layers.each do |layer|
   next if layer.folder? || layer.hidden?
@@ -16,7 +21,7 @@
   puts "Position: top = #{layer.top}, left = #{layer.left}"
   puts "Size: width = #{layer.width}, height = #{layer.height}"
   puts "Mask: width = #{layer.mask.width}, height = #{layer.mask.height}"
-  puts "Reference point: #{layer.ref_x}, #{layer.ref_y}"
+  puts "Reference point: #{layer.reference_point.x}, #{layer.reference_point.y}"
 
   puts ""
 end

lib/psd/layer.rb

@@ -287,8 +287,10 @@ def parse_blending_ranges
     # not UTF-8. Luckily Ruby kicks ass at character conversion.
     def parse_legacy_layer_name
       @legacy_name_start = @file.tell
-      len = Util.pad4 @file.read(1).unpack('C')[0]
-      @legacy_name = @file.read(len).encode('UTF-8', 'MacRoman').delete("\000")
+
+      len = Util.pad4 @file.read(1).bytes.to_a[0]
+      @legacy_name = @file.read_string(len)
+
       @legacy_name_end = @file.tell
     end
 
@@ -302,7 +304,7 @@ def parse_extra_data
         @file.seek 4, IO::SEEK_CUR
 
         # Key, very important
-        key = @file.read(4).unpack('A4')[0]
+        key = @file.read_string(4)
         @info_keys << key
 
         length = Util.pad2 @file.read_int
@@ -329,14 +331,13 @@ def parse_extra_data
         end
 
         if !info_parsed
-          PSD.logger.debug "SKIPPING: key = #{key}, length = #{length}"
+          PSD.logger.debug "Skipping: key = #{key}, pos = #{@file.tell}, length = #{length}"
           @file.seek pos + length
         end
 
         @file.seek pos + length if @file.tell != (pos + length)
       end
 
-      # puts "Layer = #{name}, Parsed = #{@info_keys - PSD.keys.uniq}, Unparsed = #{PSD.keys.uniq - @info_keys}"
       @extra_data_end = @file.tell
     end
 

lib/psd/resources/layer_comps.rb

@@ -8,7 +8,17 @@ def self.name; :layer_comps; end
         def parse
           # Descriptor version
           @file.seek 4, IO::SEEK_CUR
-          @resource.data = Descriptor.new(@file).parse
+
+          @data = Descriptor.new(@file).parse
+          @resource.data = self
+        end
+
+        def names
+          @data['list'].map { |c| c['Nm  '] }
+        end
+
+        def [](val)
+          @data[val]
         end
       end
     end