From 46b24f530191dd443a4edb451b5f5573a875a5ca Mon Sep 17 00:00:00 2001 From: emkael Date: Mon, 31 Jul 2017 20:04:02 +0200 Subject: Factoring out settings loading mechanism --- playoff.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'playoff.py') diff --git a/playoff.py b/playoff.py index fe29b97..ee15319 100644 --- a/playoff.py +++ b/playoff.py @@ -1,25 +1,12 @@ -import glob, json, os, readline, shutil, socket, sys +import os, shutil, socket from datetime import datetime from urlparse import urljoin from playoff import sql as p_sql from playoff import template as p_temp -def complete_filename(text, state): - return (glob.glob(text+'*')+[None])[state] - -if len(sys.argv) > 1: - settings_file = sys.argv[1] -else: - readline.set_completer_delims(' \t\n;') - readline.parse_and_bind("tab: complete") - readline.set_completer(complete_filename) - settings_file = raw_input('JSON settings file: ') - -if not os.path.exists(settings_file): - print 'Settings file "%s" not found' % settings_file - sys.exit(1) - -settings = json.load(open(settings_file)) +from playoff.settings import PlayoffSettings +s = PlayoffSettings() +settings = s.get() teams = settings['teams'] leaderboard = [None] * len(teams) -- cgit v1.2.3