Mensaje para descargas completadas

forestrf · Aug 24, 2014 · 52bc99e · 52bc99e
1 parent 5068b85
commit 52bc99e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Project files/F4M-Downloader/Descargador.cs b/Project files/F4M-Downloader/Descargador.cs
@@ -17,7 +17,7 @@ public class Descargador
 	public string horaRestanteString = "";
 
 	Boolean cancelado = false;
-	public String fallado = "";
+	public String estado = "";
 
 	ProcessStartInfo procesoAdobeHDS;
 	Process exeProcessProcesoAdobeHDS;
@@ -105,19 +105,20 @@ public bool download ()
 			Console.WriteLine ("AdobeHDS ha fallado.");
 			Debug.WriteLine(Utilidades.WL("AdobeHDS ha fallado"));
 			Debug.WriteLine(Utilidades.WL(e.ToString()));
-			fallado = "AdobeHDS ha fallado";
+			estado = "AdobeHDS ha fallado";
 			return false;
 		}
 
 		if (porcentajeInt == 0)
-			fallado = "Fallo";
+			estado = "Fallo";
 		else {
 			porcentaje = 100;
 			porcentajeInt = 100;
+			estado = "Terminado";
 		}
 
 
-		return !cancelado;
+		return !cancelado && estado == "Terminado";
 	}
 
 	public void p_ErrorDataReceived(object sender, DataReceivedEventArgs e)

diff --git a/Project files/F4M-Downloader/HTML.cs b/Project files/F4M-Downloader/HTML.cs
@@ -104,11 +104,11 @@ public static class HTML
 							"<div class=\"q\">Quitar</div>" +
 						"</div>";
 		for (int i=0; i<MainClass.descargasEnProceso.Count; i++) {
-			if (MainClass.descargasEnProceso [i].fallado != "") {
+			if (MainClass.descargasEnProceso [i].estado != "") {
 				resp += "<div class=\"elemento\">" +
 					"<div class=\"n\">" + MainClass.descargasEnProceso [i].nombre + "</div>" +
 					"<div class=\"u\">" + MainClass.descargasEnProceso [i].url + "</div>" +
-					"<div class=\"p\">"+MainClass.descargasEnProceso [i].fallado+"</div>" +
+					"<div class=\"p\">"+MainClass.descargasEnProceso [i].estado+"</div>" +
 					"<div class=\"t\"></div>" +
 					"<div class=\"q\"><a href=\"/?accion=cancelarDescarga&elem=" + i + "\">Quitar</a></div>" +
 					"</div>";

diff --git a/Project files/F4M-Downloader/MainClass.cs b/Project files/F4M-Downloader/MainClass.cs
@@ -14,7 +14,7 @@ public static class MainClass
 	public static string adobeHDSFile = "";
 	public static string relativePath = "";
 
-	public static string version = "0.0.3";
+	public static string version = "0.0.4";
 
 	public static int puerto = 25435;