Merge lp:~h-pawan/gtg/rtm-sync-errors into lp:~gtg/gtg/old-trunk

[Pawan Hegde]

Resolves backend pickles not getting read and RTM sync error that caused tasks to get deleted.

[Nimit Shah (nimit-svnit)]

Hi Pawan,
It is still asking me to register the app everytime. Please look into it.

review: Needs Fixing

[lp:~h-pawan/gtg/rtm-sync-errors]

1363. By Pawan Hegde on 2014-03-13

Added a callback to the token saving function on authentication. Added a message to tell the user the same.

1364. By Pawan Hegde on 2014-03-13

merged changes

1365. By Pawan Hegde on 2014-03-13

changed wording of message

[Pawan Hegde (h-pawan)]

> Hi Pawan,
> It is still asking me to register the app everytime. Please look into it.

Now, GTG will save your authentication information the first time you add the backend. This does not wait for the periodic refresh, and happens via a callback. (It still takes a few seconds to verify the authorization with RTM, so I have added a message for this. Hopefully this prevents users from closing the app right after confirming.)
On every subsequent start of the app, this information will be reloaded from disk, even if you disable the backend.
However, if you remove the backend, then the authorization information gets deleted along with all other information about the backend. You'll have to again confirm on adding the backend to GTG.

[lp:~h-pawan/gtg/rtm-sync-errors]

1366. By Pawan Hegde on 2014-03-16

Merged with latest branch

[Nimit Shah (nimit-svnit)]

Hi Pawan,
I am constantly getting an error saying that my pickle file is damaged and
hence it is asking me to authenticate again and again. Also I am getting
this error:
(process:2810): GLib-CRITICAL **: g_slice_set_config: assertion
'sys_page_size == 0' failed
The above error comes only when I have rtm backend enabled.

Nimit Shah

On Fri, Mar 14, 2014 at 12:55 AM, Pawan Hegde <email address hidden> wrote:

> > Hi Pawan,
> > It is still asking me to register the app everytime. Please look into it.
>
> Now, GTG will save your authentication information the first time you add
> the backend. This does not wait for the periodic refresh, and happens via a
> callback. (It still takes a few seconds to verify the authorization with
> RTM, so I have added a message for this. Hopefully this prevents users from
> closing the app right after confirming.)
> On every subsequent start of the app, this information will be reloaded
> from disk, even if you disable the backend.
> However, if you remove the backend, then the authorization information
> gets deleted along with all other information about the backend. You'll
> have to again confirm on adding the backend to GTG.
> --
> https://code.launchpad.net/~h-pawan/gtg/rtm-sync-errors/+merge/209978
> You are reviewing the proposed merge of lp:~h-pawan/gtg/rtm-sync-errors
> into lp:gtg.
>

[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

1366. By Pawan Hegde on 2014-03-16

Merged with latest branch

1365. By Pawan Hegde on 2014-03-13

changed wording of message

1364. By Pawan Hegde on 2014-03-13

merged changes

1363. By Pawan Hegde on 2014-03-13

Added a callback to the token saving function on authentication. Added a message to tell the user the same.

1362. By Pawan Hegde on 2014-03-07

Merged two commit branches into one. Resolved conflicts in CHANGELOG

1361. By Pawan Hegde on 2014-03-04

Updated CHANGELOG

1360. By Pawan Hegde on 2014-03-04

Fixed RTM sync errors

1359. By Pawan Hegde on 2014-03-03

Added name to changelog

1358. By Pawan Hegde on 2014-03-03

Merged

1357. By Pawan Hegde on 2014-03-01

Access pickled files as binary. Allow settings and credentials to be stored locally. Removes the need to get authenticated every time.

=== modified file 'CHANGELOG'
--- CHANGELOG	2014-03-15 19:00:54 +0000
+++ CHANGELOG	2014-03-16 19:30:38 +0000
@@ -26,6 +26,8 @@
     * Fix for Python3 compatibility and unable to close on Clicking on close button, by Fabiano Fidencio
     * Fix for bug ##1042419 : Gtg-0.2.9.tar.gz file has 'gtg' and 'GTG', by Izidor Matušov
     * Moving to Sphinx for documentation and improving the scripts, by Izidor Matušov
+    * Fix for bug #1286495 : Backends ask for authentication every time, by Pawan Hegde
+    * Fix for bug #932732  : Synchronizying twice with RTM removes all tasks, by Pawan Hegde  
 
 2013-11-24 Getting Things GNOME! 0.3.1
     * Fix for bug #1024473: Have 'Show Main Window' in notification area, by Antonio Roquentin

=== modified file 'GTG/backends/backend_rtm.py'
--- GTG/backends/backend_rtm.py	2014-03-09 12:59:59 +0000
+++ GTG/backends/backend_rtm.py	2014-03-16 19:30:38 +0000
@@ -87,7 +87,6 @@
         self.token = self._load_pickled_file(self.token_path, None)
         self.enqueued_start_get_task = False
         self.login_event = threading.Event()
-        self._this_is_the_first_loop = True
 
     def initialize(self):
         """
@@ -95,6 +94,7 @@
         """
         super(Backend, self).initialize()
         self.rtm_proxy = RTMProxy(self._ask_user_to_confirm_authentication,
+                                  self._on_successful_authentication,
                                   self.token)
 
     def save_state(self):
@@ -120,6 +120,10 @@
                                                ).INTERACTION_CONFIRM,
                                                "on_login")
         self.login_event.wait()
+        BackendSignals().interaction_requested(self.get_id(),
+                                               "Thank you. Give us a moment to verify and save your authorization",
+                                               BackendSignals(
+                                               ).INTERACTION_TEXT, None)
 
     def on_login(self):
         '''
@@ -142,9 +146,6 @@
         current_rtm_task_ids = [tid for tid in
                                 self.rtm_proxy.get_rtm_tasks_dict().keys()]
 
-        if self._this_is_the_first_loop:
-            self._on_successful_authentication()
-
         # If it's the very first time the backend is run, it's possible that
         # the user already synced his tasks in some way (but we don't know
         # that). Therefore, we attempt to induce those tasks relationships
@@ -200,9 +201,8 @@
 
     def _on_successful_authentication(self):
         '''
-        Saves the token and requests a full flush on first autentication
+        Saves the token and requests a full flush on first authentication
         '''
-        self._this_is_the_first_loop = False
         self._store_pickled_file(self.token_path,
                                  self.rtm_proxy.get_auth_token())
         # we ask the Datastore to flush all the tasks on us
@@ -514,8 +514,10 @@
 
     def __init__(self,
                  auth_confirm_fun,
+                 on_authentication_fun,
                  token=None):
         self.auth_confirm = auth_confirm_fun
+        self.on_auth = on_authentication_fun
         self.token = token
         self.authenticated = threading.Event()
         self.login_event = threading.Event()
@@ -576,6 +578,7 @@
             try:
                 if self._login():
                     self.authenticated.set()
+                    self.on_auth()
             except IOError:
                 BackendSignals().backend_failed(self.get_id(),
                                                 BackendSignals.ERRNO_NETWORK)
@@ -655,8 +658,8 @@
         http://www.rememberthemilk.com/services/api/tasks.rtm
         '''
         list_object_wrapper = self.rtm.tasks.getList(list_id=list_id,
-                                                     filter='includeArchived\
-                                                     :true').tasks
+                                                     filter='includeArchived'
+                                                            ':true').tasks
         list_object_list = self.__getattr_the_rtm_way(
             list_object_wrapper, 'list')
         if not list_object_list:

=== modified file 'GTG/backends/genericbackend.py'
--- GTG/backends/genericbackend.py	2013-11-25 02:37:46 +0000
+++ GTG/backends/genericbackend.py	2014-03-16 19:30:38 +0000
@@ -576,7 +576,7 @@
         if not os.path.exists(path):
             return default_value
 
-        with open(path, 'r') as file:
+        with open(path, 'rb') as file:
             try:
                 return pickle.load(file)
             except Exception:
@@ -587,7 +587,7 @@
         for i in range(1, PICKLE_BACKUP_NBR + 1):
             backup_file = "%s.bak.%d" % (path, i)
             if os.path.exists(backup_file):
-                with open(backup_file, 'r') as file:
+                with open(backup_file, 'rb') as file:
                     try:
                         data = pickle.load(file)
                         Log.info("Succesfully restored backup #%d for '%s'" %

=== modified file 'GTG/gtk/browser/custominfobar.py'
--- GTG/gtk/browser/custominfobar.py	2013-11-25 02:37:46 +0000
+++ GTG/gtk/browser/custominfobar.py	2014-03-16 19:30:38 +0000
@@ -152,7 +152,10 @@
         '''
         if event == Gtk.ResponseType.ACCEPT:
             if self.interaction_type == BackendSignals().INTERACTION_TEXT:
-                self._prepare_textual_interaction()
+                if self.callback != None:
+                    self._prepare_textual_interaction()
+                else:
+                    self.hide()
                 print("done")
             elif self.interaction_type == BackendSignals().INTERACTION_CONFIRM:
                 self.hide()