remove jsonout #2

Main.py

@@ -13,7 +13,7 @@ from Items import ItemFactory
 from Regions import create_regions, create_shops, mark_light_world_regions
 from InvertedRegions import create_inverted_regions, mark_dark_world_regions
 from EntranceShuffle import link_entrances, link_inverted_entrances
-from Rom import patch_rom, patch_race_rom, patch_enemizer, apply_rom_settings, LocalRom, JsonRom, get_hash_string
+from Rom import patch_rom, patch_race_rom, patch_enemizer, apply_rom_settings, LocalRom, get_hash_string
 from Rules import set_rules
 from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
 from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items, balance_multiworld_progression

Rom.py

@@ -24,53 +24,6 @@ from EntranceShuffle import door_addresses
 JAP10HASH = '03a63945398191337e896e5771f77173'
 RANDOMIZERBASEHASH = 'aec17dd8b3c76c16d0b0311c36eb1c00'
 
-
-class JsonRom(object):
-
-    def __init__(self, name=None, hash=None):
-        self.name = name
-        self.hash = hash
-        self.orig_buffer = None
-        self.patches = {}
-        self.addresses = []
-
-    def write_byte(self, address, value):
-        self.write_bytes(address, [value])
-
-    def write_bytes(self, startaddress, values):
-        if not values:
-            return
-        values = list(values)
-
-        pos = bisect.bisect_right(self.addresses, startaddress)
-        intervalstart = self.addresses[pos-1] if pos else None
-        intervalpatch = self.patches[str(intervalstart)] if pos else None
-
-        if pos and startaddress <= intervalstart + len(intervalpatch): # merge with previous segment
-            offset = startaddress - intervalstart
-            intervalpatch[offset:offset+len(values)] = values
-            startaddress = intervalstart
-            values = intervalpatch
-        else: # new segment
-            self.addresses.insert(pos, startaddress)
-            self.patches[str(startaddress)] = values
-            pos = pos + 1
-
-        while pos < len(self.addresses) and self.addresses[pos] <= startaddress + len(values): # merge the next segment into this one
-            intervalstart = self.addresses[pos]
-            values.extend(self.patches[str(intervalstart)][startaddress+len(values)-intervalstart:])
-            del self.patches[str(intervalstart)]
-            del self.addresses[pos]
-
-    def write_to_file(self, file):
-        with open(file, 'w') as stream:
-            json.dump([self.patches], stream)
-
-    def get_hash(self):
-        h = hashlib.md5()
-        h.update(json.dumps([self.patches]).encode('utf-8'))
-        return h.hexdigest()
-
 class LocalRom(object):
 
     def __init__(self, file, patch=True, name=None, hash=None):
@@ -101,6 +54,12 @@ class LocalRom(object):
             ret.write_bytes(int(address), values)
         return ret
 
+    @staticmethod
+    def verify(buffer, expected=RANDOMIZERBASEHASH):
+        buffermd5 = hashlib.md5()
+        buffermd5.update(buffer)
+        return RANDOMIZERBASEHASH == buffermd5.hexdigest()
+
     def patch_base_rom(self):
         from Patch import create_patch_file, create_rom_bytes
 
@@ -108,9 +67,7 @@ class LocalRom(object):
             with open(local_path('data/baserom.sfc'), 'rb') as stream:
                 buffer = bytearray(stream.read())
 
-            buffermd5 = hashlib.md5()
+            if self.verify(buffer):
-            buffermd5.update(buffer)
-            if RANDOMIZERBASEHASH == buffermd5.hexdigest():
                 self.buffer = buffer
                 if not os.path.exists(local_path('data/baserom.bmbp')):
                     create_patch_file(local_path('data/baserom.sfc'))
@@ -118,19 +75,16 @@ class LocalRom(object):
 
         if os.path.isfile(local_path('data/baserom.bmbp')):
             _, target, buffer = create_rom_bytes(local_path('data/baserom.bmbp'))
-            buffermd5 = hashlib.md5()
+            if self.verify(buffer):
-            buffermd5.update(buffer)
-            if RANDOMIZERBASEHASH == buffermd5.hexdigest():
                 self.buffer = bytearray(buffer)
                 with open(local_path('data/baserom.sfc'), 'wb') as stream:
                     stream.write(buffer)
                 return
 
         # verify correct checksum of baserom
-        basemd5 = hashlib.md5()
+        if not self.verify(self.buffer, JAP10HASH):
-        basemd5.update(self.buffer)
+            logging.getLogger('').warning(
-        if JAP10HASH != basemd5.hexdigest():
+                'Supplied Base Rom does not match known MD5 for JAP(1.0) release. Will try to patch anyway.')
-            logging.getLogger('').warning('Supplied Base Rom does not match known MD5 for JAP(1.0) release. Will try to patch anyway.')
 
         # extend to 2MB
         self.buffer.extend(bytearray([0x00]) * (0x200000 - len(self.buffer)))
@@ -144,16 +98,14 @@ class LocalRom(object):
                     self.write_bytes(int(baseaddress), values)
 
         # verify md5
-        patchedmd5 = hashlib.md5()
+        if self.verify(self.buffer):
-        patchedmd5.update(self.buffer)
-        if patchedmd5.hexdigest() not in [RANDOMIZERBASEHASH]:
-            raise RuntimeError('Provided Base Rom unsuitable for patching. Please provide a JAP(1.0) "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc" rom to use as a base.')
-        else:
             with open(local_path('data/baserom.sfc'), 'wb') as stream:
                 stream.write(self.buffer)
             create_patch_file(local_path('data/baserom.sfc'))
             os.remove(local_path('data/base2current.json'))
-
+        else:
+            raise RuntimeError(
+                'Provided Base Rom unsuitable for patching. Please provide a JAP(1.0) "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc" rom to use as a base.')
 
     def write_crc(self):
         crc = (sum(self.buffer[:0x7FDC] + self.buffer[0x7FE0:]) + 0x01FE) & 0xFFFF