Skip to content

Commit e27dd75

Browse files
committed
Sadly retabbing the file.
1 parent 3bb767d commit e27dd75

File tree

1 file changed

+27
-24
lines changed

1 file changed

+27
-24
lines changed

sunlight/cli.py

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,40 @@
66

77
def main():
88

9-
services = sunlight.available_services()
10-
service = services.get(args.get(0), None)
9+
services = sunlight.available_services()
10+
service = services.get(args.get(0), None)
1111

12-
if service is not None:
12+
if service is not None:
13+
available_methods = [
14+
m for m in dir(service) if not m.startswith('_') and m != 'get'
15+
]
16+
if args.get(1) in available_methods:
1317

14-
available_methods = [m for m in dir(service) if not m.startswith('_') and m != 'get']
18+
params = {
19+
g[0][2:]: g[1].get(0) for g in args.grouped.items()[1:] if
20+
g[0].startswith('--')
21+
}
22+
resp = getattr(service, args.get(1))(**params)
23+
sys.stdout.write(json.dumps(resp, indent=2) + '\n')
1524

16-
if args.get(1) in available_methods:
17-
18-
params = {g[0][2:]: g[1].get(0) for g in args.grouped.items()[1:] if g[0].startswith('--')}
19-
resp = getattr(service, args.get(1))(**params)
20-
sys.stdout.write(json.dumps(resp, indent=2) + '\n')
25+
else:
26+
help(methods=available_methods) # missing or invalid method param
2127

22-
else:
23-
help(methods=available_methods) # missing or invalid method parameter
24-
25-
else:
26-
help(services=services) # missing or invalid service parameter
28+
else:
29+
help(services=services) # missing or invalid service parameter
2730

2831
def help(services=None, methods=None):
29-
sys.stderr.write("Usage: sunlight <service> <method> [<args>, ...]\n")
32+
sys.stderr.write("Usage: sunlight <service> <method> [<args>, ...]\n")
3033

31-
if services:
32-
sys.stderr.write("Available services:\n")
33-
for s in services:
34-
sys.stderr.write(" %s\n" % s)
34+
if services:
35+
sys.stderr.write("Available services:\n")
36+
for s in services:
37+
sys.stderr.write(" %s\n" % s)
3538

36-
if methods:
37-
sys.stderr.write("Available methods:\n")
38-
for m in methods:
39-
sys.stderr.write(" %s\n" % m)
39+
if methods:
40+
sys.stderr.write("Available methods:\n")
41+
for m in methods:
42+
sys.stderr.write(" %s\n" % m)
4043

4144
if __name__ == "__main__":
42-
main()
45+
main()

0 commit comments

Comments
 (0)