From: Mariana Mărășoiu <mariana.marasoiu@gmail.com>
Date: Thu, 15 Sep 2011 22:32:49 +0000 (+0300)
Subject: pff/new: Add swarm_id as optional argument to update_session_entry_id.
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=beeaba9b4ee5ea875060233e27c42dc87d517040;p=cs-p2p-next.git

pff/new: Add swarm_id as optional argument to update_session_entry_id.

Make implied modifications in top.py.
---

diff --git a/ppf/new/config.py b/ppf/new/config.py
index 84f3a14..bdc4dfd 100644
--- a/ppf/new/config.py
+++ b/ppf/new/config.py
@@ -87,11 +87,15 @@ class SwarmDescription(object):
             session_list.append(entry)
         return session_list
 
-    def update_session_entry_id(self, session_entry, cs_id):
+    def update_session_entry_id(self, session_entry, cs_id, swarm_id = None):
         """Add or modify client session id in self and session_entry."""
         session_name = session_entry.data.sections()[0]
         self.data.set(session_name, 'client_session_id', str(cs_id))
         session_entry.data.set(session_name, 'client_session_id', str(cs_id))
+        if swarm_id is not None:
+            self.data.set(session_name, 'swarm_id', str(swarm_id))
+            session_entry.data.set(session_name, 'swarm_id', str(swarm_id))
+            self.data.set('swarm', 'swarm_id', str(swarm_id))
 
     def get_file_archives(self):
         """Return a list containing all archives from swarm."""
diff --git a/ppf/new/top.py b/ppf/new/top.py
index 17c0804..f77db32 100644
--- a/ppf/new/top.py
+++ b/ppf/new/top.py
@@ -44,7 +44,8 @@ def enhance_swarm_description(swarm_description, swarm_writer):
         session.swarm_id = swarm_id
         session_id = swarm_writer.add_client_session(session)
         # Update session_id in swarm_description list.
-        swarm_description.update_session_entry_id(session_entry, session_id)
+        swarm_description.update_session_entry_id(session_entry, session_id,
+                                                  swarm_id)
 
 def retrieve_log(session_entry):
     """Retrieve and unpack logs.