SnowFlash383935 commited on
Commit
d0fca70
·
verified ·
1 Parent(s): 634449e

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -4
app.py CHANGED
@@ -252,12 +252,20 @@ def read_signs(signs: List[Dict]) -> List[Sign]:
252
 
253
  # ==================== MAIN PARSER ====================
254
  def parse_save(doc: dict) -> dict:
255
- bx = doc.get('blockSizeX', 0)
256
- by = doc.get('blockSizeY', 0)
 
 
 
 
 
 
 
 
257
  if not bx or not by:
258
  raise ValueError("Missing blockSize")
259
 
260
- result = {}
261
 
262
  # parts
263
  try:
@@ -289,12 +297,13 @@ def parse_save(doc: dict) -> dict:
289
 
290
  # meta
291
  result['meta'] = {
292
- k: doc[k] for k in ['saveInfo', 'palette', 'authors', 'blockSizeX', 'blockSizeY']
293
  if k in doc
294
  }
295
 
296
  return result
297
 
 
298
  # ==================== GRADIO ====================
299
  def analyze_cps(file):
300
  if file is None:
 
252
 
253
  # ==================== MAIN PARSER ====================
254
  def parse_save(doc: dict) -> dict:
255
+ # Попробуем достать blockSize
256
+ bx, by = 0, 0
257
+ if 'blockSizeX' in doc and 'blockSizeY' in doc:
258
+ bx, by = doc['blockSizeX'], doc['blockSizeY']
259
+ elif 'blockSize' in doc:
260
+ bs = doc['blockSize']
261
+ if isinstance(bs, dict):
262
+ bx, by = bs.get('X', 0), bs.get('Y', 0)
263
+ elif isinstance(bs, list) and len(bs) == 2:
264
+ bx, by = bs[0], bs[1]
265
  if not bx or not by:
266
  raise ValueError("Missing blockSize")
267
 
268
+ result = {"blockSize": (bx, by)}
269
 
270
  # parts
271
  try:
 
297
 
298
  # meta
299
  result['meta'] = {
300
+ k: doc[k] for k in ['saveInfo', 'palette', 'authors', 'origin']
301
  if k in doc
302
  }
303
 
304
  return result
305
 
306
+
307
  # ==================== GRADIO ====================
308
  def analyze_cps(file):
309
  if file is None: