diff options
Diffstat (limited to 'book.py')
| -rw-r--r-- | book.py | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -13,15 +13,17 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import os +import gtk import uuid import logging -from gi.repository import GObject -import json +import gobject +import cjson import shutil import zipfile +from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT from gettext import gettext as _ -from sugar3.activity.activity import get_bundle_path, get_activity_root +from sugar.activity.activity import get_bundle_path, get_activity_root import net from infoslicer.processing.Article import Article @@ -34,11 +36,11 @@ custom = None image_root = os.path.join(get_activity_root(), 'data', 'book') -class Book(GObject.GObject): +class Book(gobject.GObject): __gsignals__ = { - 'article-selected' : (GObject.SignalFlags.RUN_FIRST, None, [object]), - 'article-added' : (GObject.SignalFlags.RUN_FIRST, None, [object]), - 'article-deleted' : (GObject.SignalFlags.RUN_FIRST, None, [object])} + 'article-selected' : (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'article-added' : (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]), + 'article-deleted' : (SIGNAL_RUN_FIRST, None, [TYPE_PYOBJECT]) } def get_article(self): return self._article @@ -69,9 +71,9 @@ class Book(GObject.GObject): self._article.uid = entry['uid'] self._article.article_title = title - GObject.idle_add(self._emit_article_selected) + gobject.idle_add(self._emit_article_selected) - article = GObject.property(type=object, + article = gobject.property(type=object, getter=get_article, setter=set_article) def _emit_article_selected(self): @@ -122,7 +124,7 @@ class Book(GObject.GObject): 'revision' : self.revision } index = file(os.path.join(self.root, 'index'), 'w') - index.write(json.dumps(data)) + index.write(cjson.encode(data)) index.close() def sync(self): @@ -130,7 +132,7 @@ class Book(GObject.GObject): self.sync_index() def __init__(self, preinstalled, root): - GObject.GObject.__init__(self) + gobject.GObject.__init__(self) self.root = root self.index = [] self.uid = None @@ -140,7 +142,7 @@ class Book(GObject.GObject): if os.path.exists(self.root): try: index = file(os.path.join(self.root, 'index'), 'r') - data = json.loads(index.read()) + data = cjson.decode(index.read()) self.uid = data['uid'] self.index = data['index'] self.revision = data['revision'] |