Merge pull request #73 from victordiaz/master

vamos vamos que nos vamos

Author: javacasm

nw-miniblip/README.md

@@ -5,7 +5,14 @@ Programa multiproposito para trabajar con la Miniblip
 # Como usarlo
 
 - Descargar NW.JS de http://nwjs.io y poner el directorio al mismo nivel que este 
-- Ejecutar NWJS ../nwjs-v0.12.3-linux-x64/nw .    
+- Bajar dependencias 
+```
+npm install
+```
+- Ejecutar nw.js haciendo referencia a este directorio 
+``` 
+../nwjs-v0.12.3-linux-x64/nw .  
+```
 - Voilá
 
 ## Caractesticas futuras

nw-miniblip/firmwares.json nw-miniblip/firmware_prueba.jsonnw-miniblip/firmwares.json renamed to nw-miniblip/firmware_prueba.json

@@ -8,19 +8,33 @@ var fs = require("fs");
 var https = require('https');
 var md5 = require('md5');
 var httpreq = require('httpreq');
+var sudo = require('sudo-prompt');
+
 
 
 function detect_board() {
 
 
 } 
 
-function upload_firmware(path_in, path_out) {
-	var cmd_dd = "sudo dd if="+path_in+" of="+path_out+" bs=512 seek=4 conv=notrunc";
+function upload_firmware(path_in) {
+	var path_out = "/dev/sdb";
+	var cmd_dd = "dd if="+path_in+" of="+path_out+" bs=512 seek=4 conv=notrunc";
 
 	console.log(cmd_dd);
 
 
+	var options = {
+	  name: 'MiniBlip Studio',
+	  onChildProcess: function(childProcess) {} // (optional)
+	};
+	sudo.exec(cmd_dd, options, function(error, stdout, stderr) {
+		console.log("error " + error);
+		console.log("stdout " + stdout);
+		console.log("stderr " + stderr);
+	})
+
+	/*
 	var execFile = require 
 	    ('child_process').execFile, child;
 
@@ -39,6 +53,7 @@ function upload_firmware(path_in, path_out) {
 	    console.log('Child process exited '+
 		'with exit code '+ code);
 	  });
+	*/
 } 
 
 
@@ -82,7 +97,6 @@ function add_item_to_firmware_list(obj, isRemote) {
 
 	if (isRemote) {
 		file_url = get_remote_firmware_url(obj.name);
-console.log(file_url);
 	} else { 
 		file_url = get_local_firmware_path(obj.name);
 	}
@@ -102,14 +116,13 @@ console.log(file_url);
 			$div.find(".author").text(obj.author);
 			$div.find(".source a").attr("href", obj.source);
 			$(this).fadeIn("500");
-
 		});
 
 		$div.find("#upload").click(function() {
 
 			if (isRemote) {
-				download_firmware(obj, function() {
-					upload_firmware(file_url, "/dev/sdb");
+				download_firmware(obj, function(isOk, local_path) {
+					if (isOk) upload_firmware(local_path);
 				});
 			} else {
 				upload_firmware(file_url, "/dev/sdb");	
@@ -159,7 +172,7 @@ function download_firmware(obj, callback) {
 				//console.log("md5 nop");
 				md5result = false;
 			}
-			callback(md5result);
+			callback(md5result, to);
 	    }); //readfile
 	});
 }
@@ -198,7 +211,7 @@ function bind_drag_and_drop_area() {
 	  e.preventDefault();
 
 	  for (var i = 0; i < e.dataTransfer.files.length; ++i) {
-	    console.log(e.dataTransfer.files[i].path);
+	    upload_firmware(e.dataTransfer.files[i].path);
 	  }
 	  return false;
 	};

nw-miniblip/javascript/main.js

@@ -1,11 +1,17 @@
 {
   "name": "miniblip",
   "version": "0.0.1",
+  "license" : "GPL-3.0",
   "main": "index.html",
   "window": {
     "toolbar": true,
     "width": 960,
     "height": 800,
     "resizable": false
-  }
+  },
+  "dependencies" : { 
+        "md5" : ">=1.3.0",
+        "httpreq" : ">=0.4.16", 
+        "sudo-prompt" : "2.1.0"
+    }
 }