From 9353289d6f087fa37b92080b5bd62c1bd542e946 Mon Sep 17 00:00:00 2001
From: Jan Sperling <sperling@b1-systems.de>
Date: Tue, 25 Feb 2020 00:43:08 +0100
Subject: [PATCH] add support for SNK 40th collection bundle format

also fixed some python3 stuff
---
 bplist.py  | 18 +++++++++++++-----
 extract.py |  2 ++
 tidy.py    |  6 ++++--
 3 files changed, 19 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 extract.py
 mode change 100644 => 100755 tidy.py

diff --git a/bplist.py b/bplist.py
index 376ecf8..0bc2351 100644
--- a/bplist.py
+++ b/bplist.py
@@ -30,6 +30,7 @@
 
 import struct
 from datetime import datetime, timedelta
+import plistlib
 
 class BPListReader(object):
     def __init__(self, s):
@@ -198,13 +199,20 @@ def __resolveObject(self, idx):
     
     def parse(self):
         # read header
-        if self.data[:8] != b'bplist00':
+        if self.data[:5] == b'<?xml':
+            # load XML formated data and convert it
+            pl = {'bundles': {}}
+            for bundle in plistlib.loads(self.data)['bundles']:
+                pl['bundles'].update({bundle['bundleName']: {'files': bundle['files']}})
+            return pl
+        elif self.data[:8] != b'bplist00':
             raise Exception('Bad magic')
-        
+
         # read trailer
         self.offset_size, self.object_ref_size, self.number_of_objects, self.top_object, self.table_offset = struct.unpack('!BB4xI4xI4xI', self.data[-26:])
         self.top_object = self.table_offset - 8
-        #print ("** plist offset_size:",self.offset_size,"objref_size:",self.object_ref_size,"num_objs:",self.number_of_objects,"top:",self.top_object,"table_ofs:",self.table_offset)
+        #print("** plist offset_size: %d objref_size: %d num_objs: %d top: %d table_ofs: %d" % 
+        #     (self.offset_size, self.object_ref_size, self.number_of_objects, self.top_object, self.table_offset))
         
         # read offset table
         self.offset_table = self.data[self.table_offset:-26]
@@ -214,14 +222,14 @@ def parse(self):
             offset_entry = ot[:self.offset_size]
             ot = ot[self.offset_size:]
             self.offsets.append(self.__unpackIntStruct(self.offset_size, offset_entry))
-        #print "** plist offsets:",self.offsets
+        #print("** plist offsets: %s" % (self.offsets))
         
         # read object table
         self.objects = []
         k = 0
         for i in self.offsets:
             obj = self.__unpackItem(i)
-            #print "** plist unpacked",k,type(obj),obj,"at",i
+            #print("** plist unpacked %d %s %s at %d" % (k, type(obj), obj, i))
             k += 1
             self.objects.append(obj)
         
diff --git a/extract.py b/extract.py
old mode 100644
new mode 100755
index f369191..00f80b2
--- a/extract.py
+++ b/extract.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 from bplist import BPListReader
 
 import os
diff --git a/tidy.py b/tidy.py
old mode 100644
new mode 100755
index ba45557..8a88de4
--- a/tidy.py
+++ b/tidy.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import sys
 
@@ -21,7 +23,7 @@
 # Move Second Impact music from Third Strike dir to Second Impact dir.
 for filename in third_strike_files:
     if filename.startswith("SF3SI") and filename.endswith(".ogg"):
-        print filename
+        print(filename)
         old = os.path.join(third_strike_path, filename)
         new = os.path.join(second_impact_path, filename)
         os.rename(old, new)
@@ -29,7 +31,7 @@
 # Move Third Strike music from Main dir to Third Strike dir.
 for filename in main_files:
     if filename.startswith("SF3TS") and filename.endswith(".ogg"):
-        print filename
+        print(filename)
         old = os.path.join(main_path, filename)
         new = os.path.join(third_strike_path, filename)
         os.rename(old, new)