PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2025-02-07 13:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix stuff.

Browse source
This commit is contained in:
Elis Axelsson 2012-08-18 17:02:03 +02:00
parent 0925635f44
commit e4fb245e36
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ponysay.py
View file

@ -27,18 +27,12 @@ The directory where ponysay is installed, this is modified when building with ma
INSTALLDIR = '/usr'
'''
The user's home directory
'''
HOME = os.environ['HOME']
'''
The directories where pony files are stored, ttyponies/ are used if the terminal is Linux VT (also known as TTY)
'''
ponydirs = []
if os.environ['TERM'] == 'linux': _ponydirs = [INSTALLDIR + '/share/ponysay/ttyponies/', HOME + '/.local/share/ponysay/ttyponies/']
else: _ponydirs = [INSTALLDIR + '/share/ponysay/ponies/', HOME + '/.local/share/ponysay/ponies/' ]
if os.environ['TERM'] == 'linux': _ponydirs = [INSTALLDIR + '/share/ponysay/ttyponies/', os.environ['HOME'] + '/.local/share/ponysay/ttyponies/']
else: _ponydirs = [INSTALLDIR + '/share/ponysay/ponies/', os.environ['HOME'] + '/.local/share/ponysay/ponies/' ]
for ponydir in _ponydirs:
if os.path.isdir(ponydir):
ponydirs.append(ponydir)
@ -48,7 +42,7 @@ for ponydir in _ponydirs:
The directories where quotes files are stored
'''
quotedirs = []
_quotedirs = [INSTALLDIR + '/share/ponysay/quotes/', HOME + '/.local/share/ponysay/quotes/']
_quotedirs = [INSTALLDIR + '/share/ponysay/quotes/', os.environ['HOME'] + '/.local/share/ponysay/quotes/']
for quotedir in _quotedirs:
if os.path.isdir(quotedir):
quotedirs.append(quotedir)
@ -113,15 +107,19 @@ class ponysay():
def __getponypath(self, names = None):
ponies = {}
for name in names:
if os.path.isfile(name):
return name
if names != None:
for name in names:
if os.path.isfile(name):
return name
for ponydir in ponydirs:
for ponyfile in os.listdir(ponydir):
ponies[ponyfile[:-5]] = ponydir + ponyfile
return ponies[names[random.randrange(0, len(names))]]
if names == None:
names = list(ponies.keys())
return ponies[names[random.randrange(0, len(names) - 1)]]
'''
Returns a list with all (pony, quote file) pairs
@ -276,15 +274,8 @@ class ponysay():
def print_pony(self, args):
ponycount = 0
for ponydir in ponydirs:
ponycount = len(os.listdir(ponydir))
if ponycount == 0:
sys.stderr.write('All the ponies are missing! Call the Princess!')
exit(1);
if args.message == None:
msg = sys.stdin.read()
msg = sys.stdin.read().strip()
else:
msg = args.message