chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes made by me in ceb's working version
[ypp-sc-tools.db-test.git]
/
yoweb-scrape
diff --git
a/yoweb-scrape
b/yoweb-scrape
index a7f4c9be10faab9bceef1439ee44e3fdb59789f1..5e24e57e749fb6f5657f19963cd518a109e7389a 100755
(executable)
--- 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]
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)
@@
-739,7
+739,10
@@
def do_ship_aid(args, bu):
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"))