From 3f51adc9a50b797d2fae4dc84381dbe581b9c92b Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Mon, 14 Feb 2011 14:07:08 +0000 Subject: Move title metadata extraction to the backends --- diff --git a/epubadapter.py b/epubadapter.py index 2d4a913..964f915 100644 --- a/epubadapter.py +++ b/epubadapter.py @@ -23,7 +23,13 @@ class EpubViewer(epubview.EpubView): self.set_document(EpubDocument(self, file_path.replace('file://', ''))) def load_metadata(self, activity): - pass + + self.metadata = activity.metadata + + if not self.metadata['title_set_by_user'] == '1': + title = self._epub._info._get_title() + if title: + self.metadata['title'] = title def update_metadata(self, activity): pass diff --git a/evinceadapter.py b/evinceadapter.py index 24a4c88..ad79189 100644 --- a/evinceadapter.py +++ b/evinceadapter.py @@ -64,7 +64,14 @@ class EvinceViewer(): return self._document.get_n_pages() def load_metadata(self, activity): + self.metadata = activity.metadata + + if not self.metadata['title_set_by_user'] == '1': + title = self._document.get_title() + if title: + self.metadata['title'] = title + sizing_mode = self.metadata.get('Read_sizing_mode', 'fit-width') _logger.debug('Found sizing mode: %s', sizing_mode) if sizing_mode == "best-fit": diff --git a/readactivity.py b/readactivity.py index 48baaa2..253d9f7 100644 --- a/readactivity.py +++ b/readactivity.py @@ -770,10 +770,6 @@ class ReadActivity(activity.Activity): self._view.connect_page_changed_handler(self.__page_changed_cb) - if not self.metadata['title_set_by_user'] == '1': - title = self._document.get_title() - if title: - self.metadata['title'] = title self._view.load_metadata(self) -- cgit v0.9.1