updated request method
This commit is contained in:
@@ -11,11 +11,15 @@ import urllib3
|
||||
import json
|
||||
import mysql.connector
|
||||
|
||||
def request(resource, seafileURL, seafileToken, method='GET', data=None):
|
||||
def request(resource, seafileURL, seafileToken, method='GET', data=None, dataIsJson=True):
|
||||
if data is None:
|
||||
data = ''
|
||||
else:
|
||||
data = json.dumps(data)
|
||||
if dataIsJson:
|
||||
data = json.dumps(data)
|
||||
headers = {'Content-type': 'application/json', 'Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}
|
||||
else:
|
||||
headers = {'Content-type': 'application/x-www-form-urlencoded', 'Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)}
|
||||
url = '{0}/api/v2.1/{1}'.format(seafileURL, resource)
|
||||
logger.debug('Request URL: {0}'.format(url))
|
||||
logger.debug('Request Method: {0}'.format(method))
|
||||
@@ -23,9 +27,10 @@ def request(resource, seafileURL, seafileToken, method='GET', data=None):
|
||||
r = requests.request(
|
||||
method,
|
||||
url,
|
||||
data=data,
|
||||
headers={'Content-type': 'application/json','Accept': 'application/json; charset=utf-8; indent=4', 'Authorization': 'Token {0}'.format(seafileToken)},
|
||||
data = data,
|
||||
headers = headers,
|
||||
)
|
||||
logger.debug('Response: {0}'.format(r))
|
||||
logger.debug('Request Status Code: {0}'.format(r.status_code))
|
||||
if r.ok:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user