transmission support almost ready

diff --git a/ControlScripts/client_script_mappings b/ControlScripts/client_script_mappings
index ffd19ecca81d39c2454601c39d4993c2fd347923..95edac413da390d811a70307fce109e7de13ef39 100644 (file)
--- a/ControlScripts/client_script_mappings
+++ b/ControlScripts/client_script_mappings
@@ -38,6 +38,14 @@ start_client()
                        clients/hrk/start_hrk_leecher_limit.sh ${download_limit} ${upload_limit} ${connection_limit} &
                        return $!
                        ;;
+               "transmission_seeder")
+                       clients/transmission/start_transmission_seeder.sh &
+                       return $!
+                       ;;
+               "transmission_leecher")
+                       clients/transmission/start_transmission_leecher.sh &
+                       return $!
+                       ;;
                "tribler_seeder")
                        clients/tribler/start_tribler_seeder.sh &
                        return $!
@@ -90,6 +98,9 @@ stop_client()
                "hrktorrent_seeder" | "hrktorrent_leecher" | "hrktorrent_seeder_limit" | "hrktorrent_leecher_limit")
                        clients/hrk/stop_hrk.sh
                        ;;
+               "transmission_seeder" | "transmission_leecher")
+                       clients/transmission/stop_transmission.sh 
+                       ;;
                "tribler_seeder")
                        clients/tribler/stop_tribler.sh
                        ;;
@@ -130,6 +141,9 @@ detect_complete_client()
                "hrktorrent_seeder" | "hrktorrent_leecher" | "hrktorrent_seeder_limit" | "hrktorrent_leecher_limit")
                        clients/hrk/detect_complete_hrk.sh ${log_file}
                        ;;
+               "transmission_seeder" | "transmission_leecher")
+                       clients/transmission/detect_complete_transmission.sh ${log_file}
+                       ;;
                "tribler_seeder")
                        clients/tribler/detect_complete_tribler_seeder.sh ${log_file}
                        ;;
@@ -169,6 +183,9 @@ parse_client_log()
                        DEBUG echo "hello hrktorrent_seeder"
                        clients/hrk/parse_hrk.sh ${log_folder} ${log_file}
                        ;;
+               "transmission_seeder" | "transmission_leecher")
+                       clients/swift/parse_swift.sh ${log_folder} ${log_file}
+                       ;;
                "tribler_seeder")
                        clients/tribler/parse_tribler.sh ${log_folder} ${log_file}
                        ;;

diff --git a/ControlScripts/clients/transmission/detect_complete_transmission.sh b/ControlScripts/clients/transmission/detect_complete_transmission.sh
index 19e36a7bb1fe9954c37d46c0e87fc522176e8cde..b94d98c530ba1fa08af7cb72511362a85d096be4 100755 (executable)
--- a/ControlScripts/clients/transmission/detect_complete_transmission.sh
+++ b/ControlScripts/clients/transmission/detect_complete_transmission.sh
@@ -24,7 +24,7 @@ LOG_FILE=$1
 
 while true; do
        # check for complete transfer
-       if cat $LOG_FILE | grep "Torrent finished" &> /dev/null; then
+       if cat $LOG_FILE | grep 'State changed from "Incomplete" to "Complete"' &> /dev/null; then
                echo "Torrent transfer finished"
                exit 0
        fi
@@ -35,9 +35,9 @@ while true; do
        fi
 
        # check stat client is alive
-       if ! pgrep "hrktorrent" &> /dev/null; then
+       if ! pgrep -f "transmission-cli" &> /dev/null; then
                if ! pgrep -f "schedule_client.sh" &> /dev/null; then
-                       echo "No hrktorrent and no schedule_client.sh process"
+                       echo "No transmission-cli and no schedule_client.sh process"
                        exit 0
                fi
        fi

diff --git a/ControlScripts/clients/transmission/parse_transmission.sh b/ControlScripts/clients/transmission/parse_transmission.sh
index c25eb24d2a8ebe4310bcab55b1f3503dde8fac90..39d25edc4f45335d4e5abad8ed5252ac16fb7366 100755 (executable)
--- a/ControlScripts/clients/transmission/parse_transmission.sh
+++ b/ControlScripts/clients/transmission/parse_transmission.sh
@@ -9,7 +9,7 @@
 #  * the name of a log file in that folder
 #
 # Sample run:
-#  ./parse_hrk.sh ../../../Results/samples/ p2p-next-01-101.log
+#  ./parse_transmission.sh ../../../Results/samples/ p2p-next-01-101.log
 
 if [ ! $# -eq 2 ]; then
        echo "usage: $0 log-folder log-file"

diff --git a/ControlScripts/clients/transmission/start_transmission_leecher.sh b/ControlScripts/clients/transmission/start_transmission_leecher.sh
index f7254528c7bcb76d854fb20c6e910a1575aa8a96..205682fc0a6b4933bb69c3e4f4187d2a7d12e6d1 100755 (executable)
--- a/ControlScripts/clients/transmission/start_transmission_leecher.sh
+++ b/ControlScripts/clients/transmission/start_transmission_leecher.sh
@@ -27,8 +27,11 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
+rm ~/.config/tramsmission/resume/*
+rm ~/.config/tramsmission/torrents/*
+
 cd $WORKING_FOLDER_REL_PATH/Regular/
 
-LD_LIBRARY_PATH=$HRK_ABS_PATH/../libtorrent-rasterbar/lib $HRK_ABS_PATH/hrktorrent --nodht ../TorrentsAndData/$TORRENT_FILE
+$TRANSMISSION_ABS_PATH/transmission-cli ../TorrentsAndData/$TORRENT_FILE -w .
 
 rm -rf *

diff --git a/ControlScripts/clients/transmission/start_transmission_seeder.sh b/ControlScripts/clients/transmission/start_transmission_seeder.sh
index 0e819272953582b1c08b643426b0175c1bb61d94..cc7129b6446d5e66fd90ceee54f8055892189845 100755 (executable)
--- a/ControlScripts/clients/transmission/start_transmission_seeder.sh
+++ b/ControlScripts/clients/transmission/start_transmission_seeder.sh
@@ -27,6 +27,9 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
+rm ~/.config/tramsmission/resume/*
+rm ~/.config/tramsmission/torrents/*
+
 cd $WORKING_FOLDER_REL_PATH/TorrentsAndData/
 
-LD_LIBRARY_PATH=$HRK_ABS_PATH/../libtorrent-rasterbar/lib $HRK_ABS_PATH/hrktorrent --nodht --nohashcheck $TORRENT_FILE
+$TRANSMISSION_ABS_PATH/transmission-cli $TORRENT_FILE -w .

diff --git a/ControlScripts/clients/transmission/stop_transmission.sh b/ControlScripts/clients/transmission/stop_transmission.sh
index b0f31f7115884537e96ca89aa9e0c4362f294cdd..dbc76b3eea920714820aff559ebda6f0b2a53885 100755 (executable)
--- a/ControlScripts/clients/transmission/stop_transmission.sh
+++ b/ControlScripts/clients/transmission/stop_transmission.sh
@@ -11,4 +11,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill -KILL -f hrktorrent
+pkill -KILL -f transmission-cli

diff --git a/ControlScripts/globalconfig b/ControlScripts/globalconfig
index df992f2af199a74c77b75cca19d412fbeb7ee8cc..c281317702206ba2c2236252fe95d305d4dd7d3b 100644 (file)
--- a/ControlScripts/globalconfig
+++ b/ControlScripts/globalconfig
@@ -31,6 +31,9 @@ HRK_ABS_PATH="/home/p2p/p2p-clients/hrktorrent/hrktorrent"
 # hrktorrent with logging support
 HRK_LOG_ABS_PATH="/home/p2p/p2p-clients/hrktorrent-logging/hrktorrent"
 
+# TRANSMISSION_PATH
+TRANSMISSION_ABS_PATH="/home/p2p/p2p-clients/transmission/cli"
+
 # XBTUT_PATH
 XBTUT_ABS_PATH="/home/p2p/export/unified-tracker/trunk/xbt/Tracker" 
 

diff --git a/TestSpecs/gen/transmission_test_01.csv b/TestSpecs/gen/transmission_test_01.csv
new file mode 100644 (file)
index 0000000..beabd0a
--- /dev/null
+++ b/TestSpecs/gen/transmission_test_01.csv
@@ -0,0 +1,2 @@
+1,1,1,2,Nelimitat,1 Mbit/s,1 Mbit/s,64M,TODO
+2,1,3,4,Nelimitat,8 Mbit/s,8 Mbit/s,64M,TODO