account.py

@@ -18,6 +18,9 @@ class Account:
     self._transport2proto={}
     self._cnx=None
 
+  def getDesc(self):
+    return (self._hlogin + "@" + self._host)
+
   def setHost(self,hostName):
     self._host=hostName
 

start.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# vim: set sw=4 ts=4 si et: 
 
 import sys
 import os
@@ -25,7 +26,8 @@ class Answer:
         while not self._answer:
             sys.stderr.write(question)
             tmp_ans = raw_input()
-          if tmp_ans in (answerlist): self._answer=tmp_ans
+            if tmp_ans in (answerlist): 
+                self._answer = tmp_ans
       
     def get(self):
         return self._answer;
@@ -43,15 +45,20 @@ class JabSync:
 
     def parseCmdLine(self):
         parser = OptionParser()
-    parser.add_option("-c","--config",\
-      action="store", type="string", dest="filename",\
-      help="Use file a configuration file",metavar="config")
+        parser.add_option(\
+            "-c","--config",\
+            action="store", \
+            type="string", \
+            dest="filename",\
+            help="Use file a configuration file",\
+            metavar="config")
         (options,args)=parser.parse_args()
         if options.filename:
             self._configFile=options.filename
         else:
             self._configFile=os.path.join(os.path.expanduser("~"),".jabsync")
         print "Configuration file: " + self._configFile 
+
     def init(self):
         self._config = Config()
         self._config.loadFromFile(self._configFile)
@@ -101,22 +108,28 @@ class JabSync:
                         "   [y]ahoo"+\
                         "   [-] Forget JIDs using this host",\
                         what_tp_ans.keys())
-	  trans_proto=what_tp_ans[what_transport]
+                    trans_proto = what_tp_ans[what_transport.get()]
+                    print "Selected : " + trans_proto
                     if trans_proto == "forget": 
                         # TODO: ajouter regles d'exclusion
                         zero = 0
                     else:
                         # TODO: ajouter transport a la config XML
+                        self._commonTransports[hostName] = trans_proto
                         zero = 0 
                 return self.giveTransport(hostName)
 
+      
     def get(self):
+        print "jabsync::get\n"
         #get Roster
         for account in self._accountList:
             roster = account.getRoster()
             # fusionner les roster
             jid_list = roster.getJIDs()
             for jid in jid_list:
+                print "Getting... " 
+                print jid
                 transport = jid.getDomain()
                 trans_proto = self.giveTransport(transport)
                 if not self._commonJIDs.has_key(trans_proto):
@@ -125,8 +138,8 @@ class JabSync:
                 jid_groups = roster.getGroups(jid)
                 if not jid_name: jid_name = jid.getNode()	
                 if not self._commonJIDs[trans_proto].has_key(jid.getNode()):
-          self._commonJIDs[trans_proto][jid.getNode()]=(jid_name,jid_groups)
-#          print " <- "+jid.getNode()+" @ "+trans_proto+" = "+jid_name	  
+                    self._commonJIDs[trans_proto][jid.getNode()] = \
+                        (jid_name,jid_groups)
                 print "\x1B[G <- "+jid.getNode()+" @ "+trans_proto+" = "+jid_name
 
   #upload rosters