More friendly sortrez order

bin/sortrez

@@ -25,60 +25,30 @@ import argparse
 import macresources
 
 
-MACROMAN_SORT = [
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-
-    0x20, 0x22, 0x23, 0x28, 0x29, 0x2a, 0x2b, 0x2c,
-    0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-    0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e,
-    0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,
-
-    0x47, 0x48, 0x58, 0x5a, 0x5e, 0x60, 0x67, 0x69,
-    0x6b, 0x6d, 0x73, 0x75, 0x77, 0x79, 0x7b, 0x7f,
-    0x8d, 0x8f, 0x91, 0x93, 0x96, 0x98, 0x9f, 0xa1,
-    0xa3, 0xa5, 0xa8, 0xaa, 0xab, 0xac, 0xad, 0xae,
-
-    0x54, 0x48, 0x58, 0x5a, 0x5e, 0x60, 0x67, 0x69,
-    0x6b, 0x6d, 0x73, 0x75, 0x77, 0x79, 0x7b, 0x7f,
-    0x8d, 0x8f, 0x91, 0x93, 0x96, 0x98, 0x9f, 0xa1,
-    0xa3, 0xa5, 0xa8, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,
-
-    0x4c, 0x50, 0x5c, 0x62, 0x7d, 0x81, 0x9a, 0x55,
-    0x4a, 0x56, 0x4c, 0x4e, 0x50, 0x5c, 0x62, 0x64,
-    0x65, 0x66, 0x6f, 0x70, 0x71, 0x72, 0x7d, 0x89,
-    0x8a, 0x8b, 0x81, 0x83, 0x9c, 0x9d, 0x9e, 0x9a,
-
-    0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0x95,
-    0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0x52, 0x85,
-    0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8,
-    0xc9, 0xca, 0xcb, 0x57, 0x8c, 0xcc, 0x52, 0x85,
-
-    0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0x26,
-    0x27, 0xd4, 0x20, 0x4a, 0x4e, 0x83, 0x87, 0x87,
-    0xd5, 0xd6, 0x24, 0x25, 0x2d, 0x2e, 0xd7, 0xd8,
-    0xa7, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-
-    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-]
-
-
-def sortkey(resource):
-    return (*(MACROMAN_SORT[char] for char in resource.type), resource.id)
-
-
 parser = argparse.ArgumentParser(description='''
     Sort the resources in a Rez file (for diffing).
 ''')
 
 parser.add_argument('src', nargs='*', help='Rez files')
+parser.add_argument('--like', action='store', help='Rez file supplying the sort order')
 args = parser.parse_args()
 
+if args.like is not None:
+    args.like = macresources.parse_rez_code(open(args.like, 'rb').read())
+    args.like = {(r.type, r.id): idx for (idx, r) in enumerate(args.like)}
+    # print(args.like)
+
+def sortkey(resource):
+    if args.like:
+        for tryrange in [[resource.id], reversed(range(resource.id)), range(resource.id, 0x8000)]:
+            for parentid in tryrange:
+                parentidx = args.like.get((resource.type, parentid), None)
+                if parentidx is not None:
+                    # print('found one', (0, parentidx, resource.id))
+                    return (0, parentidx, resource.id)
+
+    return (1, resource.type.decode('mac_roman'), resource.id)
+
 for srcfile in args.src:
     with open(srcfile, 'r+b') as f:
         raw = f.read()