auto commit to github

Author: ketankr9

.gitignore

@@ -1,5 +1,6 @@
 api.sh
 *.cpp
+notes.txt
 
 # Binaries for programs and plugins
 *.exe

README.md

@@ -2,6 +2,7 @@
 solve cses.fi problemset via command line. Inspired from awesome [leetcode-cli](https://github.com/skygragon/leetcode-cli).
 
 
+## How to use cses-cli
 * Download the required binary from [https://github.com/ketankr9/cses-cli/releases](https://github.com/ketankr9/cses-cli/releases)
 * Install [lynx](https://www.google.com/search?q=install+lynx+&oq=install+lynx). For ubuntu use ```sudo apt install lynx```
 * Rename the binary to cses-cli and move it to PATH
@@ -13,8 +14,18 @@ cses-cli show 1742
 cses-cli solve 1742
 cses-cli submit 1742.task.cpp
 ```
+## Auto Commit to your GitHub Repository (if needed)  
+* Obtain access token for your repo. See [how to get token](https://github.com/skygragon/leetcode-cli-plugins/blob/master/docs/github.md#generate-token)
+* Configure cses-cli for github as follows
+```
+$$$ cses-cli github
+Token: 1f10d6065e78a2654a14xxxxxxxxxxxxxxxxxxxx 
+Repository: cses-solutions 
+Github Username: ketankr9 
+Github Email: [email protected]
+```
 
-**Example**
+## Screenshot
 ```
 $$$ cses-cli login
 Username: test123xyz
@@ -97,11 +108,12 @@ Submission time:2020-03-07 13:56:29
 Language:C++17
 Status:READY
 Result:ACCEPTED
+Comitting to Github[===>                ] ✔
 ```
 
 >I will add support for these features only if people show some love to this repo since current commit suffices my need.
 
 *	Supports only C++ currently, will add support for other languages on request.
 *	A modifiable template code file.
-*	Auto commit to Github repository
+*	Auto commit to Github repository **UPDATE: Done**
 *	Clean LaTex based $equation$ from problem statement. Eg $1 ≤ n ≤ 10^6$

github.go

@@ -0,0 +1,89 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"time"
+
+	"github.com/google/go-github/github"
+	"golang.org/x/oauth2"
+)
+
+type githubConfig struct {
+	Token       string `json:"token"`
+	SourceRepo  string `json:"repository"`
+	AuthorName  string `json:"username"`
+	AuthorEmail string `json:"email"`
+}
+
+var client *github.Client
+var ctx = context.Background()
+
+func getTree(ref *github.Reference, opts *githubConfig, sourceFiles string) (tree *github.Tree, err error) {
+	content, err := ioutil.ReadFile(sourceFiles)
+	if err != nil {
+		fmt.Println(err)
+		return nil, err
+	}
+
+	entries := []*github.TreeEntry{
+		{
+			Path:    github.String(filepath.Base(sourceFiles)),
+			Type:    github.String("blob"),
+			Content: github.String(string(content)),
+			Mode:    github.String("100644"),
+		},
+	}
+
+	tree, _, err = client.Git.CreateTree(ctx, opts.AuthorName, opts.SourceRepo, *ref.Object.SHA, entries)
+	return tree, err
+}
+
+func pushCommit(ref *github.Reference, tree *github.Tree, opts *githubConfig) (err error) {
+
+	parent, _, err := client.Repositories.GetCommit(ctx, opts.AuthorName, opts.SourceRepo, *ref.Object.SHA)
+	if err != nil {
+		return err
+	}
+	parent.Commit.SHA = parent.SHA
+
+	commitMessage := "file updated"
+	date := time.Now()
+	author := &github.CommitAuthor{Date: &date, Name: &opts.AuthorName, Email: &opts.AuthorEmail}
+	commit := &github.Commit{Author: author, Message: &commitMessage, Tree: tree, Parents: []*github.Commit{parent.Commit}}
+	newCommit, _, err := client.Git.CreateCommit(ctx, opts.AuthorName, opts.SourceRepo, commit)
+	if err != nil {
+		return err
+	}
+
+	ref.Object.SHA = newCommit.SHA
+	_, _, err = client.Git.UpdateRef(ctx, opts.AuthorName, opts.SourceRepo, ref, false)
+	return err
+}
+
+func updateFile(sourceFiles string, opts *githubConfig) bool {
+
+	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: opts.Token})
+	tc := oauth2.NewClient(ctx, ts)
+	client = github.NewClient(tc)
+
+	ref, _, err := client.Git.GetRef(ctx, opts.AuthorName, opts.SourceRepo, "refs/heads/master")
+	if err != nil {
+		return false
+	}
+	if ref == nil {
+		return false
+	}
+
+	tree, err := getTree(ref, opts, sourceFiles)
+	if err != nil {
+		return false
+	}
+
+	if err := pushCommit(ref, tree, opts); err != nil {
+		return false
+	}
+	return true
+}

helper.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
@@ -21,6 +22,10 @@ func check(e error) {
 	}
 }
 
+func validGithubConfig(opts *githubConfig) bool {
+	return opts.Token != "" && opts.SourceRepo != "" && opts.AuthorName != "" && opts.AuthorEmail != ""
+}
+
 func UserHomeDir() string {
 	if runtime.GOOS == "windows" {
 		home := os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
@@ -33,11 +38,24 @@ func UserHomeDir() string {
 }
 
 func updateConfig(sess *Session) {
-	out, err := json.Marshal(sess)
+	out, err := json.MarshalIndent(sess, "", "    ")
 	check(err)
 	cacheSet("login.json", string(out), sess.Root)
 }
 
+func updateIfNew(scanner *bufio.Scanner, src *string, text string) {
+	if *src == "" {
+		fmt.Print(text + ": ")
+	} else {
+		fmt.Print(text + "(" + *src + "): ")
+	}
+	scanner.Scan()
+	val := scanner.Text()
+	if val != "" {
+		*src = val
+	}
+}
+
 func cacheSet(filename string, data string, root string) {
 	f, err := os.Create(filepath.Join(root, filename))
 	check(err)

main.go

@@ -31,12 +31,14 @@ cses result 1068
 // optional
 cses stat 1068
 */
+
 type Session struct {
-	Csrf   string `json:"csrfToken"`
-	User   string `json:"username"`
-	Cookie string `json:"cookie"`
-	Root   string `json:"root"`
-	Editor string `json:"editor"`
+	Csrf   string       `json:"csrf"`
+	User   string       `json:"username"`
+	Cookie string       `json:"cookie"`
+	Root   string       `json:"root"`
+	Editor string       `json:"editor"`
+	Github githubConfig `json:"github"`
 }
 
 var cpptemplate = `
@@ -78,9 +80,7 @@ func login(sess *Session, pass string) bool {
 func promtLogin(sess *Session) bool {
 	scanner := bufio.NewScanner(os.Stdin)
 
-	fmt.Print("Username: ")
-	scanner.Scan()
-	sess.User = scanner.Text()
+	updateIfNew(scanner, &sess.User, "Username")
 
 	fmt.Print("Password: ")
 	scanner.Scan()
@@ -134,22 +134,26 @@ func list(sess *Session) {
 
 }
 
-func printResult(link string, sess *Session) {
+func printResult(link string, sess *Session) bool {
 
 	s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
 	s.Prefix = "PENDING "
 	s.Start()
 	defer s.Stop()
 
 	for true {
-		status, text := printResultRequest(link, sess.Cookie)
+		status, text, verdict := printResultRequest(link, sess.Cookie)
 		s.Prefix = status + " "
 
 		if status == "READY" || status == "" {
-			fmt.Println("\n" + text)
+			fmt.Print("\n" + text)
+			if verdict == "ACCEPTED" {
+				return true
+			}
 			break
 		}
 	}
+	return false
 }
 
 func submit(filename string, sess *Session) {
@@ -170,7 +174,18 @@ func submit(filename string, sess *Session) {
 	}
 
 	link := submitRequest(opts, filename, sess.Cookie)
-	printResult(link, sess)
+
+	if verdict := printResult(link, sess); verdict && validGithubConfig(&sess.Github) {
+		s := spinner.New(spinner.CharSets[36], 100*time.Millisecond)
+		s.Prefix = "Comitting to Github"
+		s.Start()
+		defer s.Stop()
+		if ok := updateFile(filename, &sess.Github); ok {
+			fmt.Println("✔")
+		} else {
+			fmt.Println("✘")
+		}
+	}
 }
 
 func getTask(task string, sess *Session) (string, bool) {
@@ -217,15 +232,29 @@ func solve(task string, sess *Session) {
 
 	if sess.Editor == "" {
 		scanner := bufio.NewScanner(os.Stdin)
-		fmt.Print("Editor: ")
-		scanner.Scan()
-		sess.Editor = scanner.Text()
 
+		updateIfNew(scanner, &sess.Editor, "Editor")
+
+		if sess.Editor == "" {
+			fmt.Println("Editor still not configured")
+			return
+		}
 		updateConfig(sess)
 	}
 	exec.Command(sess.Editor, filename).Output()
 }
 
+func configureGithub(sess *Session) {
+	scanner := bufio.NewScanner(os.Stdin)
+
+	updateIfNew(scanner, &sess.Github.Token, "Token")
+	updateIfNew(scanner, &sess.Github.SourceRepo, "Repository")
+	updateIfNew(scanner, &sess.Github.AuthorName, "Github Username")
+	updateIfNew(scanner, &sess.Github.AuthorEmail, "Github Email")
+
+	updateConfig(sess)
+}
+
 func stat(task string) {
 	fmt.Println("#Todo")
 }
@@ -239,6 +268,7 @@ func main() {
 	}
 
 	sess := &Session{}
+
 	isLogged := initSess(sess)
 
 	switch flag.Arg(0) {
@@ -270,6 +300,8 @@ func main() {
 			return
 		}
 		submit(flag.Arg(1), sess)
+	case "github":
+		configureGithub(sess)
 
 	case "stat":
 		fmt.Println("sw stat 1068")

requests.go

@@ -83,7 +83,7 @@ func listRequest(cookie string) io.ReadCloser {
 	return resp.Body
 }
 
-func printResultRequest(link string, cookie string) (string, string) {
+func printResultRequest(link string, cookie string) (string, string, string) {
 	req, err := http.NewRequest("GET", "https://cses.fi"+link, nil)
 	check(err)
 
@@ -99,7 +99,9 @@ func printResultRequest(link string, cookie string) (string, string) {
 	status := doc.Find("#status").Text()
 	text := doc.Find(".summary-table > tbody:nth-child(2)").Contents().Text()
 
-	return status, text
+	verdict := doc.Find(".summary-table > tbody:nth-child(2) > tr:nth-child(6) > td:nth-child(2) > span:nth-child(1)").Contents().Text()
+
+	return status, text, verdict
 }
 
 func downloadTask(task string) string {

test.sh

@@ -1,19 +1,24 @@
 #!/bin/bash
 
+TASK="1068"
+
 echo "[*] rm -rf ~/.cses/"
 rm -rf ~/.cses/
 
 echo "[*] go run ./*.go login"
 go run ./*.go login
 
+echo "[*] go run ./*.go github"
+go run ./*.go github
+
 echo "[*] go run ./*.go list"
 go run ./*.go list
 
-echo "[*] go run ./*.go show 1742"
-go run ./*.go show 1742
+echo "[*] go run ./*.go show ${TASK}"
+go run ./*.go show "${TASK}"
 
-echo "[*] go run ./*.go solve 1742"
-go run ./*.go solve 1742
+echo "[*] go run ./*.go solve ${TASK}"
+go run ./*.go solve "${TASK}"
 
-echo "[*] go run ./*.go submit 1742.task.cpp"
-go run ./*.go submit 1742.task.cpp
+echo "[*] go run ./*.go submit ${TASK}.task.cpp"
+go run ./*.go submit "${TASK}".task.cpp