From 507f8afd1d5a92ad746528b7a2dfaaa524c0ccc1 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 15 Apr 2009 23:34:52 +0000
Subject: Switch to sugar-port

---
(limited to 'document.py')

diff --git a/document.py b/document.py
index 6e1e979..d751eb9 100644
--- a/document.py
+++ b/document.py
@@ -14,13 +14,12 @@
 
 import os
 import gtk
-from zipfile import ZipFile
 
-try:
-    import json
-    json.dumps
-except (ImportError, AttributeError):
-    import simplejson as json
+import logging
+logger = logging.getLogger('cartoon-builder')
+
+import port.json as json
+from port.tarball import Tarball
 
 import theme
 from sound import *
@@ -41,7 +40,7 @@ def clean(index):
     Document.tape[index] = EmptyFrame()
 
 def save(filepath):
-    zip = ZipFile(filepath, 'w')
+    tar = Tarball(filepath, 'w')
 
     cfg = { 'ground': {},
             'sound' : {},
@@ -52,7 +51,7 @@ def save(filepath):
         if value.custom():
             node['custom'] = True
             node['filename'] = arcname
-            zip.writestr(arcname, value.serialize())
+            tar.write(arcname, value.serialize())
         else:
             node['custom'] = False
         node['name'] = unicode(value.name)
@@ -65,7 +64,7 @@ def save(filepath):
             [i for i in set(Document.tape) if not i.empty() and i.custom()]):
         arcname = 'frame%03d.png' % i
         cfg['frames'][frame.id] = arcname
-        zip.writestr(arcname, frame.serialize())
+        tar.write(arcname, frame.serialize())
 
     for i, frame in enumerate(Document.tape):
         if not frame.empty():
@@ -75,34 +74,38 @@ def save(filepath):
             node['index'] = i
             cfg['tape'].append(node)
 
-    zip.writestr('MANIFEST', json.dumps(cfg))
-    zip.close()
+    tar.write('MANIFEST', json.dumps(cfg))
+    tar.close()
 
 def load(filepath):
-    zip = ZipFile(filepath, 'r')
-    cfg = json.loads(zip.read('MANIFEST'))
+    try:
+        tar = Tarball(filepath)
+        cfg = json.loads(tar.read('MANIFEST'))
 
-    def _load(node, restored_class, preinstalled_class):
-        if node['custom']:
-            return restored_class(node['name'], node['id'],
-                    zip.read(node['filename']))
-        else:
-            return preinstalled_class(node['name'], node['id'])
+        def _load(node, restored_class, preinstalled_class):
+            if node['custom']:
+                return restored_class(node['name'], node['id'],
+                        tar.read(node['filename']))
+            else:
+                return preinstalled_class(node['name'], node['id'])
 
-    Document.ground = _load(cfg['ground'], RestoredGround, PreinstalledGround)
-    Document.sound = _load(cfg['sound'], RestoredSound, PreinstalledSound)
+        Document.ground = _load(cfg['ground'], RestoredGround, PreinstalledGround)
+        Document.sound = _load(cfg['sound'], RestoredSound, PreinstalledSound)
 
-    frames = {}
+        frames = {}
 
-    for id, arcname in cfg['frames'].items():
-        frames[id] = RestoredFrame(id, zip.read(arcname))
+        for id, arcname in cfg['frames'].items():
+            frames[id] = RestoredFrame(id, tar.read(arcname))
 
-    for node in cfg['tape']:
-        i = node['index']
-        if i < theme.TAPE_COUNT:
-            if node['custom']:
-                Document.tape[i] = frames[node['id']]
-            else:
-                Document.tape[i] = PreinstalledFrame(node['id'])
+        for node in cfg['tape']:
+            i = node['index']
+            if i < theme.TAPE_COUNT:
+                if node['custom']:
+                    Document.tape[i] = frames[node['id']]
+                else:
+                    Document.tape[i] = PreinstalledFrame(node['id'])
+
+        tar.close()
 
-    zip.close()
+    except Exception, e:
+        logger.error('Cannot load jobject: %s' % e)
--
cgit v0.9.1