* sane handling of log filenames
* do not quit immediately of user does not start on a ship
max_myself_age=3600):
if len(args) != 1: bu('this action takes only chat log filename')
logfn = args[0]
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)
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)
(pirate, fetcher.ocean) = match.groups()
myself = PirateInfo(pirate,max_myself_age)
s = "%s" % track.myname()
vn = track.vessel()
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"))
s += " on board the %s at %s\n" % (
vn, time.strftime("%Y-%m-%d %H:%M:%S"))