psd 2.1.2 → 3.9.0

data/lib/psd/{layer_info → layer/info}/typetool.rb

@@ -1,11 +1,13 @@
 # encoding: UTF-8
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   # Parses and provides information about text areas within layers in
   # the document.
   class TypeTool < LayerInfo
-    @key = 'TySh'
+    def self.should_parse?(key)
+      key == 'TySh'
+    end
     
     # Parse all of the text data in the layer.
     def parse
@@ -16,9 +18,6 @@ class PSD
       descriptor_version = @file.read_int
 
       @data[:text] = Descriptor.new(@file).parse
-      @data[:text]['EngineData']
-        .encode!('UTF-8', 'MacRoman', invalid: :replace, undef: :replace)
-        .delete!("\000")
 
       @data[:engine_data] = nil
       begin
@@ -42,12 +41,7 @@ class PSD
     # Extracts the text within the text area. In the event that psd-enginedata fails
     # for some reason, we attempt to extract the text using some rough regex.
     def text_value
-      if engine_data.nil?
-        # Something went wrong, lets hack our way through.
-        /\/Text \(˛ˇ(.*)\)$/.match(@data[:text]['EngineData'])[1].gsub /\r/, "\n"
-      else
-        engine_data.EngineDict.Editor.Text
-      end
+      @data[:text]['Txt ']
     end
     alias :to_s :text_value
 
@@ -56,8 +50,11 @@ class PSD
     def font
       {
         name: fonts.first,
+        fonts: fonts,
         sizes: sizes,
         colors: colors,
+        alignment: alignment,
+        leadings: leadings,
         css: to_css
       }
     end
@@ -69,11 +66,26 @@ class PSD
       engine_data.ResourceDict.FontSet.map(&:Name)
     end
 
+    # Return all leadings (line spacing) for this layer.
+    def leadings
+      return [] if engine_data.nil? || !styles.has_key?('Leading')
+      styles['Leading'].uniq
+    end
+
     # Return all font sizes for this layer.
     def sizes
       return [] if engine_data.nil? || !styles.has_key?('FontSize')
       styles['FontSize'].uniq
     end
+    
+    def alignment
+      return {} if engine_data.nil?
+      engine_data.EngineDict.ParagraphRun.RunArray.map do |s| 
+        ["left", "right", "center", "justify"][[s.ParagraphSheet.Properties.Justification.to_i,3].min]
+      end
+    rescue
+      []
+    end
 
     # Return all colors used for text in this layer. The colors are returned in RGBA
     # format as an array of arrays.
@@ -125,11 +137,13 @@ class PSD
       definition = {
         'font-family' => fonts.join(', '),
         'font-size' => "#{sizes.first}pt",
-        'color' => "rgba(#{colors.first.join(', ')})"
+        'color' => "rgba(#{colors.first.join(', ')})",
+        'text-align' => alignment.first
       }
 
       css = []
       definition.each do |k, v|
+        next if v.nil?
         css << "#{k}: #{v};"
       end
 
@@ -162,4 +176,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/{layer_info → layer/info}/unicode_name.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class UnicodeName < LayerInfo
-    @key = 'luni'
+    def self.should_parse?(key)
+      key == 'luni'
+    end
 
     def parse
       pos = @file.tell

data/lib/psd/{layer_info → layer/info}/vector_mask.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class VectorMask < LayerInfo
-    @key = 'vmsk'
+    def self.should_parse?(key)
+      ['vmsk', 'vsms'].include?(key)
+    end
 
     attr_reader :invert, :not_link, :disable, :paths
 
@@ -14,12 +16,12 @@ class PSD
       @not_link = (tag & (0x01 << 1)) > 0
       @disable = (tag & (0x01 << 2)) > 0
 
-      num_records = (@length - 8) / 26
-      
+      # I haven't figured out yet why this is 10 and not 8.
+      num_records = (@length - 10) / 26
       @paths = []
       num_records.times do
         @paths << PathRecord.new(@file)
       end
     end
   end
-end
+end

data/lib/psd/layer/info/vector_mask_as_global_mask.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class VectorMaskAsGlobalMask < LayerInfo
+    def self.should_parse?(key)
+      key == 'vmgm'
+    end
+
+    attr_reader :enabled
+
+    def parse
+      @enabled = @file.read_boolean
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/layer/info/vector_origination.rb

@@ -0,0 +1,14 @@
+require 'psd/layer_info'
+
+class PSD
+  class VectorOrigination < LayerInfo
+    def self.should_parse?(key)
+      key == 'vogk'
+    end
+
+    def parse
+      @file.seek 8, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/vector_stroke.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class VectorStroke < LayerInfo
-    @key = 'vstk'
+    def self.should_parse?(key)
+      key == 'vstk'
+    end
 
     def parse
       version = @file.read_int

data/lib/psd/{layer_info → layer/info}/vector_stroke_content.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class VectorStrokeContent < LayerInfo
-    @key = 'vscg'
+    def self.should_parse?(key)
+      key == 'vscg'
+    end
 
     attr_reader :key
     

data/lib/psd/layer/info/vibrance.rb

@@ -0,0 +1,22 @@
+require 'psd/layer_info'
+
+class PSD
+  class Vibrance < LayerInfo
+    def self.should_parse?(key)
+      key == 'vibA'
+    end
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+
+    def vibrance
+      @data['vibrance']
+    end
+
+    def saturation
+      @data['Strt']
+    end
+  end
+end

data/lib/psd/layer/info.rb

@@ -1,34 +1,125 @@
+require 'psd/layer/info/black_white'
+require 'psd/layer/info/blend_clipping_elements'
+require 'psd/layer/info/blend_interior_elements'
+require 'psd/layer/info/brightness_contrast'
+require 'psd/layer/info/channel_blending_restrictions'
+require 'psd/layer/info/channel_mixer'
+require 'psd/layer/info/color_balance'
+require 'psd/layer/info/color_lookup'
+require 'psd/layer/info/content_generator'
+require 'psd/layer/info/curves'
+require 'psd/layer/info/effects_layer'
+require 'psd/layer/info/exposure'
+require 'psd/layer/info/fill_opacity'
+require 'psd/layer/info/gradient_fill'
+require 'psd/layer/info/gradient_map'
+require 'psd/layer/info/hue_saturation'
+require 'psd/layer/info/invert'
+require 'psd/layer/info/knockout'
+require 'psd/layer/info/layer_effects'
+require 'psd/layer/info/layer_mask_as_global_mask'
+require 'psd/layer/info/layer_group'
+require 'psd/layer/info/layer_id'
+require 'psd/layer/info/layer_name_source'
+require 'psd/layer/info/layer_section_divider'
+require 'psd/layer/info/legacy_typetool'
+require 'psd/layer/info/levels'
+require 'psd/layer/info/locked'
+require 'psd/layer/info/metadata_setting'
+require 'psd/layer/info/object_effects'
+require 'psd/layer/info/pattern'
+require 'psd/layer/info/pattern_fill'
+require 'psd/layer/info/photo_filter'
+require 'psd/layer/info/placed_layer'
+require 'psd/layer/info/posterize'
+require 'psd/layer/info/reference_point'
+require 'psd/layer/info/selective_color'
+require 'psd/layer/info/sheet_color'
+require 'psd/layer/info/solid_color'
+require 'psd/layer/info/threshold'
+require 'psd/layer/info/transparency_shapes_layer'
+require 'psd/layer/info/typetool'
+require 'psd/layer/info/unicode_name'
+require 'psd/layer/info/vector_mask'
+require 'psd/layer/info/vector_mask_as_global_mask'
+require 'psd/layer/info/vector_origination'
+require 'psd/layer/info/vector_stroke'
+require 'psd/layer/info/vector_stroke_content'
+require 'psd/layer/info/vibrance'
+
 class PSD
   class Layer
     module Info
       # All of the extra layer info sections that we know how to parse.
       LAYER_INFO = {
+        black_white: BlackWhite,
         blend_clipping_elements: BlendClippingElements,
         blend_interior_elements: BlendInteriorElements,
-        type: TypeTool,
+        brightness_contrast: BrightnessContrast,
+        channel_blending_restrictions: ChannelBlendingRestrictions,
+        channel_mixer: ChannelMixer,
+        color_balance: ColorBalance,
+        color_lookup: ColorLookup,
+        content_generator: ContentGenerator,
+        curves: Curves,
+        effects_layer: EffectsLayer,
+        exposure: Exposure,
+        fill_opacity: FillOpacity,
+        gradient_fill: GradientFill,
+        gradient_map: GradientMap,
+        hue_saturation: HueSaturation,
+        invert: Invert,
+        knockout: Knockout,
+        layer_effects: LayerEffects,
+        layer_mask_as_global_mask: LayerMaskAsGlobalMask,
+        layer_id: LayerID,
+        layer_name_source: LayerNameSource,
         legacy_type: LegacyTypeTool,
+        levels: Levels,
+        locked: Locked,
         metadata: MetadataSetting,
-        layer_name_source: LayerNameSource,
-        object_effects: ObjectEffects,
         name: UnicodeName,
-        section_divider: LayerSectionDivider,
         nested_section_divider: NestedLayerDivider,
-        reference_point: ReferencePoint,
-        layer_id: LayerID,
-        fill_opacity: FillOpacity,
+        object_effects: ObjectEffects,
+        pattern_fill: PatternFill,
+        photo_filter: PhotoFilter,
         placed_layer: PlacedLayer,
-        locked: Locked,
+        posterize: Posterize,
+        reference_point: ReferencePoint,
+        selective_color: SelectiveColor,
+        section_divider: LayerSectionDivider,
+        sheet_color: SheetColor,
+        solid_color: SolidColor,
+        threshold: Threshold,
+        transparency_shapes_layer: TransparencyShapesLayer,
+        type: TypeTool,
         vector_mask: VectorMask,
-        vector_mask_2: VectorMask2,
+        vector_mask_as_global_mask: VectorMaskAsGlobalMask,
+        vector_origination: VectorOrigination,
         vector_stroke: VectorStroke,
-        vector_stroke_content: VectorStrokeContent
-      }
+        vector_stroke_content: VectorStrokeContent,
+        vibrance: Vibrance
+      }.freeze
+
+      BIG_LAYER_INFO_KEYS = %w{ LMsk Lr16 Lr32 Layr Mt16 Mt32 Mtrn Alph FMsk lnk2 FEid FXid PxSD }
 
       attr_reader :adjustments
       alias :info :adjustments
 
+      LAYER_INFO.keys.each do |key|
+        define_method(key) { @adjustments[key] }
+      end
+
       private
 
+      def parse_additional_layer_info_length(key)
+        if @header.big? && BIG_LAYER_INFO_KEYS.include?(key)
+          Util.pad2 @file.read_longlong
+        else
+          Util.pad2 @file.read_int
+        end
+      end
+
       # This section is a bit tricky to parse because it represents all of the
       # extra data that describes this layer.
       def parse_layer_info
@@ -42,18 +133,18 @@ class PSD
           key = @file.read_string(4)
           @info_keys << key
 
-          length = Util.pad2 @file.read_int
+          length = parse_additional_layer_info_length(key)
           pos = @file.tell
 
           key_parseable = false
           LAYER_INFO.each do |name, info|
-            next unless info.key == key
+            next unless info.should_parse?(key)
 
             PSD.logger.debug "Layer Info: key = #{key}, start = #{pos}, length = #{length}"
 
             i = info.new(self, length)
             @adjustments[name] = LazyExecute.new(i, @file).now(:skip).later(:parse)
-              
+
             key_parseable = true and break
           end
 
@@ -65,10 +156,6 @@ class PSD
 
         @extra_data_end = @file.tell
       end
-
-      def vector_mask
-        info[:vector_mask_2] || info[:vector_mask]
-      end
     end
   end
-end
+end

data/lib/psd/layer/position_and_channels.rb

@@ -10,8 +10,6 @@ class PSD
       private
 
       def parse_position_and_channels
-        start_section(:info)
-
         @top = @file.read_int
         @left = @file.read_int
         @bottom = @file.read_int
@@ -23,12 +21,10 @@ class PSD
 
         @channels.times do
           channel_id = @file.read_short
-          channel_length = @file.read_int
+          channel_length = @header.big? ? @file.read_longlong : @file.read_int
 
           @channels_info << {id: channel_id, length: channel_length}
         end
-
-        end_section(:info)
       end
 
       def export_position_and_channels(outfile)
@@ -44,4 +40,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer.rb

@@ -1,18 +1,28 @@
+require 'psd/layer/blend_modes'
+require 'psd/layer/blending_ranges'
+require 'psd/layer/channel_image'
+require 'psd/layer/exporting'
+require 'psd/layer/helpers'
+require 'psd/layer/info'
+require 'psd/layer/mask'
+require 'psd/layer/name'
+require 'psd/layer/path_components'
+require 'psd/layer/position_and_channels'
+
 class PSD
   # Represents a single layer and all of the data associated with
   # that layer.
   class Layer
-    include Section
     include BlendModes
     include BlendingRanges
     include ChannelImage
     include Exporting
-    include Helpers
     include Info
     include Mask
     include Name
     include PathComponents
     include PositionAndChannels
+    include Helpers
 
     attr_reader :id, :info_keys, :header
     attr_accessor :group_layer, :node, :file
@@ -29,9 +39,6 @@ class PSD
       @blend_mode = {}
       @group_layer = nil
 
-      @blending_mode = 'normal'
-      @opacity = 255
-
       # Just used for tracking which layer adjustments we're parsing.
       # Not essential.
       @info_keys = []
@@ -39,8 +46,6 @@ class PSD
 
     # Parse the layer and all of it's sub-sections.
     def parse(index=nil)
-      start_section
-
       @id = index
 
       parse_position_and_channels
@@ -58,7 +63,6 @@ class PSD
 
       @file.seek @layer_end # Skip over any filler zeros
 
-      end_section
       return self
     end
 
@@ -66,12 +70,5 @@ class PSD
     def [](val)
       self.send(val)
     end
-
-    # We delegate all missing method calls to the extra layer info to make it easier
-    # to access that data.
-    def method_missing(method, *args, &block)
-      return @adjustments[method] if @adjustments.has_key?(method)
-      super
-    end
   end
-end
+end

data/lib/psd/layer_info.rb

@@ -3,10 +3,6 @@ class PSD
   class LayerInfo
     attr_reader :data
 
-    # The value of the key as used in the PSD format.
-    class << self; attr_accessor :key; end
-    @key = ""
-
     def initialize(layer, length)
       @layer = layer
       @file = layer.file

data/lib/psd/layer_mask.rb

@@ -2,8 +2,6 @@ class PSD
   # Covers parsing the global mask and controls parsing of all the
   # layers/folders in the document.
   class LayerMask
-    include Section
-
     attr_reader :layers, :global_mask
 
     # Store a reference to the file and the header and initialize the defaults.
@@ -15,27 +13,57 @@ class PSD
       @layers = []
       @merged_alpha = false
       @global_mask = nil
-      @extras = []
     end
 
     # Allows us to skip this section because it starts with the length of the section
     # stored as an integer.
     def skip
-      @file.seek @file.read_int, IO::SEEK_CUR
+      @file.seek parse_mask_size, IO::SEEK_CUR
       return self
     end
 
-    # Parse this section, including all of the layers and folders. Once implemented, this
-    # will also trigger parsing of the channel images for each layer.
+    # Parse this section, including all of the layers and folders.
     def parse
-      start_section
+      mask_size = parse_mask_size
+
+      start_position = @file.tell
+      finish = start_position + mask_size
 
-      mask_size = @file.read_int
-      finish = @file.tell + mask_size
+      PSD.logger.debug "Layer mask section: #{start_position} - #{finish}"
 
       return self if mask_size <= 0
 
-      layer_info_size = Util.pad2(@file.read_int)
+      parse_layers
+      parse_global_mask
+
+      consumed_bytes = @file.tell - start_position
+      parse_layer_tagged_blocks(mask_size - consumed_bytes)
+
+      # Layers are parsed in reverse order
+      layers.reverse!
+
+      # Ensure we're at the end of this section
+      @file.seek finish
+
+      self
+    end
+
+    private
+
+    def parse_mask_size
+      @header.big? ? @file.read_longlong : @file.read_int
+    end
+
+    def parse_layer_info_size
+      Util.pad2(@header.big? ? @file.read_longlong : @file.read_int)
+    end
+
+    def channel_information_length
+      @header.big? ? 10 : 6
+    end
+
+    def parse_layers
+      layer_info_size = parse_layer_info_size
 
       if layer_info_size > 0
         layer_count = @file.read_short
@@ -45,8 +73,8 @@ class PSD
           @merged_alpha = true
         end
 
-        if layer_count * (18 + 6 * @header.channels) > layer_info_size
-          raise "Unlikely number of layers parsed: #{layer_count}"
+        if layer_count * (18 + channel_information_length * @header.channels) > layer_info_size
+          PSD.logger.error "Unlikely number of layers parsed: #{layer_count}"
         end
 
         @layer_section_start = @file.tell
@@ -58,60 +86,43 @@ class PSD
           layer.parse_channel_image(@header)
         end
       end
-
-      # Layers are parsed in reverse order
-      layers.reverse!
-      group_layers
-
-      parse_global_mask
-
-      # Ensure we're at the end of this section
-      @file.seek finish
-      end_section
-
-      return self
     end
 
-    # Export the mask and all the children layers to a file.
-    def export(outfile)
-      if @layers.size == 0
-        # No data, just read whatever's here.
-        return outfile.write @file.read(@section_end[:all] - start_of_section)
+    def parse_layer_tagged_blocks(remaining_length)
+      end_pos = @file.tell + remaining_length
+
+      while @file.tell < end_pos
+        res = parse_additional_layer_info_block
+        break unless res
       end
+    end
 
-      # Read the initial mask data since it won't change
-      outfile.write @file.read(@layer_section_start - @file.tell)
+    def parse_additional_layer_info_block
+      sig = @file.read_string(4)
 
-      @layers.reverse.each do |layer|
-        layer.export(outfile)
+      unless %w(8BIM 8B64).include?(sig)
+        @file.seek(-4, IO::SEEK_CUR)
+        return false
       end
 
-      outfile.write @file.read(end_of_section - @file.tell)
-    end
-
-    private
+      key = @file.read_string(4)
 
-    def group_layers
-      group_layer = nil
-      layers.each do |layer|
-        if layer.folder?
-          group_layer = layer
-        elsif layer.folder_end?
-          group_layer = nil
-        else
-          layer.group_layer = layer
-        end
+      if %w(Lr16 Lr32 Mt16).include?(key)
+        parse_layers
+        return true
       end
+
+      false
     end
 
     def parse_global_mask
       length = @file.read_int
-      
+
       PSD.logger.debug "Global Mask: length = #{length}"
       return if length <= 0
 
       mask_end = @file.tell + length
-      
+
       @global_mask = {}
       @global_mask[:overlay_color_space] = @file.read_short
       @global_mask[:color_components] = 4.times.map { |i| @file.read_short >> 8 }
@@ -126,4 +137,4 @@ class PSD
       @file.seek mask_end
     end
   end
-end
+end

data/lib/psd/lazy_execute.rb

@@ -41,7 +41,11 @@ class PSD
     end
 
     def inspect
-      "<PSD::LazyExecute @obj=#{@obj.class.name}, @pos=#{@start_pos}, @load_method=:#{@load_method}>"
+      if loaded?
+        @obj.inspect
+      else
+        "<PSD::LazyExecute @obj=#{@obj.class.name}, @pos=#{@start_pos}, @load_method=:#{@load_method}>"
+      end
     end
 
     private