indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

quiet option when getting json

merge-requests/30/head
Bob Mottram 2021-03-10 15:47:12 +00:00
parent 2bdde313ee
commit ce3f21f9b1
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
session.py
View File

@ -86,7 +86,7 @@ def urlExists(session, url: str, timeoutSec=3,
def getJson(session, url: str, headers: {}, params: {}, def getJson(session, url: str, headers: {}, params: {},
version='1.2.0', httpPrefix='https', version='1.2.0', httpPrefix='https',
domain='testdomain', timeoutSec=20) -> {}: domain='testdomain', timeoutSec=20, quiet=False) -> {}:
if not isinstance(url, str): if not isinstance(url, str):
print('url: ' + str(url)) print('url: ' + str(url))
print('ERROR: getJson failed, url should be a string') print('ERROR: getJson failed, url should be a string')
@ -102,7 +102,8 @@ def getJson(session, url: str, headers: {}, params: {},
sessionHeaders['User-Agent'] += \ sessionHeaders['User-Agent'] += \
'; +' + httpPrefix + '://' + domain + '/' '; +' + httpPrefix + '://' + domain + '/'
if not session: if not session:
print('WARN: getJson failed, no session specified for getJson') if not quiet:
print('WARN: getJson failed, no session specified for getJson')
return None return None
try: try:
result = session.get(url, headers=sessionHeaders, result = session.get(url, headers=sessionHeaders,
@ -112,22 +113,26 @@ def getJson(session, url: str, headers: {}, params: {},
sessionHeaders2 = sessionHeaders.copy() sessionHeaders2 = sessionHeaders.copy()
if sessionHeaders2.get('Authorization'): if sessionHeaders2.get('Authorization'):
sessionHeaders2['Authorization'] = 'REDACTED' sessionHeaders2['Authorization'] = 'REDACTED'
print('ERROR: getJson failed\nurl: ' + str(url) + ' ' + if not quiet:
'headers: ' + str(sessionHeaders2) + ' ' + print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
'params: ' + str(sessionParams)) 'headers: ' + str(sessionHeaders2) + ' ' +
print(e) 'params: ' + str(sessionParams))
print(e)
except ValueError as e: except ValueError as e:
sessionHeaders2 = sessionHeaders.copy() sessionHeaders2 = sessionHeaders.copy()
if sessionHeaders2.get('Authorization'): if sessionHeaders2.get('Authorization'):
sessionHeaders2['Authorization'] = 'REDACTED' sessionHeaders2['Authorization'] = 'REDACTED'
print('ERROR: getJson failed\nurl: ' + str(url) + ' ' + if not quiet:
'headers: ' + str(sessionHeaders2) + ' ' + print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +
'params: ' + str(sessionParams) + ' ') 'headers: ' + str(sessionHeaders2) + ' ' +
print(e) 'params: ' + str(sessionParams) + ' ')
print(e)
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if not quiet:
print('WARN: getJson failed, connection was reset during getJson') if e.errno == errno.ECONNRESET:
print(e) print('WARN: getJson failed, ' +
'connection was reset during getJson')
print(e)
return None return None

2
speaker.py
View File

@ -263,7 +263,7 @@ def getSpeakerFromServer(baseDir: str, session,
speakerJson = \ speakerJson = \
getJson(session, url, headers, None, getJson(session, url, headers, None,
__version__, httpPrefix, domain) __version__, httpPrefix, domain, 20, True)
return speakerJson return speakerJson