holla

Merge branch 'master' of https://github.com/TheCodeCamp/CodeCamp

Author: iamsaquib8

contest/models/problem/problem.json

@@ -47,5 +47,12 @@
     },
     "author":{
         "type":"string"
+    },
+    "testCaseInput":{
+        "type":"string",
+        "default":""
+    },
+    "testCaseOutput":{
+        "type":"string"
     }
 } 

judge0/app.js judge/app.jsjudge0/app.js renamed to judge/app.js

@@ -16,53 +16,51 @@ const compileProblem= async (lang , filename)=>{
     var cmd,file;
     switch(lang){
         case "c":
-            file = path.basename(filename ,path.extname(filename)) +".out "
-            cmd="cd result && gcc -o " + file + " " + path.join(__dirname,"result/"+filename);
+            file = path.basename(filename,'.c') +".out ";
+            cmd="cd "+ path.join(__dirname,"result/source") && "gcc -o " +path.join(__dirname,"result/binary/") +file + " " + filename;
             break;
         case "c++":
         case "cpp":
-            file = path.basename(filename ,path.extname(filename)) +".out "
-            cmd = "cd result && g++ -o " + file + " " + path.join(__dirname,"result/"+filename);
+            file = path.basename(filename,'.cpp')+".out";
+            console.log(file)
+            cmd="cd "+ path.join(__dirname,"result/source") + " && g++ -o " + path.join(__dirname,"result/binary/")+file + " " +filename;
             break;
         case "java":
-            file = path.basename(filename ,path.extname(filename)) 
-            cmd = "cd result && javac "+ path.join(__dirname,"result/"+filename)
-    }
-
-        
+            file = path.basename(filename,'.java')
+            cmd ="cd "+ path.join(__dirname,"result/source") + " && javac -d " + path.join(__dirname,"result/binary/") +" " +filename;
+    }        
     return new Promise((resolve,reject)=>{
      exec(cmd, (error, stdout, stderr) => {
         if (error) {
           //console.error(`${error}`);
-
           reject(error);
         }
-        console.log( cmd)
         resolve(file)
       }); 
     })  
 }
 
 //Run Compiled if okay the check result
 
-async function runCompiled(lang,file){
+async function runCompiled(lang,file,contest,problem){
 
     var cmd;
     switch(lang){
         case "c":
-            cmd="cd result && ./" + file +  " <'input.txt'";
+            cmd= "cd "+ path.join(__dirname,"result/binary") + " && ./" + file +  " <"+ path.join(__dirname,"result/input/")+contest+"/"+problem+".txt";
             break;
         case "c++":
-        case "cpp":
-            cmd = "cd result && ./" + file +" <'input.txt'";
+        case "cpp": 
+            cmd = "cd "+ path.join(__dirname,"result/binary") + " && ./" + file +" <"+ path.join(__dirname,"result/input/")+contest+"/"+problem+".txt";
             break;
         case "java":
-            cmd = "cd result && java " + file +" <'input.txt'";
+            cmd =  "cd "+ path.join(__dirname,"result") + " && java " + file +" <"+ path.join(__dirname,"result/input/")+contest+"/"+problem+".txt";
     }
 
     return new Promise((resolve,reject)=>{
     exec(cmd, {timeout:100000,maxBuffer:2147483647,encoding:'utf8'},(error, stdout, stderr) => { 
-        if (error) {             
+        if (error) {      
+            //console.log(error)       
               reject(error);
         }
         var res=stdout;
@@ -84,25 +82,25 @@ const checkResult=async (UserResult,serverResult)=>{
         }
     })
 }
-const serverResult = async ()=>{
+const serverResult = async (contest,problem)=>{
     return new Promise((resolve,reject)=>{
-       var buf= fs.readFileSync(path.join(__dirname,'result/result.txt'),'utf8');
+       var buf= fs.readFileSync(path.join(__dirname,"result/output/"+contest+"/"+problem+".txt"),'utf8');
        resolve(buf)
     }).catch((e)=>{
         console.log(e)
     })
 }
 
 const base64tofile = async (base64,lang)=>{
-    var fileout=new Buffer(base64,'base64').toString('ascii');
-    var filename = "Solution.";
+    const fileout=new Buffer(base64,'base64').toString('ascii');
+    let filename = 'Solution.';
     if(lang=='C++'|| lang == 'c++'){
         filename+='cpp';
     }else{
         filename+=lang;
     }
     return new Promise((resolve,reject)=>{
-        fs.writeFile(path.join(__dirname ,'result/'+filename),fileout, function(err) {
+        fs.writeFile(path.join(__dirname ,'result/source/'+filename),fileout, function(err) {
             if(err) {
                 reject('Can not write file');
             }
@@ -111,26 +109,15 @@ const base64tofile = async (base64,lang)=>{
     })
 }
 
-async function compileAndRunProblem(lang , description){
+async function compileAndRunProblem(contest,problem,id,lang ,description){
     const filename= await base64tofile(description,lang);
     const file = await compileProblem(lang,filename);
-    const result= await runCompiled(lang,file);
-    const serverRes= await serverResult();
-    console.log(serverRes)
+    console.log(contest,problem)
+    const result= await runCompiled(lang,file,contest,problem);
+    const serverRes= await serverResult(contest,problem);
     const Result = await checkResult(result,serverRes);
-    //console.log(Result)
+    console.log(Result)
     return Result;
 
 }
-//base64tofile('dmFyIHBhdGggPSByZXF1aXJlKCdwYXRoJyk7DQp2YXIgZnMgPSByZXF1aXJlKCdmcycpOw==','C');
-//compileAndRunProblem('C','I2luY2x1ZGU8c3RkaW8uaD4NCmludCBtYWluKCl7DQoJcHJpbnRmKCJoZWxsbyB3b3JsZCIpOw0KfQ0K')
-
-/*compileProblem('C','test.c')
-    .then((file)=>{
-        runCompiled('C',file)})
-        .then((res)=>{
-            checkResult(res,'abcd')
-        })
-*/
-
 module.exports = {compileAndRunProblem,compileProblem,runCompiled,base64tofile,serverResult,checkResult}

judge0/compileProblem.js judge/compileProblem.jsjudge0/compileProblem.js renamed to judge/compileProblem.js

@@ -0,0 +1 @@
+fdhdjdjd

judge0/models/solution/solution.js judge/models/solution/solution.jsjudge0/models/solution/solution.js renamed to judge/models/solution/solution.js

@@ -0,0 +1 @@
+fdhdjdjd