Clean up and handle errors

bleakgrey · Mar 14, 2018 · d7385c1 · d7385c1
1 parent c4c6441
commit d7385c1
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/src/Utils.vala b/src/Utils.vala
@@ -1,6 +1,6 @@
 public class Utils{
 
-	private static const string dir = "/tmp/Transporter";
+	private const string dir = "/tmp/Transporter";
 	private static string zip = null;
 
 	public static string get_send_path(string[] uris){
@@ -25,7 +25,7 @@ public class Utils{
 	    else if(uris.length == 1 && dirs == 1)
 	    	return paths[0];
 	    else
-	    	return get_temp_path(paths);
+	    	return get_archive_path(paths);
 	}
 
 	public static bool is_directory(string path){
@@ -43,14 +43,23 @@ public class Utils{
 		return "directory" in stdout;
 	}
 
-	private static string get_temp_path(string[] paths){
+	// magic-wormhole doesn't support multiple file sending or
+	// when directory contains symlinks to other directories.
+	//
+	// That's why we have to create an archive.
+	private static string get_archive_path(string[] paths){
 		info ("Preparing zip file at: "+dir);
 		clean_temp();
 
 		//Create temp folder
 		zip = "Transfer-" + new GLib.DateTime.now_local ().to_unix ().to_string ();
 		var zip_path = "%s/%s".printf(dir, zip);
-		Process.spawn_command_line_sync ("mkdir " + dir);
+		try{
+			Process.spawn_command_line_sync ("mkdir " + dir);
+		}
+		catch(GLib.SpawnError e){
+			warning(e.message);
+		}
 
 		//Create symlinks for each file
 		foreach (string path in paths) {
@@ -76,9 +85,12 @@ public class Utils{
 	}
 
 	public static void clean_temp(){
-		if(dir != null && dir != "/"){
-			info("Cleaning up temporary files");
-			Process.spawn_command_line_async ("rm -rf /tmp/Transporter");
+		info("Cleaning up temporary files");
+		try{
+			Process.spawn_command_line_sync ("rm -rf "+dir);
+		}
+		catch(GLib.SpawnError e){
+			warning(e.message);
 		}
 	}
 

diff --git a/src/View/DropView.vala b/src/View/DropView.vala
@@ -15,6 +15,7 @@ public class DropView : Gtk.Box {
 	};
 	private const string DRAG_TEXT = _("Drag files and folders here");
 	private const string DROP_TEXT = _("Drop to send");
+	private const string PREPARE_TEXT = _("Preparing files...");
 
 	private Gtk.Label title;
 
@@ -68,14 +69,31 @@ public class DropView : Gtk.Box {
 
 	private void on_drag_data_received (Gdk.DragContext drag_context, int x, int y, Gtk.SelectionData data, uint info, uint time){
 	    Gtk.drag_finish (drag_context, true, false, time);
-	    title.label = _("One moment...");
 
-	    var path = Utils.get_send_path (data.get_uris ());
-        var display = window.get_display ();
+	    var display = window.get_display ();
         var clipboard = Gtk.Clipboard.get_for_display (display, Gdk.SELECTION_CLIPBOARD);
         window.prevScreen();
         window.addScreen (new SendView (window, clipboard));
-        window.wormhole.send (path);
+		title.label = PREPARE_TEXT;
+
+		var uris = data.get_uris ();
+		try{
+			if(Thread.supported ()){
+	            new Thread<bool>.try ("PackThread", () => {
+	            	var path = Utils.get_send_path (uris);
+	        		wormhole.send (path);
+	                return false;
+	            });
+	        }
+	        else{
+		       	var path = Utils.get_send_path (uris);
+	        	wormhole.send (path);
+	        }
+    	}
+    	catch(Error e){
+    		warning(e.message);
+    		wormhole.errored(e.message, _("Internal Error"), true);
+    	}
 	}
 
 }