Fix incorrect order in JSON output

jorgebastida · Feb 7, 2015 · 9c9de11 · 9c9de11
1 parent bb02512
commit 9c9de11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/glue/formats/base.py b/glue/formats/base.py
@@ -158,7 +158,7 @@ def needs_rebuild(self):
         return False
 
     def render(self, *args, **kwargs):
-        return json.dumps(self.get_context(*args, **kwargs))
+        return json.dumps(self.get_context(*args, **kwargs), indent=4)
 
 
 class BasePlistFormat(BaseTextFormat):

diff --git a/glue/formats/jsonformat.py b/glue/formats/jsonformat.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 import os
 import json
 import codecs
@@ -33,7 +34,7 @@ def populate_argument_parser(cls, parser):
     def get_context(self, *args, **kwargs):
         context = super(JSONFormat, self).get_context(*args, **kwargs)
 
-        frames = dict([[i['filename'], {'filename': i['filename'],
+        frames = OrderedDict([[i['filename'], {'filename': i['filename'],
                                         'frame': {'x': i['x'],
                                                   'y': i['y'],
                                                   'w': i['width'],
@@ -47,7 +48,7 @@ def get_context(self, *args, **kwargs):
                                         'sourceSize': {'w': i['original_width'],
                                                        'h': i['original_height']}}] for i in context['images']])
 
-        data = dict(frames=None, meta={'version': context['version'],
+        data = OrderedDict(frames=None, meta={'version': context['version'],
                                        'hash': context['hash'],
                                        'name': context['name'],
                                        'sprite_path': context['sprite_path'],