ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixeed bug with interactive mode

Browse source
This commit is contained in:
neersighted 2012-03-01 09:31:44 -08:00
parent fe58751ecc
commit badee8baa7
1 changed files with 45 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

121
cloudbot
View file

@ -10,7 +10,7 @@ import re
# Files # Files
configfile = os.path.isfile("./config") configfile = os.path.isfile("./config")
os.path.isfile("./bot.py") botfile = os.path.isfile("./bot.py")
# Colors # Colors
nocol = "\033[1;m" nocol = "\033[1;m"
@ -85,32 +85,32 @@ except (subprocess.CalledProcessError):
# Set commands # Set commands
if daemon: if daemon:
if backend == "daemon": if (backend == "daemon"):
start = daemonstart start = daemonstart
stop = daemonstop stop = daemonstop
restart = daemonrestart restart = daemonrestart
pid = daemonpid pid = daemonpid
elif backend == "screen": elif (backend == "screen"):
start = screenstart start = screenstart
stop = screenstop stop = screenstop
restart = screenrestart restart = screenrestart
pid = screenpid pid = screenpid
elif backend == False: elif (backend == False):
print firstrun print firstrun
else: else:
print error5 print error5
elif screen: elif screen:
if backend == "daemon": if (backend == "daemon"):
start = daemonstart start = daemonstart
stop = daemonstop stop = daemonstop
restart = daemonrestart restart = daemonrestart
pid = daemonpid pid = daemonpid
elif backend == "screen": elif (backend == "screen"):
start = screenstart start = screenstart
stop = screenstop stop = screenstop
restart = screenrestart restart = screenrestart
pid = screenpid pid = screenpid
elif backend == False: elif (backend == False):
print firstrun print firstrun
else: else:
print error5 print error5
@ -135,77 +135,46 @@ print "http://git.io/cloudbot "\
# Read arguments/turn interactive # Read arguments/turn interactive
try: try:
if running: if (len(sys.argv) > 1):
if (len(sys.argv) > 1): read = 0
if (sys.argv[1] == 'start'):
print "Bot is alread running, cannot start!"
elif (sys.argv[1] == 'stop'):
command = stop
print "Stopping... (" + backend + ")"
elif (sys.argv[1] == 'restart'):
command = restart
print "Restarting... (" + backend + ")"
elif (sys.argv[1] == 'status'):
command = pid
print green + "Bot is running! " + nocol
elif (sys.argv[1] == 'clear'):
command = clearlog
else:
command = command
print usage
exit
else:
print "{1|start} {2|stop} {3|restart} {4|status} {5|exit}"
read = int(raw_input('Please choose a option: '))
if read == 1:
print "Bot is alread running, cannot start!"
elif read == 2:
command = stop
print "Stopping... (" + backend + ")"
elif read == 3:
command = restart
print "Restarting... (" + backend + ")"
elif read == 4:
command = pid
print green + "Bot is running! " + nocol
elif read == 5:
print quit
else:
print error3
else: else:
if (len(sys.argv) > 1): sys.argv = "interactive"
if (sys.argv[1] == 'start'): print iusage
command = start read = int(raw_input("Please choose a option: "))
print "Starting... (" + backend + ")"
elif (sys.argv[1] == 'stop'): if (sys.argv[1] == "start") or (read == 1):
print "Bot is not running, cannot stop!" if running:
elif (sys.argv[1] == 'restart'): print "Bot is already running, cannot start!"
print "Bot is not running, cannot restart!"
elif (sys.argv[1] == 'status'):
print red + "Bot is not running!" + nocol
elif (sys.argv[1] == 'clear'):
command = clearlog
else:
command = command
print usage
exit
else: else:
print iusage command = start
read = int(raw_input('Please choose a option: ')) elif (sys.argv[1] == "stop") or (read == 2):
if read == 1: if running:
command = start command = stop
print "Starting... (" + backend + ")" print "Stopping... (" + backend + ")"
elif read == 2: else:
print "Bot is not running, cannot stop!" print "Bot is not running, cannot stop!"
elif read == 3: elif (sys.argv[1] == "restart") or (read == 3):
command = restart if running:
elif read == 4: command = restart
print red + "Bot is not running, cannot restart!" + nocol print "Restarting... (" + backend + ")"
elif read == 5: else:
print quit print "Bot is not running, cannot restart!"
else: elif (sys.argv[1] == "status") or (read == 4):
print error3 if running:
exit command = pid
print green + "Bot is running! " + nocol
else:
print red + "Bot is not running! " + nocol
elif (sys.argv[1] == "clear"):
command = clearlog
elif (sys.argv[1] == "exit") or (read == 5) or (read == 0):
exit
elif (sys.argv[1] == "interactive"):
pass
else:
command = command
print usage
exit
# Pretify errors # Pretify errors
except (TypeError, ValueError), e: except (TypeError, ValueError), e:
print error3 print error3