mirror of
				https://github.com/RicterZ/nhentai.git
				synced 2025-11-04 02:50:55 +01:00 
			
		
		
		
	Changed parser option checks to allow artist search
This commit is contained in:
		@@ -73,6 +73,8 @@ def cmd_parser():
 | 
				
			|||||||
                      help='search doujinshi by keyword')
 | 
					                      help='search doujinshi by keyword')
 | 
				
			||||||
    parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
 | 
					    parser.add_option('--favorites', '-F', action='store_true', dest='favorites',
 | 
				
			||||||
                      help='list or download your favorites')
 | 
					                      help='list or download your favorites')
 | 
				
			||||||
 | 
					    parser.add_option('--artist', '-a', action='store', dest='artist',
 | 
				
			||||||
 | 
					                      help='list doujinshi by artist name')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # page options
 | 
					    # page options
 | 
				
			||||||
    parser.add_option('--page-all', dest='page_all', action='store_true', default=False,
 | 
					    parser.add_option('--page-all', dest='page_all', action='store_true', default=False,
 | 
				
			||||||
@@ -112,6 +114,8 @@ def cmd_parser():
 | 
				
			|||||||
                      help='generate PDF file')
 | 
					                      help='generate PDF file')
 | 
				
			||||||
    parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
 | 
					    parser.add_option('--rm-origin-dir', dest='rm_origin_dir', action='store_true', default=False,
 | 
				
			||||||
                      help='remove downloaded doujinshi dir when generated CBZ or PDF file')
 | 
					                      help='remove downloaded doujinshi dir when generated CBZ or PDF file')
 | 
				
			||||||
 | 
					    parser.add_option('--move-to-folder', dest='move_to_folder', action='store_true', default=False,
 | 
				
			||||||
 | 
					                      help='remove files in doujinshi dir then move new file to folder when generated CBZ or PDF file')
 | 
				
			||||||
    parser.add_option('--meta', dest='generate_metadata', action='store_true',
 | 
					    parser.add_option('--meta', dest='generate_metadata', action='store_true',
 | 
				
			||||||
                      help='generate a metadata file in doujinshi format')
 | 
					                      help='generate a metadata file in doujinshi format')
 | 
				
			||||||
    parser.add_option('--regenerate-cbz', dest='regenerate_cbz', action='store_true', default=False,
 | 
					    parser.add_option('--regenerate-cbz', dest='regenerate_cbz', action='store_true', default=False,
 | 
				
			||||||
@@ -209,12 +213,12 @@ def cmd_parser():
 | 
				
			|||||||
            _ = [i.strip() for i in f.readlines()]
 | 
					            _ = [i.strip() for i in f.readlines()]
 | 
				
			||||||
            args.id = set(int(i) for i in _ if i.isdigit())
 | 
					            args.id = set(int(i) for i in _ if i.isdigit())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (args.is_download or args.is_show) and not args.id and not args.keyword and not args.favorites:
 | 
					    if (args.is_download or args.is_show) and not args.id and not args.keyword and not args.favorites and not args.artist:
 | 
				
			||||||
        logger.critical('Doujinshi id(s) are required for downloading')
 | 
					        logger.critical('Doujinshi id(s) are required for downloading')
 | 
				
			||||||
        parser.print_help()
 | 
					        parser.print_help()
 | 
				
			||||||
        sys.exit(1)
 | 
					        sys.exit(1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if not args.keyword and not args.id and not args.favorites:
 | 
					    if not args.keyword and not args.id and not args.favorites and not args.artist:
 | 
				
			||||||
        parser.print_help()
 | 
					        parser.print_help()
 | 
				
			||||||
        sys.exit(1)
 | 
					        sys.exit(1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user