From 5cbf32f2e9d6d2d726424d893743bc9e212f493b Mon Sep 17 00:00:00 2001
From: yakamok <38737288+yakamok@users.noreply.github.com>
Date: Tue, 27 Nov 2018 17:07:48 +0100
Subject: [PATCH] Cleanup

---
 api/niflheim-api.py | 56 +++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/api/niflheim-api.py b/api/niflheim-api.py
index 0e2dc0c..8fea46a 100644
--- a/api/niflheim-api.py
+++ b/api/niflheim-api.py
@@ -1,11 +1,6 @@
-from flask import Flask, request, render_template
-from flask_restful import Resource, Api
-from json import dumps
-from flask import jsonify
-import time
-import sys
-import os
 import time
+from flask import Flask, render_template
+from flask_restful import Resource, Api
 import requests
 import psycopg2
 
@@ -17,14 +12,16 @@ DB_USER = "yggindex"
 DB_NAME = "yggindex"
 DB_HOST = "localhost"
 
+#will add this as something seperate and pull down to a file rather
+#than request it everytime.
 def get_nodelist():
     data = requests.get("use the raw view of the github nodelist", timeout=1)
     nodes = [x.split() for x in data.text.split('\n') if x]
-    
+
     index_table = {}
 
-    for x in nodes:
-        index_table[x[0]] = x[1]
+    for key in nodes:
+        index_table[key[0]] = key[1]
     return index_table
 
 
@@ -39,21 +36,24 @@ def check_nodelist(nodetable, key):
 
 
 def age_calc(ustamp):
-    if (time.time() - ustamp) <= 14400 :
+    if (time.time() - ustamp) <= 14400:
         return True
     else:
         return False
 
 #active nodes in the past 4hrs
-class nodes_current(Resource):
+class nodesCurrent(Resource):
     def get(self):
-        dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
+        dbconn = psycopg2.connect(host=DB_HOST,\
+                                    database=DB_NAME,\
+                                    user=DB_USER,\
+                                    password=DB_PASSWORD)
         cur = dbconn.cursor()
         nodes = {}
         cur.execute("select * from yggindex")
         for i in cur.fetchall():
             if age_calc(int(i[2])):
-                nodes[i[0]] = [i[1],int(i[2])]
+                nodes[i[0]] = [i[1], int(i[2])]
 
         dbconn.commit()
         cur.close()
@@ -67,32 +67,38 @@ class nodes_current(Resource):
 
 @app.route("/")
 def fpage():
-    dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
+    dbconn = psycopg2.connect(host=DB_HOST,\
+                                database=DB_NAME,\
+                                user=DB_USER,\
+                                password=DB_PASSWORD)
     cur = dbconn.cursor()
     nodes = {}
     cur.execute("select * from yggindex")
 
     for i in cur.fetchall():
         if age_calc(int(i[2])):
-            nodes[i[0]] = [i[1],int(i[2])]
+            nodes[i[0]] = [i[1], int(i[2])]
 
     dbconn.commit()
     cur.close()
     dbconn.close()
 
-    return render_template('index.html', nodes = str(len(nodes)))
+    return render_template('index.html', nodes=str(len(nodes)))
 
 
 @app.route("/contrib")
 def cpage():
     try:
-        NODELIST = get_nodelist()
+        domain_nodelist = get_nodelist()
         print "list exists"
     except:
         print "failed"
-        NODELIST = None
+        domain_nodelist = None
 
-    dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
+    dbconn = psycopg2.connect(host=DB_HOST,\
+                                database=DB_NAME,\
+                                user=DB_USER,\
+                                password=DB_PASSWORD)
     cur = dbconn.cursor()
     cur.execute("select * from contrib")
     nodes = []
@@ -106,16 +112,16 @@ def cpage():
     dbconn.close()
 
     dnodes = []
-    for x in nodes:
-        dnodes.append(check_nodelist(NODELIST, x))
+    for key in nodes:
+        dnodes.append(check_nodelist(domain_nodelist, key))
 
     dnodes.sort(reverse=True)
 
-    return render_template('contrib.html', contribnodes = dnodes, nocontribs=str(len(dnodes)))
+    return render_template('contrib.html', contribnodes=dnodes, nocontribs=str(len(dnodes)))
 
 
 #sort out the api request here for the url
-api.add_resource(nodes_current, '/current')
+api.add_resource(nodesCurrent, '/current')
 
 if __name__ == '__main__':
-     app.run(host='::', port=3000)
+    app.run(host='::', port=3000)