aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Lezaeta <prflr88@gmail.com>2012-09-14 15:58:43 -0300
committerPablo Lezaeta <prflr88@gmail.com>2012-09-14 15:58:43 -0300
commit41bd18af8febfdd02bca3dae529275dd894bb8e0 (patch)
treed87139f0b030cbf9e4192008472450a96c45473c
parent9841942ebc71c8e73c180185a5aac1ab22683fd0 (diff)
downloadponysay-41bd18af8febfdd02bca3dae529275dd894bb8e0.tar.gz
ponysay-41bd18af8febfdd02bca3dae529275dd894bb8e0.tar.bz2
ponysay-41bd18af8febfdd02bca3dae529275dd894bb8e0.zip
Added -A, +A (--all, ++all) opts for show both fim and non fim mlp ponies
-rwxr-xr-xponysay32
1 files changed, 18 insertions, 14 deletions
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()