chiark / gitweb /
Massively improved /officer cmd handling
[ypp-sc-tools.main.git] / yoweb-scrape
index 7db7afa..c3e6d73 100755 (executable)
@@ -41,6 +41,11 @@ def debug(m):
        if opts.debug > 0:
                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)
        if ti < 7200: return '%2dm' % (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)
@@ -424,18 +429,28 @@ class ChatLogTracker:
                self._pl = {}   # self._pl['Pirate'] =
                self._vl = {}   #   self._vl['Vessel']['Pirate'] = PirateAboard
                                # self._vl['Vessel']['#lastinfo']
-               self._v = None          # self._v =
-               self._vessel = None     #       self._vl[self._vessel]
+                               # 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 _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:
@@ -446,44 +461,110 @@ class ChatLogTracker:
                        pa = PirateAboard(pirate, v, timestamp, event)
                        self._pl[pirate] = pa
                        v[pirate] = pa
-               v['#lastinfo'] = timestamp
-               self.force_redisplay()
+               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['#lastinfo']
-                       if timestamp - la > opts.ship_reboard_clearout:
-                               self._debug_line_disposition(timestamp,'',
-                                       'stale reset '+vn)
-                               self._trash_vessel(v)
-                               del self._vl[vn]
-
-       def _create_vessel(self, vn, timestamp):
-               self._vl[vn] = v = { '#lastinfo': timestamp }
-               return v
+               for v in self._vl.values():
+                       self._vessel_check_expire(v, timestamp)
 
-       def _update_vessel_lookup(self, vn, timestamp, dml):
+       def _vessel_lookup(self, vn, timestamp, dml=[], create=False):
                v = self._vl.get(vn, None)
-               if v is None:
-                       dml.append('new')
-                       v = self._create_vessel(vn, timestamp)
-               elif timestamp - v['#lastinfo'] > opts.ship_reboard_clearout:
-                       dml.append('stale')
-                       self._trash_vessel(v)
-                       v = self._create_vessel(vn, timestamp)
-               else:
-                       dml.append('current')
+               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)
@@ -533,9 +614,10 @@ class ChatLogTracker:
                if m:
                        dm = ['boarding']
                        pn = self._myself.name
-                       self._vessel = vn = m.group(1)
-                       self._v = self._update_vessel_lookup(vn, timestamp, dm)
-
+                       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(' '.join(dm))
@@ -557,62 +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()
-                       dml = ['metachat', cmd]
+                       (cmd, pattern, targets) = m2.groups()
+                       dml = ['cmd', chan, cmd]
 
                        if cmd == 'a': each = self._onboard_event
                        else: each = disembark
 
                        if cmdr == self._myself.name:
                                dml.append('self')
-                               how = 'manual: /%s' % cmd
+                               how = 'cmd: %s' % cmd
                        else:
                                dml.append('other')
-                               how = '/%s %s' % (cmd,cmdr)
-
-                       v = None
-                       if vn is not None and len(vn.split(' ')) == 2:
-                               v = self._update_vessel_lookup(
-                                       vn.title(), timestamp, dml)
-                       elif self._v is None:
-                               dml.append('no-current')
-                       elif vn is None:
-                               dml.append('current')
-                               v = self._v
-                       elif regexp.match('(?:.* )?%s$' % vn.title(),
-                                       self._vessel):
-                               dml.append('match')
-                               v = self._v
-                       else:
-                               dml.append('unk-abbrev')
+                               how = 'cmd: %s %s' % (cmd,cmdr)
 
-                       if v is None:
-                               return d(' '.join(dml))
+                       v = self._find_matching_vessel(
+                               pattern, timestamp, cmdr, dml, create=True)
 
-                       targets = targets.strip().split(' ')
-                       dml.append(`len(targets)`)
-                       for target in targets:
-                               each(v, timestamp, target.title(), how)
+                       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)
 
-                       return d(' '.join(dml))
+                       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');
@@ -651,13 +725,14 @@ class ChatLogTracker:
                        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, '#lastinfo',
                                v['#lastinfo'])
+               assert v['#name'] == vn
                for pn in sorted(v.keys()):
                        if pn.startswith('#'): continue
                        pa = v[pn]
@@ -799,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 -----
 
@@ -910,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 ----------