From 6c61400565bbd80bd4beb8dbdb7d73c307d547c5 Mon Sep 17 00:00:00 2001
From: Jonas Wrede <jonas@wrede.sh>
Date: Sun, 29 Apr 2018 14:33:35 +0200
Subject: [PATCH] Added mbit conversion in csv function

mbit conversion is pretty usefull to have in the right size when sending to another program.
---
 speedtest.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/speedtest.py b/speedtest.py
index 359224c..7ee8b7b 100755
--- a/speedtest.py
+++ b/speedtest.py
@@ -963,19 +963,27 @@ class SpeedtestResults(object):
         writer.writerow([to_utf8(v) for v in row])
         return out.getvalue()
 
-    def csv(self, delimiter=','):
-        """Return data in CSV format"""
+    def byte_2_mbit(self, value):
+        return value/1000000
 
+    def csv(self, delimiter=',', mbit=False):
+        """Return data in CSV format"""
         data = self.dict()
+        upload = data['upload']
+        download = data['download']
+        if mbit:
+            upload = self.byte_2_mbit(upload)
+            download = self.byte_2_mbit(download)
         out = StringIO()
         writer = csv.writer(out, delimiter=delimiter, lineterminator='')
         row = [data['server']['id'], data['server']['sponsor'],
                data['server']['name'], data['timestamp'],
-               data['server']['d'], data['ping'], data['download'],
-               data['upload'], self._share or '', self.client['ip']]
+               data['server']['d'], data['ping'], download,
+               upload, self._share or '', self.client['ip']]
         writer.writerow([to_utf8(v) for v in row])
         return out.getvalue()
 
+
     def json(self, pretty=False):
         """Return data in JSON format"""