def patch_dmm(args): print(repr(args.patches)) for i in range(len(args.patches[0])): patch = args.patches[0][i] if not os.path.isfile(patch): print('File {0} does not exist.'.format(patch)) sys.exit(1) if not os.path.isfile(args.map): print('File {0} does not exist.'.format(args.mine)) sys.exit(1) if not os.path.isfile(args.project): print('DM Environment File {0} does not exist.'.format(args.project)) sys.exit(1) dmm = Map(forgiving_atom_lookups=True) dmm.Load(args.map, format='dmm') fmt = DMMFormat(dmm) context = None added = 0 removed = 0 currentpatch = '' def changeMarker(ln): a = Atom('/obj/effect/byondtools/changed') a.setProperty('tag', '{}:{}'.format(currentpatch, ln), flags=PropertyFlags.MAP_SPECIFIED) return a def printReport(context, added, removed): if context is not None: x, y, z = context print(' Z={} +{} -{}'.format(z, added, removed)) REG_INSTRUCTION = re.compile( r'^(?P<change>[\+\-])(?P<amount>[0-9\*]+)?\s+(?P<atom>/.*)') for i in range(len(args.patches[0])): patch = args.patches[0][i] print('* Applying {}...'.format(patch)) currentpatch = patch with open(patch) as f: ln = 0 lz = -1 skip_block = False for line in f: ln += 1 line = line.strip() if line == '': continue if line.startswith('#'): continue if line.startswith('<') and line.endswith('>'): strcoords = line.strip('<>').split(',') newcoords = [] for coord in strcoords: newcoords += [int(coord)] if context is not None and lz != context[2]: printReport(context, added, removed) lz = context[2] added = removed = 0 context = newcoords skip_block = False continue if line.startswith('@') and not skip_block: # @CHECK before-hash after-hash atoms-block x, y, z = context if line.startswith('@CHECK'): _, beforehash, afterhash, serdata = line.split(' ', 3) if args.clobber: #print('WARNING: <{},{},{}> has changed and will be overwritten. (--clobber)'.format(x, y, z)) t = fmt.consumeTileChunk(serdata, cache=False) t.AppendAtom(changeMarker(ln)) dmm.SetTileAt(x, y, z, t) skip_block = True continue curhash = dmm.GetTileAt(x, y, z).GetHash() if afterhash == curhash: print( 'Skipping <{},{},{}> (already what we expected)' .format(x, y, z)) skip_block = True continue #else: print('PRE {} != {}: OK'.format(curhash,afterhash)) if beforehash != curhash: print( 'WARNING: <{},{},{}> has changed. Operations on this tile may not be accurate!' .format(x, y, z)) continue #else: print('OLD {} == {}: OK'.format(curhash,beforehash)) if not skip_block and (line.startswith('+') or line.startswith('-')): if line == '-ALL': dmm.SetTileAt(x, y, z, dmm.CreateTile()) continue m = REG_INSTRUCTION.match(line) if m is None: print('{}:{}: MALFORMED INSTRUCTION: {}'.format( args.patch, ln, line)) sys.exit(1) amount = m.group('amount') if amount == '*': amount = 9999 else: amount = int(m.group('amount') or 1) change = m.group('change') atom = fmt.consumeAtom(m.group('atom'), ln) atom.filename = args.patch atom.line = ln if atom is None: print( '{}:{}: WARNING: Unable to parse instance specified by chunk {}' .format(args.patch, ln, m.group('atom'))) continue x, y, z = context if x == 0 and y == 0 and z == 0: print('WE AT <0,0,0> SOMEFIN WRONG') if z >= len(dmm.zLevels): continue tile = dmm.GetTileAt(x, y, z) if change == '-': for _ in range(amount): if tile.CountAtom(atom) > 0: tile.RemoveAtom(atom, hash=False) removed += 1 else: break elif change == '+': for _ in range(amount): tile.AppendAtom(atom, hash=False) added += amount tile.UpdateHash() # dmm.SetTileAt(x, y, z, tile) # print('{} - {}'.format((x,y,z),tile)) printReport(context, added, removed) print('Saving...') dmm.Save(args.output if args.output else args.map)
def compare_dmm(args): if not os.path.isfile(args.theirs): print('File {0} does not exist.'.format(args.theirs)) sys.exit(1) if not os.path.isfile(args.mine): print('File {0} does not exist.'.format(args.mine)) sys.exit(1) if not os.path.isfile(args.project): print('DM Environment File {0} does not exist.'.format(args.project)) sys.exit(1) theirs_dmm = Map(forgiving_atom_lookups=True) theirs_dmm.Load(args.theirs, format='dmm') mine_dmm = Map(forgiving_atom_lookups=True) mine_dmm.Load(args.mine, format='dmm') ttitle, _ = os.path.splitext(os.path.basename(args.theirs)) mtitle, _ = os.path.splitext(os.path.basename(args.mine)) format = DMMFormat(theirs_dmm) output = '{} - {}.dmmpatch'.format(ttitle, mtitle) if args.output: output = args.output with open(output, 'w') as f: stats = {'diffs': 0, 'tilediffs': 0, 'tiles': 0, 'atoms': 0} print('Comparing maps...') for z in range(len(theirs_dmm.zLevels)): t_zlev = theirs_dmm.zLevels[z] m_zlev = mine_dmm.zLevels[z] if t_zlev.height != m_zlev.height or t_zlev.width != m_zlev.width: print( '!!! ZLEVEL {} HEIGHT/WIDTH MISMATCH: ({},{}) != ({},{})'. format(z, t_zlev.height, t_zlev.width, m_zlev.height, m_zlev.width)) continue print(" Scanning z-level {} ({}x{})...".format( z, t_zlev.height, t_zlev.width)) for y in range(t_zlev.height): for x in range(t_zlev.width): CHANGES = {} tTile = theirs_dmm.GetTileAt(x, y, z) # if tTile is None: # print('!!! THEIRS <{},{},{}>: Tile object is None!'.format(x, y, z)) # #return mTile = mine_dmm.GetTileAt(x, y, z) # if tTile is None: # print('!!! MINE <{},{},{}>: Tile object is None!'.format(x, y, z)) # #return theirs = {} mine = {} all_keys = set() if tTile: for A in tTile.GetAtoms(): key = format.SerializeAtom(A) all_keys.add(key) if key not in theirs: theirs[key] = [A, 0] theirs[key][1] += 1 if mTile: for A in mTile.GetAtoms(): key = format.SerializeAtom(A) all_keys.add(key) if key not in mine: mine[key] = [A, 0] mine[key][1] += 1 removals = set() additions = set() kept = {} for key in all_keys: change = None minecount = 0 if key in mine: minecount = mine[key][1] theircount = 0 if key in theirs: theircount = theirs[key][1] delta = minecount - theircount if delta < 0: change = '-' removals.add(key) elif delta > 0: change = '+' additions.add(key) if minecount > 0 and delta <= 0: kept[key] = minecount if change is not None: CHANGES[key] = [ change, abs(delta), minecount, theircount ] stats['tiles'] += 1 def writeChanges(f, source, CHANGES): for key in source: change, amount, mc, tc = CHANGES[key] # change, amount, _, _ = changedat # f.write(' # {} vs {}\n'.format(mc, tc)) abs_amt = abs(amount) if abs_amt > 1: f.write(' {}{} {}\n'.format( change, abs_amt if mc > 0 else '*', key)) else: f.write(' {} {}\n'.format(change, key)) stats['diffs'] += abs_amt if len(CHANGES) > 0: f.write('<{},{},{}>\n'.format(x, y, z)) stats['tilediffs'] += 1 f.write(' @CHECK {before} {after} {tiledat}\n'.format( before=tTile.GetHash(), after=mTile.GetHash(), tiledat=format.SerializeTile(mTile))) if len(kept) == 0: f.write(' -ALL\n') else: writeChanges(f, removals, CHANGES) """ for key,count in kept.items(): if count > 1: f.write(' ={} {}\n'.format(count, key)) else: f.write(' = {}\n'.format(key)) """ writeChanges(f, additions, CHANGES) print('Compared maps: {} differences in {} tiles.'.format( stats['diffs'], stats['tilediffs'])) print('Total: {} atoms, {} tiles.'.format(stats['diffs'], stats['tilediffs']))
def compare_dmm(args): if not os.path.isfile(args.theirs): print('File {0} does not exist.'.format(args.theirs)) sys.exit(1) if not os.path.isfile(args.mine): print('File {0} does not exist.'.format(args.mine)) sys.exit(1) if not os.path.isfile(args.project): print('DM Environment File {0} does not exist.'.format(args.project)) sys.exit(1) theirs_dmm = Map(forgiving_atom_lookups=True) theirs_dmm.readMap(args.theirs) mine_dmm = Map(forgiving_atom_lookups=True) mine_dmm.readMap(args.mine) if theirs_dmm.width != mine_dmm.width: print('Width is not equal: {} != {}.'.format(theirs_dmm.width, mine_dmm.width)) sys.exit(1) if theirs_dmm.height != mine_dmm.height: print('Height is not equal: {} != {}.'.format(theirs_dmm.height, mine_dmm.height)) sys.exit(1) ttitle, _ = os.path.splitext(os.path.basename(args.theirs)) mtitle, _ = os.path.splitext(os.path.basename(args.mine)) output = '{} - {}.dmmpatch'.format(ttitle, mtitle) if args.output: output = args.output with open(output, 'w') as f: stats = {'diffs': 0, 'tilediffs': 0} print('Comparing maps...') for z in range(len(theirs_dmm.zLevels)): for y in range(theirs_dmm.height): for x in range(theirs_dmm.width): CHANGES = {} tTile = theirs_dmm.GetTileAt(x, y, z) mTile = mine_dmm.GetTileAt(x, y, z) theirs = tTile.GetAtoms() mine = mTile.GetAtoms() for atom in theirs + mine: key = atom.MapSerialize() change = None if atom not in mine: change = '-' if atom not in theirs: change = '+' if change is not None: CHANGES[key] = change if len(CHANGES) > 0: f.write('<{},{},{}>\n'.format(x, y, z)) stats['tilediffs'] += 1 for key, change in CHANGES.items(): f.write(' {} {}\n'.format(change, key)) stats['diffs'] += 1 print('Compared maps: {} differences in {} tiles.'.format( stats['diffs'], stats['tilediffs']))