Merge lp:~ilja-smoli/do/gtg into lp:~tomaz-muraus/do/gtg

[Ilja Smoli]

-- Fixed plugin crash gnome-do
-- Adjusted a bit GTG Dbus contract
-- Tags are added to the body of task
Now active tasks are working

=== added file 'GTG/GTG.mdp'
--- GTG/GTG.mdp	1970-01-01 00:00:00 +0000
+++ GTG/GTG.mdp	2010-10-13 08:39:47 +0000
@@ -0,0 +1,39 @@
+<Project name="GTG" fileversion="2.0" newfilesearch="OnLoadAutoInsert" DefaultNamespace="GTG" language="C#" targetFramework="3.5" ctype="DotNetProject">
+  <Deployment.LinuxDeployData />
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+      <Output directory="bin/Debug" assembly="GTG" />
+      <Build debugmode="True" target="Library" />
+      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+    <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <Output directory="bin/Release" assembly="GTG" />
+      <Build debugmode="False" target="Library" />
+      <Execution consolepause="False" runwithwarnings="True" runtime="MsNet" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File subtype="Directory" buildaction="Compile" name="src" />
+    <File subtype="Directory" buildaction="Compile" name="Resources" />
+    <File subtype="Code" buildaction="Compile" name="src/CompleteAction.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/CreateAction.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/DeleteTask.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/GTGDBus.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/GTGTask.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/GTGTaskItemSource.cs" />
+    <File subtype="Code" buildaction="Compile" name="src/OpenAction.cs" />
+    <File subtype="Code" buildaction="Nothing" name="Resources/GTG.addin.xml" />
+  </Contents>
+  <References>
+    <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
+    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
+    <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
+  </References>
+</Project>
\ No newline at end of file

=== modified file 'GTG/Makefile.am'
--- GTG/Makefile.am	2010-03-27 12:22:00 +0000
+++ GTG/Makefile.am	2010-10-13 08:39:47 +0000
@@ -3,7 +3,10 @@
 ASSEMBLY=GTG
 
 FILES = \
-	src/GTGAction.cs \
+	src/CompleteAction.cs \
+	src/CreateAction.cs \
+	src/DeleteTask.cs \
+	src/OpenAction.cs \
 	src/GTGTask.cs \
 	src/GTGTaskItemSource.cs \
 	src/GTGDBus.cs

=== modified file 'GTG/Resources/GTG.addin.xml'
--- GTG/Resources/GTG.addin.xml	2010-05-01 10:59:54 +0000
+++ GTG/Resources/GTG.addin.xml	2010-10-13 08:39:47 +0000
@@ -13,7 +13,7 @@
 		<Import assembly="GTG.dll"/>
 	</Runtime>
 
-	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
+	<Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
@@ -29,4 +29,4 @@
 		<Action type="GTG.CompleteTask" />
 		<Action type="GTG.DeleteTask" />
 	</Extension>
-</Addin>
\ No newline at end of file
+</Addin>

=== added file 'GTG/Resources/GTG.addin.xml.in'
--- GTG/Resources/GTG.addin.xml.in	1970-01-01 00:00:00 +0000
+++ GTG/Resources/GTG.addin.xml.in	2010-10-13 08:39:47 +0000
@@ -0,0 +1,32 @@
+<Addin
+	id="GTG"
+	namespace="Do"
+	version="1.1"
+	name="Getting Things Gnome"
+	description="Create a new and edit, complete or delete an existing GTG task."
+	author="Tomaž Muraus"
+	category="Community"
+	defaultEnabled="false"
+	url="http://do.davebsd.com/wiki/GTG_Plugin"
+>
+	<Runtime>
+		<Import assembly="GTG.dll"/>
+	</Runtime>
+
+	<Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
+	
+	<Dependencies>
+		<Addin id="Universe" version="1.0" />
+	</Dependencies>
+	
+	<!-- Sources -->
+	<Extension path="/Do/ItemSource">
+		<ItemSource type="GTG.GTGTaskItemSource" />
+	</Extension>
+	<Extension path="/Do/Action">
+		<Action type="GTG.CreateTask" />
+		<Action type="GTG.OpenTask" />
+		<Action type="GTG.CompleteTask" />
+		<Action type="GTG.DeleteTask" />
+	</Extension>
+</Addin>
\ No newline at end of file

=== modified file 'GTG/src/CreateAction.cs'
--- GTG/src/CreateAction.cs	2010-05-01 10:59:54 +0000
+++ GTG/src/CreateAction.cs	2010-10-13 08:39:47 +0000
@@ -53,7 +53,7 @@
 		
 		public override string Description
 		{
-			get { return AddinManager.CurrentLocalizer.GetString ("Creata a new task in Getting Things Gnome!"); }
+			get { return AddinManager.CurrentLocalizer.GetString ("Create a new task in Getting Things Gnome!"); }
 		}
 		
 		public override string Icon
@@ -153,9 +153,11 @@
 			}
 			
 			task.Title = itemText;
-			gtg.CreateTask(task);
+			var tid = gtg.CreateTask(task);
+			if(tid.ContainsKey("id")){
+				gtg.OpenTaskEditor(tid["id"].ToString());
+			}
 			gtgItemSource.UpdateItems();
-				
 			return null;
 		}
 		

=== removed file 'GTG/src/GTGAction.cs'
--- GTG/src/GTGAction.cs	2010-05-01 10:59:54 +0000
+++ GTG/src/GTGAction.cs	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-// GTGAction.cs
-// 
-// GNOME Do is the legal property of its developers, whose names are too
-// numerous to list here.  Please refer to the COPYRIGHT file distributed with
-// this source distribution.
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-using Do.Universe;
-using Do.Platform;
-
-using Mono.Addins;
-
-using GTG.DBus;
-
-namespace GTG
-{
-	public class CreateTask : Act
-	{
-		static Regex regExpDate = new Regex(@"(?<type>(starts?|ends?|due)):\s?
-									((?<date_full>(?<day>0[1-9]|[12][0-9]|3[01])[- /.](?<month>0[1-9]|1[012])[- /.](?<year>20\d\d))
-								  	|(?<date_days>\+(?<days>\d+)\s?days?)
-									|(?<date_tommorow>tom{1,2}or{1,2}ow)
-									|(?<date_today>today))", 
-		                           RegexOptions.IgnorePatternWhitespace | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-		static Regex regExpTags = new Regex(@"@(?<tag>[A-Za-z0-9_]+)");
-		
-		public CreateTask()
-		{
-		}
-		
-		public override string Name 
-		{
-			get { return AddinManager.CurrentLocalizer.GetString ("Create a GTG task"); }
-		}
-		
-		public override string Description
-		{
-			get { return AddinManager.CurrentLocalizer.GetString ("Creata a new task in Getting Things Gnome!"); }
-		}
-		
-		public override string Icon
-		{
-			get { return "gtg"; }
-		}
-		
-		public override IEnumerable<Type> SupportedItemTypes
-		{
-			get 
-			{
-				yield return typeof(ITextItem);
-				yield return typeof(GTGTask);
-			}
-		}
-			
-		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
-		{
-			if (items.First() is ITextItem)
-			{
-				TextItemPerform(items.First() as ITextItem);
-			}
-			else
-			{
-				TaskItemPerform(items.First() as GTGTask);
-			}
-
-			return null;
-		}
-		
-		protected Item[] TaskItemPerform(GTGTask task)
-		{
-			GTGDBus gtg = new GTGDBus();
-			
-			gtg.OpenTaskEditor(task.TaskId);
-			
-			return null;
-		}
-			
-		protected Item[] TextItemPerform (ITextItem item)
-		{
-			GTGTaskItemSource gtgItemSource = new GTGTaskItemSource();
-			string itemText = item.Text;
-
-			if (itemText.Length == 0)
-			{
-				return null;
-			}
-			
-			GTGDBus gtg = new GTGDBus();
-			GTGTask task = new GTGTask();
-			
-			MatchCollection matchesDate = regExpDate.Matches(itemText);
-			MatchCollection matchesTags = regExpTags.Matches(itemText);
-			
-			if (matchesDate.Count > 0)
-			{
-				DateTime dateStart = DateTime.MinValue;
-				DateTime dateDue = DateTime.MinValue;
-				itemText = regExpDate.Replace(itemText, "");
-				
-				// Task start and/or due date is located in the text
-				foreach (Match match in matchesDate)
-				{
-					string type = match.Groups["type"].Value;
-					
-					if (type.IndexOf("start") != -1)
-					{
-						// Start date
-						dateStart = getDateFromMatch(match);
-					}
-					else
-					{
-						// Due/end data
-						dateDue = getDateFromMatch(match);
-					}
-				}
-				
-				if (dateStart != DateTime.MinValue)
-				{
-					task.StartDate = dateStart;
-				}
-				
-				if (dateDue != DateTime.MinValue)
-				{
-					task.DueDate = dateDue;
-				}
-			}
-			
-			if (matchesTags.Count > 0)
-			{
-				itemText = regExpTags.Replace(itemText, "");
-				foreach (Match match in matchesTags)
-				{
-					task.Tags.Add("@" + match.Groups["tag"].Value);
-				}
-			}
-			
-			task.Title = itemText;
-			gtg.CreateTask(task);
-			gtgItemSource.UpdateItems();
-				
-			return null;
-		}
-		
-		protected DateTime getDateFromMatch(Match match)
-		{
-			DateTime date;
-			
-			if (match.Groups["date_full"].Success)
-			{
-				date = new DateTime(int.Parse(match.Groups["year"].Value), int.Parse(match.Groups["month"].Value), int.Parse(match.Groups["day"].Value));
-			}
-			else if (match.Groups["date_days"].Success)
-			{
-				date = DateTime.Today.AddDays(int.Parse(match.Groups["days"].Value));
-			}
-			else if (match.Groups["date_tommorow"].Success)
-			{
-				date = DateTime.Today.AddDays(1);
-			}
-			else
-			{
-				date = DateTime.Today;
-			}
-			
-			return date;
-		}
-	}
-}
\ No newline at end of file

=== modified file 'GTG/src/GTGDBus.cs'
--- GTG/src/GTGDBus.cs	2010-05-01 10:59:54 +0000
+++ GTG/src/GTGDBus.cs	2010-10-13 08:39:47 +0000
@@ -20,7 +20,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Linq;
 using NDesk.DBus;
 
 using Do.Platform;
@@ -33,13 +33,17 @@
 	{
 		// There is a bug in ndesk-dbus package which comes with Ubuntu (9.10)
 	 	// Package from https://edge.launchpad.net/~docky-core/+archive/ppa PPA works fine
+		//This call cause System.Exception: Read non-zero byte at position 4 while expecting padding
 		IDictionary<string, object>[] get_tasks();
 		IDictionary<string, object> get_task(string taskId);
-		
-		string open_task_editor(string taskId);
-		string new_task(string status, string title, string dueDate, string startDate, string doneDate, string[] tags, string text, string subTasks);
-		string modify_task(string taskId, Hashtable taskData);
-		string delete_task(string taskId);
+		string[] get_task_ids(string ids);
+		
+		void open_task_editor(string taskId);
+		IDictionary<string, object> new_task(string status, string title, string dueDate, string startDate, string doneDate, string[] tags, string text, string subTasks);
+		void modify_task(string taskId, IDictionary<string, object> taskData);
+		void delete_task(string taskId);
+		void show_task_browser();
+		
 	}
 	
 	public class GTGDBus
@@ -50,7 +54,7 @@
 		
 		public GTGDBus()
 		{
-			GTG = FindInstance();
+			//GTG = FindInstance();
 			try
 			{
 				GTG = FindInstance();
@@ -73,61 +77,87 @@
 		
 		public IDictionary<string, object>[] GetActiveTasks()
 		{
-			return GTG.get_tasks();
+			var tids = GTG.get_task_ids("Active");
+			return tids.Select(tid => GetTask(tid)).ToArray();
+	
 		}
 				
 		public IDictionary<string, object> GetTask(string taskId)
 		{
+			Log.Debug("Get GTG task "+taskId);
 			return GTG.get_task(taskId);
 		}
 		
-		public string CreateTask(GTGTask task)
+		public IDictionary<string, object> CreateTask(GTGTask task)
 		{
 			try
 			{
-				return GTG.new_task(task.StatusString, task.Title, task.DueDateString, task.StartDateString,
+				Log.Debug("Creating GTG task "+task.Title);
+				//We want add tags also to the body of task as classic  
+				task.Text = String.Join(", ",task.TagsArray) + task.Text +"\n";
+				var returnedTask = GTG.new_task(task.StatusString, task.Title, task.DueDateString, task.StartDateString,
 			                    	task.DoneDateString, task.TagsArray, task.Text, task.SubTasksString);
-			}
-			catch (Exception)
-			{
-				return "";
-			}
-		}
-		
-		public string OpenTaskEditor(string taskId)
-		{
-			try
-			{
-				return GTG.open_task_editor(taskId);
-			}
-			catch (Exception)
-			{
-				return "";
-			}
-		}
-		
-		public string CompleteTask(GTGTask task)
-		{
-			try
-			{
-				return GTG.modify_task(task.TaskId, task.GetTaskData());
-			}
-			catch (Exception)
-			{
-				return "";
-			}
-		}
-		
-		public string DeleteTask(string taskId)
-		{
-			try
-			{
-				return GTG.delete_task(taskId);
-			}
-			catch (Exception)
-			{
-				return "";
-			}
-		}
+				Log.Debug("GTG task created with id "+returnedTask["id"]);
+				return returnedTask;
+			}
+			catch (Exception)
+			{
+				return null;
+			}
+		}
+		
+		public void OpenTaskEditor(string taskId)
+		{
+			try
+			{
+				Log.Debug("Opening GTG task editor "+taskId);
+				GTG.open_task_editor(taskId);
+			}
+			catch (Exception)
+			{
+				
+			}
+		}
+		
+		public void CompleteTask(GTGTask task)
+		{
+			try
+			{
+				Log.Debug("Modifying GTG task "+task.Title);
+				GTG.modify_task(task.TaskId, task.GetTaskData());
+			}
+			catch (Exception)
+			{
+				
+			}
+		}
+		
+		public void DeleteTask(string taskId)
+		{
+			try
+			{
+				Log.Debug("Delete GTG task "+taskId);
+				GTG.delete_task(taskId);
+			}
+			catch (Exception)
+			{
+			
+			}
+		}
+		
+		public void ShowTaskBrowser()
+		{
+			try
+			{
+				Log.Debug("Showing GTG task browser");
+				GTG.show_task_browser();
+			}
+			catch (Exception)
+			{
+			
+			}
+		}
+
+		
 	}
 }
\ No newline at end of file

=== modified file 'GTG/src/GTGTask.cs'
--- GTG/src/GTGTask.cs	2010-05-01 10:59:54 +0000
+++ GTG/src/GTGTask.cs	2010-10-13 08:39:47 +0000
@@ -169,9 +169,10 @@
 			get { return ""; }
 		}
 		
-		public Hashtable GetTaskData()
+		public IDictionary<string, object> GetTaskData()
 		{
-			Hashtable taskData = new Hashtable();
+			//Hashtable taskData = new Hashtable();
+			var taskData = new Dictionary<string, object>();
 			
 			taskData.Add("status", this.StatusString);
 			taskData.Add("title", this.Title);

=== modified file 'GTG/src/GTGTaskItemSource.cs'
--- GTG/src/GTGTaskItemSource.cs	2010-05-01 10:59:54 +0000
+++ GTG/src/GTGTaskItemSource.cs	2010-10-13 08:39:47 +0000
@@ -66,7 +66,8 @@
 		public override void UpdateItems()
 		{
 			items.Clear();	
-
+			
+			
 			foreach (IDictionary<string, object> item in gtg.GetActiveTasks())
 			{
 				items.Add(new GTGTask((string)item["id"], (string)item["title"]));

=== modified file 'configure.ac'
--- configure.ac	2010-03-08 02:43:56 +0000
+++ configure.ac	2010-10-13 08:39:47 +0000
@@ -313,6 +313,8 @@
 GoogleMaps/Resources/GoogleMaps.addin.xml
 GoogleSearch/Makefile
 GoogleSearch/Resources/GoogleSearch.addin.xml
+GTG/Makefile
+GTG/Resources/GTG.addin.xml
 ImageShack/Makefile
 ImageShack/Resources/ImageShack.addin.xml
 JIRA/Makefile