From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Mon, 22 Aug 2011 05:50:59 +0000 (+0300)
Subject: ppf: Replace date, time with h timestamp.
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=6d1f239a3d753bf84291e1aabfd4d1c58d168cce;p=cs-p2p-next.git

ppf: Replace date, time with h timestamp.

timestamp will be a Python Datetime object.
---

diff --git a/ppf/new/storage.py b/ppf/new/storage.py
index d87076c..3db0af8 100644
--- a/ppf/new/storage.py
+++ b/ppf/new/storage.py
@@ -127,6 +127,7 @@ class Swarm(object):
 
 class ClientSession(object):
     """ Class mimics a C structure. """
+    # TODO: Add timezone.
     def __init__(self, swarm_id=None, btclient=None, system_os=None,
             system_os_version=None, system_ram=None, system_cpu=None,
             public_ip=None, public_port=None, ds_limit=None, us_limit=None,
@@ -151,13 +152,12 @@ class ClientSession(object):
 
 class PeerStatusMessage(object):
     """ Class mimics a C structure. """
-    def __init__(self, swarm_id=None, client_session_id=None, date=None,
-            time=None, peer_ip=None, peer_port=None, download_speed=None,
+    def __init__(self, swarm_id=None, client_session_id=None, timestamp=None,
+            peer_ip=None, peer_port=None, download_speed=None,
             upload_speed=None):
         self.swarm_id = swarm_id
         self.client_session_id = client_session_id
-        self.date = date
-        self.time = time
+        self.timestamp = timestamp
         self.peer_ip = peer_ip
         self.peer_port = peer_port
         self.download_speed = download_speed
@@ -165,14 +165,13 @@ class PeerStatusMessage(object):
 
 class StatusMessage(object):
     """ Class mimics a C structure. """
-    def __init__(self, swarm_id=None, client_session_id=None, date=None,
+    def __init__(self, swarm_id=None, client_session_id=None, timestamp=None,
             time=None, num_peers=None, num_dht_peers=None,
             download_speed=None, upload_speed=None, download_size=None,
             upload_size=None, eta=None):
         self.swarm_id = swarm_id
         self.client_session_id = client_session_id
-        self.date = date
-        self.time = time
+        self.timestamp = timestamp
         self.num_peers = num_peers
         self.num_dht_peers = num_dht_peers
         self.download_speed = download_speed
@@ -183,14 +182,13 @@ class StatusMessage(object):
 
 class VerboseMessage(object):
     """ Class mimics a C structure. """
-    def __init__(self, swarm_id=None, client_session_id=None, date=None,
-            time=None, transfer_direction=None, peer_ip=None, peer_port=None,
+    def __init__(self, swarm_id=None, client_session_id=None, timestamp=None,
+            transfer_direction=None, peer_ip=None, peer_port=None,
             message_type=None, index=None, begin=None, length=None,
             listen_port=None):
         self.swarm_id = swarm_id
         self.client_session_id = client_session_id
-        self.date = date
-        self.time = time
+        self.timestamp = timestamp
         self.transfer_direction = transfer_direction
         self.peer_ip = peer_ip
         self.peer_port = peer_port
@@ -369,18 +367,11 @@ class TreeTextFileAccess(FileAccess):
         session_path = os.path.join(swarm_path, str(msg.client_session_id))
         message_file = os.path.join(session_path, "peer_status.txt")
 
-        f = open(message_file, 'w')
-        f.write("""id = %s
-        swarm_id = %s
-        client_session_id = %s
-        date = %s
-        time = %s
-        peer_ip = %s
-        peer_port = %s
-        download_speed = %s
-        upload_speed = %s
-        """ %(1, msg.swarm_id, msg.client_session_id, msg.date, msg.time,
-            msg.peer_ip, msg.peer_port, msg.download_speed, msg.upload_speed))
+        f = open(message_file, 'a')
+        f.write("""%s,%s,%s,%s,%s,%s,%s,%s\n"""
+                %(1, msg.swarm_id, msg.client_session_id, msg.timestamp,
+                    msg.peer_ip, msg.peer_port, msg.download_speed,
+                    msg.upload_speed))
         f.close()
 
     def add_status_message(self, msg):
@@ -389,22 +380,12 @@ class TreeTextFileAccess(FileAccess):
         session_path = os.path.join(swarm_path, str(msg.client_session_id))
         message_file = os.path.join(session_path, "status.txt")
 
-        f = open(message_file, 'w')
-        f.write("""id = %s
-        swarm_id = %s
-        client_session_id = %s
-        date = %s
-        time = %s
-        num_peers = %s
-        num_dht_peers = %s
-        download_speed = %s
-        upload_speed = %s
-        download_size = %s
-        upload_size = %s
-        eta = %s
-        """ %(1, msg.swarm_id, msg.client_session_id, msg.date, msg.time,
-            msg.num_peers, msg.num_dht_peers, msg.download_speed,
-            msg.upload_speed, msg.download_size, msg.upload_size, msg.eta))
+        f = open(message_file, 'a')
+        f.write("""%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n"""
+                %(1, msg.swarm_id, msg.client_session_id, msg.timestamp,
+                    msg.num_peers, msg.num_dht_peers, msg.download_speed,
+                    msg.upload_speed, msg.download_size, msg.upload_size,
+                    msg.eta))
         f.close()
 
     def add_verbose_message(self, msg):
@@ -413,24 +394,12 @@ class TreeTextFileAccess(FileAccess):
         session_path = os.path.join(swarm_path, str(msg.client_session_id))
         message_file = os.path.join(session_path, "verbose.txt")
 
-        f = open(message_file, 'w')
-        f.write("""id = %s
-        swarm_id = %s
-        client_session_id = %s
-        date = %s
-        time = %s
-        transfer_direction = %s
-        peer_ip = %s
-        peer_port = %s
-        message_type = %s
-        index = %s
-        begin = %s
-        length = %s
-        listen_port = %s
-        """ %(1, msg.swarm_id, msg.client_session_id, msg.date, msg.time,
-            msg.transfer_direction, msg.peer_ip, msg.peer_port,
-            msg.message_type, msg.index, msg.begin, msg.length,
-            msg.listen_port))
+        f = open(message_file, 'a')
+        f.write("""%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n"""
+                %(1, msg.swarm_id, msg.client_session_id, msg.timestamp,
+                    msg.transfer_direction, msg.peer_ip, msg.peer_port,
+                    msg.message_type, msg.index, msg.begin, msg.length,
+                    msg.listen_port))
         f.close()
 
 class DatabaseAccess(SwarmDataAccess):