Skip to content

Commit c73cc0b

Browse files
added parameter support in format json for custom_start
1 parent 1642666 commit c73cc0b

File tree

2 files changed

+34
-20
lines changed

2 files changed

+34
-20
lines changed

qencode/custom_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def prepare_params(self):
127127
query = dict(query=self.params)
128128
try:
129129
self.query = json.dumps(query, cls=MyEncoder, encoding='utf-8')
130-
except BaseException as e:
130+
except Exception as e:
131131
self.error = True
132132
self.message = repr(e)
133133

qencode/task.py

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,39 @@ def custom_start(self, params, **kwargs):
112112
:return: None
113113
114114
"""
115-
query_obj = Query()
116-
query_obj.params = params
117-
query_obj.validate_params()
118-
if query_obj.error:
119-
self.error = query_obj.error
120-
self.message = query_obj.message
121-
return
122-
123-
query_obj.prepare_params()
124-
if query_obj.error:
125-
self.error = query_obj.error
126-
self.message = query_obj.message
127-
128-
if not self.error:
129-
self._create_task(1)
130-
data = self._prepare_data2(query_obj.query, **kwargs)
131-
132-
if not self.error and self.task_token:
133-
self._start_encode('start_encode2', data)
115+
if params is not None:
116+
query_obj = Query()
117+
query_obj.params = params
118+
query_obj.validate_params()
119+
if query_obj.error:
120+
self.error = query_obj.error
121+
self.message = query_obj.message
122+
return
123+
124+
query_obj.prepare_params()
125+
if query_obj.error:
126+
self.error = query_obj.error
127+
self.message = query_obj.message
128+
129+
if not self.error:
130+
self._create_task(1)
131+
data = self._prepare_data2(query_obj.query, **kwargs)
132+
133+
if not self.error and self.task_token:
134+
self._start_encode('start_encode2', data)
135+
136+
elif kwargs.get('query') is not None:
137+
query = kwargs.get('query')
138+
if not self.error:
139+
self._create_task(1)
140+
data = self._prepare_data2(query, **kwargs)
141+
print data
142+
143+
if not self.error and self.task_token:
144+
self._start_encode('start_encode2', data)
145+
else:
146+
self.error = True
147+
self.mesage = 'params or query is required'
134148

135149

136150
def status(self):

0 commit comments

Comments
 (0)