Tribler: StatusParser now writes results to database

Signed-off-by: Adriana Draghici <adriana008@gmail.com>

diff --git a/log-parser/tribler/StatusParser.py b/log-parser/tribler/StatusParser.py
index 05757c7..3b2905f 100644 (file)
--- a/log-parser/tribler/StatusParser.py
+++ b/log-parser/tribler/StatusParser.py
@@ -3,9 +3,9 @@
 import sys
 import getopt
 import re
-#from DatabaseWriter import DatabaseWriter
-#from DatabaseCommander import DatabaseCommander
-#import julian
+from DatabaseWriter import DatabaseWriter
+from DatabaseCommander import DatabaseCommander
+import julian
 import datetime
 
 DEBUG = True
@@ -68,7 +68,7 @@ def tribler_canon_download_size(non_canon_value, filename):
 # 492mb -> 492*1024*1024
 def tribler_canon_upload_size(non_canon_value):
     pass
-
+# 26.456787 -> 26 (seconds)
 def tribler_canon_eta(non_canon_value):
     return int(float(non_canon_value))
 
@@ -91,7 +91,7 @@ def tribler_parse_status_line(line):
     if DEBUG == True:
         print "string_array is: ", string_array
     if len(string_array) != 16:
-        print "Error: Wrong line format!"
+        print "Error: Invalid line format!"
         return None
 
     # get timestamp and transform it in datetime format
@@ -154,11 +154,11 @@ def tribler_parse_status_file(dbw, client_session_id, filename):
 
             (time, num_peers, dht, download_speed, upload_speed, download_size, upload_size, eta_time) = tribler_parse_status_line(line)
 
-
-           # if DEBUG == True:
-            print "(%d, %s, %d, %d kb/s, %d kb/s, %d bytes, %d bytes)" % (num_peers, time, eta_time, download_speed, upload_speed, download_size, upload_size)
-            
-          #  dbw.add_status_message_datetime(client_session_id, time, num_peers, dht, download_speed, upload_speed, download_size, upload_size, eta_time)
+            if DEBUG == True:
+                print "(%d, %s, %d, %d kb/s, %d kb/s, %d bytes, %d bytes)" % (num_peers, time, eta_time, download_speed, upload_speed, 
+                                                                                download_size, upload_size)
+            dbw.add_status_message_datetime(client_session_id, time, num_peers, dht, download_speed, upload_speed, 
+                                            download_size, upload_size, eta_time)
 
     except IOError:
         print "Error processing file %s." %filename
@@ -168,8 +168,8 @@ def main_just_parse():
        client_session_id = 1
        tribler_parse_status_file(None, client_session_id, filename)
 
+def main_with_DB():
 
-def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hi:f:", ["help",
             "id=", "file="])
@@ -181,7 +181,7 @@ def main():
     client_session_id = None
     filename = None
     database = None
-    
+
     for o, a in opts:
         if o in ("-h", "--help"):
             usage()
@@ -208,7 +208,7 @@ def main():
     database = args[0]
 
     dbc = DatabaseCommander(database)
-    
+
     # check for client_session_id, swarm_id, btclient_id
     cursor = dbc.select_client_sessions_by_id(client_session_id)
     if cursor == None:
@@ -252,7 +252,8 @@ def main():
 
     # parse status file
     dbw = DatabaseWriter(database)
-    tribler_parse_status_file(dbw, client_session_id,filename)
-
+    tribler_parse_status_file(dbw, client_session_id, filename)
+    
 if __name__ == "__main__":
-    sys.exit(main_just_parse())
+    sys.exit(main_with_DB())
+   # sys.exit(main_just_parse())