Merge pull request #13 from J-P-S-O/master

Add is text or binary

Author: Octalbyte

.gitignore

@@ -1,3 +1,2 @@
 data
 node_modules
-package-lock.json

package-lock.json

@@ -1 +1 @@
-{"dependencies":{"-":"^0.0.1","chalk":"^5.0.0","g":"^2.0.1","hyperspace":"^3.19.0","prompt-sync":"^4.2.0"}}
+{"dependencies":{"-":"^0.0.1","chalk":"^5.0.0","g":"^2.0.1","hyperspace":"^3.19.0","istextorbinary":"^6.0.0","prompt-sync":"^4.2.0"}}

package.json

@@ -12,7 +12,7 @@ let fs = require("fs")
 let log = console.log;
 let http = require("http")
 let crypto = require("crypto")
-
+const { isText } = require('istextorbinary')
 
 
 
@@ -88,13 +88,14 @@ const requestListener = function (req, res) {
 
       intcode = "./data/keys/" + intcode
       fs.writeFileSync(intcode,body)
-      fs.readFile(intcode, 'utf8', function(err, data)
-{
+    
+      fs.readFile(intcode, 'utf8', function(err, data){
     if (err){ throw err; }
     var lines = data.split('\n')
     var type = lines[2]
     type = type.replace("Content-Type: ","")
     //log(type)
+    
     lines = lines.slice(3).join('\n');
     lines = lines.split("\n")
     let i = 0
@@ -105,11 +106,13 @@ const requestListener = function (req, res) {
     }
     lines = lines.join('\n')
     //console.log(lines)
-    fs.writeFileSync(intcode, lines);
+    /* fs.writeFileSync(intcode, lines); */
     fs.writeFileSync(intcode+".type",type)
-    console.log("File uploaded to "+"\x1b[32m"+intcode.replace("./data/keys/","")+"\x1b[37m" +" Type: " + type)
-
+console.log("File uploaded to "+"\x1b[32m"+intcode.replace("./data/keys/","")+"\x1b[37m" +" Type: " + type)
+    
 });
+
+
     })
 
   }else if(req.url.includes("/../")) {

run.js

@@ -30,7 +30,7 @@
     <input type="text" name="Code" id = "code" size="15">  <button id = "downb">Download file</button></br>
     <form action="/upload" method="post" enctype="multipart/form-data">
       <label for="upload">File:</label>
-      <input type="file" name="upload" id="upload"><br/>
+      <input type="file" id="upload"><br/>
       <input type="submit" name="submit" value="Upload">
   </form>
   <script src = "start.js"></script>