Minor cleanup.

This commit is contained in:
Moridius 2020-02-14 22:43:48 +01:00
parent 9215b20a13
commit 21e650a483
1 changed files with 31 additions and 35 deletions

42
src/SpaceApiCli.py Normal file → Executable file
View File

@ -2,19 +2,19 @@
#
# Reiko Kaps 2015-2020 <r31k@k4p5.de>
import json
import sys, os, argparse
import shutil
import argparse
import subprocess
import sys
try:
import requests
from requests.exceptions import ConnectionError
except ImportError as e:
except ImportError:
print('please install requests python module')
sys.exit(1)
DIR_URL='https://directory.spaceapi.io/'
DIR_URL = 'https://directory.spaceapi.io/'
def download(url):
"""
@ -43,25 +43,24 @@ def list_spaces():
print('{}'.format(name))
def status(json, verbose):
"""Ermittelt aus dem Json den Status des Hackerspace"""
def status(json_data, verbose):
"""Ermittelt aus dem JSON den Status des Hackerspace"""
if verbose is True:
pass
if json['state']['open'] is False:
print('{} is closed'.format(str(json['space'])))
if json_data['state']['open'] is False:
print('{} is closed'.format(str(json_data['space'])))
return False
print('{} is open'.format(str(json['space'])))
print('{} is open'.format(str(json_data['space'])))
return True
def getHomepage(json, verbose):
def getHomepage(json_data, verbose):
"""Ermittelt aus dem Json die Homepage des Hackerspace"""
if json['url']:
print('opening {}'.format(json['url']))
subprocess.run(['firefox', json['url']])
if json_data['url']:
print('opening {}'.format(json_data['url']))
subprocess.run(['firefox', json_data['url']])
else:
return False
@ -83,6 +82,7 @@ def getspaceurl(name, debug=False):
return directory[key]
sys.exit(1)
def main(args):
if args.verbose:
debug = args.v
@ -94,18 +94,17 @@ def main(args):
list_spaces()
sys.exit(0)
try:
json = download(getspaceurl(args.name, debug))
except ConnectionError as e:
data = download(getspaceurl(args.name, debug))
except ConnectionError:
print('not connected')
sys.exit(1)
if args.web:
getHomepage(json, debug)
getHomepage(data, debug)
sys.exit(0)
if status(json, verbose=False):
if status(data, verbose=False):
sys.exit(0)
@ -118,6 +117,3 @@ if __name__ == "__main__":
args = parser.parse_args()
main(args)