2020.3 - 2020/01/22

Kieran BW · Kieran BW · commit f40ccc13325a · 2020-01-22T11:19:01.000Z
diff --git a/ActiveGithub.py b/ActiveGithub.py
@@ -18,6 +18,4 @@
 gitrepo.logPrint("{} out of {} Forked repos are alive and newer than the source!"
 .format(len(aliveRepos), len(forkedRepos)), "bold")
 for aliveRepo in aliveRepos:
-	gitrepo.logPrint("Name: {}\n- Latest update: {}\n- Link: {}\n- Stars: {}"
-	.format(aliveRepo["full_name"], aliveRepo["pushed_at"], aliveRepo["html_url"],
-	aliveRepo["stargazers_count"]))
+	gitrepo.printRepo(aliveRepo)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,12 +8,10 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 ## 2020.1 - 2020/01/17
 - Updated ActiveGithub.py, gitrepo.py, UserReposActive.py. Added UserReposTraffic.py
 
-
 ## 2020.2 - 2020/01/21
 - Added GitHubRepl.py with basic functionality - I aim for feature parity with
   github.com
-- Additions and optimisations to lib changes to signatures and new functions are
-  in bold
+- Changes to signatures and new functions are in bold
 	- getGithubApiRequest(urlExcBase, **jsonOnly=True**)
 	- sourceAlive(**repoData**, lifespan)
 	- getListOfAliveForks(**repoData**, lifespan, enableNewer=True)
@@ -25,3 +23,13 @@ patch-level version changes can be found in [commit messages](../../commits/mast
 - Optimisations of lib and UserReposActive (UserReposActive.py:5(forEachRepo)
   originally took 10.92s and now takes 9.197s per call) - 15% speed improvement
   Using cProfile
+
+## 2020.3 - 2020/01/22
+- Optimisations to getPaginatedGithubApiRequest (12.49s to 8.94s per call) - 28%
+  speed improvement when getting a list of forked repos that are alive and newer
+  than user starred repos
+- Changes to signatures and new functions are in bold
+	- **printIssue**(issue)
+	- **printUser**(user)
+	- **printGist**(gist)
+	- **printRepo**(repo)
diff --git a/GitHubRepl.py b/GitHubRepl.py
@@ -13,41 +13,12 @@ def printMarkdown(raw, maxpages=0):
 	paginatedList(md, 30, print, maxpages)
 
 
-def printRepo(repo):
-	try:
-		gitrepo.logPrint("{}"
-		.format(("[\033[91mArchived\033[00m] " if repo["archived"] else "") + repo["name"]), "bold")
-	except:
-		return
-	description = repo["description"] if "description" in repo else "[description]"
-	language = repo["language"] if "language" in repo else "[unknown]"
-	try:
-		licenseName = repo["license"]["name"]
-	except:
-		licenseName = "[unknown]"
-	updated = repo["updated_at"] if "updated_at" in repo else "[unknown]"
-	gitrepo.logPrint("{}\nLanguage: {} License: {} Last Updated: {}"
-	.format(description, language, licenseName, updated))
-	gitrepo.logPrint("Link: {}" .format(repo["html_url"]))
-
 
 def listRepos(data, user):
 	userRepos = gitrepo.getListOfUserRepos(user, data)
-	paginatedList(userRepos, 8, printRepo)
-
-def printIssue(issue):
-	gitrepo.logPrint(("[\033[91mClosed\033[00m] " if issue["state"] == "closed" else "")
-	+ issue["title"], "bold")
-	gitrepo.logPrint(issue["updated_at"])
+	paginatedList(userRepos, 8, gitrepo.printRepo)
 
-def printUser(user):
-	gitrepo.logPrint(user["login"], "bold")
-	gitrepo.logPrint(user["html_url"])
 
-def printGist(gist):
-	gitrepo.logPrint(gist["description"], "bold")
-	gitrepo.logPrint("Files: {}" .format(list(gist["files"].keys())), "bold")
-	gitrepo.logPrint(gist["html_url"])
 
 def paginatedList(iterable, perPage, printFunc, maxpages=0):
 	totalPages = len(iterable) // perPage + 1
@@ -100,14 +71,14 @@ def profile(user=None):
 def gists(user=None):
 	user = username if user is None else user
 	userGists = gitrepo.getUserGists(user)
-	paginatedList(userGists, 30, printGist)
+	paginatedList(userGists, 30, gitrepo.printGist)
 
 def showrepo(repo, user=None):
 	clear()
 	user = username if user is None else user
 	rawMarkdown = gitrepo.getReadme(user+"/"+repo)
 	repoText = gitrepo.getRepo(user+"/"+repo)
-	printRepo(repoText)
+	gitrepo.printRepo(repoText)
 	gitrepo.logPrint("README", "bold")
 	printMarkdown(rawMarkdown, 1)
 
@@ -119,17 +90,17 @@ def showreadme(repo, user=None):
 
 def searchissues(searchTerm):
 	issues = gitrepo.search(searchTerm, context="issues")
-	paginatedList(issues, 30, printIssue)
+	paginatedList(issues, 30, gitrepo.printIssue)
 
 
 def searchrepos(searchTerm):
 	searchRepos = gitrepo.search(searchTerm, context="repositories")
-	paginatedList(searchRepos, 10, printRepo)
+	paginatedList(searchRepos, 10, gitrepo.printRepo)
 
 
 def searchusers(searchTerm):
 	users = gitrepo.search(searchTerm, context="users")
-	paginatedList(users, 30, printUser)
+	paginatedList(users, 30, gitrepo.printUser)
 
 
 functions = {"exit": replexit, "help": replhelp, "repos": repos, "stars": stars,
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@
 
 Checks that a repo is active and gets a list of active forks
 
+Turns out that I could have used https://github.com/PyGithub/PyGithub. Oh well gitrepo.py does what I need for this project.
+
 ## ActiveGithub.py
 ### Input
 - Set the repo lifespan (weeks - eg. 1 - default=36)>
diff --git a/UserReposActive.py b/UserReposActive.py
@@ -18,9 +18,7 @@ def forEachRepo(sourceRepo):
 	gitrepo.logPrint("{} out of {} Forked repos are alive and newer than the source!"
 	.format(len(aliveRepos), len(forkedRepos)), "bold")
 	for aliveRepo in aliveRepos:
-		gitrepo.logPrint("Name: {}\n- Latest update: {}\n- Link: {}\n- Stars: {}"
-		.format(aliveRepo["full_name"], aliveRepo["pushed_at"], aliveRepo["html_url"],
-		aliveRepo["stargazers_count"]))
+		gitrepo.printRepo(aliveRepo)
 
 
 username, death = gitrepo.getUsernameAndLifespan()
diff --git a/gitrepo.py b/gitrepo.py
@@ -86,17 +86,17 @@ def getListOfUserRepos(username, context):
 
 
 def getPaginatedGithubApiRequest(apiUrl):
+	firstPage = getGithubApiRequest(apiUrl+"?per_page=100", False)
+	iterable = firstPage.json()
 	try:
-		lastPage = int(getGithubApiRequest(
-			apiUrl+"?per_page=100", False).links['last']['url'].split("&page=")[1])
+		lastPage = int(firstPage.links['last']['url'].split("&page=")[1])
 	except:
 		lastPage = 1
 	pageLimit = 5
 	if lastPage > pageLimit:
 		logPrint("There are over {} pages! Limiting to {} pages" .format(pageLimit, pageLimit), "warning")
 		lastPage = pageLimit
-	iterable = []
-	for page in range(1, lastPage + 1):
+	for page in range(2, lastPage + 1):
 		iterationsInstance = getGithubApiRequest(apiUrl+"?per_page=100&page="+str(page))
 		iterable.extend(iterationsInstance)
 	return iterable
@@ -150,3 +150,35 @@ def search(searchTerm, context="repositories"):
 
 def getUserGists(username):
 	return getPaginatedGithubApiRequest("users/"+username+"/gists")
+
+
+def printIssue(issue):
+	logPrint(("[\033[91mClosed\033[00m] " if issue["state"] == "closed" else "")
+	+ issue["title"], "bold")
+	logPrint(issue["updated_at"])
+
+def printUser(user):
+	logPrint(user["login"], "bold")
+	logPrint(user["html_url"])
+
+def printGist(gist):
+	logPrint(gist["description"], "bold")
+	logPrint("Files: {}" .format(list(gist["files"].keys())), "bold")
+	logPrint(gist["html_url"])
+
+def printRepo(repo):
+	try:
+		logPrint("{}"
+		.format(("[\033[91mArchived\033[00m] " if repo["archived"] else "") + repo["name"]), "bold")
+	except:
+		return
+	description = repo["description"] if "description" in repo else "[description]"
+	language = repo["language"] if "language" in repo else "[unknown]"
+	try:
+		licenseName = repo["license"]["name"]
+	except:
+		licenseName = "[unknown]"
+	updated = repo["updated_at"] if "updated_at" in repo else "[unknown]"
+	logPrint("{}\nLanguage: {}, License: {}, Last Updated: {}"
+	.format(description, language, licenseName, updated))
+	logPrint("Link: {}" .format(repo["html_url"]))
