read_ipa 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633320fea9c2ac9e0b6d190e02b433182ae96725
-  data.tar.gz: f8bd24b55c57782557c5e5d27140bfa742452bc7
+  metadata.gz: 648e457c45f8e39dfcb492df5565274878225573
+  data.tar.gz: 9274380e7df40a0108f61f176f102762bca3ec29
 SHA512:
-  metadata.gz: bd2ad75d4f7bd65bf0fd0d2c195446ed4d770d5a77b5ba60280faaa9aae06b5ce283ca2261e1d21d66288e7e71e3d3f0ca5b12df1cc415e5a562032206f6b160
-  data.tar.gz: b40ea7ca19ef9256a3aa2f4717f2d8e996fd62d3564fb89941e6fcaf64a41ad399732f1e6b517a42404a9565b4f434e166218b2b872658ed4cdf5749c7d3f054
+  metadata.gz: 3a405bbc23f2bec232ca790e4e8074a25204e8949a0f31b76fc208e04ebaa93e522c0ddeebf31cba4bc75f4de4d749d048d024a3f7e236da63e19dcc9b75edfd
+  data.tar.gz: 56a3d52489279132673d92ead33ef86b3e64c065dd8124748d6a913ba92bcc724fb30b21089e8b1696754c811711426401ebc07be16e36cd090f69cdeecb53e2

data/lib/read_ipa.rb

@@ -6,7 +6,8 @@ rescue LoadError
 end
 
 require 'read_ipa/plist_binary'
-require 'read_ipa/png_file'
+require 'apple_png'
+require 'chunky_png'
 
 module ReadIpa
   class IpaFile
@@ -48,20 +49,41 @@ module ReadIpa
       end
     end
 
+    def read_png(data)
+      begin
+        return ApplePng.new(data)
+      rescue NotValidApplePngError
+        return ChunkyPng::Image.from_datastream(data)
+      end
+    end
+
+    def get_highest_res_icon(icons_array)
+      highest_res_icon = icons_array
+        .map{ |icon_path| icon_path.downcase.end_with?('.png') ? icon_path : icon_path + '.png' }
+        .map{ |icon_path| read_file(icon_path) }
+        .max_by{|data| read_png(data).width }
+
+      begin
+        return ApplePng.new(highest_res_icon).data
+      rescue NotValidApplePngError
+        highest_res_icon
+      end
+    end
+
     def icon_file
       if plist["CFBundleIconFiles"]
-        highest_res_icon = plist["CFBundleIconFiles"]
-          .map{ |icon|
-            data = read_file(icon)
-            ReadIpa::PngFile.new(data)
-          }
-          .sort{ |a,b| b.width <=> a.width }
-          .first
-        highest_res_icon.raw_data
+        get_highest_res_icon(plist["CFBundleIconFiles"])
+      elsif plist["CFBundleIcons"]
+        dict = plist["CFBundleIcons"]
+        primary_icons = dict["CFBundlePrimaryIcon"]
+        return nil unless primary_icons
+        icons = primary_icons.to_rb["CFBundleIconFiles"]
+        return nil unless icons
+        get_highest_res_icon(icons)
       elsif plist["CFBundleIconFile"]
         data = read_file(plist["CFBundleIconFile"])
-        png = ReadIpa::PngFile.new(data)
-        png.raw_data
+        png = ApplePng.new(data)
+        png.data
       else
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: read_ipa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Marvin Killing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: apple_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Extract metadata from iOS packages such as the app name, the app icons
   or the binary file. This is a diverging fork of github.com/schlu/Ipa-Reader.
 email: marvinkilling@gmail.com
@@ -77,7 +105,6 @@ files:
 - Rakefile
 - lib/read_ipa.rb
 - lib/read_ipa/plist_binary.rb
-- lib/read_ipa/png_file.rb
 - test/test_read_ipa.rb
 homepage: https://github.com/playtestcloud/read_ipa
 licenses:

data/lib/read_ipa/png_file.rb

@@ -1,113 +0,0 @@
-# direct port of python code at https://gist.github.com/4141831#file_ipin.py
-require 'zlib'
-
-module ReadIpa
-  class PngFile
-    attr_accessor :raw_data, :width, :height
-
-    def initialize(oldPNG)
-      # begin
-        self.raw_data = extract_apple_png(oldPNG)
-      # rescue
-      #  self.width, self.height = oldPNG[0x10..0x18].unpack('NN')
-      #  self.raw_data = oldPNG
-      # end
-    end
-
-    def extract_apple_png(oldPNG)
-      pngheader = "\x89PNG\r\n\x1A\n".b
-
-      if oldPNG[0...8] != pngheader
-        return nil
-      end
-
-      newPNG = oldPNG[0...8]
-
-      chunkPos = newPNG.length
-
-      idatAcc = "".b
-      breakLoop = false
-
-      # For each chunk in the PNG file
-      while chunkPos < oldPNG.length
-        skip = false
-
-        # Reading chunk
-        chunkLength = oldPNG[chunkPos...chunkPos+4]
-        chunkLength = chunkLength.unpack("N")[0]
-        chunkType = oldPNG[chunkPos+4...chunkPos+8]
-        chunkData = oldPNG[chunkPos+8...chunkPos+8+chunkLength]
-        chunkCRC = oldPNG[chunkPos+chunkLength+8...chunkPos+chunkLength+12]
-        chunkCRC = chunkCRC.unpack("N")[0]
-        chunkPos += chunkLength + 12
-
-        # Parsing the header chunk
-        if chunkType == "IHDR".b
-          self.width = chunkData[0...4].unpack("N")[0]
-          self.height = chunkData[4...8].unpack("N")[0]
-        end
-
-        # Parsing the image chunk
-        if chunkType == "IDAT".b
-          # Store the chunk data for later decompression
-          idatAcc += chunkData
-          skip = true
-        end
-
-        # Removing CgBI chunk
-        if chunkType == "CgBI".b
-          skip = true
-        end
-
-        # Stopping the PNG file parsing
-        if chunkType == "IEND".b
-          # Uncompressing the image chunk
-          inf = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-          chunkData = inf.inflate(idatAcc)
-          inf.finish
-          inf.close
-
-          chunkType = "IDAT".b
-
-          # Swapping red & blue bytes for each pixel
-          newdata = "".b
-
-          self.height.times do
-            i = newdata.length
-            newdata += chunkData[i..i].to_s
-            self.width.times do
-              i = newdata.length
-              newdata += chunkData[i+2..i+2].to_s
-              newdata += chunkData[i+1..i+1].to_s
-              newdata += chunkData[i+0..i+0].to_s
-              newdata += chunkData[i+3..i+3].to_s
-            end
-          end
-
-          # Compressing the image chunk
-          chunkData = newdata
-          chunkData = Zlib::Deflate.deflate( chunkData )
-          chunkLength = chunkData.length
-          chunkCRC = Zlib.crc32(chunkType)
-          chunkCRC = Zlib.crc32(chunkData, chunkCRC)
-          chunkCRC = (chunkCRC + 0x100000000) % 0x100000000
-          breakLoop = true
-        end
-
-        if !skip
-          newPNG += [chunkLength].pack("N")
-          newPNG += chunkType
-          if chunkLength > 0
-            newPNG += chunkData
-          end
-          newPNG += [chunkCRC].pack("N")
-        end
-
-        break if breakLoop
-      end
-
-      return newPNG
-    end
-
-  end
-end