Cleanup export tool

Changed files (7)

• modified birdfont/GtkWindow.vala
• modified libbirdfont/BirdFont.vala
• modified libbirdfont/ExportCallback.vala
• modified libbirdfont/ExportTool.vala
• modified libbirdfont/NativeWindow.vala
• modified libbirdfont/TestCases.vala
• modified libbirdfont/TooltipArea.vala

Diff

diff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex f95abeb..ba64696 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -265,17 +265,6 @@ public class GtkWindow : Gtk.Window, NativeWindow { 		dialog.show_all (); 	} -	public void spawn (string command) {-		try {-			print (command);-			print ("\n");-			Process.spawn_command_line_async (command);-		} catch (GLib.Error e) {-			warning (@"Command failed: $command");-			warning (e.message);-		}-	}- 	public void set_scrollbar_size (double size) { 		scrollbar.adjustment.page_size = size; 	}@@ -876,7 +865,7 @@ public class GtkWindow : Gtk.Window, NativeWindow { 	} 	 	/** Run export in a background thread. */-	public void export () {+	public void export_font () { 		unowned Thread<void*> export_thread; 		 		MenuTab.start_background_thread ();diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 3832e90..2292c8c 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -287,7 +287,7 @@ public static int run_export (string[] arg) {  	if (!specific_formats || write_ttf) { 		print (@"Writing $(BirdFont.current_font.get_name ()).ttf to $output_directory\n");-		ExportTool.export_ttf_font_path (File.new_for_path (output_directory), false);+		ExportTool.export_ttf_font_path (File.new_for_path (output_directory)); 	} 	 	Toolbox.redraw_tool_box ();diff --git a/libbirdfont/ExportCallback.vala b/libbirdfont/ExportCallback.valaindex 82b4633..0f71b0b 100644--- a/libbirdfont/ExportCallback.vala+++ b/libbirdfont/ExportCallback.vala@@ -26,17 +26,17 @@ public class ExportCallback : GLib.Object { 		if (font.font_file == null) { 			MenuTab.save_callback = new SaveCallback (); 			MenuTab.save_callback.file_saved.connect (() => {-				MainWindow.native_window.export ();+				MainWindow.native_window.export_font (); 			}); 			MenuTab.save_callback.save (); 		} else {-			MainWindow.native_window.export ();+			MainWindow.native_window.export_font (); 		} 	} 	 	/** Export TTF, EOT and SVG fonts. */ 	public static void export_fonts () {-		ExportTool.export_ttf_font_sync ();+		ExportTool.export_ttf_font (); 		ExportTool.export_svg_font (); 		TooltipArea.show_text (t_("Three font files have been created."));	 	}diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex f372117..1b2e32e 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -1,5 +1,5 @@ /*-    Copyright (C) 2012 Johan Mattsson+    Copyright (C) 2012 2014 Johan Mattsson      This library is free software; you can redistribute it and/or modify      it under the terms of the GNU Lesser General Public License as @@ -15,8 +15,7 @@ namespace BirdFont {  public class ExportTool : GLib.Object {-	private static ExportThread export_thread;-+	 	public ExportTool (string n) { 	} @@ -338,8 +337,8 @@ os.put_string ( </div>  <div>-	<h3 class="small">Handgloves & Mittoms</h3>-	<p class="small">Wind blows in Hauges poetry.</p>+	<h3 class="big">Handgloves & Mittoms</h3>+	<p class="big">Bibliography</p> </p> </div> @@ -370,120 +369,15 @@ os.put_string ( 		return export_ttf_font_path (file); 	} -	public static bool export_ttf_font_sync () {-		Font font = BirdFont.get_current_font ();-		File file = font.get_folder ();-		return export_ttf_font_path (file, false);-	}-		-	// FIXME: move to search path class-	private static string[] get_birdfont_export (File folder, string temp_file) {-		File f;-		string dest = @"\"$((!) folder.get_path ())\" \"$temp_file\"";-		-		f = File.new_for_path ("birdfont-export.sh");-		if (f.query_exists ()) {-			return { -				"sh", -				"birdfont-export.sh",-				"--ttf",-				"-o",-				dest-			};-		}--		f = File.new_for_path ("../birdfont-export.sh");	-		if (f.query_exists ()) {-			return { -				"sh", -				"../birdfont-export.sh",-				"--ttf",-				"-o",-				dest-			};-		}--		f = File.new_for_path (@"$(BirdFont.bundle_path)/Contents/MacOS/birdfont-export");-		if (f.query_exists ()) {-			return { -				@"$(BirdFont.bundle_path)/Contents/MacOS/birdfont-export",-				"--ttf",-				"-o",-				dest-			};-		}-		-		f = File.new_for_path ("birdfont-export.exe");	-		if (f.query_exists ()) {-			return { -				(!) f.get_path (),-				"--ttf",-				"-o",-				dest-			};-		}--		f = File.new_for_path (@"$PREFIX/bin/birdfont-export");-		if (f.query_exists ()) {-			return { -				@"$PREFIX/bin/birdfont-export",-				"--ttf",-				"-o",-				dest-			};-		}--		f = File.new_for_path ("birdfont-export");	-		if (f.query_exists ()) {-			return { -				(!) f.get_path (),-				"--ttf",-				"-o",-				dest-			};-		}--		f = File.new_for_path (BirdFont.exec_path + "/Contents/MacOS/birdfont-export");	-		if (f.query_exists ()) {-			return { -				(!) f.get_path (),-				"--ttf",-				"-o",-				dest-			};-		}-		-		warning ("Can't find birdfont-export.");-		-		return { -				"birdfont-export",-				"--ttf",-				"-o",-				dest-			};-	}-	-	public static bool export_ttf_font_path (File folder, bool async = true) {+	public static bool export_ttf_font_path (File folder) { 		Font current_font = BirdFont.get_current_font (); 		File ttf_file; 		File eot_file;-		string temp_file; 		bool done = true;-		-		if (BirdFont.win32) {-			async = false;-		} 				 		try {-			// create a copy of current font and use it in a separate -			// export thread-			-			if (async) {-				temp_file = current_font.save_backup ();-			} else {-				temp_file = current_font.get_path (); -			}-			+			current_font.save_backup ();+ 			ttf_file = folder.get_child (current_font.get_full_name () + ".ttf"); 			eot_file = folder.get_child (current_font.get_full_name () + ".eot"); @@ -495,20 +389,10 @@ os.put_string ( 				eot_file.delete (); 			} 			-			assert (!is_null (temp_file));-			assert (!is_null (ttf_file.get_path ()));-			assert (!is_null (eot_file.get_path ()));--			export_thread = new ExportThread (temp_file, (!) ttf_file.get_path (), (!) eot_file.get_path (), async);--			if (async) {-				spawn_export (folder, temp_file);-			}-			-			if (!async) {-				export_thread.run ();-			}+			TooltipArea.show_text (t_("Writing TTF and EOT files.")); 			+			write_ttf ((!) ttf_file.get_path ());+			write_eot ((!) ttf_file.get_path (), (!) eot_file.get_path ()); 		} catch (Error e) { 			critical (@"$(e.message)"); 			done = false;@@ -517,22 +401,6 @@ os.put_string ( 		return done;		 	} -	public static int spawn_export (File folder, string temp_file) {-		string[] spawn_args = get_birdfont_export (folder, temp_file);-		string c = "";--		TooltipArea.show_text (t_("Writing TTF and EOT files."));--		foreach (string s in spawn_args) {-			c += s + " ";-		}-		-		debug (@"Running: $(c)\n");-		MainWindow.native_window.spawn (c);-		-		return 0;-	}-	 	public static bool export_svg_font () { 		Font font = BirdFont.get_current_font (); 		TooltipArea.show_text (t_("Writing SVG file."));@@ -558,97 +426,37 @@ os.put_string ( 			fo.close (); 		} catch (Error e) { 			critical (@"$(e.message)");-			status (e.message);+			TooltipArea.show_text (e.message); 			return false; 		} 		 		return true; 	} -	public class ExportThread : GLib.Object {-		private static string ffi;-		private static string ttf;-		private static string eot;-		private bool async = false;--		public ExportThread (string nffi, string nttf, string neot, bool async) {-			ffi = nffi.dup ();-			ttf = nttf.dup ();-			eot = neot.dup ();-			this.async = async;-		}-		-		public void* run () {-			assert (!is_null (ffi));-			assert (!is_null (ttf));-			assert (!is_null (eot));-			-			write_ttf ();-			write_eof ();--			return null;-		}+	static void write_ttf (string ttf) {+		OpenFontFormatWriter fo = new OpenFontFormatWriter ();+		Font f = BirdFont.get_current_font ();+		File file = (!) File.new_for_path (ttf); 		-		void write_ttf () {-			OpenFontFormatWriter fo = new OpenFontFormatWriter ();-			Font f;-			File file = (!) File.new_for_path (ttf);--			return_if_fail (!is_null (ffi));			-			return_if_fail (!is_null (ttf));-			return_if_fail (!is_null (file));-			return_if_fail (!is_null (fo));-			-			try {-				if (async) {-					printd ("Loading the intermediate file.\n");-					f = new Font ();-					f.set_file (ffi);-					if (!f.load ()) {-						warning (@"Can't read $ffi");-					}-				} else {-					f = BirdFont.get_current_font ();-					printd ("File is already loaded.\n");-				}-				-				fo.open (file);-				fo.write_ttf_font (f);-				fo.close ();-			} catch (Error e) {-				critical (@"$(e.message)");-			}-		}-		-		void write_eof () {-			EotWriter fo;--			return_if_fail (!is_null (this));-			return_if_fail (!is_null (ttf));-			return_if_fail (!is_null (eot));-			-			fo = new EotWriter (ttf, eot);--			return_if_fail (!is_null (fo));--			try {-				fo.write ();-			} catch (Error e) {-				warning ("EOF conversion falied.");-				critical (@"$(e.message)");-			}+		try {+			fo.open (file);+			fo.write_ttf_font (f);+			fo.close ();+		} catch (Error e) {+			warning ("Can't write TTF font.");+			critical (@"$(e.message)"); 		}- 	} 	-	private static void status (string s) {-		TooltipArea status = MainWindow.get_tooltip ();-		-		if (is_null (status)) {-			return;+	static void write_eot (string ttf, string eot) {+		EotWriter fo = new EotWriter (ttf, eot);++		try {+			fo.write ();+		} catch (Error e) {+			warning ("EOF conversion falied.");+			critical (@"$(e.message)"); 		}-		-		TooltipArea.show_text (s); 	} } diff --git a/libbirdfont/NativeWindow.vala b/libbirdfont/NativeWindow.valaindex 7fc1974..69048b8 100644--- a/libbirdfont/NativeWindow.vala+++ b/libbirdfont/NativeWindow.vala@@ -29,8 +29,6 @@ public interface NativeWindow : GLib.Object { 	public abstract void set_scrollbar_size (double size); 	public abstract void set_scrollbar_position (double position); 	-	public abstract void spawn (string command);-	 	/** Request text input from the UI. */ 	public abstract void set_text_listener (TextListener listener); 	@@ -59,7 +57,7 @@ public interface NativeWindow : GLib.Object { 	public abstract void hide_tooltip (); 	 	/** Export fonts in a background thread. */-	public abstract void export ();+	public abstract void export_font ();  	/** Load font in a background thread. */ 	public abstract void load ();diff --git a/libbirdfont/TestCases.vala b/libbirdfont/TestCases.valaindex 1d1b079..9056c70 100644--- a/libbirdfont/TestCases.vala+++ b/libbirdfont/TestCases.vala@@ -203,7 +203,7 @@ class TestCases { 		 		Tool.yield (); 		-		if (!ExportTool.export_ttf_font_path (f, false)) {+		if (!ExportTool.export_ttf_font_path (f)) { 			warning ("TTF export failed."); 		} 		diff --git a/libbirdfont/TooltipArea.vala b/libbirdfont/TooltipArea.valaindex 12190c1..dc2ca6c 100644--- a/libbirdfont/TooltipArea.vala+++ b/libbirdfont/TooltipArea.vala@@ -34,8 +34,10 @@ public class TooltipArea : GLib.Object { 	public static void show_text (string text) { 		IdleSource idle = new IdleSource (); 		idle.set_callback (() => {-			MainWindow.get_tooltip ().tooltip = text;-			MainWindow.get_tooltip ().redraw ();+			if (!is_null (MainWindow.get_tooltip ())) {+				MainWindow.get_tooltip ().tooltip = text;+				MainWindow.get_tooltip ().redraw ();+			} 			return false; 		}); 		idle.attach (null);