myned/modufur
1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-12-24 14:27:27 +00:00
Code Issues Activity

Reordering of setdefault method logic

Browse source
This commit is contained in:
Myned 2017-12-23 21:32:08 -05:00
parent b8b0637c8a
commit 05dd3a4fa2
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/utils/utils.py
View file

@ -28,6 +28,7 @@ try:
with open('config.json') as infile: with open('config.json') as infile:
config = jsn.load(infile) config = jsn.load(infile)
print('LOADED : config.json') print('LOADED : config.json')
except FileNotFoundError: except FileNotFoundError:
with open('config.json', 'w') as outfile: with open('config.json', 'w') as outfile:
jsn.dump({'client_id': 0, 'info_channel': 0, 'owner_id': 0, 'permissions': 126016, jsn.dump({'client_id': 0, 'info_channel': 0, 'owner_id': 0, 'permissions': 126016,
@ -37,28 +38,30 @@ except FileNotFoundError:
def setdefault(filename, default=None, json=False): def setdefault(filename, default=None, json=False):
if not json: if json:
try: try:
with open(filename, 'rb') as infile: with open(filename, 'rb') as infile:
print('LOADED : {}'.format(filename)) print(f'LOADED : {filename}')
return pkl.load(infile) return jsn.load(infile)
except FileNotFoundError: except FileNotFoundError:
with open(filename, 'wb+') as iofile: with open(filename, 'wb+') as iofile:
print('FILE NOT FOUND : {} created and loaded with default values'.format(filename)) print(f'FILE NOT FOUND : {filename} created and loaded with default values')
pkl.dump(default, iofile) jsn.dump(default, iofile)
iofile.seek(0) iofile.seek(0)
return pkl.load(iofile) return jsn.load(iofile)
else: else:
try: try:
with open(filename, 'rb') as infile: with open(filename, 'rb') as infile:
print(f'LOADED : {filename}') print(f'LOADED : {filename}')
return jsn.load(infile) return pkl.load(infile)
except FileNotFoundError: except FileNotFoundError:
with open(filename, 'wb+') as iofile: with open(filename, 'wb+') as iofile:
print(f'FILE NOT FOUND : {filename} created and loaded with default values') print(f'FILE NOT FOUND : {filename} created and loaded with default values')
jsn.dump(default, iofile) pkl.dump(default, iofile)
iofile.seek(0) iofile.seek(0)
return jsn.load(iofile) return pkl.load(iofile)
def load(filename, *, json=False): def load(filename, *, json=False):