From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 17 May 2009 01:07:09 +0000 (+0100)
Subject: fixes made by me in ceb's working version
X-Git-Tag: 1.0~49^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=43e1a827c400f0c686936d52e91555eec44517d0

fixes made by me in ceb's working version
 * sane handling of log filenames
 * do not quit immediately of user does not start on a ship
---

diff --git a/yoweb-scrape b/yoweb-scrape
index a7f4c9b..5e24e57 100755
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -693,9 +693,9 @@ def prep_chat_log(args, bu,
 		max_myself_age=3600):
 	if len(args) != 1: bu('this action takes only chat log filename')
 	logfn = args[0]
-	logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_chat-log-\\w+$'
+	logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_'
 	match = regexp.match(logfn_re, logfn)
-	if not match: bu('chat log filename is not in default format')
+	if not match: bu('chat log filename is not in expected format')
 	(pirate, fetcher.ocean) = match.groups()
 	
 	myself = PirateInfo(pirate,max_myself_age)
@@ -739,7 +739,10 @@ def do_ship_aid(args, bu):
 		s = "%s" % track.myname()
 
 		vn = track.vessel()
-		if vn is None: print s + " ...?"; return
+		if vn is None:
+			print s + " ...?"
+			time.sleep(1)
+			continue
 
 		s += " on board the %s at %s\n" % (
 			vn, time.strftime("%Y-%m-%d %H:%M:%S"))