X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yoweb-scrape;h=7db7afac44400fe17ae3ae0e4b3a904d994c2c40;hp=93ce3177b59d5370da7b90544b9bd21a98ec5990;hb=57d3c622af5045dcfe1566cf6600de48e4924265;hpb=d759000ee3d3e189ab8e8305ec0ea97bc9889e5a

diff --git a/yoweb-scrape b/yoweb-scrape
index 93ce317..7db7afa 100755
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -523,9 +523,10 @@ class ChatLogTracker:
 		def ob1(did): ob_x(m.group(1), did); return d(did)
 		def oba(did): return ob1('%s %s' % (did, m.group(2)))
 
-		def disembark(pirate, event):
-			ob_x(pirate, 'leaving '+event)
-			del self._v[pirate]
+		def disembark(v, timestamp, pirate, event):
+			self._onboard_event(
+					v, timestamp, pirate, 'leaving '+event)
+			del v[pirate]
 			del self._pl[pirate]
 
 		m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
@@ -575,23 +576,43 @@ class ChatLogTracker:
 			if not m2: return chat(what)
 
 			(cmd, vn, targets) = m2.groups()
+			dml = ['metachat', cmd]
 
-			if cmdr == self._myself.name: how = 'manual: /%s' % cmd
-			else: how = '/%s %s' % (cmd,cmdr)
-			if cmd == 'a': each = ob_x
+			if cmd == 'a': each = self._onboard_event
 			else: each = disembark
 
-			if vn is not None:
-				vn = vn.title()
-				if not regexp.match(
-						'(?:.* )?' + vn + '$',
-						self._vessel):
-					return chat('/%s %s:' % (cmd,vn))
+			if cmdr == self._myself.name:
+				dml.append('self')
+				how = 'manual: /%s' % cmd
+			else:
+				dml.append('other')
+				how = '/%s %s' % (cmd,cmdr)
+
+			v = None
+			if vn is not None and len(vn.split(' ')) == 2:
+				v = self._update_vessel_lookup(
+					vn.title(), timestamp, dml)
+			elif self._v is None:
+				dml.append('no-current')
+			elif vn is None:
+				dml.append('current')
+				v = self._v
+			elif regexp.match('(?:.* )?%s$' % vn.title(),
+					self._vessel):
+				dml.append('match')
+				v = self._v
+			else:
+				dml.append('unk-abbrev')
+
+			if v is None:
+				return d(' '.join(dml))
+
+			targets = targets.strip().split(' ')
+			dml.append(`len(targets)`)
+			for target in targets:
+				each(v, timestamp, target.title(), how)
 
-			for target in targets.split(' '):
-				if not target: continue
-				each(target.title(), how)
-			return d('/%s' % cmd)
+			return d(' '.join(dml))
 
 		m = rm('(\\w+) (?:issued an order|ordered everyone) "')
 		if m: return ob1('general order');
@@ -626,7 +647,8 @@ class ChatLogTracker:
 
 		m = rm('(\\w+) has left the vessel\.')
 		if m:
-			disembark(m.group(1), 'disembarked')
+			pirate = m.group(1)
+			disembark(self._v, timestamp, pirate, 'disembarked')
 			return d('disembarked')
 
 		return d('not matched')