Merge lp:~ethcelon-deactivatedaccount/gtg/bugfix into lp:~gtg/gtg/old-trunk

[om bhallamudi]

Proposed fix for bug Bug #963891 ( Tags are changed to all-lower-case while conversion to hamster activity Edit )

[Parin Porecha (parinporecha)]

Hi Om,

I have looked at your patch, and it looks like it will solve the bug.

A couple of nitpicks -

Line 23 of the diff does not make sense (You changed the dictionary to hold the same string as a key and it's value).
Line 14 of the diff does not convert hamster activities to lowercase anymore. This may lead to tags like - @Home, @HOME, @home. We don't want that. If we found a variant of gtg tag already in hamster, we use that instead.

So, please change your logic to compare lowercase tags of both GTG and Hamster but use the original tag.
I'll test and review the patch after you make these changes.

review: Needs Fixing

[om bhallamudi (ethcelon-deactivatedaccount)]

Hi Parin
About Line 24 of the diff, GTG itself considers @HOME @Home and @home as different tags, so isn't it natural that when we start a hamster task we might want to differentiate between them?

[Parin Porecha (parinporecha)]

Yes, GTG considers those tags different, but we will be changing that.

You see sometimes we can type a wrong case by mistake. It is very
irritating to go back to the editor, select that tag and change that
particular letter. Now, we will be changing all the tags by default to
lowercase so that situations like these do not happen.
Since you're already working on fixing a similar bug, it is better to merge
a patch that will not be needed to get changed again after sometime.

Another reason -
Hamster also considers @Home, @HOME as different. Now, you take both GTG's
tags and Hamster's tags and add them. You get a big assorted combination of
5-6 tags which are different whereas the meaning behind all of them is only
one and that is - home.

On Thu, Feb 27, 2014 at 10:53 PM, om bhallamudi <email address hidden>wrote:

> Hi Parin
> About Line 24 of the diff, GTG itself considers @HOME @Home and @home as
> different tags, so isn't it natural that when we start a hamster task we
> might want to differentiate between them?
>
> --
> https://code.launchpad.net/~om-bhallamudi/gtg/bugfix/+merge/208634
> You are reviewing the proposed merge of lp:~om-bhallamudi/gtg/bugfix into
> lp:gtg.
>

--
Regards,
Parin Porecha

GTG Developer
GNOME Foundation Member
Github <https://github.com/parinporecha/> |
Launchpad<https://launchpad.net/~parinporecha>
 | Gnome Bugzilla<https://bugzilla.gnome.org/page.cgi?id=describeuser.html&login=parinporecha%40gmail.com><https://bugzilla.gnome.org/page.cgi?id=describeuser.html&login=parinporecha%40gmail.com>
 | Ohloh <https://www.ohloh.net/accounts/parinporecha>

[om bhallamudi (ethcelon-deactivatedaccount)]

I have added the following functionality:
If we have a similar tag in hamster while adding a task from GTG, we use the tag which is already present in hamster
Else, we use the lower case of whatever tag we give the task in GTG, keeping in mind the fact that all tags are being switched to lower case.

[Izidor Matušov (izidor)]

GTG moved the primary code hosting over to Github: https://github.com/getting-things-gnome

If your patch is still relevant and you would like to get it merged, create a pull request on github against branch https://github.com/getting-things-gnome/gtg

Unmerged revisions

1361. By om bhallamudi on 2014-02-27

bugfix for #963891

1360. By om bhallamudi on 2014-02-27

bugfix for #963891, removed some debug statements and made the variable names more clear

1359. By om bhallamudi on 2014-02-27

bugfix for #963891

1358. By om bhallamudi on 2014-02-27

bugfix for #963891

1357. By om bhallamudi on 2014-02-27

hamster plugin fix: bug #963891

=== modified file 'GTG/plugins/hamster/hamster.py'
--- GTG/plugins/hamster/hamster.py	2014-01-12 07:15:09 +0000
+++ GTG/plugins/hamster/hamster.py	2014-02-28 11:36:44 +0000
@@ -72,7 +72,7 @@
         if task is None:
             return
         gtg_title = task.get_title()
-        gtg_tags = [t.lstrip('@').lower() for t in task.get_tags_name()]
+        gtg_tags = [t.lstrip('@') for t in task.get_tags_name()]
 
         activity = "Other"
         if self.preferences['activity'] == 'tag':
@@ -91,8 +91,7 @@
         category = ""
         if self.preferences['category'] == 'auto_tag':
             hamster_activities = dict([(str(x[0]), unicode(x[1]))
-                                       for x in
-                                       self.hamster.GetActivities('')])
+                                       for x in self.hamster.GetActivities('')])
             if (gtg_title in hamster_activities
                     or gtg_title.replace(",", "") in hamster_activities):
                     category = "%s" % hamster_activities[gtg_title]
@@ -117,19 +116,36 @@
             description = task.get_excerpt(strip_tags=True,
                                            strip_subtasks=True)
 
-        tag_candidates = []
+        
         try:
+            hamster_tags = [str(x[1]) for x in self.hamster.GetTags(False)]
+            lower_gtg_tags = [x.lower() for x in gtg_tags]
+            existing_tags = []
+            for tag in hamster_tags:
+                if tag.lower() in lower_gtg_tags:
+                   existing_tags.append(tag)
+            
+            
             if self.preferences['tags'] == 'existing':
-                hamster_tags = set([str(x[1]) for x in
-                                    self.hamster.GetTags(False)])
-                tag_candidates = list(hamster_tags.intersection(set(gtg_tags)))
+                tag_candidates = existing_tags
+                
             elif self.preferences['tags'] == 'all':
-                tag_candidates = gtg_tags
+                tag_candidates = existing_tags
+                lower_hamster_tags = [x.lower() for x in hamster_tags]
+                new_tags = []
+
+                for tag in gtg_tags:
+                    if tag.lower() not in lower_hamster_tags:
+                        new_tags.append(tag.lower())
+               
+                tag_candidates = (set(tag_candidates).union(new_tags))
+               
+                    
         except dbus.exceptions.DBusException:
             # old hamster version, doesn't support tags
             pass
         tag_str = "".join([" #" + x for x in tag_candidates])
-
+       
         # Format of first argument of AddFact -
         # `[-]start_time[-end_time] activity@category, description #tag1 #tag2`
         fact = activity