Skip to content

Commit 2f682f5

Browse files
tslashdtslashd
committed
fix response.body
1 parent 7531753 commit 2f682f5

7 files changed

Lines changed: 65 additions & 45 deletions

File tree

‎surftimer/ck_bonus.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,17 @@ def insertBonus(
6262
# xquery = 0
6363
# time.sleep(3)
6464

65+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
6566
if xquery < 1:
66-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
67+
response.body = response.body = json.dumps(content_data).encode('utf-8')
6768
response.status_code = status.HTTP_304_NOT_MODIFIED
6869
return response
6970

7071
# Prepare the response
7172
toc = time.perf_counter()
7273
print(f"Execution time {toc - tic:0.4f}")
7374

74-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
75+
response.body = response.body = json.dumps(content_data).encode('utf-8')
7576
response.status_code = status.HTTP_201_CREATED
7677
return response
7778

@@ -100,16 +101,17 @@ def updateBonus(
100101
)
101102
xquery = insertQuery(sql)
102103

104+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
103105
if xquery < 1:
104-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
106+
response.body = json.dumps(content_data).encode('utf-8')
105107
response.status_code = status.HTTP_304_NOT_MODIFIED
106108
return response
107109

108110
# Prepare the response
109111
toc = time.perf_counter()
110112
print(f"Execution time {toc - tic:0.4f}")
111113

112-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
114+
response.body = json.dumps(content_data).encode('utf-8')
113115
response.status_code = status.HTTP_200_OK
114116
return response
115117

@@ -384,14 +386,15 @@ def deleteBonus(
384386

385387
xquery = insertQuery(surftimer.queries.sql_deleteBonus.format(mapname))
386388

389+
content_data = {"deleted": xquery, "xtime": time.perf_counter() - tic}
387390
if xquery < 1:
388-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
391+
response.body = json.dumps(content_data).encode('utf-8')
389392
response.status_code = status.HTTP_304_NOT_MODIFIED
390393
return response
391394

392395
toc = time.perf_counter()
393396
print(f"Execution time {toc - tic:0.4f}")
394397

395-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
398+
response.body = json.dumps(content_data).encode('utf-8')
396399
response.status_code = status.HTTP_200_OK
397400
return response

‎surftimer/ck_checkpoints.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,18 @@ async def insertOrUpdateCheckpoints(
4747
data.stage_attempts,
4848
)
4949
xquery = insertQuery(sql)
50-
50+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
51+
5152
if xquery < 1:
52-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
53+
response.body = json.dumps(content_data).encode('utf-8')
5354
response.status_code = status.HTTP_304_NOT_MODIFIED
5455
return response
5556

5657
# Prepare the response
5758
toc = time.perf_counter()
5859
print(f"Execution time {toc - tic:0.4f}")
5960

60-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
61+
response.body = json.dumps(content_data).encode('utf-8')
6162
response.status_code = status.HTTP_201_CREATED
6263
return response
6364

@@ -206,15 +207,16 @@ async def deleteCheckpoints(
206207

207208
xquery = insertQuery(surftimer.queries.sql_deleteCheckpoints.format(mapname))
208209

210+
content_data = {"deleted": xquery, "xtime": time.perf_counter() - tic}
209211
if xquery < 1:
210-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
212+
response.body = json.dumps(content_data).encode('utf-8')
211213
response.status_code = status.HTTP_304_NOT_MODIFIED
212214
return response
213215

214216
toc = time.perf_counter()
215217
print(f"Execution time {toc - tic:0.4f}")
216218

217-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
219+
response.body = json.dumps(content_data).encode('utf-8')
218220
response.status_code = status.HTTP_200_OK
219221
return response
220222

‎surftimer/ck_latestrecords.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,17 @@ async def insertLatestRecord(
7676
xquery = insertQuery(sql)
7777
# xquery = 0
7878
# time.sleep(3)
79-
79+
80+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
8081
if xquery < 1:
81-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
82+
response.body = json.dumps(content_data).encode('utf-8')
8283
response.status_code = status.HTTP_304_NOT_MODIFIED
8384
return response
8485

8586
# Prepare the response
8687
toc = time.perf_counter()
8788
print(f"Execution time {toc - tic:0.4f}")
8889

89-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
90+
response.body = json.dumps(content_data).encode('utf-8')
9091
response.status_code = status.HTTP_201_CREATED
9192
return response

‎surftimer/ck_maptier.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,18 @@ async def insertMapTier(
7373
tic = time.perf_counter()
7474

7575
xquery = insertQuery(surftimer.queries.sql_insertmaptier.format(data.mapname, data.tier))
76-
76+
77+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
7778
if xquery < 1:
78-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
79+
response.body = json.dumps(content_data).encode('utf-8')
7980
response.status_code = status.HTTP_304_NOT_MODIFIED
8081
return response
8182

8283
# Prepare the response
8384
toc = time.perf_counter()
8485
print(f"Execution time {toc - tic:0.4f}")
8586

86-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
87+
response.body = json.dumps(content_data).encode('utf-8')
8788
response.status_code = status.HTTP_201_CREATED
8889
return response
8990

@@ -105,16 +106,17 @@ async def updateMapTier(
105106

106107
xquery = insertQuery(surftimer.queries.sql_updatemaptier.format(data.tier, data.mapname))
107108

109+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
108110
if xquery < 1:
109-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
111+
response.body = json.dumps(content_data).encode('utf-8')
110112
response.status_code = status.HTTP_304_NOT_MODIFIED
111113
return response
112114

113115
# Prepare the response
114116
toc = time.perf_counter()
115117
print(f"Execution time {toc - tic:0.4f}")
116118

117-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
119+
response.body = json.dumps(content_data).encode('utf-8')
118120
response.status_code = status.HTTP_200_OK
119121
return response
120122

@@ -135,15 +137,16 @@ async def updateMapperName(
135137

136138
xquery = insertQuery(surftimer.queries.sql_updateMapperName.format(data.mappername, data.mapname))
137139

140+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
138141
if xquery < 1:
139-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
142+
response.body = json.dumps(content_data).encode('utf-8')
140143
response.status_code = status.HTTP_304_NOT_MODIFIED
141144
return response
142145

143146
# Prepare the response
144147
toc = time.perf_counter()
145148
print(f"Execution time {toc - tic:0.4f}")
146149

147-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
150+
response.body = json.dumps(content_data).encode('utf-8')
148151
response.status_code = status.HTTP_200_OK
149152
return response

‎surftimer/ck_playeroptions2.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,17 @@ async def insertPlayerOptions(request: Request, response: Response, steamid32: s
6363

6464
xquery = insertQuery(surftimer.queries.sql_insertPlayerOptions.format(steamid32))
6565

66+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
6667
if xquery < 1:
67-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
68+
response.body = json.dumps(content_data).encode('utf-8')
6869
response.status_code = status.HTTP_304_NOT_MODIFIED
6970
return response
7071

7172
# Prepare the response
7273
toc = time.perf_counter()
7374
print(f"Execution time {toc - tic:0.4f}")
7475

75-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
76+
response.body = json.dumps(content_data).encode('utf-8')
7677
response.status_code = status.HTTP_201_CREATED
7778
return response
7879

@@ -163,16 +164,18 @@ async def updatePlayerOptions(
163164
data.steamid32,
164165
)
165166
)
167+
print('xquery',xquery)
168+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
166169

167170
if xquery < 1:
168-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
171+
response.body = json.dumps(content_data).encode('utf-8')
169172
response.status_code = status.HTTP_304_NOT_MODIFIED
170-
return response
173+
# response.headers['content-type'] = 'application/json'
171174

172175
# Prepare the response
173176
toc = time.perf_counter()
174177
print(f"Execution time {toc - tic:0.4f}")
175178

176-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
179+
response.body = json.dumps(content_data).encode('utf-8')
177180
response.status_code = status.HTTP_200_OK
178181
return response

‎surftimer/ck_playerrank.py‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,18 @@ async def insertPlayerRank(
6666
style,
6767
)
6868
xquery = insertQuery(sql)
69-
69+
70+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
7071
if xquery < 1:
71-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
72+
response.body = json.dumps(content_data).encode('utf-8')
7273
response.status_code = status.HTTP_304_NOT_MODIFIED
7374
return response
7475

7576
# Prepare the response
7677
toc = time.perf_counter()
7778
print(f"Execution time {toc - tic:0.4f}")
7879

79-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
80+
response.body = json.dumps(content_data).encode('utf-8')
8081
response.status_code = status.HTTP_201_CREATED
8182
return response
8283

@@ -115,16 +116,17 @@ async def updatePlayerRankPoints(
115116
)
116117
xquery = insertQuery(sql)
117118

119+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
118120
if xquery < 1:
119-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
121+
response.body = json.dumps(content_data).encode('utf-8')
120122
response.status_code = status.HTTP_304_NOT_MODIFIED
121123
return response
122124

123125
# Prepare the response
124126
toc = time.perf_counter()
125127
print(f"Execution time {toc - tic:0.4f}")
126128

127-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
129+
response.body = json.dumps(content_data).encode('utf-8')
128130
response.status_code = status.HTTP_200_OK
129131
return response
130132

@@ -166,16 +168,17 @@ async def updatePlayerRankPoints2(
166168
)
167169
xquery = insertQuery(sql)
168170

171+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
169172
if xquery < 1:
170-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
173+
response.body = json.dumps(content_data).encode('utf-8')
171174
response.status_code = status.HTTP_304_NOT_MODIFIED
172175
return response
173176

174177
# Prepare the response
175178
toc = time.perf_counter()
176179
print(f"Execution time {toc - tic:0.4f}")
177180

178-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
181+
response.body = json.dumps(content_data).encode('utf-8')
179182
response.status_code = status.HTTP_200_OK
180183
return response
181184

@@ -202,16 +205,17 @@ async def updatePlayerRank(
202205
)
203206
xquery = insertQuery(sql)
204207

208+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
205209
if xquery < 1:
206-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
210+
response.body = json.dumps(content_data).encode('utf-8')
207211
response.status_code = status.HTTP_304_NOT_MODIFIED
208212
return response
209213

210214
# Prepare the response
211215
toc = time.perf_counter()
212216
print(f"Execution time {toc - tic:0.4f}")
213217

214-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
218+
response.body = json.dumps(content_data).encode('utf-8')
215219
response.status_code = status.HTTP_200_OK
216220
return response
217221

@@ -271,16 +275,17 @@ async def updateLastSeen(
271275
sql = surftimer.queries.sql_UpdateLastSeenMySQL.format(steamid32)
272276
xquery = insertQuery(sql)
273277

278+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
274279
if xquery < 1:
275-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
280+
response.body = json.dumps(content_data).encode('utf-8')
276281
response.status_code = status.HTTP_304_NOT_MODIFIED
277282
return response
278283

279284
# Prepare the response
280285
toc = time.perf_counter()
281286
print(f"Execution time {toc - tic:0.4f}")
282287

283-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
288+
response.body = json.dumps(content_data).encode('utf-8')
284289
response.status_code = status.HTTP_200_OK
285290
return response
286291

‎surftimer/ck_playertemp.py‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,17 @@ async def insertPlayerTmp(request: Request, response: Response, data: PlayerTemp
5353
)
5454
)
5555

56+
content_data = {"inserted": xquery, "xtime": time.perf_counter() - tic}
5657
if xquery < 1:
57-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
58+
response.body = json.dumps(content_data).encode('utf-8')
5859
response.status_code = status.HTTP_304_NOT_MODIFIED
5960
return response
6061

6162
# Prepare the response
6263
toc = time.perf_counter()
6364
print(f"Execution time {toc - tic:0.4f}")
6465

65-
response.body = {"inserted": xquery, "xtime": time.perf_counter() - tic}
66+
response.body = json.dumps(content_data).encode('utf-8')
6667
response.status_code = status.HTTP_201_CREATED
6768
return response
6869

@@ -93,17 +94,18 @@ async def updatePlayerTmp(request: Request, response: Response, data: PlayerTemp
9394
data.zonegroup,
9495
)
9596
)
96-
97+
98+
content_data = {"updated": xquery, "xtime": time.perf_counter() - tic}
9799
if xquery < 1:
98-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
100+
response.body = json.dumps(content_data).encode('utf-8')
99101
response.status_code = status.HTTP_304_NOT_MODIFIED
100102
return response
101103

102104
# Prepare the response
103105
toc = time.perf_counter()
104106
print(f"Execution time {toc - tic:0.4f}")
105107

106-
response.body = {"updated": xquery, "xtime": time.perf_counter() - tic}
108+
response.body = json.dumps(content_data).encode('utf-8')
107109
response.status_code = status.HTTP_200_OK
108110
return response
109111

@@ -122,15 +124,16 @@ async def deletePlayerTmp(
122124

123125
xquery = insertQuery(surftimer.queries.sql_deletePlayerTmp.format(steamid32))
124126

125-
if xquery <= 0:
126-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
127+
content_data = {"deleted": xquery, "xtime": time.perf_counter() - tic}
128+
if xquery < 1:
129+
response.body = json.dumps(content_data).encode('utf-8')
127130
response.status_code = status.HTTP_304_NOT_MODIFIED
128131
return response
129132

130133
toc = time.perf_counter()
131134
print(f"Execution time {toc - tic:0.4f}")
132135

133-
response.body = {"deleted": xquery, "xtime": time.perf_counter() - tic}
136+
response.body = json.dumps(content_data).encode('utf-8')
134137
response.status_code = status.HTTP_200_OK
135138
return response
136139

0 commit comments

Comments
 (0)