fix format

[nhentai.git] / nhentai / doujinshi.py

diff --git a/nhentai/doujinshi.py b/nhentai/doujinshi.py
index 164edaa0317b38792b52f6a8506ac1cf06b98588..3dea1044daf2aae62adf82f4f8765242cf732aaf 100644 (file)
--- a/nhentai/doujinshi.py
+++ b/nhentai/doujinshi.py
@@ -1,42 +1,85 @@
 # coding: utf-8
-from __future__ import print_function
+
 from tabulate import tabulate
-from constant import DETAIL_URL, IMAGE_URL
-from logger import logger
+
+from nhentai.constant import DETAIL_URL, IMAGE_URL
+from nhentai.logger import logger
+from nhentai.utils import format_filename
+
+EXT_MAP = {
+    'j': 'jpg',
+    'p': 'png',
+    'g': 'gif',
+}
+
+
+class DoujinshiInfo(dict):
+    def __init__(self, **kwargs):
+        super(DoujinshiInfo, self).__init__(**kwargs)
+
+    def __getattr__(self, item):
+        try:
+            return dict.__getitem__(self, item)
+        except KeyError:
+            return ''
 
 
 class Doujinshi(object):
-    def __init__(self, name=None, subtitle=None, id=None, img_id=None, ext='jpg', pages=0):
+    def __init__(self, name=None, id=None, img_id=None, ext='', pages=0, name_format='[%i][%a][%t]', **kwargs):
         self.name = name
-        self.subtitle = subtitle
         self.id = id
         self.img_id = img_id
         self.ext = ext
         self.pages = pages
         self.downloader = None
         self.url = '%s/%d' % (DETAIL_URL, self.id)
+        self.info = DoujinshiInfo(**kwargs)
 
-    def __repr__(self):
-        return '<Doujinshi: {}>'.format(self.name)
+        name_format = name_format.replace('%i', str(self.id))
+        name_format = name_format.replace('%a', self.info.artists)
+        name_format = name_format.replace('%t', self.name)
+        name_format = name_format.replace('%s', self.info.subtitle)
+        self.filename = format_filename(name_format)
 
-    def show(self):
-        table = [
+        self.table = [
+            ["Parodies", self.info.parodies],
             ["Doujinshi", self.name],
-            ["Subtitle", self.subtitle],
+            ["Subtitle", self.info.subtitle],
+            ["Characters", self.info.characters],
+            ["Authors", self.info.artists],
+            ["Languages", self.info.languages],
+            ["Tags", self.info.tags],
             ["URL", self.url],
             ["Pages", self.pages],
         ]
-        logger.info(u'Print doujinshi information\n{}'.format(tabulate(table)))
+
+    def __repr__(self):
+        return '<Doujinshi: {0}>'.format(self.name)
+
+    def show(self):
+
+        logger.info(u'Print doujinshi information of {0}\n{1}'.format(self.id, tabulate(self.table)))
 
     def download(self):
-        logger.info('Start download doujinshi: %s' % self.name)
+        logger.info('Starting to download doujinshi: %s' % self.name)
         if self.downloader:
             download_queue = []
-            for i in xrange(1, self.pages + 1):
-                download_queue.append('%s/%d/%d.%s' % (IMAGE_URL, int(self.img_id), i, self.ext))
-            self.downloader.download(download_queue, self.id)
+
+            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]]))
+            '''
+
         else:
-            logger.critical('Downloader has not be loaded')
+            logger.critical('Downloader has not been loaded')
 
 
 if __name__ == '__main__':