forked from public/pyceo
Kill Bartle's hybrid main.py
This commit is contained in:
parent
5d8d866fca
commit
ac79cd6e64
40
bin/ceo
40
bin/ceo
|
@ -1,3 +1,39 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import ceo.main
|
|
||||||
ceo.main.start()
|
import sys, ldap
|
||||||
|
from getpass import getpass
|
||||||
|
import ceo.urwid.main
|
||||||
|
import ceo.console.main
|
||||||
|
from ceo import ldapi, members, library
|
||||||
|
|
||||||
|
def start():
|
||||||
|
try:
|
||||||
|
print "Reading config file...",
|
||||||
|
members.configure()
|
||||||
|
library.configure()
|
||||||
|
|
||||||
|
print "Connecting to LDAP..."
|
||||||
|
members.connect(AuthCallback())
|
||||||
|
|
||||||
|
if len(sys.argv) == 1:
|
||||||
|
ceo.urwid.main.start()
|
||||||
|
else:
|
||||||
|
ceo.console.main.start()
|
||||||
|
except ldap.LOCAL_ERROR, e:
|
||||||
|
print ldapi.format_ldaperror(e)
|
||||||
|
except ldap.INSUFFICIENT_ACCESS, e:
|
||||||
|
print ldapi.format_ldaperror(e)
|
||||||
|
print "You probably aren't permitted to do whatever you just tried."
|
||||||
|
print "Admittedly, ceo probably shouldn't have crashed either."
|
||||||
|
|
||||||
|
class AuthCallback:
|
||||||
|
def callback(self, error):
|
||||||
|
try:
|
||||||
|
print "Password: ",
|
||||||
|
return getpass("")
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print ""
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
start()
|
||||||
|
|
36
ceo/main.py
36
ceo/main.py
|
@ -1,36 +0,0 @@
|
||||||
import sys, ldap
|
|
||||||
from getpass import getpass
|
|
||||||
import ceo.urwid.main
|
|
||||||
import ceo.console.main
|
|
||||||
from ceo import ldapi, members, library
|
|
||||||
|
|
||||||
def start():
|
|
||||||
try:
|
|
||||||
print "Reading config file...",
|
|
||||||
#XXX this should really all be done through one big config file
|
|
||||||
members.configure()
|
|
||||||
library.configure()
|
|
||||||
print "read."
|
|
||||||
|
|
||||||
print "Connecting to LDAP..."
|
|
||||||
members.connect(AuthCallback())
|
|
||||||
|
|
||||||
if len(sys.argv) == 1:
|
|
||||||
ceo.urwid.main.start()
|
|
||||||
else:
|
|
||||||
ceo.console.main.start()
|
|
||||||
except ldap.LOCAL_ERROR, e:
|
|
||||||
print ldapi.format_ldaperror(e)
|
|
||||||
except ldap.INSUFFICIENT_ACCESS, e:
|
|
||||||
print ldapi.format_ldaperror(e)
|
|
||||||
print "You probably aren't permitted to do whatever you just tried."
|
|
||||||
print "Admittedly, ceo probably shouldn't have crashed either."
|
|
||||||
|
|
||||||
class AuthCallback:
|
|
||||||
def callback(self, error):
|
|
||||||
try:
|
|
||||||
print "Password: ",
|
|
||||||
return getpass("")
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print ""
|
|
||||||
sys.exit(1)
|
|
Loading…
Reference in New Issue