X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yoweb-scrape;h=e7e3ec79bd44d952dee663d0874324d805449014;hp=3c42f7e6bfcb4ca16ffdec44463c2cab40722e49;hb=9e7deaa661702a20b4aaca1967b572290edfec1a;hpb=22cf24aa11e3994f91c285fe96434025a731f4ac

diff --git a/yoweb-scrape b/yoweb-scrape
index 3c42f7e..e7e3ec7 100755
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -89,8 +89,9 @@ class Fetcher:
 			ages.append(age)
 		return ages
 
-	def need_wait(self, now):
+	def need_wait(self, now, imaginary=[]):
 		ages = self._cache_scan(now)
+		ages += imaginary
 		ages.sort()
 		debug('Fetcher   ages ' + `ages`)
 		min_age = 1
@@ -247,7 +248,7 @@ u'\\s*\\S*/([-A-Za-z]+)\\s*$|\\s*\\S*/\\S*\\s*\\(ocean\\-wide(?:\\s|\\xa0)+([-A-
 				skl.msg('puzzle "%s" no standing found' % puzzle)
 				continue
 			standing = sl[0]
-			for i in range(0, len(standingvals)-1):
+			for i in range(0, len(standingvals)):
 				if standing == standingvals[i]:
 					self.standings[puzzle] = i
 			if not puzzle in self.standings:
@@ -417,8 +418,23 @@ class PirateAboard:
 		pa.pi = None
 
 	def pirate_info(pa):
-		if not pa.pi and not fetcher.need_wait(time.time()):
-			pa.pi = PirateInfo(pa.name, 3600)
+		now = time.time()
+		if pa.pi:
+			age = now - pa.pi_fetched
+			guide = random.randint(120,240)
+			if age <= guide:
+				return pa.pi
+			debug('PirateAboard refresh %d > %d  %s' % (
+				age, guide, pa.name))
+			imaginary = [2,6]
+		else:
+			imaginary = [1]
+		wait = fetcher.need_wait(now, imaginary)
+		if wait:
+			debug('PirateAboard fetcher not ready %d' % wait)
+			return pa.pi
+		pa.pi = PirateInfo(pa.name, 600)
+		pa.pi_fetched = now
 		return pa.pi
 
 class ChatLogTracker:
@@ -429,18 +445,29 @@ class ChatLogTracker:
 		self._pl = {}	# self._pl['Pirate'] =
 		self._vl = {}	#   self._vl['Vessel']['Pirate'] = PirateAboard
 				# self._vl['Vessel']['#lastinfo']
-		self._v = None		# self._v =
-		self._vessel = None	#	self._vl[self._vessel]
+				# self._vl['Vessel']['#name']
+				# self._v = self._vl[self._vessel]
 		self._date = None
 		self._myself = myself_pi
-		self._need_redisplay = False
 		self._f	= file(logfn)
 		self._lbuf = ''
 		self._progress = [0, os.fstat(self._f.fileno()).st_size]
+		self._disembark_myself()
+		self._need_redisplay = False
+		self._lastvessel = None
+
+	def _disembark_myself(self):
+		self._v = None
+		self._vessel = None
+		self.force_redisplay()
 
 	def force_redisplay(self):
 		self._need_redisplay = True
 
+	def _vessel_updated(self, v, timestamp):
+		v['#lastinfo'] = timestamp
+		self.force_redisplay()
+
 	def _onboard_event(self,v,timestamp,pirate,event):
 		pa = self._pl.get(pirate, None)
 		if pa is not None and pa.v is v:
@@ -451,44 +478,110 @@ class ChatLogTracker:
 			pa = PirateAboard(pirate, v, timestamp, event)
 			self._pl[pirate] = pa
 			v[pirate] = pa
-		v['#lastinfo'] = timestamp
-		self.force_redisplay()
+		self._vessel_updated(v, timestamp)
 		return pa
 
 	def _trash_vessel(self, v):
 		for pn in v:
 			if pn.startswith('#'): continue
 			del self._pl[pn]
+		vn = v['#name']
+		del self._vl[vn]
+		if v is self._v: self._disembark_myself()
 		self.force_redisplay()
 
+	def _vessel_stale(self, v, timestamp):
+		return timestamp - v['#lastinfo'] > opts.ship_reboard_clearout
+
+	def _vessel_check_expire(self, v, timestamp):
+		if not self._vessel_stale(v, timestamp):
+			return v
+		self._debug_line_disposition(timestamp,'',
+			'stale-reset ' + v['#name'])
+		self._trash_vessel(v)
+		return None
+
 	def expire_garbage(self, timestamp):
-		for (vn,v) in list(self._vl.iteritems()):
-			la = v['#lastinfo']
-			if timestamp - la > opts.ship_reboard_clearout:
-				self._debug_line_disposition(timestamp,'',
-					'stale reset '+vn)
-				self._trash_vessel(v)
-				del self._vl[vn]
-
-	def _create_vessel(self, vn, timestamp):
-		self._vl[vn] = v = { '#lastinfo': timestamp }
-		return v
+		for v in self._vl.values():
+			self._vessel_check_expire(v, timestamp)
 
-	def _update_vessel_lookup(self, vn, timestamp, dml):
+	def _vessel_lookup(self, vn, timestamp, dml=[], create=False):
 		v = self._vl.get(vn, None)
-		if v is None:
-			dml.append('new')
-			v = self._create_vessel(vn, timestamp)
-		elif timestamp - v['#lastinfo'] > opts.ship_reboard_clearout:
-			dml.append('stale')
-			self._trash_vessel(v)
-			v = self._create_vessel(vn, timestamp)
-		else:
-			dml.append('current')
+		if v is not None:
+			v = self._vessel_check_expire(v, timestamp)
+		if v is not None:
+			dml.append('found')
+			return v
+		if not create:
+			dml.append('no')
+		dml.append('new')
+		self._vl[vn] = v = { '#name': vn }
+		self._vessel_updated(v, timestamp)
 		return v
 
+	def _find_matching_vessel(self, pattern, timestamp, cmdr,
+					dml=[], create=False):
+		# use when a commander pirate `cmdr' specified a vessel
+		#  by name `pattern' (either may be None)
+		# if create is true, will create the vessel
+		#  record if an exact name is specified
+
+		if (pattern is not None and
+		    not '*' in pattern
+		    and len(pattern.split(' ')) == 2):
+			vn = pattern.title()
+			dml.append('exact')
+			return self._vessel_lookup(
+				vn, timestamp, dml=dml, create=create)
+
+		if pattern is None:
+			pattern_check = lambda vn: True
+		else:
+			re = '(?:.* )?%s$' % pattern.lower().replace('*','.+')
+			pattern_check = regexp.compile(re, regexp.I).match
+
+		tries = []
+
+		cmdr_pa = self._pl.get(cmdr, None)
+		if cmdr_pa: tries.append((cmdr_pa.v, 'cmdr'))
+
+		tries.append((self._v, 'here'))
+		tried_vns = []
+
+		for (v, dm) in tries:
+			if v is None: dml.append(dm+'?'); continue
+			
+			vn = v['#name']
+			if not pattern_check(vn):
+				tried_vns.append(vn)
+				dml.append(dm+'#')
+				continue
+
+			dml.append(dm+'!')
+			return v
+
+		if pattern is not None and '*' in pattern:
+			search = [
+				(vn,v)
+				for (vn,v) in self._vl.iteritems()
+				if not self._vessel_stale(v, timestamp)
+				if pattern_check(vn)
+				]
+			#debug('CLT-RE /%s/ wanted (%s) searched (%s)' % (
+			#	re,
+			#	'/'.join(tried_vns),
+			#	'/'.join([vn for (vn,v) in search])))
+
+			if len(search)==1:
+				dml.append('one')
+				return search[0][1]
+			elif search:
+				dml.append('many')
+			else:
+				dml.append('none')
+
 	def _debug_line_disposition(self,timestamp,l,m):
-		debug('CLT %13s %-30s %s' % (timestamp,m,l))
+		debug('CLT %13s %-40s %s' % (timestamp,m,l))
 
 	def chatline(self,l):
 		rm = lambda re: regexp.match(re,l)
@@ -534,13 +627,18 @@ class ChatLogTracker:
 			del v[pirate]
 			del self._pl[pirate]
 
+		def disembark_me(why):
+			self._disembark_myself()
+			return d('disembark-me '+why)
+
 		m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
 		if m:
 			dm = ['boarding']
 			pn = self._myself.name
-			self._vessel = vn = m.group(1)
-			self._v = self._update_vessel_lookup(vn, timestamp, dm)
-
+			vn = m.group(1)
+			v = self._vessel_lookup(vn, timestamp, dm, create=True)
+			self._lastvessel = self._vessel = vn
+			self._v = v
 			ob_x(pn, 'we boarded')
 			self.expire_garbage(timestamp)
 			return d(' '.join(dm))
@@ -580,11 +678,11 @@ class ChatLogTracker:
 			(cmdr, metacmd) = m.groups()
 			metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
 			m2 = regexp.match(
-				'/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
+				'/([ad]) (?:([A-Za-z* ]+)\\s*:)?([A-Za-z ]+)$',
 				metacmd)
 			if not m2: return chat(chan)
 
-			(cmd, vn, targets) = m2.groups()
+			(cmd, pattern, targets) = m2.groups()
 			dml = ['cmd', chan, cmd]
 
 			if cmd == 'a': each = self._onboard_event
@@ -592,32 +690,20 @@ class ChatLogTracker:
 
 			if cmdr == self._myself.name:
 				dml.append('self')
-				how = 'manual: /%s' % cmd
+				how = 'cmd: %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')
+				how = 'cmd: %s %s' % (cmd,cmdr)
+
+			v = self._find_matching_vessel(
+				pattern, timestamp, cmdr, dml, create=True)
 
 			if v is not None:
 				targets = targets.strip().split(' ')
 				dml.append(`len(targets)`)
 				for target in targets:
 					each(v, timestamp, target.title(), how)
+				self._vessel_updated(v, timestamp)
 
 			dm = ' '.join(dml)
 			chat_core(cmdr, 'cmd '+chan)
@@ -641,32 +727,49 @@ class ChatLogTracker:
 		m = rm('(\\w+) officer chats, "(.*)"$')
 		if m: return chat_metacmd('officer')
 
+		m = rm('Ye accepted the offer to job with ')
+		if m: return disembark_me('jobbing')
+
+		m = rm('Ye hop on the ferry and are whisked away ')
+		if m: return disembark_me('ferry')
+
+		m = rm('Whisking away to yer home on the magical winds')
+		if m: return disembark_me('home')
+
 		m = rm('Game over\\.  Winners: ([A-Za-z, ]+)\\.$')
 		if m:
 			pl = m.group(1).split(', ')
 			if not self._myself.name in pl:
-				return d('lost boarding battle')
+				return d('lost melee')
 			for pn in pl:
 				if ' ' in pn: continue
-				ob_x(pn,'won boarding battle')
-			return d('won boarding battle')
+				ob_x(pn,'won melee')
+			return d('won melee')
 
 		m = rm('(\\w+) is eliminated\\!')
 		if m: return ob1('eliminated in fray');
 
+		m = rm('(\\w+) has driven \w+ from the ship\\!')
+		if m: return ob1('boarder repelled');
+
+		m = rm('\w+ has bested (\\w+), and turns'+
+			' to the rest of the ship\\.')
+		if m: return ob1('boarder unrepelled');
+
 		m = rm('(\\w+) has left the vessel\.')
 		if m:
 			pirate = m.group(1)
 			disembark(self._v, timestamp, pirate, 'disembarked')
 			return d('disembarked')
 
-		return d('not matched')
+		return d('not-matched')
 
 	def _str_vessel(self, vn, v):
 		s = ' vessel %s\n' % vn
 		s += ' '*20 + "%-*s   %13s\n" % (
 				max_pirate_namelen, '#lastinfo',
 				v['#lastinfo'])
+		assert v['#name'] == vn
 		for pn in sorted(v.keys()):
 			if pn.startswith('#'): continue
 			pa = v[pn]
@@ -721,14 +824,22 @@ class ChatLogTracker:
 	def myname(self):
 		# returns our pirate name
 		return self._myself.name
-	def vessel(self):
-		# returns the vessel we're aboard or None
+	def vesselname(self):
+		# returns the vessel name we're aboard or None
 		return self._vessel
-	def aboard(self):
-		# returns a list of PirateAboard sorted by name
-		if self._v is None: return []
-		return [ self._v[pn]
-			 for pn in sorted(self._v.keys())
+	def lastvesselname(self):
+		# returns the last vessel name we were aboard or None
+		return self._lastvessel
+	def aboard(self, vesselname=True):
+		# returns a list of PirateAboard the vessel
+		#  sorted by pirate name
+		#  you can pass this None and you'll get []
+		#  or True for the current vessel (which is the default)
+		if vesselname is True: v = self._v
+		else: v = self._vl.get(vesselname.title())
+		if v is None: return []
+		return [ v[pn]
+			 for pn in sorted(v.keys())
 			 if not pn.startswith('#') ]
 
 #---------- implementations of actual operation modes ----------
@@ -789,9 +900,9 @@ def prep_chat_log(args, bu,
 	if not match: bu('chat log filename is not in expected format')
 	(pirate, ocean) = match.groups()
 	fetcher.default_ocean(ocean)
-	
-	myself = PirateInfo(pirate,max_myself_age)
+
 	progress.show_init(pirate, fetcher.ocean)
+	myself = PirateInfo(pirate,max_myself_age)
 	track = ChatLogTracker(myself, logfn)
 
 	opts.debug -= 2
@@ -888,21 +999,29 @@ def do_ship_aid(args, bu):
 
 	displayer.realstart()
 
+	def find_vessel():
+		vn = track.vesselname()
+		if vn: return (vn, " on board the %s" % vn)
+		vn = track.lastvesselname()
+		if vn: return (vn, " ashore from the %s" % vn)
+		return (None, " not on a vessel")
+
+	displayer.show(track.myname() + find_vessel()[1] + '...')
+
 	while True:
 		track.catchup()
 		now = time.time()
 
-		s = "%s" % track.myname()
-
-		vn = track.vessel()
-		if vn is None: s += " not on a vessel?!"
-		else: s += " on board the %s" % vn
+		(vn, s) = find_vessel()
+		s = track.myname() + s
 		s += " at %s\n" % time.strftime("%Y-%m-%d %H:%M:%S")
 
 		tbl = StandingsTable()
 		tbl.headings()
 
-		for pa in track.aboard():
+		aboard = track.aboard(vn)
+
+		for pa in aboard:
 			pi = pa.pirate_info()
 
 			xs = ''