0.3.1 - add login session

[nhentai.git] / nhentai / doujinshi.py

diff --git a/nhentai/doujinshi.py b/nhentai/doujinshi.py
index 30eca396ef2510b0c92e266b2677b8edaebe2eeb..6cb17e8dacf3eaecf1038ef4c21cb7979a12e195 100644 (file)
--- a/nhentai/doujinshi.py
+++ b/nhentai/doujinshi.py
@@ -36,6 +36,7 @@ class Doujinshi(object):
         self.downloader = None
         self.url = '%s/%d' % (DETAIL_URL, self.id)
         self.info = DoujinshiInfo(**kwargs)
+        self.filename = format_filename('[%s][%s][%s]' % (self.id, self.info.artist, self.name))
 
     def __repr__(self):
         return '<Doujinshi: {0}>'.format(self.name)
@@ -44,10 +45,10 @@ class Doujinshi(object):
         table = [
             ["Doujinshi", self.name],
             ["Subtitle", self.info.subtitle],
-            ["Characters", self.info.characters],
-            ["Authors", self.info.artists],
+            ["Characters", self.info.character],
+            ["Authors", self.info.artist],
             ["Language", self.info.language],
-            ["Tags", self.info.tags],
+            ["Tags", ', '.join(self.info.tag.keys())],
             ["URL", self.url],
             ["Pages", self.pages],
         ]
@@ -57,10 +58,20 @@ class Doujinshi(object):
         logger.info('Starting to download doujinshi: %s' % self.name)
         if self.downloader:
             download_queue = []
+
+            if len(self.ext) != self.pages:
+                logger.warning('Page count and ext count do not equal')
+
+            for i in range(1, min(self.pages, len(self.ext)) + 1):
+                download_queue.append('%s/%d/%d.%s' % (IMAGE_URL, int(self.img_id), i, self.ext[i-1]))
+
+            self.downloader.download(download_queue, self.filename)
+
+            '''
             for i in range(len(self.ext)):
                 download_queue.append('%s/%d/%d.%s' % (IMAGE_URL, int(self.img_id), i+1, EXT_MAP[self.ext[i]]))
+            '''
 
-            self.downloader.download(download_queue, format_filename('%s-%s' % (self.id, self.name[:200])))
         else:
             logger.critical('Downloader has not been loaded')