From e2e8be5ab390ececafb9af118b95c9f6f4e59643 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Tue, 31 Jan 2017 23:02:01 +0100
Subject: [PATCH] Added uptime to api request and changed returning state to
 None

---
 .gitignore                              |   1 +
 v1/__pycache__/diskusage.cpython-34.pyc | Bin 920 -> 0 bytes
 v1/__pycache__/uptime.cpython-34.pyc    | Bin 978 -> 972 bytes
 v1/app.py                               |  19 ++++++-------------
 v1/uptime.py                            |  10 +++++-----
 5 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 v1/__pycache__/diskusage.cpython-34.pyc

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..54921dc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+v1/__pycache__
diff --git a/v1/__pycache__/diskusage.cpython-34.pyc b/v1/__pycache__/diskusage.cpython-34.pyc
deleted file mode 100644
index 1507a630e073a70fd8eb580cbc1972d981659b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 920
zcmYjPOK;Oa5T5ZPbsnV;P{jo}<={)Ls!~q~s?wH9r4dqEwT*-<r@L-V96RjVQ4=*6
z;0N??@P9b%l@k|^95^xKpwRWsXujF?e6!!~uhw#7@Av)1cN^dbJQ##wmrS3N6EqQ0
zfFVK;0fhy^2I0V0!W6q8Y9N*>XoGY>crdU)bwSd$I((sRF31{4mt)MRUIV&*^CuMt
zAI*|3qGB9tgL_vN=V)*T9@!f*eNFDR%UvwE7pz2f?ZN(sZJ1e50NeqS5bXd!9WfJS
z?ku=Nh;7*D5~9UtGk{Mo;9N9$S+o|*{&L5F!DE9b2HzSyHTd4(fx#X(LF0aRT5oS}
zZpCfg)>E(jFEV&ZC$Xcx_HAQl<<Qi08OO=3amp+yzJXe!pZ~lL&a_lIIF{oiJ4r-8
zm%+ZuNB#UZ7)^?sJPTNiQXfT`NTmwKTY*UQpw!W|+#F4)YBH61{D_L_2KR$)T*ozh
zgz7O9U~q+;rs0w`$tnpyQ!tVL1)3or`QzMM@Px!;Y*(H!MKmpVI&&bgp>P<mvIsj2
zoC;WTU{}C~o$h(I0Z!q<paE(Ih)A!edzm3zaNs)~<D@b!NEI!Gaf`f&QopA7+Km^7
z{b(E|DMzv5lUBJjzZ&T3cxLS|No6N54)Zb-2TJA2ca1ZOiW`Hv=k+Ird`IPbb&gKC
z_&iCfi|PjEZk_4sEbJKzyFpN|k^{7{g{$;6tiW1E^_(|)VK|JEEDWd3U?@cr1vf%$
zb^Ik`<+^IUYHqPPi-s}`4Q9q2sU#~N5c4BY6}$Ixn2R!%uUeF<u5#5{@m5+bYTz%<
C#?HI|

diff --git a/v1/__pycache__/uptime.cpython-34.pyc b/v1/__pycache__/uptime.cpython-34.pyc
index 5607a489b23538055781124b3a72d3664f5e13d3..772136f11a861ca1a30275f9cc702e18826b3537 100644
GIT binary patch
delta 43
xcmcb_euka%9S<*8B>Th&#*LhZm_!&Df>VH4li4q`A&`-wh>?MTVe(U^w*dR}3p@Y-

delta 49
zcmX@Zeu<s)9S<*;@7oCx%o{lmF-b8q1g9`C1Z%SRWi|vdG88c~Ffc^1_?715Ouo<b
F764&L4io?Y

diff --git a/v1/app.py b/v1/app.py
index 8dfe132..3a5dd9c 100755
--- a/v1/app.py
+++ b/v1/app.py
@@ -9,8 +9,8 @@ from json import loads, dumps
 from werkzeug.security import generate_password_hash, \
 	check_password_hash
 
-import uptime
 from diskusage import diskUsage
+from uptime import timeSinceBoot
 
 app = Flask(__name__, static_url_path = "")
 auth = HTTPBasicAuth()
@@ -70,22 +70,15 @@ def get_diskUsage():
 	except:
 		abort(404)
 
-@app.route('/api/v1/disks/<disk_name>', methods=['GET'])
-@auth.login_required
-def get_singleDiskUsage(disk_name, other):
-
-	if (diskUsage(disk_name)):
-		return jsonify({task_type: diskUsage(disk_name)})
-	else:
-		abort(404)
 
 @app.route('/api/v1/uptimes', methods=['GET'])
 @auth.login_required
 def get_uptimes():
-	up = uptime.uptime()
-	print(up)
-	return jsonify({'duration': up.duration, 'users': up.users,
-		'load': up.load})
+	try:
+		return jsonify({ 'uptime': timeSinceBoot() })
+	except:
+		abort(404)
+
 
 @app.route('/api/v1/uptimes/duration', methods=['GET'])
 @auth.login_required
diff --git a/v1/uptime.py b/v1/uptime.py
index e0a9591..4b6856c 100755
--- a/v1/uptime.py
+++ b/v1/uptime.py
@@ -3,7 +3,9 @@
 # @Author: KevinMidboe
 # @Date:   2017-01-27 19:48:42
 # @Last Modified by:   KevinMidboe
-# @Last Modified time: 2017-01-31 21:02:21
+# @Last Modified time: 2017-01-31 23:01:48
+
+# TODO add better error handling to return statements
 
 from psutil import boot_time
 from time import time
@@ -27,16 +29,14 @@ def timeSinceBoot():
 
 	# Return in day format
 	if deltaSeconds >= 86400:
-		# TODO error handling
 		return secToDay(deltaSeconds)
 
 	# Return in hour format
 	elif deltaSeconds < 86400 and deltaSeconds >= 0:
-		# TODO error handling
 		return secToHour(deltaSeconds)
 	else:
-		# Throw error
-		return 'Null'
+		# TODO Throw error
+		return None
 
 if __name__=="__main__":
 	print(timeSinceBoot())
\ No newline at end of file