X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yoweb-scrape;h=b62ce0037528b1db9684d2484bc3dae9c0250bdb;hp=03607451167a1d831c77f8137ad525e8783388ec;hb=ed817cf1be071a52992d8dd9fabc2437472d8085;hpb=c1f55148710340aad66796dab67e5b7376f04f9b

diff --git a/yoweb-scrape b/yoweb-scrape
index 0360745..b62ce00 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
@@ -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:
@@ -521,7 +537,7 @@ class ChatLogTracker:
 		if pattern is None:
 			pattern_check = lambda vn: True
 		else:
-			re = '(?:.* )?%s$' % pattern.lower().replace('*','.*')
+			re = '(?:.* )?%s$' % pattern.lower().replace('*','.+')
 			pattern_check = regexp.compile(re, regexp.I).match
 
 		tries = []