cli update

This commit is contained in:
Eriks Karls 2019-07-19 10:59:45 +03:00
parent 4d10f60302
commit a2af70a3ef
2 changed files with 29 additions and 29 deletions

View File

@ -2,10 +2,6 @@
"""Console script for erepublik_script.""" """Console script for erepublik_script."""
__author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv'
__version__ = '0.1.0'
import json import json
import os import os
import random import random
@ -23,12 +19,37 @@ from erepublik_script.citizen import Citizen
__all__ = ["Citizen"] __all__ = ["Citizen"]
INTERACTIVE = True
CONFIG = defaultdict(bool) CONFIG = defaultdict(bool)
@click.command() @click.command()
def main(args=None): @click.option('--silent', help='Run silently', type=bool, is_flag=True)
def main(silent):
global CONFIG
assert sys.version_info >= (3, 7, 1)
if silent:
write_log = utils.write_silent_log
else:
write_log = utils.write_interactive_log
try:
with open('config.json', 'r') as f:
CONFIG = json.load(f)
write_log('Config file found. Checking...')
CONFIG = utils.parse_config(CONFIG)
except:
CONFIG = utils.parse_config()
with open('config.json', 'w') as f:
json.dump(CONFIG, f, indent=True, sort_keys=True)
if CONFIG['interactive']:
write_log = utils.write_interactive_log
else:
write_log = utils.write_silent_log
write_log('\nTo quit press [ctrl] + [c]', False)
os.chdir(os.path.dirname(os.path.realpath(__file__)))
write_log('Version: ' + utils.VERSION)
player = None player = None
try: # If errors before player is initialized try: # If errors before player is initialized
while True: while True:
@ -395,29 +416,7 @@ def main(args=None):
if __name__ == "__main__": if __name__ == "__main__":
assert sys.version_info >= (3, 7, 1)
write_log = utils.write_silent_log
try:
with open('config.json', 'r') as f:
CONFIG = json.load(f)
write_log('Config file found. Checking...')
CONFIG = utils.parse_config(CONFIG)
except:
CONFIG = utils.parse_config()
with open('config.json', 'w') as f:
json.dump(CONFIG, f, indent=True, sort_keys=True)
if CONFIG['interactive']:
write_log = utils.write_interactive_log
else:
write_log = utils.write_silent_log
write_log('\nTo quit press [ctrl] + [c]', False)
os.chdir(os.path.dirname(os.path.realpath(__file__)))
write_log('Version: ' + utils.VERSION)
while True: while True:
main() main()
write_log("Restarting after 1h") utils.write_interactive_log("Restarting after 1h")
utils.interactive_sleep(60 * 60) utils.interactive_sleep(60 * 60)

View File

@ -4,3 +4,4 @@ PyInstaller==3.4
python-slugify==2.0.1 python-slugify==2.0.1
pytz==2018.9 pytz==2018.9
requests==2.21.0 requests==2.21.0
Click>=6.0