Merge branch 'pull/221' into master

diff --cc nhentai/cmdline.py
Simple merge

diff --cc nhentai/command.py
index 76365d8b8855d4674b2b9a8a627fd2a0d2fa168d,92b6793e8a950d2b9b780bf46d168266baac024c..fe746cb014f80f1fba8e72ebadb85ab02ee32d90
--- 1/nhentai/command.py
--- 2/nhentai/command.py
+++ b/nhentai/command.py
@@@ -91,15 -89,10 +91,18 @@@ def main()
                                  timeout=options.timeout, delay=options.delay)
  
          for doujinshi in doujinshi_list:
- 
+             if not options.dryrun:
+                 doujinshi.downloader = downloader
+                 doujinshi.download()
 +                                              
 +            doujinshi.downloader = downloader
 +            doujinshi.download()
 +                      
 +            if options.generate_metadata:
 +              table=doujinshi.table            
 +              generate_metadatafile(options.output_dir,table,doujinshi)
 +                      
+ 
              if options.is_save_download_history:
                  with DB() as db:
                      db.add_one(doujinshi.id)

diff --cc nhentai/utils.py
Simple merge