From 41bd18af8febfdd02bca3dae529275dd894bb8e0 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Fri, 14 Sep 2012 15:58:43 -0300 Subject: Added -A, +A (--all, ++all) opts for show both fim and non fim mlp ponies --- ponysay | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'ponysay') diff --git a/ponysay b/ponysay index 115661b..46d3522 100755 --- a/ponysay +++ b/ponysay @@ -67,6 +67,8 @@ class Ponysay(): elif args.opts['++onelist'] is not None: self.__extraponies(); self.onelist() elif args.opts['+l'] is not None: self.__extraponies(); self.list() elif args.opts['+L'] is not None: self.__extraponies(); self.linklist() + elif args.opts['-A'] is not None: self.list(); self.__extraponies(); self.list() + elif args.opts['+A'] is not None: self.linklist(); self.__extraponies(); self.linklist() else: self.__extraponies(args) self.__bestpony(args) @@ -1750,20 +1752,22 @@ opts.add_argumentless(['--quoters']) opts.add_argumentless(['--onelist']) opts.add_argumentless(['++onelist']) -opts.add_argumentless(['-h', '--help'], help = 'Print this help message.') -opts.add_argumentless(['-v', '--version'], help = 'Print the version of the program.') -opts.add_argumentless(['-l', '--list'], help = 'List pony names.') -opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.') -opts.add_argumentless(['+l', '++list'], help = 'List non-MLP:FiM pony names.') -opts.add_argumentless(['+L', '++symlist', '++altlist'], help = 'List non-MLP:FiM pony names with alternatives.') -opts.add_argumentless(['-B', '--bubblelist', '--balloonlist'], help = 'List balloon styles.') -opts.add_argumentless(['-c', '--compact'], help = 'Compress messages.') -opts.add_argumented( ['-W', '--wrap'], arg = 'COLUMN', help = 'Specify column where the message should be wrapped.') -opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.') -opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.') -opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.') -opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.') - +opts.add_argumentless(['-h', '--help'], help = 'Print this help message.') +opts.add_argumentless(['-v', '--version'], help = 'Print the version of the program.') +opts.add_argumentless(['-l', '--list'], help = 'List pony names.') +opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.') +opts.add_argumentless(['+l', '++list'], help = 'List non-MLP:FiM pony names.') +opts.add_argumentless(['+L', '++symlist', '++altlist'], help = 'List non-MLP:FiM pony names with alternatives.') +opts.add_argumentless(['-A', '--all'], help = 'List MLP:FIM and non-MLP:FiM pony names.') +opts.add_argumentless(['+A', '++all'], help = 'List MLP:FIM and non-MLP:FiM pony names with alternatives.') +opts.add_argumentless(['-B', '--bubblelist', '--balloonlist'], help = 'List balloon styles.') +opts.add_argumentless(['-c', '--compact'], help = 'Compress messages.') +opts.add_argumented( ['-W', '--wrap'], arg = 'COLUMN', help = 'Specify column where the message should be wrapped.') +opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.') +opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.') +opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.') +opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.') + opts.parse() -- cgit