ShaYmez
/
dmr_utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added json and dictionary checking to eliminate terminations when the DMR-MARC database can't download.

This commit is contained in:
Cort Buffington 2018-04-04 13:51:51 -05:00
parent 7f5a223637
commit 192d36a94c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dmr_utils/utils.py
View File

@ -22,6 +22,7 @@ from __future__ import print_function
import json
from os.path import isfile, getmtime
from os import remove
from time import time
from urllib import URLopener
from csv import reader as csv_reader
@ -114,7 +115,13 @@ def mk_id_dict(_path, _file):
if _file.endswith(('.json','.JSON')):
try:
with open(_path+_file, 'rU') as _handle:
ids = json.loads(_handle.read().decode('utf-8', 'ignore'))
try:
ids = json.loads(_handle.read().decode('utf-8', 'ignore'))
except (ValueError):
remove(_path+_file)
return dict
if 'repeaters' in ids:
ids = ids['repeaters']
id_type = 'locator'
@ -130,9 +137,13 @@ def mk_id_dict(_path, _file):
else:
return dict
for row in range(len(ids)):
dict[int(ids[row][id_type])] = ids[row][id_value].encode('ascii','ignore')
try:
for row in range(len(ids)):
dict[int(ids[row][id_type])] = ids[row][id_value].encode('ascii','ignore')
except (ValueError, KeyError):
remove(_path+_file)
return dict;
_handle.close
return dict
except IOError:
@ -195,4 +206,4 @@ def get_alias(_id, _dict, *args):
return _id
# FOR LEGACY PURPOSES
get_info = get_alias
get_info = get_alias