X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yoweb-scrape;h=29af391a5257329bc5c42be7def11fc908a631b5;hb=cf4c8a428ee34d085c4557036521d098bc1901cc;hp=93ce3177b59d5370da7b90544b9bd21a98ec5990;hpb=d759000ee3d3e189ab8e8305ec0ea97bc9889e5a;p=ypp-sc-tools.main.git

diff --git a/yoweb-scrape b/yoweb-scrape
index 93ce317..29af391 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)\\.\\.\\.$')
@@ -556,42 +557,66 @@ class ChatLogTracker:
 		m = rm('(\\w+) abandoned a (\\S.*\\S) station\\.$')
 		if m: oba('stopped'); return d("end")
 
-		def chat(what):
-			who = m.group(1)
-			try: pa = self._pl[who]
-			except KeyError: return d('chat mystery')
-			if pa.v is self._v:
-				pa.last_chat_time = timestamp
-				pa.last_chat_chan = what
-				self.force_redisplay()
-				return d('chat '+what)
-
-		def chat_metacmd(what):
+		def chat_core(speaker, chan):
+			try: pa = self._pl[speaker]
+			except KeyError: return 'mystery'
+			if pa.v is not self._v: return 'elsewhere'
+			pa.last_chat_time = timestamp
+			pa.last_chat_chan = chan
+			self.force_redisplay()
+			return 'here'
+
+		def chat(chan):
+			speaker = m.group(1)
+			dm = chat_core(speaker, chan)
+			return d('chat %s %s' % (chan, dm))
+
+		def chat_metacmd(chan):
 			(cmdr, metacmd) = m.groups()
 			metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
 			m2 = regexp.match(
 				'/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
 				metacmd)
-			if not m2: return chat(what)
+			if not m2: return chat(chan)
 
 			(cmd, vn, targets) = m2.groups()
+			dml = ['cmd', chan, 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 not None:
+				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)
+			dm = ' '.join(dml)
+			chat_core(cmdr, 'cmd '+chan)
+			return d(dm)
 
 		m = rm('(\\w+) (?:issued an order|ordered everyone) "')
 		if m: return ob1('general order');
@@ -626,7 +651,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')