customTemplate and languageSupport:java,cpp,python,javascript

Author: ketankr9

.gitignore

@@ -1,6 +1,13 @@
 api.sh
-*.cpp
+*.task.*
 notes.txt
+template.*
+
+project/*.task.*
+project/template.*
+project/cses-cli
+project/pkg
+project/src
 
 # Binaries for programs and plugins
 *.exe

make_release.sh

@@ -6,15 +6,18 @@ then
       RELEASE_VERSION="latest"
 fi
 
-CDIR=`pwd`
-RDIR="${CDIR}/release/${RELEASE_VERSION}"
+RDIR="$(pwd)/release/${RELEASE_VERSION}"
 
 mkdir -p "$RDIR"
 
+cd project
+CDIR=`pwd`
+
 for goarch in ""amd64 386""; do
   for goos in ""linux windows darwin""; do
     NAME="${PROJECT_NAME}_${RELEASE_VERSION}_${goos}_${goarch}"
     GOPATH="${CDIR}" CGO_ENABLED=0 GOOS=${goos} GOARCH=${goarch} go build -o ${RDIR}/${NAME}
     echo ${NAME}
   done
 done
+cd ..

Makefile renamed to project/Makefile

@@ -2,13 +2,9 @@ package main
 
 import (
 	"bufio"
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
-	"mime/multipart"
-	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -40,7 +36,7 @@ func UserHomeDir() string {
 func updateConfig(sess *Session) {
 	out, err := json.MarshalIndent(sess, "", "    ")
 	check(err)
-	cacheSet("login.json", string(out), sess.Root)
+	cacheSet("config.json", string(out), sess.Root)
 }
 
 func updateIfNew(scanner *bufio.Scanner, src *string, text string) {
@@ -79,6 +75,14 @@ func cacheGet(filename string, root string) ([]byte, bool) {
 	return content, true
 }
 
+func getTemplate(ext string) string {
+	content, err := ioutil.ReadFile("template"+ext)
+	if err != nil {
+		return ""
+	}
+	return string(content)
+}
+
 func getTaskFromCache(task string, root string) string {
 	path := filepath.Join(root, task+".task.html")
 
@@ -115,41 +119,23 @@ func writeCodeFile(filename string, text string, template string) bool {
 	return true
 }
 
-func newfileUploadRequest(uri string, params map[string]string, paramName, path string, cookie string) (*http.Request, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-	part, err := writer.CreateFormFile(paramName, filepath.Base(path))
-	if err != nil {
-		return nil, err
-	}
-	_, err = io.Copy(part, file)
-
-	for key, val := range params {
-		_ = writer.WriteField(key, val)
-	}
-	err = writer.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	return newfileUploadRequestPost(uri, body, cookie, writer.FormDataContentType())
+var extLangMap = map[string]string{
+	".java": "Java",
+	".js": "Node.js",
+	".py": "Python3",
+	".cpp": "C++",
 }
-
-func fileMeta(filename string) (string, string, string, bool) {
-	parts := strings.Split(filepath.Base(filename), ".")
-	lang := parts[2]
-	option := ""
-	if lang == "cpp" {
-		lang = "C++"
-		option = "C++17"
-	}
-	return parts[0], lang, option, true
+var extOptionMap = map[string]string{
+	".java": "",
+	".js": "",
+	".py": "CPython3",
+	".cpp": "C++17",
+}
+var langExtMap = map[string]string {
+	"java": ".java",
+	"javascript": ".js",
+	"python": ".py",
+	"cpp": ".cpp",
 }
 
 var unicodeMap = map[string]string{

github.go renamed to project/github.go

@@ -38,24 +38,24 @@ type Session struct {
 	Cookie string       `json:"cookie"`
 	Root   string       `json:"root"`
 	Editor string       `json:"editor"`
+	Lang string `json:"lang"`
 	Github githubConfig `json:"github"`
 }
 
-var cpptemplate = `
-#include<bits/stdc++.h>
-using namespace std;
+// var cpptemplate = `
+// #include<bits/stdc++.h>
+// using namespace std;
 
-int main(){
+// int main(){
 
-	return 0;
-}
-`
+// 	return 0;
+// }
+// `
 
 func initSess(sess *Session) bool {
-	sess.Root = filepath.Join(UserHomeDir(), ".cses")
 	os.MkdirAll(sess.Root, os.ModePerm)
 
-	out, ok := cacheGet("login.json", sess.Root)
+	out, ok := cacheGet("config.json", sess.Root)
 	if !ok {
 		return false
 	}
@@ -145,7 +145,7 @@ func printResult(link string, sess *Session) bool {
 		status, text, verdict := printResultRequest(link, sess.Cookie)
 		s.Prefix = status + " "
 
-		if status == "READY" || status == "" {
+		if status == "READY" || status == "COMPILE ERROR" || status == "" {
 			fmt.Print("\n" + text)
 			if verdict == "ACCEPTED" {
 				return true
@@ -156,31 +156,28 @@ func printResult(link string, sess *Session) bool {
 	return false
 }
 
-func submit(filename string, sess *Session) {
+func submit(sourceFile string, sess *Session) {
 
-	task, lang, option, exist := fileMeta(filename)
-	if !exist {
-		fmt.Println("File doesn't exist")
-		return
-	}
+	ext := filepath.Ext(sourceFile)
+	task := strings.Split(filepath.Base(sourceFile), ".")[0]
 
 	opts := map[string]string{
 		"csrf_token": sess.Csrf,
 		"task":       task,
-		"lang":       lang,
+		"lang":       extLangMap[ext],
 		"type":       "course",
 		"target":     "problemset",
-		"option":     option,
+		"option":     extOptionMap[ext],
 	}
 
-	link := submitRequest(opts, filename, sess.Cookie)
+	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 = "Comitting to Github"
 		s.Start()
 		defer s.Stop()
-		if ok := updateFile(filename, &sess.Github); ok {
+		if ok := updateFile(sourceFile, &sess.Github); ok {
 			fmt.Println("✔")
 		} else {
 			fmt.Println("✘")
@@ -226,9 +223,10 @@ func solve(task string, sess *Session) {
 		fmt.Println("Task Doesn't Exist")
 	}
 
-	filename := task + ".task.cpp"
+	filename := task + ".task" + langExtMap[sess.Lang]
+	template := getTemplate(langExtMap[sess.Lang])
 
-	writeCodeFile(filename, text, cpptemplate)
+	writeCodeFile(filename, text, template)
 
 	if sess.Editor == "" {
 		scanner := bufio.NewScanner(os.Stdin)
@@ -255,19 +253,36 @@ func configureGithub(sess *Session) {
 	updateConfig(sess)
 }
 
-func stat(task string) {
-	fmt.Println("#Todo")
+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")
 }
 
+// func stat(task string) {
+// 	fmt.Println("#Todo")
+// }
+
 func main() {
 
 	flag.Parse()
 
 	if flag.NArg() == 0 {
-		os.Exit(1)
+		showHelp()
+		return
 	}
 
-	sess := &Session{}
+	sess := &Session{
+		Lang: "cpp",
+		Root: filepath.Join(UserHomeDir(), ".cses"),
+	}
 
 	isLogged := initSess(sess)
 
@@ -303,11 +318,11 @@ func main() {
 	case "github":
 		configureGithub(sess)
 
-	case "stat":
-		fmt.Println("sw stat 1068")
-		stat("stat 1068")
-
+	// case "stat":
+	// 	fmt.Println("sw stat 1068")
+	// 	stat("stat 1068")
+	case "help":
 	default:
-		fmt.Println("sw default")
+		showHelp()
 	}
 }

helper.go renamed to project/helper.go

@@ -5,20 +5,23 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"mime/multipart"
+	"os"
+	"fmt"
+	"path/filepath"
 
 	"github.com/PuerkitoBio/goquery"
 )
 
-// func printResp(resp *http.Response) {
-// 	body := &bytes.Buffer{}
-// 	_, err := body.ReadFrom(resp.Body)
-// 	if err != nil {
-// 		log.Fatal(err)
-// 	}
-// 	fmt.Println(body)
-// 	fmt.Println(resp.Header)
-// 	fmt.Println(resp.StatusCode)
-// }
+func printResp(resp *http.Response) {
+	body := &bytes.Buffer{}
+	_, err := body.ReadFrom(resp.Body)
+	check(err)
+
+	fmt.Println(body)
+	fmt.Println(resp.Header)
+	fmt.Println(resp.StatusCode)
+}
 
 func newfileUploadRequestPost(uri string, body *bytes.Buffer, cookie string, contentType string) (*http.Request, error) {
 
@@ -29,13 +32,44 @@ func newfileUploadRequestPost(uri string, body *bytes.Buffer, cookie string, con
 	return req, err
 }
 
+func newfileUploadRequest(uri string, params map[string]string, path string, cookie string) (*http.Request, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+	filename := filepath.Base(path)
+	if filepath.Ext(path) == ".java" {
+		filename = "Solution.java"
+	}
+	part, err := writer.CreateFormFile("file", filename)
+	if err != nil {
+		return nil, err
+	}
+	_, err = io.Copy(part, file)
+
+	for key, val := range params {
+		_ = writer.WriteField(key, val)
+	}
+	err = writer.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	return newfileUploadRequestPost(uri, body, cookie, writer.FormDataContentType())
+}
+
 func submitRequest(opts map[string]string, filename string, cookie string) string {
-	request, err := newfileUploadRequest("https://cses.fi/course/send.php", opts, "file", filename, cookie)
+	request, err := newfileUploadRequest("https://cses.fi/course/send.php", opts, filename, cookie)
 	check(err)
 
 	client := &http.Client{}
 	resp, err := client.Do(request)
 	check(err)
+
 	defer resp.Body.Close()
 
 	doc, err := goquery.NewDocumentFromReader(resp.Body)