X-Git-Url: https://git.nirgal.com/?p=fourmizzz.git;a=blobdiff_plain;f=members.py;h=f3af288435cbf1b84a2e68229f10c80e160a0953;hp=0cb7ea3629afd1f81506277bc960f48ff54e21db;hb=c3dd1dd6673275c3a5d3f066f86641cbda0ed263;hpb=4a5dabecb04febea59bea55b49450597db6982c8 diff --git a/members.py b/members.py index 0cb7ea3..f3af288 100755 --- a/members.py +++ b/members.py @@ -18,12 +18,12 @@ import htmlentities #PASSWORD #BASE_URL HOME = os.environ['HOME'] -ARCHIVE = HOME + '/fourmizzz/archive.py' -RESULT = HOME + '/fourmizzz/results.log' +ARCHIVE = HOME + '/.fourmizzz/archive.py' +RESULT = HOME + '/.fourmizzz/results.log' def read_config(): ''' - That function will read config.py in fourmizzz directory + That function will read config.py in .fourmizzz directory and set up globals SERVER, LOGIN, PASSWORD, and BASE_URL. ''' global SERVER, LOGIN, PASSWORD @@ -34,11 +34,11 @@ LOGIN = 'MonIdentifiant' PASSWORD = 'MonMotDePasse' ''' - sys.path.append(HOME+'/fourmizzz') + sys.path.append(HOME+'/.fourmizzz') try: import config except ImportError: - CONFIG = HOME+'/fourmizzz/config.py' + CONFIG = HOME+'/.fourmizzz/config.py' logging.fatal("No configuration file. Creating %s", CONFIG) f = open(CONFIG, mode='w+', encoding='utf-8') f.write(CONFIG_TEMPLATE) @@ -213,9 +213,12 @@ def tdc_compare(oldtdc, newtdc): if __name__ == '__main__': from optparse import OptionParser parser = OptionParser() - parser.add_option('-d', '--debug', + parser.add_option('-d', '-v', '--debug', '--verbose', action='store_true', dest='debug', default=False, help="debug mode") + parser.add_option('-q', '--quiet', + action='store_true', dest='quiet', default=False, + help="quiet mode") parser.add_option('-a', '--alliance', dest='alliance', help="alliance tag. default is to process player own alliance.") @@ -226,7 +229,9 @@ if __name__ == '__main__': if options.debug: loglevel = logging.DEBUG - else: + elif options.quiet: + loglevel = logging.WARNING + else loglevel = logging.INFO logging.basicConfig(filename=RESULT, level=loglevel, format='%(asctime)s %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S %Z')