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=ca174e27647efdba100a326e8559e9f6fd62d5c4;hp=493ef53fcffc77825a31cf40dad8c9494cd80f15;hb=f6ea97a00f4890926e35de02645891f93c0d65a4;hpb=46fafd1982761ccb564d29a625528692abb4cd7c diff --git a/yoweb-scrape b/yoweb-scrape index 493ef53..ca174e2 100755 --- a/yoweb-scrape +++ b/yoweb-scrape @@ -10,6 +10,7 @@ import urllib2 import errno import sys import re as regexp +import random from optparse import OptionParser from BeautifulSoup import BeautifulSoup @@ -27,7 +28,7 @@ standingvals = ('Able/Distinguished/Respected/Master'+ pirate_ref_re = regexp.compile('^/yoweb/pirate\\.wm') -max_pirate_namelen = 20 +max_pirate_namelen = 12 def debug(m): @@ -44,6 +45,10 @@ class Fetcher: if oe.errno != errno.EEXIST: raise self._cache_scan(time.time()) + def _default_ocean(self): + if self.ocean is None: + self.ocean = 'ice' + def _cache_scan(self, now): # returns list of ages, unsorted ages = [] @@ -72,12 +77,12 @@ class Fetcher: min_age = 1 need_wait = 0 for age in ages: - if age < min_age: + if age < min_age and age < 300: debug('Fetcher morewait min=%d age=%d' % (min_age, age)) need_wait = max(need_wait, min_age - age) - min_age += 1 - min_age *= 1.5 + min_age += 3 + min_age *= 1.25 if need_wait > 0: debug('Fetcher wait %d' % need_wait) time.sleep(need_wait) @@ -91,12 +96,12 @@ class Fetcher: if oe.errno != errno.ENOENT: raise f = None now = time.time() - max_age = max(opts.min_max_age, max(max_age, opts.expire_age)) + max_age = max(opts.min_max_age, min(max_age, opts.expire_age)) if f is not None: s = os.fstat(f.fileno()) age = now - s.st_mtime if age > max_age: - debug('Fetcher stale') + debug('Fetcher stale %d < %d'% (max_age, age)) f = None if f is not None: data = f.read() @@ -119,6 +124,7 @@ class Fetcher: return data def yoweb(self, kind, tail, max_age): + self._default_ocean() url = 'http://%s.puzzlepirates.com/yoweb/%s%s' % ( self.ocean, kind, tail) return self.fetch(url, max_age) @@ -149,6 +155,7 @@ class SomethingSoupInfo(SoupLog): class PirateInfo(SomethingSoupInfo): # Public data members: # pi.standings = { 'Treasure Haul': 'Able' ... } + # pi.name = name # pi.crew = (id, name) # pi.flag = (id, name) # pi.msgs = [ 'message describing problem with scrape' ] @@ -156,6 +163,7 @@ class PirateInfo(SomethingSoupInfo): def __init__(self, pirate, max_age=300): SomethingSoupInfo.__init__(self, 'pirate.wm?target=', pirate, max_age) + self.name = pirate self._find_standings() self.crew = self._find_crewflag('crew', '^/yoweb/crew/info\\.wm') @@ -208,7 +216,7 @@ u'\\s*\\S*/([-A-Za-z]+)\\s*$|\\s*\\S*/\\S*\\s*\\(ocean\\-wide(?:\\s|\\xa0)+([-A- skl.msg('puzzle "%s" multiple standings %s' % (puzzle, `sl`)) continue - if not len(sl): + if not sl: skl.msg('puzzle "%s" no standing found' % puzzle) continue standing = sl[0] @@ -292,31 +300,50 @@ class CrewInfo(SomethingSoupInfo): return `(self.crew, self.msgs)` class StandingsTable: - def __init__(self, use_puzzles=puzzles): + def __init__(self, use_puzzles=None, col_width=6): + if use_puzzles is None: + if opts.ship_duty: + use_puzzles=[ + 'Navigating','Battle Navigation', + 'Gunning', + ['Sailing','Rigging'], + 'Bilging', + 'Carpentry', + 'Treasure Haul' + ] + else: + use_puzzles=puzzles self._puzzles = use_puzzles self.s = '' + self._cw = col_width-1 def _pline(self, pirate, puzstrs): - self.s += '%-*s' % (max_pirate_namelen, pirate) + self.s += ' %-*s' % (max(max_pirate_namelen, 14), pirate) for v in puzstrs: - self.s += ' %-*.*s' % (5,5, v) + self.s += ' %-*.*s' % (self._cw,self._cw, v) self.s += '\n' def _puzstr(self, pi, puzzle): if not isinstance(puzzle,list): puzzle = [puzzle] try: standing = max([pi.standings[p] for p in puzzle]) except KeyError: return '?' - c1 = standingvals[standing][0] - if standing < 3: c1 = c1.lower() # 3 = Master - hashes = '*' * (standing / 2) - equals = '+' * (standing % 2) - return c1 + hashes + equals + if not standing: return '' + s = '' + if self._cw > 4: + c1 = standingvals[standing][0] + if standing < 3: c1 = c1.lower() # 3 = Master + s += `standing` + if self._cw > 5: + s += ' ' + s += '*' * (standing / 2) + s += '+' * (standing % 2) + return s def headings(self): def puzn_redact(name): if isinstance(name,list): return '/'.join( - ["%.2s" % puzn_redact(n) + ["%.*s" % (self._cw/2, puzn_redact(n)) for n in name]) spc = name.find(' ') if spc < 0: return name @@ -324,10 +351,9 @@ class StandingsTable: self._pline('', map(puzn_redact, self._puzzles)) def literalline(self, line): self.s += line + '\n' - def pirate(self, pirate): - pi = PirateInfo(pirate, 600) + def pirate(self, pi): puzstrs = [self._puzstr(pi,puz) for puz in self._puzzles] - self._pline(pirate, puzstrs) + self._pline(pi.name, puzstrs) def results(self): return self.s @@ -341,8 +367,8 @@ def do_pirate(pirates, bu): def prep_crew_of(args, bu, max_age=300): if len(args) != 1: bu('crew-of takes one pirate name') - pi = PirateInfo(args[0]) - return CrewInfo(pi.crew[0]) + pi = PirateInfo(args[0], max_age) + return CrewInfo(pi.crew[0], max_age) def do_crew_of(args, bu): ci = prep_crew_of(args, bu) @@ -356,9 +382,147 @@ def do_standings_crew_of(args, bu): if not members: continue tab.literalline('%s:' % rank) for p in members: - tab.pirate(p) + pi = PirateInfo(p, random.randint(900,1800)) + tab.pirate(pi) print tab.results() +class PirateAboard: + # pa.v + # pa.last_time + # pa.last_event + # pa.gunner + def __init__(pa, v, time, event): + pa.v = v + pa.last_time = time + pa.last_event = event + pa.gunner = False + +class ShipCrewTracker: + def __init__(self, myself_pi): + self._pl = {} # self._pl['Pirate'] = + self._vl = {} # self._vl['Vessel']['Pirate'] = PirateAboard + # self._vl['Vessel']['#lastaboard'] + self._v = None # self._v = + self._vessel = None # self._vl[self._vessel] + self._date = None + self._myself = myself_pi + self._need_redisplay = False + + def _refresh(self): + self._need_redisplay = True + + def _onboard_event(self,timestamp,pirate,event): + try: pa = self._pl[pirate] + except KeyError: pa = None + if pa is not None and pa.v is self._v: + pa.last_time = timestamp + pa.last_event = event + else: + if pa is not None: del pa.v[pirate] + pa = PirateAboard(self._v, timestamp, event) + self._pl[pirate] = pa + self._v[pirate] = pa + self._v['#lastaboard'] = timestamp + self._refresh() + return pa + + def clear_vessel(self, timestamp): + if self._v is not None: + for p in self._v: + if p.startswith('#'): continue + del self._pl[p] + self._v = {'#lastaboard': timestamp} + + def _warn(self, m): + pass + + def chatline(self,l): + rm = lambda re: regexp.match(re,l) + m = rm('=+ (\\d+)/(\\d+)/(\\d+) =+$') + if m: + self._date = m.groups() + return + if self._date is None: + return + m = rm('\\[(\d\d):(\d\d):(\d\d)\\] ') + if not m: + self._warn('undated? '+l) + return + + time_tuple = [int(x) for x in self._date + m.groups()] + time_tuple += (-1,-1,-1) + print `time_tuple` + timestamp = time.mktime(time_tuple) + l = l[l.find(' ')+1:] + + ob = lambda who, event: self._onboard_event( + timestamp, who, event) + oba = lambda m, did: ob( + m.group(1), '%s %s' % (did, m.group(2))) + + m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$') + if m: + self._vessel = m.group(1) + try: self._v = self._vl[self._vessel] + except KeyError: self._v = None + if self._v is not None: la = self._v['#lastaboard'] + else: la = 0 + if timestamp - la > 3600: + self.clear_vessel(timestamp) + ob(self._myself.name, 'we boarded') + + if self._v is None: return + + m = rm('You have ordered (\\w+) to do some (\\S.*\\S)\\.$') + if m: + pa = oba(m, 'ordered') + if m.group(2) == 'Gunning': + pa.gunner = True + return + + m = rm('(\\w+) abandoned a (\\S.*\\S) station\\.$') + if m: oba(m,'abandoned'); return + + m = rm('(\\w+) says, "') + if m: ob(m.group(1), 'talked'); return + + m = rm('(\\w+) has left the vessel\.') + if m: + who = m.group(1) + ob(who, 'disembarked') + del self._v[who] + del self._pl[who] + return + + return + +def do_ship_aid(args, bu): + if len(args) != 1: bu('ship-aid takes only chat log filename') + logfn = args[0] + logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_chat-log-\\w+$' + match = regexp.match(logfn_re, logfn) + if not match: bu('ship-aid chat log filename is not in default format') + (pirate, fetcher.ocean) = match.groups() + myself_pi = PirateInfo(pirate,3600) + track = ShipCrewTracker(myself_pi) + f = file(logfn) + l = '' + while True: + print "1>"+l+"<" + l += f.readline() + if l.endswith('\n'): + l.rstrip() + print "2>"+l+"<" + track.chatline(l) +# print `track.__dict__` + l = '' + continue + if l: + continue + print "3>EOF<" + print `track.__dict__` + os.sleep(1) + def main(): global opts, fetcher @@ -368,10 +532,10 @@ actions: yoweb-scrape [--ocean OCEAN ...] pirate PIRATE yoweb-scrape [--ocean OCEAN ...] crew-of PIRATE yoweb-scrape [--ocean OCEAN ...] standings-crew-of PIRATE + yoweb-scrape [--ocean OCEAN ...] ship-aid CHAT-LOG ''') ao = pa.add_option - ao('-O','--ocean',dest='ocean', metavar='OCEAN', - default='ice', + ao('-O','--ocean',dest='ocean', metavar='OCEAN', default=None, help='select ocean OCEAN') ao('--cache-dir', dest='cache_dir', metavar='DIR', default='~/.yoweb-scrape-cache', @@ -380,7 +544,12 @@ actions: help='enable debugging output') ao('-q','--quiet', action='store_true', dest='quiet', help='suppress warning output') + + ao('--ship-duty', action='store_true', dest='ship_duty', + help='show ship duty station puzzles') + (opts,args) = pa.parse_args() + random.seed() if len(args) < 1: pa.error('need a mode argument')