cacheSet/Get for all data types + persistent list cache

Author: ketankr9

README.md

@@ -26,7 +26,7 @@ Github Email: ketan.krishnan.xxxxx@iitbhu.ac.in
 ```
 
 ## Configuration  
-**Custom Template**: Create a file named *template.cpp, template.py, template.java, template.js* for respective languages in the **working** directory to use this feature.
+**Custom Template**: Create a file named *template.cpp, template.py, template.java, template.js* for respective languages in the **working** directory to use this feature.  
 **Languages Supported**: *cpp*(C++17) \[default\], *java*, *python*(CPython3), *javascript*(Node.js)  
 Also you can manually edit the config at ```~/.cses/config.json```  
 ```

project/helper.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"bufio"
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -33,12 +35,6 @@ func UserHomeDir() string {
 	return os.Getenv("HOME")
 }
 
-func updateConfig(sess *Session) {
-	out, err := json.MarshalIndent(sess, "", "    ")
-	check(err)
-	cacheSet("config.json", string(out), sess.Root)
-}
-
 func updateIfNew(scanner *bufio.Scanner, src *string, text string) {
 	if *src == "" {
 		fmt.Print(text + ": ")
@@ -52,31 +48,47 @@ func updateIfNew(scanner *bufio.Scanner, src *string, text string) {
 	}
 }
 
-func cacheSet(filename string, data string, root string) {
+func cacheSet(filename string, data interface{}, root string) {
+
 	f, err := os.Create(filepath.Join(root, filename))
+	defer f.Close()
 	check(err)
 
-	w := bufio.NewWriter(f)
-	w.WriteString(data)
+	b, err := json.MarshalIndent(data, "", "  ")
+	check(err)
 
-	w.Flush()
-	defer f.Close()
+	_, err = io.Copy(f, bytes.NewReader(b))
 }
 
-func cacheGet(filename string, root string) ([]byte, bool) {
+func cacheGet(filename string, ret interface{}, root string) bool {
 	path := filepath.Join(root, filename)
 
 	_, err := os.Stat(path)
 	if os.IsNotExist(err) {
-		return nil, false
+		return false
 	}
 	content, err := ioutil.ReadFile(path)
 	check(err)
-	return content, true
+
+	json.Unmarshal(content, ret)
+	return true
+}
+
+func updateListByTask(task string, status string, root string) {
+	var problems = []*Problem{}
+	cacheGet("problemList.json", &problems, root)
+
+	for _, v := range problems {
+		if task == v.Task {
+			v.Solved = status
+			break
+		}
+	}
+	cacheSet("problemList.json", problems, root)
 }
 
 func getTemplate(ext string) string {
-	content, err := ioutil.ReadFile("template"+ext)
+	content, err := ioutil.ReadFile("template" + ext)
 	if err != nil {
 		return ""
 	}
@@ -121,21 +133,21 @@ func writeCodeFile(filename string, text string, template string) bool {
 
 var extLangMap = map[string]string{
 	".java": "Java",
-	".js": "Node.js",
-	".py": "Python3",
-	".cpp": "C++",
+	".js":   "Node.js",
+	".py":   "Python3",
+	".cpp":  "C++",
 }
 var extOptionMap = map[string]string{
 	".java": "",
-	".js": "",
-	".py": "CPython3",
-	".cpp": "C++17",
+	".js":   "",
+	".py":   "CPython3",
+	".cpp":  "C++17",
 }
-var langExtMap = map[string]string {
-	"java": ".java",
+var langExtMap = map[string]string{
+	"java":       ".java",
 	"javascript": ".js",
-	"python": ".py",
-	"cpp": ".cpp",
+	"python":     ".py",
+	"cpp":        ".cpp",
 }
 
 var unicodeMap = map[string]string{

project/main.go

@@ -2,17 +2,15 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strconv"
 	"strings"
+	"sync"
 	"time"
 
-	"github.com/PuerkitoBio/goquery"
 	"github.com/briandowns/spinner"
 )
 
@@ -38,29 +36,19 @@ type Session struct {
 	Cookie string       `json:"cookie"`
 	Root   string       `json:"root"`
 	Editor string       `json:"editor"`
-	Lang string `json:"lang"`
+	Lang   string       `json:"lang"`
 	Github githubConfig `json:"github"`
 }
 
-// var cpptemplate = `
-// #include<bits/stdc++.h>
-// using namespace std;
-
-// int main(){
-
-// 	return 0;
-// }
-// `
-
 func initSess(sess *Session) bool {
 	os.MkdirAll(sess.Root, os.ModePerm)
 
-	out, ok := cacheGet("config.json", sess.Root)
+	ok := cacheGet("config.json", sess, sess.Root)
 	if !ok {
 		return false
 	}
 
-	json.Unmarshal(out, sess)
+	// json.Unmarshal(out, sess)
 	if sess.Csrf == "" || sess.User == "" || sess.Cookie == "" {
 		return false
 	}
@@ -78,64 +66,56 @@ func login(sess *Session, pass string) bool {
 }
 
 func promtLogin(sess *Session) bool {
-	scanner := bufio.NewScanner(os.Stdin)
 
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		sess.Cookie, sess.Csrf = newCookieCsrf()
+		wg.Done()
+	}()
+
+	scanner := bufio.NewScanner(os.Stdin)
 	updateIfNew(scanner, &sess.User, "Username")
 
 	fmt.Print("Password: ")
 	scanner.Scan()
 	PASSWORD := scanner.Text()
 
-	sess.Cookie, sess.Csrf = newCookieCsrf()
+	s := spinner.New(spinner.CharSets[36], 100*time.Millisecond)
+	s.Prefix = "Logging "
+
+	s.Start()
+	wg.Wait()
 	ok := login(sess, PASSWORD)
+	s.Stop()
 
 	if !ok {
 		return false
 	}
 
-	updateConfig(sess)
-
+	cacheSet("config.json", sess, sess.Root)
 	return true
 }
 
-func list(sess *Session) {
-
-	doc, err := goquery.NewDocumentFromReader(listRequest(sess.Cookie))
-	check(err)
-
-	doc.Find(".task").Each(func(i int, s *goquery.Selection) {
-
-		solved := "✘"
-
-		a := s.Find("a")
-		link, _ := a.Attr("href")
-		taskNumber := link[17:]
-		title := a.Text()
-
-		hitRatio := strings.Split(s.Find("span").Text(), "/")
-		n, err := strconv.ParseFloat(strings.TrimSpace(hitRatio[0]), 64)
-		check(err)
-		d, err := strconv.ParseFloat(strings.TrimSpace(hitRatio[1]), 64)
-		check(err)
-
-		percent := n * 100 / d
-
-		s.Find(".task-score").Each(func(o int, k *goquery.Selection) {
-			st, _ := k.Attr("class")
-			if strings.Contains(st, "full") {
-				solved = "✔"
-			} else if "task-score icon " == st {
-				solved = "-"
-			}
-		})
+func updateProblemListCache(sess *Session) {
+	s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
+	s.Prefix = "Updating Problem List "
+	s.Start()
+	problems := listRequest(sess.Cookie)
+	cacheSet("problemList.json", problems, sess.Root)
+	s.Stop()
+}
 
-		fmt.Printf("\t%s [%s] %-25s (%.1f %%)\n", solved, taskNumber, title, percent)
-	})
+func list(sess *Session) {
+	var problems = []*Problem{}
+	cacheGet("problemList.json", &problems, sess.Root)
 
+	for _, v := range problems {
+		fmt.Printf("\t%s [%s] %-25s (%.1f %%)\n", v.Solved, v.Task, v.Title, v.HitRatio)
+	}
 }
 
 func printResult(link string, sess *Session) bool {
-
 	s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
 	s.Prefix = "PENDING "
 	s.Start()
@@ -171,17 +151,22 @@ func submit(sourceFile string, sess *Session) {
 
 	link := submitRequest(opts, sourceFile, sess.Cookie)
 
-	if verdict := printResult(link, sess); verdict && validGithubConfig(&sess.Github) {
-		s := spinner.New(spinner.CharSets[36], 100*time.Millisecond)
-		s.Prefix = "Committing to Github"
-		s.Start()
-		if ok := updateFile(sourceFile, &sess.Github); ok {
-			s.Stop()
-			fmt.Println("Github: "+sess.Github.SourceRepo+" ✔")
-		} else {
-			s.Stop()
-			fmt.Println("Github: ✘")
+	if verdict := printResult(link, sess); verdict {
+		go updateListByTask(opts["task"], "✔", sess.Root)
+		if validGithubConfig(&sess.Github) {
+			s := spinner.New(spinner.CharSets[36], 100*time.Millisecond)
+			s.Prefix = "Committing to Github"
+			s.Start()
+			if ok := updateFile(sourceFile, &sess.Github); ok {
+				s.Stop()
+				fmt.Println("Github: " + sess.Github.SourceRepo + " ✔")
+			} else {
+				s.Stop()
+				fmt.Println("Github: ✘")
+			}
 		}
+	} else {
+		updateListByTask(opts["task"], "✘", sess.Root)
 	}
 }
 
@@ -194,16 +179,16 @@ func getTask(task string, sess *Session) (string, bool) {
 	if os.IsNotExist(err) {
 		s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
 		s.Prefix = "Downloading "
-		s.Start()
-		defer s.Stop()
 
+		s.Start()
 		text := downloadTask(task)
+		s.Stop()
+
 		if text == "" {
 			return "", false
 		}
 		cacheSet(filename, text, sess.Root)
 	}
-
 	return getTaskFromCache(task, sess.Root), true
 }
 
@@ -237,7 +222,7 @@ func solve(task string, sess *Session) {
 			fmt.Println("Editor still not configured")
 			return
 		}
-		updateConfig(sess)
+		cacheSet("config.json", sess, sess.Root)
 	}
 	exec.Command(sess.Editor, filename).Output()
 }
@@ -250,18 +235,18 @@ func configureGithub(sess *Session) {
 	updateIfNew(scanner, &sess.Github.AuthorName, "Github Username")
 	updateIfNew(scanner, &sess.Github.AuthorEmail, "Github Email")
 
-	updateConfig(sess)
+	cacheSet("config.json", sess, sess.Root)
 }
 
-func showHelp(){
+func showHelp() {
 	fmt.Println("Usage:")
 
 	fmt.Println("\tcses-cli login")
 	fmt.Println("\tcses-cli list")
 	fmt.Println("\tcses-cli show 1068")
 	fmt.Println("\tcses-cli solve 1068")
 	fmt.Println("\tcses-cli submit 1068.task.cpp")
-	
+
 	fmt.Println("Optional:")
 	fmt.Println("\tcses-cli github")
 }
@@ -292,6 +277,7 @@ func main() {
 			fmt.Println("Login failed")
 		} else {
 			fmt.Println("Logged in successfully")
+			updateProblemListCache(sess)
 		}
 	case "list":
 		list(sess)