walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Update API post data to match current UI post data

This commit is contained in:
Matt Martz 2016-09-14 10:34:20 -05:00
parent fd8b8cfa92
commit 292e250990
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
speedtest.py
View File

@ -506,6 +506,8 @@ class SpeedtestResults(object):
self.server = server self.server = server
self._share = None self._share = None
self.timestamp = datetime.datetime.utcnow().isoformat() self.timestamp = datetime.datetime.utcnow().isoformat()
self.bytes_received = 0
self.bytes_sent = 0
def __repr__(self): def __repr__(self):
return repr(self.dict()) return repr(self.dict())
@ -526,17 +528,24 @@ class SpeedtestResults(object):
# We use a list instead of a dict because the API expects parameters # We use a list instead of a dict because the API expects parameters
# in a certain order # in a certain order
api_data = [ api_data = [
'download=%s' % download,
'ping=%s' % ping,
'upload=%s' % upload,
'promo=',
'startmode=%s' % 'pingselect',
'recommendedserverid=%s' % self.server['id'], 'recommendedserverid=%s' % self.server['id'],
'accuracy=%s' % 1, 'ping=%s' % ping,
'serverid=%s' % self.server['id'], 'screenresolution=',
'promo=',
'download=%s' % download,
'screendpi=',
'upload=%s' % upload,
'testmethod=http',
'hash=%s' % md5(('%s-%s-%s-%s' % 'hash=%s' % md5(('%s-%s-%s-%s' %
(ping, upload, download, '297aae72')) (ping, upload, download, '297aae72'))
.encode()).hexdigest()] .encode()).hexdigest(),
'touchscreen=none',
'startmode=pingselect',
'accuracy=1',
'bytesreceived=%s' % self.bytes_received,
'bytessent=%s' % self.bytes_sent,
'serverid=%s' % self.server['id'],
]
headers = {'Referer': 'http://c.speedtest.net/flash/speedtest.swf'} headers = {'Referer': 'http://c.speedtest.net/flash/speedtest.swf'}
request = build_request('://www.speedtest.net/api/api.php', request = build_request('://www.speedtest.net/api/api.php',
@ -953,9 +962,9 @@ class Speedtest(object):
cons_thread.join(timeout=0.1) cons_thread.join(timeout=0.1)
stop = timeit.default_timer() stop = timeit.default_timer()
self.results.bytes_received = sum(finished)
self.results.download = ( self.results.download = (
(sum(finished) / (stop - start)) * 8.0 (self.results.bytes_received / (stop - start)) * 8.0
) )
if self.results.download > 100000: if self.results.download > 100000:
self.config['threads']['upload'] = 8 self.config['threads']['upload'] = 8
@ -1020,9 +1029,9 @@ class Speedtest(object):
cons_thread.join(timeout=0.1) cons_thread.join(timeout=0.1)
stop = timeit.default_timer() stop = timeit.default_timer()
self.results.bytes_sent = sum(finished)
self.results.upload = ( self.results.upload = (
(sum(finished) / (stop - start)) * 8.0 (self.results.bytes_sent / (stop - start)) * 8.0
) )
return self.results.upload return self.results.upload