Merge branch 'dev' into master

diff --cc nhentai/cmdline.py
index 360ed9a6c0ea8c0d1d9a7a15eb67725dc9e5a5f2,f34e54ed4ec3c5345c8a33226525ae1ef1c3fdff..14b8730b7e57d733cb57bfcb867e074229b1de45
--- 1/nhentai/cmdline.py
--- 2/nhentai/cmdline.py
+++ b/nhentai/cmdline.py
@@@ -48,12 -48,9 +48,13 @@@ def cmd_parser()
  
      # doujinshi options
      parser.add_option('--id', type='string', dest='id', action='store', help='doujinshi ids set, e.g. 1,2,3')
-     parser.add_option('--search', '-s', type='string', dest='keyword', action='store', help='search doujinshi by keyword')
+     parser.add_option('--search', '-s', type='string', dest='keyword', action='store',
+                       help='search doujinshi by keyword')
      parser.add_option('--tag', type='string', dest='tag', action='store', help='download doujinshi by tag')
 +    parser.add_option('--artist', type='string', dest='artist', action='store', help='download doujinshi by artist')
 +    parser.add_option('--character', type='string', dest='character', action='store', help='download doujinshi by character')
 +    parser.add_option('--parody', type='string', dest='parody', action='store', help='download doujinshi by parody')
 +    parser.add_option('--group', type='string', dest='group', action='store', help='download doujinshi by group')
      parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
                        help='list or download your favorites.')
  

diff --cc nhentai/command.py
index aad850ad7c6bf59a1893313c3ed062e3ece45015,083980dad2d07a686f02c644fbd433573936cf29..f7dc68d140c088625bdcda9db9a31e517ff716cc
--- 1/nhentai/command.py
--- 2/nhentai/command.py
+++ b/nhentai/command.py
@@@ -45,32 -46,8 +46,32 @@@ def main()
          if options.is_download and doujinshis:
              doujinshi_ids = map(lambda d: d['id'], doujinshis)
  
 +    elif options.artist:
 +        doujinshis = tag_parser(options.artist, max_page=options.max_page, index=1)
 +        print_doujinshi(doujinshis)
 +        if options.is_download and doujinshis:
 +            doujinshi_ids = map(lambda d: d['id'], doujinshis)
 +
 +    elif options.character:
 +        doujinshis = tag_parser(options.character, max_page=options.max_page, index=2)
 +        print_doujinshi(doujinshis)
 +        if options.is_download and doujinshis:
 +            doujinshi_ids = map(lambda d: d['id'], doujinshis)
 +
 +    elif options.parody:
 +        doujinshis = tag_parser(options.parody, max_page=options.max_page, index=3)
 +        print_doujinshi(doujinshis)
 +        if options.is_download and doujinshis:
 +            doujinshi_ids = map(lambda d: d['id'], doujinshis)
 +
 +    elif options.group:
 +        doujinshis = tag_parser(options.group, max_page=options.max_page, index=4)
 +        print_doujinshi(doujinshis)
 +        if options.is_download and doujinshis:
 +            doujinshi_ids = map(lambda d: d['id'], doujinshis)
 +
      elif options.keyword:
-         doujinshis = search_parser(options.keyword, options.page)
+         doujinshis = search_parser(options.keyword, sorting=options.sorting, page=options.page)
          print_doujinshi(doujinshis)
          if options.is_download:
              doujinshi_ids = map(lambda d: d['id'], doujinshis)