Merge pull request jupyter#99 from minrk/graph-pass

pass on generateGraph.py

Author: Carreau

generateGraph.py

@@ -24,14 +24,14 @@ def get_commits(user, repository, force_refresh=False):
     return commits
 
 def create_repo_node(repo_name, image_url, count):
-    return {"name" : repo_name , "image" : image_url, "group" : count, "type" : "repo"} 
+    return {"name" : repo_name , "image" : image_url, "group" : count, "type" : "repo"}
 
 def create_contributor_node(contributor, group=1):
     return {"name" : contributor["login"], "image" : contributor["avatar_url"], "group" : group, "type" : "contributor"}
 
 def create_center_node(image=CENTER_IMG):
-	return {"name" : "JUPYTER", "image" : image, "group" : 0, "type" : "center"}
-    
+    return {"name" : "JUPYTER", "image" : image, "group" : 0, "type" : "center"}
+
 def create_graph_repos(repos=REPOS, use_custom_images=USE_CUSTOM_IMAGES, repo_img_dir=REPO_IMG_DIR, img_type=IMG_TYPE):
     graph = {"nodes" : [], "links" : []}
     center_id = 0
@@ -41,7 +41,7 @@ def create_graph_repos(repos=REPOS, use_custom_images=USE_CUSTOM_IMAGES, repo_im
         commits = get_commits(user, repository)
         url = CENTER_IMG
         if use_custom_images:
-        	url = repo_img_dir + user + "_" + repository + "." + img_type
+            url = repo_img_dir + user + "_" + repository + "." + img_type
         repo_node = create_repo_node(repository, url, len(repo_ids))
         graph["nodes"].append(repo_node)
         repo_id = len(graph["nodes"]) - 1
@@ -50,6 +50,8 @@ def create_graph_repos(repos=REPOS, use_custom_images=USE_CUSTOM_IMAGES, repo_im
         for commit in commits:
             duplicate = False
             author = commit["author"]
+            if not author:
+                continue
             for index, node in enumerate(graph["nodes"]):
                 if node["name"] == author["login"]:
                     duplicate = True
@@ -58,36 +60,36 @@ def create_graph_repos(repos=REPOS, use_custom_images=USE_CUSTOM_IMAGES, repo_im
                 node = create_contributor_node(author, group=len(repo_ids)-1)
                 graph["nodes"].append(node)
                 contrib_id = len(graph["nodes"]) - 1
-            	graph["links"].append({"source" : repo_id, "target" : contrib_id, "value" : 2})
+                graph["links"].append({"source" : repo_id, "target" : contrib_id, "value" : 2})
     graph["links"].append({"source" : repo_ids[0], "target" : repo_ids[-1], "value" : 1})
     return graph
 
 def should_refresh(timestamp_file=TIMESTAMP_FILE, refresh_interval=REFRESH_INTERVAL):
-	now = time.time()
-	then = 0
-	if os.path.isfile(timestamp_file):
-		with open(timestamp_file, 'r') as f:
-			then = float(f.readline().strip())
-	return now - then > refresh_interval
+    now = time.time()
+    then = 0
+    if os.path.isfile(timestamp_file):
+        with open(timestamp_file, 'r') as f:
+            then = float(f.readline().strip())
+    return now - then > refresh_interval
 
 def update_timestamp(timestamp_file=TIMESTAMP_FILE):
-	now = time.time()
-	with open(timestamp_file, 'w') as f:
-		f.write(str(now))
+    now = time.time()
+    with open(timestamp_file, 'w') as f:
+        f.write(str(now))
 
 def main(command=[]):
-	force_refresh = False
-	if len(command) > 0 and command[0] == "force-refresh":
-		force_refresh = True
-	if force_refresh or should_refresh():
-		graph = create_graph_repos()
-		if graph is not None and len(graph["nodes"]) > 0:	
-			with open(DATA_FILE, 'w') as f:
-				json.dump(graph, f)
-		else:
-			raise ValueError("Empty graph generated")
-		update_timestamp()		
-		
+    force_refresh = False
+    if len(command) > 0 and command[0] == "force-refresh":
+        force_refresh = True
+    if force_refresh or should_refresh():
+        graph = create_graph_repos()
+        if graph is not None and len(graph["nodes"]) > 0:
+            with open(DATA_FILE, 'w') as f:
+                json.dump(graph, f, indent=1, sort_keys=True)
+        else:
+            raise ValueError("Empty graph generated")
+        update_timestamp()
+
 
 if __name__ == "__main__":
-	main(command=sys.argv[1:])
+    main(command=sys.argv[1:])