From 70a3bd11660ddac8e45c059c7a1db0a33a26c344 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Thu, 21 Feb 2019 02:27:28 -0500
Subject: [PATCH] turtle status

---
 core/Follow.lua     | 20 +++++++++++---------
 core/apis/swarm.lua |  2 +-
 miners/etc/apps.db  |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/Follow.lua b/core/Follow.lua
index 74b8162..abe885d 100644
--- a/core/Follow.lua
+++ b/core/Follow.lua
@@ -78,7 +78,6 @@ end
 
 local function follow(member)
   local turtle = member.turtle
-  turtle.setStatus('follow ' .. member.id)
   turtle.reset()
   turtle.set({
     digPolicy = page.mode.value,
@@ -108,9 +107,17 @@ local function follow(member)
   end
 end
 
-function swarm:onRemove(member)
+function swarm:onRemove(member, status, message)
   if member.socket then
     member.turtle.set({ status = 'idle' })
+    member.turtle.abort(true)
+  end
+  if member.snmp then
+    member.snmp:close()
+    member.snmp = nil
+  end
+  if not status then
+    _G._debug(message)
   end
 end
 
@@ -139,7 +146,7 @@ end
 Event.addRoutine(function()
   while true do
     local pt = GPS.getPoint()
-    if pt and not Point.same(pt, gpt) then
+    if not pts or (pt and not Point.same(pt, gpt)) then
       gpt = pt
       pts = {
         { x = pt.x + 2, z = pt.z,     y = pt.y },
@@ -171,12 +178,7 @@ Event.addRoutine(function()
   end
 end)
 
---swarm:run(follow)
-
 UI:setPage(page)
 UI:pullEvents()
 
-for _, member in pairs(swarm.pool) do
-  member.snmp:write({ type = 'scriptEx', args = 'turtle.abort(true)' })
-  member.snmp:close()
-end
+swarm:stop()
diff --git a/core/apis/swarm.lua b/core/apis/swarm.lua
index 69b49b9..94e5de5 100644
--- a/core/apis/swarm.lua
+++ b/core/apis/swarm.lua
@@ -50,7 +50,7 @@ function Swarm:remove(id, s, m)
       member.socket = nil
     end
     if member.handler then
-      Event.terminate(member.handler)
+      member.handler:terminate()
       member.handler = nil
     end
   end
diff --git a/miners/etc/apps.db b/miners/etc/apps.db
index e470984..3acf3c3 100644
--- a/miners/etc/apps.db
+++ b/miners/etc/apps.db
@@ -19,7 +19,7 @@
 	},
 	[ "4486006f811b88cacd5f211fd579717e29b600cd" ] = {
 		title = "Multi",
-		category = "Mining",
+		category = "Turtle",
 		icon = "    \0315\\\030 \031  \
  \0304\031f _ \030 \031c/\0315\\\
  \0304   ",