Merge lp:~jonathan-barnoud/gtg/quickadd into lp:~gtg/gtg/old-trunk

[Pititjo]

[Pititjo (jonathan-barnoud)]

Include due: and defer: attributes. The syntax is due:date or defer:date with date is yyyy-mm-dd or yyyymmdd or mmdd or today or a weekday name.

[Bertrand Rousseau (bertrand-rousseau)]

Very nice! I tested it and it works like a charm.

Just 2 remarks:

 - could you modify your patch to support i18n? Basically it means that you should put "_( )" around translatable strings. I'm thinking about day names here.
 - could you also support "tomorrow"? Since you already support "today", "tomorrow" would be quite nice too.

review: Needs Fixing

[lp:~jonathan-barnoud/gtg/quickadd]

225. By Pititjo on 2009-03-31

ajout de tomorrow et de la localisation pour due et defer dans le quick add

226. By Pititjo on 2009-03-31

add _() for attributes in quick add

=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py	2009-03-31 14:15:29 +0000
+++ GTG/taskbrowser/browser.py	2009-03-31 15:28:25 +0000
@@ -29,6 +29,7 @@
 import os
 import locale
 import re
+import datetime
 from gnome import url_show
 
 #our own imports
@@ -536,9 +537,68 @@
             self.quickadd_pane.show()
         else :
             self.quickadd_pane.hide()
-            
+    
+    def canonical_date(self, arg) :
+        """
+        Transform "arg" in a valid yyyy-mm-dd date or return None.
+        "arg" can be a yyyy-mm-dd, yyyymmdd, mmdd, today or a weekday name.
+        """
+        day_names_en = ["monday", "tuesday", "wednesday", "thursday",
+                        "friday", "saturday", "sunday"]
+        if re.match(r'\d{4}-\d{2}-\d{2}', arg) :
+            date = arg
+        elif arg.isdigit() :
+            if len(arg) == 8 :
+                date = "%s-%s-%s" % (arg[:4],arg[4:6],arg[6:])
+            elif len(arg) == 4 :
+                year = datetime.date.today().year
+                date = "%i-%s-%s" % (year,arg[:2],arg[2:])
+        elif arg.lower() == "today" :
+            today = datetime.date.today()
+            year = today.year
+            month = today.month
+            day = today.day
+            date = "%i-%i-%i" % (year,month,day)
+        elif arg.lower() in day_names_en :
+            today = datetime.date.today()
+            today_day = today.weekday()
+            arg_day = day_names_en.index(arg)
+            if arg_day > today_day :
+                delta = datetime.timedelta(days = arg_day-today_day)
+            else :
+                delta = datetime.timedelta(days = arg_day-today_day+7)
+            next_date = today + delta
+            year = next_date.year
+            month = next_date.month
+            day = next_date.day
+            date = "%i-%i-%i" % (year,month,day)
+        else :
+            return None
+        if self.is_date_valid(date) :
+            return date
+        else :
+            return None
+    
+    def is_date_valid(self, fulldate) :
+        """
+        Return True if the date exists. False else.
+        "fulldate" is yyyy-mm-dd
+        """
+        splited_date = fulldate.split("-")
+        if len(splited_date) != 3 :
+            return False
+        year,month,day = splited_date
+        try :
+            date = datetime.date(int(year),int(month),int(day))
+        except ValueError :
+            return False
+        else :
+            return True
+    
     def quickadd(self,widget) : #pylint: disable-msg=W0613
         text = self.quickadd_entry.get_text()
+        due_date = None
+        defer_date = None
         if text :
             tags,notagonly = self.get_selected_tags() #pylint: disable-msg=W0612
             # Get tags in the title
@@ -553,9 +613,14 @@
                 if attribute.lower() == "tags" :
                     for tag in args.split(",") :
                         tags.append(GTG.core.tagstore.Tag("@"+tag))
-                # Here you can add new commands
-                #elif attribute.lower() == "defer" :
-                #elif attribute.lower() == "due" :
+                elif attribute.lower() == "defer" :
+                    defer_date = self.canonical_date(args)
+                    if defer_date is None :
+                        valid_attribute = False
+                elif attribute.lower() == "due" :
+                    due_date = self.canonical_date(args)
+                    if due_date is None :
+                        valid_attribute = False
                 else :
                     # attribute is unknown
                     valid_attribute = False
@@ -567,6 +632,10 @@
             task = self.req.new_task(tags=tags,newtask=True)
             if text != "" :
                 task.set_title(text)
+            if not due_date is None :
+                task.set_due_date(due_date)
+            if not defer_date is None :
+                task.set_start_date(defer_date)
             id_toselect = task.get_id()
             #############
             self.quickadd_entry.set_text('')