New command line argument "--skip_hash"

Just add it to the beginning of the command (./extract.py --skip_hash)
and the hash will be skipped.

Fixed bug where if the old file that matches the new file does not exist
we get a crash. Now we attempt to extract the new file without the old file.

Added automatic file renaming. You can put your .img files in the "old"
directory and they will be renamed automatically, and back at the end of
the extraction. Additionally, the "output" directory will get .img appended
to their file names after the extraction.

Removed the need for the "LD_LIBRARY_PATH=./lib64/" part of the
command by setting it within the script.

Updated README.md to reflect all changes.

Author: superr

README.md

@@ -5,10 +5,10 @@
 
 ### Full OTA
 
-- LD_LIBRARY_PATH=./lib64/ ./extract.py --output_dir output/ payload.bin
+- ./extract.py [--skip_hash] --output_dir output/ payload.bin
 - This will start to extract the images within the payload.bin file to the output folder you are in.
 
 ### Incremental OTA
 
-- Copy original images (from full OTA or dumped from devices) to old folder (with part name without file extension, ex: boot, system)
-- LD_LIBRARY_PATH=./lib64/ ./extract.py --output_dir output/ --old_dir old/ payload.bin
+- Copy original images (from full OTA or dumped from devices) to old folder
+- ./extract.py [--skip_hash] --output_dir output/ --old_dir old/ payload.bin

bspatch

@@ -2,11 +2,13 @@
 
 import argparse
 import errno
+import glob
 import os
 
 import update_payload
 from update_payload import applier
 
+os.environ['LD_LIBRARY_PATH'] = './lib64/'
 
 def list_content(payload_file_name):
     with open(payload_file_name, 'rb') as payload_file:
@@ -18,13 +20,16 @@ def list_content(payload_file_name):
                                          part.new_partition_info.size))
 
 
-def extract(payload_file_name, output_dir="output", old_dir="old", partition_names=None):
+def extract(payload_file_name, output_dir="output", old_dir="old", partition_names=None, skip_hash=None):
     try:
         os.makedirs(output_dir)
     except OSError as e:
         if e.errno != errno.EEXIST:
             raise
 
+    for i in glob.glob(old_dir + '/*.img'):
+        os.rename(i, i[:-4])
+    
     with open(payload_file_name, 'rb') as payload_file:
         payload = update_payload.Payload(payload_file)
         payload.Init()
@@ -40,12 +45,20 @@ def extract(payload_file_name, output_dir="output", old_dir="old", partition_nam
                 helper._ApplyToPartition(
                     part.operations, part.partition_name,
                     'install_operations', output_file,
-                    part.new_partition_info, old_file, part.old_partition_info)
+                    part.new_partition_info, old_file,
+                    part.old_partition_info, skip_hash)
             else:
                 helper._ApplyToPartition(
                     part.operations, part.partition_name,
                     'install_operations', output_file,
-                    part.new_partition_info)
+                    part.new_partition_info,
+                    skip_hash=skip_hash)
+
+    for i in glob.glob(old_dir + '/*'):
+        os.rename(i, i + '.img')
+
+    for i in glob.glob(output_dir + '/*'):
+        os.rename(i, i + '.img')
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
@@ -59,9 +72,11 @@ def extract(payload_file_name, output_dir="output", old_dir="old", partition_nam
                         help="Name of the partitions to extract")
     parser.add_argument("--list_partitions", action="store_true",
                         help="List the partitions included in the payload.bin")
+    parser.add_argument("--skip_hash", action="store_true",
+                        help="Skip the hash check for individual img files")
 
     args = parser.parse_args()
     if args.list_partitions:
         list_content(args.payload)
     else:
-        extract(args.payload, args.output_dir, args.old_dir, args.partitions)
+        extract(args.payload, args.output_dir, args.old_dir, args.partitions, args.skip_hash)