working on transmission log parsing script

diff --git a/ControlScripts/clients/transmission/test.sh b/ControlScripts/clients/transmission/test.sh
index eba7dc2..38090a6 100755 (executable)
--- a/ControlScripts/clients/transmission/test.sh
+++ b/ControlScripts/clients/transmission/test.sh
@@ -1,19 +1,78 @@
 # Clean and parse the log file
-cat $1 | tr '\r' '\n' | grep '^Seeding, uploading' | awk -F '[ \t()]+' '
+cat $1 | tr '\r' '\n' | grep 'Seeding' | awk -F '[ \t(),;%]+' '
 BEGIN  {
-       rel_time = 0;
+       rel_time = "?";
+       percent = "?";
+       ulspeed = "?";
+       dlspeed = "?";
 }
 
 {
-       percent = 100;
-       if($11 == "KiB/s")
-               upspeed = $10;
-       else if($11 == "MiB/s")
-               upspeed = $10 * 1024.0;
-       else if($11 == "GiB/s")
-               upspeed = $10 * 1024.0 * 1024.0;
-       else
-               upspeed = "?";
-       printf "%d %.2f %.2f %.2f\n", rel_time, percent, upspeed, dlspeed;
-       rel_time++;
+       rel_time = $1;
+
+#      if($2 ~ /Seeding/)
+#      {
+#              percent = 100;
+#              if($9 == "KiB/s")
+#                      ulspeed = $8;
+#              else if($9 == "MiB/s")
+#                      ulspeed = $8 * 1024.0;
+#              else if($9 == "GiB/s")
+#                      ulspeed = $8 * 1024.0 * 1024.0;
+#              else
+#                      ulspeed = "?";
+#      }
+       if($2 !~ /Progress/)
+       {
+               percent = $3;
+
+               if($10 = "KiB/s")
+                       ulspeed = $9;
+               else if($10 == "MiB/s")
+                       ulspeed = $9 * 1024.0;
+               else if($10 == "GiB/s")
+                       ulspeed = $9 * 1024.0 * 1024.0;
+               else
+                       ulspeed = "?";
+
+               if($15 = "KiB/s")
+                       dlspeed = $14;
+               else if($15 == "MiB/s")
+                       dlspeed = $14 * 1024.0;
+               else if($15 == "GiB/s")
+                       dlspeed = $14 * 1024.0 * 1024.0;
+               else
+                       dlspeed = "?";
+       }       
+
+       printf "%d %.2f %.2f %.2f\n", rel_time, percent, ulspeed, dlspeed;
 }'
+
+#cat $1 | tr '\r' '\n' | grep 'Progress:' | awk -F '[ \t(),;%]+' '
+#BEGIN {
+#}
+#
+#{
+#      rel_time = $1;
+#      percent = $3;
+#
+#      if($10 = "KiB/s")
+#              ulspeed = $9;
+#      else if($10 == "MiB/s")
+#              ulspeed = $9 * 1024.0;
+#      else if($10 == "GiB/s")
+#              ulspeed = $9 * 1024.0 * 1024.0;
+#      else
+#              ulspeed = "?";
+#
+#      if($15 = "KiB/s")
+#              ulspeed = $14;
+#      else if($15 == "MiB/s")
+#              ulspeed = $14 * 1024.0;
+#      else if($15 == "GiB/s")
+#              ulspeed = $14 * 1024.0 * 1024.0;
+#      else
+#              ulspeed = "?";
+#      
+#      printf "%d %.2f %.2f %.2f\n", rel_time, percent, ulspeed, dlspeed;
+#}'