From: Adriana Draghici <adriana.draghici@cti.pub.ro>
Date: Fri, 24 Sep 2010 17:30:51 +0000 (+0300)
Subject: autorun: server can control NextShare
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=b4f7ce8004bf01032fb5f3faf0267c4a9be86df5;p=cs-p2p-next.git

autorun: server can control NextShare
---

diff --git a/autorun/server/BTClientsControl.py b/autorun/server/BTClientsControl.py
index 810b6dd..e0b9302 100644
--- a/autorun/server/BTClientsControl.py
+++ b/autorun/server/BTClientsControl.py
@@ -4,9 +4,10 @@ import logging
 from Util import *
 
 from BitTorrentClientRun import *
+from HrktorrentRun import *
 from TransmissionRun import *
 from TriblerRun import *
-from HrktorrentRun import *
+from NextShareRun import *
 from TriblerStatusParser import *
 
 class BTClientsControl:
@@ -34,10 +35,12 @@ class BTClientsControl:
 
         if bt_client_data[CLIENT] == TRANSMISSION:
             btcr = TransmissionRun(bt_client_data[BASE_DIR])
-        elif bt_client_data[CLIENT] == TRIBLER:
-            btcr = TriblerRun(bt_client_data[BASE_DIR])
         elif bt_client_data[CLIENT] == HRKTORRENT:
             btcr = HrktorrentRun(bt_client_data[BASE_DIR])
+        elif bt_client_data[CLIENT] == TRIBLER:
+            btcr = TriblerRun(bt_client_data[BASE_DIR])
+        elif bt_client_data[CLIENT] == NEXTSHARE:
+            btcr = NextShareRun(bt_client_data[BASE_DIR])
         else:
             self.error_msg = "Unknown BitTorrent client: " + bt_client_data[CLIENT] + "."
             return -1
diff --git a/autorun/server/Client.py b/autorun/server/Client.py
index 2f16dcb..c20feba 100644
--- a/autorun/server/Client.py
+++ b/autorun/server/Client.py
@@ -94,7 +94,18 @@ def test_all_commands(torrent_file):
             LOG_FILE: "tribler-" + torrent_name + ".log", #verbose messages
             DL_LIMIT: 250,
             UP_LIMIT: 250
-
+            }
+    start_data_nextshare = {
+            CLIENT: NEXTSHARE, PORT:10150,
+            BASE_DIR:"/home/p2p/p2p-clients/next-share",
+            TORRENT: torrent_file,
+            DL_DIR: "/home/p2p/p2p-dld/next-share",
+            LOG_DIR: "/home/p2p/p2p-log/next-share",
+            OUT_DIR: "/home/p2p/p2p-log/next-share",
+            OUT_FILE: torrent_name + ".out", #status messages
+            LOG_FILE: "next-share-" + torrent_name + ".log", #verbose messages
+            DL_LIMIT: 250,
+            UP_LIMIT: 250
             }
     start_data_transmission = {
             CLIENT: TRANSMISSION, PORT:10250,
@@ -125,7 +136,7 @@ def test_all_commands(torrent_file):
             }
     #print s.send_command(GET_OUTPUT, "")
    
-    response = s.send_command(START_MSG, start_data_tribler)
+    response = s.send_command(START_MSG, start_data_nextshare)
     print response
     pid1 = response[1]
     print pid1
diff --git a/autorun/server/NextShareRun.py b/autorun/server/NextShareRun.py
index a652417..5bd86f5 100644
--- a/autorun/server/NextShareRun.py
+++ b/autorun/server/NextShareRun.py
@@ -15,7 +15,7 @@ from BitTorrentClientRun import BitTorrentClientRun
 DEBUG = True
 
 
-class TriblerRun(BitTorrentClientRun):
+class NextShareRun(BitTorrentClientRun):
     def __init__(self, base_path):
 
         os.environ["PYTHONPATH"] = base_path