Changeset 1794

Timestamp:

02/21/07 11:22:33 (22 months ago)

Author:

abaumann

Message:

update mototool to new motosync API
remove --list option, because it was too hard to maintain and served little purpose
add code to look for motosync.py in /usr/lib/opensync/python-plugins if no package config was found
update README

Location:

plugins/moto-sync

Files:

• README (modified) (3 diffs)
• mototool (modified) (5 diffs)

plugins/moto-sync/README

@@ -36 +36 @@
 REQUIREMENTS
 
- * OpenSync 0.20 or later with the python bindings and python-module plugin
+ * OpenSync 0.30 or later with the python bindings and python-module plugin
  * Python 2.4 or newer
  * The python-dateutil library (at least version 1.1),
@@ -77 +77 @@
         msynctool --addmember phone file-sync
         msynctool --configure phone 1 # configure moto-sync, as above
-        msynctool --configure phone 2 # configure file-sync, set the path
+        msynctool --configure phone 2 # configure file-sync, set the path(s)
+        msynctool --discover phone 1
+        msynctool --discover phone 2
         msynctool --sync phone # cross your fingers!
-
-NB: make sure your file-sync directory has only events and contacts in 
-it, no TODO or other data. Otherwise OpenSync will mysteriously 
-deadlock, because there were changes from the file-sync that couldn't be 
-converted. I'm told that this bug is already fixed by the development 
-branch of OpenSync.
 
 
@@ -91 +87 @@
 Before doing anything with write enabled, it is probably a good idea to
 backup the data from your phone. You can use the mototool script to
-do this, to delete entries on the phone, or to examine the data that
-moto-sync would send to opensync. Run 'mototool --help' for details
-or, for the impatient, try:
+do this, and to delete entries on the phone. Run 'mototool --help' for 
+details, or, for the impatient, try:
     mototool -v -d (device string) -f myphone.backup --backup
 

plugins/moto-sync/mototool

@@ -16 +16 @@
     libdir = child.fromchild.readline().rstrip('\n')
     if child.wait() != 0 or not os.path.isdir(libdir):
-        sys.stderr.write("Error: couldn't locate OpenSync library directory\n")
-        sys.exit(1)
+        # no pkgconfig, try standard install path
+        libdir = '/usr/lib/opensync'
+        if not os.path.isdir(libdir):
+            sys.stderr.write("Error: couldn't locate OpenSync library directory\n")
+            sys.exit(1)
     sys.path.append(os.path.join(libdir, 'opensync', 'python-plugins'))
     import motosync
@@ -35 +38 @@
     p.add_option('-f', '--file', dest='filename',
                  help='name of backup/restore data file')
-    p.add_option('--list', action='store_const', dest='mode', const='list',
-                 help='list data on the phone in OpenSync XML format')
     p.add_option('--backup', action='store_const', dest='mode', const='backup',
                  help='backup entries from the phone to a file')
@@ -47 +48 @@
     options, args = p.parse_args()
     if not options.mode:
-        p.error('one of the list, backup, restore, delete actions is required')
+        p.error('one of the backup, restore, or delete actions is required')
     if options.mode in ['backup', 'restore'] and not options.filename:
         p.error('this action requires a --file argument')
@@ -110 +111 @@
     prompt_user(options)
     pc = motosync.PhoneComms(options.device)
-
-    if options.mode == 'list':
-        pa = motosync.PhoneAccess(pc)
-        for objtype in options.objtype:
-            for change in pa.list_changes(objtype):
-                print change.uid
-                print change.data
+    pc.connect()
 
     if options.mode == 'delete' or options.mode == 'restore':
@@ -163 +158 @@
                 pc.write_contact(e)
 
+    pc.disconnect()
+
 
 if __name__ == "__main__":