chiark / gitweb /
Massively improved /officer cmd handling
[ypp-sc-tools.main.git] / yoweb-scrape
index 04e392d..c3e6d73 100755 (executable)
@@ -39,7 +39,12 @@ max_pirate_namelen = 12
 
 def debug(m):
        if opts.debug > 0:
-               print m
+               print >>opts.debug_file, m
+
+def sleep(seconds):
+       if opts.debug > 0:
+               opts.debug_file.flush()
+       time.sleep(seconds)
 
 def format_time_interval(ti):
        if ti < 120: return '%d:%02d' % (ti / 60, ti % 60)
@@ -103,7 +108,7 @@ class Fetcher:
                need_wait = self.need_wait(now)
                if need_wait > 0:
                        debug('Fetcher   wait %d' % need_wait)
-                       time.sleep(need_wait)
+                       sleep(need_wait)
 
        def fetch(self, url, max_age):
                debug('Fetcher fetch %s' % url)
@@ -423,57 +428,143 @@ class ChatLogTracker:
        def __init__(self, myself_pi, logfn):
                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._vl['Vessel']['#lastinfo']
+                               # self._vl['Vessel']['#name']
+                               # self._v = self._vl[self._vessel]
                self._date = None
                self._myself = myself_pi
-               self._need_redisplay = False
                self._f = file(logfn)
                self._lbuf = ''
                self._progress = [0, os.fstat(self._f.fileno()).st_size]
+               self._disembark_myself()
+               self._need_redisplay = False
+
+       def _disembark_myself(self):
+               self._v = None
+               self._vessel = None
+               self.force_redisplay()
 
        def force_redisplay(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:
+       def _vessel_updated(self, v, timestamp):
+               v['#lastinfo'] = timestamp
+               self.force_redisplay()
+
+       def _onboard_event(self,v,timestamp,pirate,event):
+               pa = self._pl.get(pirate, None)
+               if pa is not None and pa.v is v:
                        pa.last_time = timestamp
                        pa.last_event = event
                else:
                        if pa is not None: del pa.v[pirate]
-                       pa = PirateAboard(pirate, self._v, timestamp, event)
+                       pa = PirateAboard(pirate, v, timestamp, event)
                        self._pl[pirate] = pa
-                       self._v[pirate] = pa
-               self._v['#lastaboard'] = timestamp
-               self.force_redisplay()
+                       v[pirate] = pa
+               self._vessel_updated(v, timestamp)
                return pa
 
        def _trash_vessel(self, v):
                for pn in v:
                        if pn.startswith('#'): continue
                        del self._pl[pn]
+               vn = v['#name']
+               del self._vl[vn]
+               if v is self._v: self._disembark_myself()
                self.force_redisplay()
 
+       def _vessel_stale(self, v, timestamp):
+               return timestamp - v['#lastinfo'] > opts.ship_reboard_clearout
+
+       def _vessel_check_expire(self, v, timestamp):
+               if not self._vessel_stale(v, timestamp):
+                       return v
+               self._debug_line_disposition(timestamp,'',
+                       'stale-reset ' + v['#name'])
+               self._trash_vessel(v)
+               return None
+
        def expire_garbage(self, timestamp):
-               for (vn,v) in list(self._vl.iteritems()):
-                       la = v['#lastaboard']
-                       if timestamp - la > opts.ship_reboard_clearout:
-                               self._debug_line_disposition(timestamp,'',
-                                       'stale reset '+vn)
-                               self._trash_vessel(v)
-                               del self._vl[vn]
-
-       def clear_vessel(self, timestamp):
-               if self._v is not None:
-                       self._trash_vessel(self._v)
-               self._v = {'#lastaboard': timestamp}
-               self._vl[self._vessel] = self._v
+               for v in self._vl.values():
+                       self._vessel_check_expire(v, timestamp)
+
+       def _vessel_lookup(self, vn, timestamp, dml=[], create=False):
+               v = self._vl.get(vn, None)
+               if v is not None:
+                       v = self._vessel_check_expire(v, timestamp)
+               if v is not None:
+                       dml.append('found')
+                       return v
+               if not create:
+                       dml.append('no')
+               dml.append('new')
+               self._vl[vn] = v = { '#name': vn }
+               self._vessel_updated(v, timestamp)
+               return v
+
+       def _find_matching_vessel(self, pattern, timestamp, cmdr,
+                                       dml=[], create=False):
+               # use when a commander pirate `cmdr' specified a vessel
+               #  by name `pattern' (either may be None)
+               # if create is true, will create the vessel
+               #  record if an exact name is specified
+
+               if (pattern is not None and
+                   not '*' in pattern
+                   and len(pattern.split(' ')) == 2):
+                       vn = pattern.title()
+                       dml.append('exact')
+                       return self._vessel_lookup(
+                               vn, timestamp, dml=dml, create=create)
+
+               if pattern is None:
+                       pattern_check = lambda vn: True
+               else:
+                       re = '(?:.* )?%s$' % pattern.lower().replace('*','.*')
+                       pattern_check = regexp.compile(re, regexp.I).match
+
+               tries = []
+
+               cmdr_pa = self._pl.get(cmdr, None)
+               if cmdr_pa: tries.append((cmdr_pa.v, 'cmdr'))
+
+               tries.append((self._v, 'here'))
+               tried_vns = []
+
+               for (v, dm) in tries:
+                       if v is None: dml.append(dm+'?'); continue
+                       
+                       vn = v['#name']
+                       if not pattern_check(vn):
+                               tried_vns.append(vn)
+                               dml.append(dm+'#')
+                               continue
+
+                       dml.append(dm+'!')
+                       return v
+
+               if pattern is not None and '*' in pattern:
+                       search = [
+                               (vn,v)
+                               for (vn,v) in self._vl.iteritems()
+                               if not self._vessel_stale(v, timestamp)
+                               if pattern_check(vn)
+                               ]
+                       #debug('CLT-RE /%s/ wanted (%s) searched (%s)' % (
+                       #       re,
+                       #       '/'.join(tried_vns),
+                       #       '/'.join([vn for (vn,v) in search])))
+
+                       if len(search)==1:
+                               dml.append('one')
+                               return search[0][1]
+                       elif search:
+                               dml.append('many')
+                       else:
+                               dml.append('none')
 
        def _debug_line_disposition(self,timestamp,l,m):
-               debug('CLT %13s %-30s %s' % (timestamp,m,l))
+               debug('CLT %13s %-40s %s' % (timestamp,m,l))
 
        def chatline(self,l):
                rm = lambda re: regexp.match(re,l)
@@ -507,35 +598,29 @@ class ChatLogTracker:
 
                l = l[l.find(' ')+1:]
 
-               def ob_x(who,event):
-                       return self._onboard_event(timestamp, who, event)
+               def ob_x(pirate,event):
+                       return self._onboard_event(
+                                       self._v, timestamp, pirate, event)
                def ob1(did): ob_x(m.group(1), did); return d(did)
                def oba(did): return ob1('%s %s' % (did, m.group(2)))
 
-               def disembark(who, how):
-                       ob_x(who, 'leaving '+how)
-                       del self._v[who]
-                       del self._pl[who]
+               def disembark(v, timestamp, pirate, event):
+                       self._onboard_event(
+                                       v, timestamp, pirate, 'leaving '+event)
+                       del v[pirate]
+                       del self._pl[pirate]
 
                m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
                if m:
+                       dm = ['boarding']
                        pn = self._myself.name
-                       self._vessel = m.group(1)
-                       dm = 'boarding'
-
-                       try:             self._v = self._vl[self._vessel]
-                       except KeyError: self._v = None; dm += ' new'
-                       
-                       if self._v is not None:  la = self._v['#lastaboard']
-                       else:                    la = 0; dm += ' ?la'
-
-                       if timestamp - la > opts.ship_reboard_clearout:
-                               self.clear_vessel(timestamp)
-                               dm += ' stale'
-
+                       vn = m.group(1)
+                       v = self._vessel_lookup(vn, timestamp, dm, create=True)
+                       self._vessel = vn
+                       self._v = v
                        ob_x(pn, 'we boarded')
                        self.expire_garbage(timestamp)
-                       return d(dm)
+                       return d(' '.join(dm))
 
                if self._v is None:
                        return d('no vessel')
@@ -554,42 +639,54 @@ class ChatLogTracker:
                m = rm('(\\w+) abandoned a (\\S.*\\S) station\\.$')
                if m: oba('stopped'); return d("end")
 
-               def chat(what):
-                       who = m.group(1)
-                       try: pa = self._pl[who]
-                       except KeyError: return d('chat mystery')
-                       if pa.v is self._v:
-                               pa.last_chat_time = timestamp
-                               pa.last_chat_chan = what
-                               self.force_redisplay()
-                               return d('chat '+what)
-
-               def chat_metacmd(what):
+               def chat_core(speaker, chan):
+                       try: pa = self._pl[speaker]
+                       except KeyError: return 'mystery'
+                       if pa.v is not self._v: return 'elsewhere'
+                       pa.last_chat_time = timestamp
+                       pa.last_chat_chan = chan
+                       self.force_redisplay()
+                       return 'here'
+
+               def chat(chan):
+                       speaker = m.group(1)
+                       dm = chat_core(speaker, chan)
+                       return d('chat %s %s' % (chan, dm))
+
+               def chat_metacmd(chan):
                        (cmdr, metacmd) = m.groups()
                        metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
                        m2 = regexp.match(
-                               '/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
+                               '/([ad]) (?:([A-Za-z* ]+)\\s*:)?([A-Za-z ]+)$',
                                metacmd)
-                       if not m2: return chat(what)
+                       if not m2: return chat(chan)
 
-                       (cmd, vn, targets) = m2.groups()
+                       (cmd, pattern, targets) = m2.groups()
+                       dml = ['cmd', chan, cmd]
 
-                       if cmdr == self._myself.name: how = 'manual: /%s' % cmd
-                       else: how = '/%s %s' % (cmd,cmdr)
-                       if cmd == 'a': each = ob_x
+                       if cmd == 'a': each = self._onboard_event
                        else: each = disembark
 
-                       if vn is not None:
-                               vn = vn.title()
-                               if not regexp.match(
-                                               '(?:.* )?' + vn + '$',
-                                               self._vessel):
-                                       return chat('/%s %s:' % (cmd,vn))
+                       if cmdr == self._myself.name:
+                               dml.append('self')
+                               how = 'cmd: %s' % cmd
+                       else:
+                               dml.append('other')
+                               how = 'cmd: %s %s' % (cmd,cmdr)
 
-                       for target in targets.split(' '):
-                               if not target: continue
-                               each(target.title(), how)
-                       return d('/%s' % cmd)
+                       v = self._find_matching_vessel(
+                               pattern, timestamp, cmdr, dml, create=True)
+
+                       if v is not None:
+                               targets = targets.strip().split(' ')
+                               dml.append(`len(targets)`)
+                               for target in targets:
+                                       each(v, timestamp, target.title(), how)
+                               self._vessel_updated(v, timestamp)
+
+                       dm = ' '.join(dml)
+                       chat_core(cmdr, 'cmd '+chan)
+                       return d(dm)
 
                m = rm('(\\w+) (?:issued an order|ordered everyone) "')
                if m: return ob1('general order');
@@ -624,16 +721,18 @@ class ChatLogTracker:
 
                m = rm('(\\w+) has left the vessel\.')
                if m:
-                       disembark(m.group(1), 'disembarked')
+                       pirate = m.group(1)
+                       disembark(self._v, timestamp, pirate, 'disembarked')
                        return d('disembarked')
 
-               return d('not matched')
+               return d('not-matched')
 
        def _str_vessel(self, vn, v):
                s = ' vessel %s\n' % vn
                s += ' '*20 + "%-*s   %13s\n" % (
-                               max_pirate_namelen, '#lastaboard',
-                               v['#lastaboard'])
+                               max_pirate_namelen, '#lastinfo',
+                               v['#lastinfo'])
+               assert v['#name'] == vn
                for pn in sorted(v.keys()):
                        if pn.startswith('#'): continue
                        pa = v[pn]
@@ -775,7 +874,7 @@ def do_track_chat_log(args, bu):
                track.catchup()
                if track.changed():
                        print track
-               time.sleep(1)
+               sleep(1)
 
 #----- ship management aid -----
 
@@ -886,7 +985,7 @@ def do_ship_aid(args, bu):
                s += tbl.results()
 
                displayer.show(s)
-               time.sleep(1)
+               sleep(1)
                rotate_nya = rotate_nya[1:3] + rotate_nya[0]
 
 #---------- main program ----------
@@ -915,7 +1014,7 @@ display modes (for --display) apply to ship-aid:
                help='cache yoweb pages in DIR')
        ao('-D','--debug', action='count', dest='debug', default=0,
                help='enable debugging output')
-       ao('--debug-fd', action='count', dest='debug_fd',
+       ao('--debug-fd', type='int', dest='debug_fd',
                help='write any debugging output to specified fd')
        ao('-q','--quiet', action='store_true', dest='quiet',
                help='suppress warning output')
@@ -935,7 +1034,9 @@ display modes (for --display) apply to ship-aid:
                pa.error('need a mode argument')
 
        if opts.debug_fd is not None:
-               opts.debug_file = fdopen(opts.debug_fd, 'w')
+               opts.debug_file = os.fdopen(opts.debug_fd, 'w')
+       else:
+               opts.debug_file = sys.stdout
 
        mode = args[0]
        mode_fn_name = 'do_' + mode.replace('_','#').replace('-','_')