Cleanup parsers

lector/parsers/epub.py

@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# TODO
+# Maybe also include book description
+
 import os
 import zipfile
 import logging
@@ -25,47 +28,27 @@ logger = logging.getLogger(__name__)
 
 class ParseEPUB:
     def __init__(self, filename, temp_dir, file_md5):
-        # TODO
-        # Maybe also include book description
-        self.book_ref = None
         self.book = None
-        self.temp_dir = temp_dir
         self.filename = filename
+        self.temp_dir = temp_dir
         self.extract_path = os.path.join(temp_dir, file_md5)
 
     def read_book(self):
-        self.book_ref = EPUB(self.filename, self.temp_dir)
-        self.book_ref.generate_metadata()
-        self.book = self.book_ref.book
-        return True
+        self.book = EPUB(self.filename, self.temp_dir)
 
-    def get_title(self):
-        return self.book['title']
+    def generate_metadata(self):
+        self.book.generate_metadata()
+        return self.book.metadata
 
-    def get_author(self):
-        return self.book['author']
-
-    def get_year(self):
-        return self.book['year']
-
-    def get_cover_image(self):
-        return self.book['cover']
-
-    def get_isbn(self):
-        return self.book['isbn']
-
-    def get_tags(self):
-        return self.book['tags']
-
-    def get_contents(self):
+    def generate_content(self):
         zipfile.ZipFile(self.filename).extractall(self.extract_path)
 
-        self.book_ref.generate_toc()
-        self.book_ref.generate_content()
+        self.book.generate_toc()
+        self.book.generate_content()
 
         toc = []
         content = []
-        for count, i in enumerate(self.book['content']):
+        for count, i in enumerate(self.book.content):
             toc.append((i[0], i[1], count + 1))
             content.append(i[2])