chiark / gitweb /
make --debug-fd work
[ypp-sc-tools.db-live.git] / yoweb-scrape
index 2a3559009ef23e941e17bed9fc35298634251c4d..577b3b8d50234349760b2c5b4b58d6da5aba461a 100755 (executable)
@@ -13,6 +13,7 @@ import errno
 import sys
 import re as regexp
 import random
+import curses
 from optparse import OptionParser
 
 from BeautifulSoup import BeautifulSoup
@@ -38,7 +39,7 @@ max_pirate_namelen = 12
 
 def debug(m):
        if opts.debug > 0:
-               print m
+               print >>opts.debug_file, m
 
 def format_time_interval(ti):
        if ti < 120: return '%d:%02d' % (ti / 60, ti % 60)
@@ -58,9 +59,9 @@ class Fetcher:
                        if oe.errno != errno.EEXIST: raise
                self._cache_scan(time.time())
 
-       def _default_ocean(self):
+       def default_ocean(self, ocean='ice'):
                if self.ocean is None:
-                       self.ocean = 'ice'
+                       self.ocean = ocean
 
        def _cache_scan(self, now):
                # returns list of ages, unsorted
@@ -141,7 +142,7 @@ class Fetcher:
                return data
 
        def yoweb(self, kind, tail, max_age):
-               self._default_ocean()
+               self.default_ocean()
                url = 'http://%s.puzzlepirates.com/yoweb/%s%s' % (
                        self.ocean, kind, tail)
                return self.fetch(url, max_age)
@@ -432,7 +433,7 @@ class ChatLogTracker:
                self._lbuf = ''
                self._progress = [0, os.fstat(self._f.fileno()).st_size]
 
-       def _refresh(self):
+       def force_redisplay(self):
                self._need_redisplay = True
 
        def _onboard_event(self,timestamp,pirate,event):
@@ -447,14 +448,14 @@ class ChatLogTracker:
                        self._pl[pirate] = pa
                        self._v[pirate] = pa
                self._v['#lastaboard'] = timestamp
-               self._refresh()
+               self.force_redisplay()
                return pa
 
        def _trash_vessel(self, v):
                for pn in v:
                        if pn.startswith('#'): continue
                        del self._pl[pn]
-               self._refresh()
+               self.force_redisplay()
 
        def expire_garbage(self, timestamp):
                for (vn,v) in list(self._vl.iteritems()):
@@ -481,7 +482,8 @@ class ChatLogTracker:
 
                m = rm('=+ (\\d+)/(\\d+)/(\\d+) =+$')
                if m:
-                       self._date = m.groups()
+                       self._date = [int(x) for x in m.groups()]
+                       self._previous_timestamp = None
                        return d('date '+`self._date`)
 
                if self._date is None:
@@ -491,9 +493,18 @@ class ChatLogTracker:
                if not m:
                        return d('no timestamp')
 
-               time_tuple = [int(x) for x in self._date + m.groups()]
-               time_tuple += (-1,-1,-1)
-               timestamp = time.mktime(time_tuple)
+               while True:
+                       time_tuple = (self._date +
+                                     [int(x) for x in m.groups()] +
+                                     [-1,-1,-1])
+                       timestamp = time.mktime(time_tuple)
+                       if timestamp >= self._previous_timestamp: break
+                       self._date[2] += 1
+                       self._debug_line_disposition(timestamp,'',
+                               'new date '+`self._date`)
+
+               self._previous_timestamp = timestamp
+
                l = l[l.find(' ')+1:]
 
                def ob_x(who,event):
@@ -501,6 +512,11 @@ class ChatLogTracker:
                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]
+
                m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
                if m:
                        pn = self._myself.name
@@ -545,8 +561,35 @@ class ChatLogTracker:
                        if pa.v is self._v:
                                pa.last_chat_time = timestamp
                                pa.last_chat_chan = what
-                               self._refresh()
-                               return d(what+' chat')
+                               self.force_redisplay()
+                               return d('chat '+what)
+
+               def chat_metacmd(what):
+                       (cmdr, metacmd) = m.groups()
+                       metacmd = regexp.sub('\\s+', ' ', metacmd).strip()
+                       m2 = regexp.match(
+                               '/([ad]) (?:([A-Za-z ]+)\\s*:)?([A-Za-z ]+)$',
+                               metacmd)
+                       if not m2: return chat(what)
+
+                       (cmd, vn, targets) = m2.groups()
+
+                       if cmdr == self._myself.name: how = 'manual: /%s' % cmd
+                       else: how = '/%s %s' % (cmd,cmdr)
+                       if cmd == 'a': each = ob_x
+                       else: each = disembark
+
+                       if vn is not None:
+                               vn = vn.title()
+                               if not regexp.match(
+                                               '(?:.* )?' + vn + '$',
+                                               self._vessel):
+                                       return chat('/%s %s:' % (cmd,vn))
+
+                       for target in targets.split(' '):
+                               if not target: continue
+                               each(target.title(), how)
+                       return d('/%s' % cmd)
 
                m = rm('(\\w+) (?:issued an order|ordered everyone) "')
                if m: return ob1('general order');
@@ -557,11 +600,14 @@ class ChatLogTracker:
                m = rm('(\\w+) tells ye, "')
                if m: return chat('private')
 
+               m = rm('Ye told (\\w+), "(.*)"$')
+               if m: return chat_metacmd('private')
+
                m = rm('(\\w+) flag officer chats, "')
                if m: return chat('flag officer')
 
-               m = rm('(\\w+) officer chats, "')
-               if m: return chat('officer')
+               m = rm('(\\w+) officer chats, "(.*)"$')
+               if m: return chat_metacmd('officer')
 
                m = rm('Game over\\.  Winners: ([A-Za-z, ]+)\\.$')
                if m:
@@ -578,10 +624,7 @@ class ChatLogTracker:
 
                m = rm('(\\w+) has left the vessel\.')
                if m:
-                       who = m.group(1)
-                       ob_x(who, 'disembarked')
-                       del self._v[who]
-                       del self._pl[who]
+                       disembark(m.group(1), 'disembarked')
                        return d('disembarked')
 
                return d('not matched')
@@ -634,6 +677,8 @@ class ChatLogTracker:
                        if self._lbuf.endswith('\n'):
                                self.chatline(self._lbuf.rstrip())
                                self._lbuf = ''
+                               if opts.debug >= 2:
+                                       debug(self.__str__())
                if progress: progress.caughtup()
 
        def changed(self):
@@ -648,6 +693,7 @@ class ChatLogTracker:
                return self._vessel
        def aboard(self):
                # returns a list of PirateAboard sorted by name
+               if self._v is None: return []
                return [ self._v[pn]
                         for pn in sorted(self._v.keys())
                         if not pn.startswith('#') ]
@@ -691,6 +737,9 @@ class ProgressPrintPercentage:
        def progress(self,*a):
                self._f.write(self.progress_string(*a))
                self._f.flush()
+       def show_init(self, pirate, ocean):
+               print >>self._f, 'Starting up, %s on the %s ocean' % (
+                       pirate, ocean)
        def caughtup(self):
                self._f.write('                   \r')
                self._f.flush()
@@ -702,17 +751,21 @@ 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]
-       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)
-       if not match: bu('chat log filename is not in default format')
-       (pirate, fetcher.ocean) = match.groups()
+       if not match: bu('chat log filename is not in expected format')
+       (pirate, ocean) = match.groups()
+       fetcher.default_ocean(ocean)
        
        myself = PirateInfo(pirate,max_myself_age)
+       progress.show_init(pirate, fetcher.ocean)
        track = ChatLogTracker(myself, logfn)
 
-       opts.debug -= 1
+       opts.debug -= 2
        track.catchup(progress)
-       opts.debug += 1
+       opts.debug += 2
+
+       track.force_redisplay()
 
        return (myself, track)
 
@@ -731,6 +784,62 @@ class Display_dumb(ProgressPrintPercentage):
                ProgressPrintPercentage.__init__(self)
        def show(self, s):
                print '\n\n', s;
+       def realstart(self):
+               pass
+
+class Display_overwrite(ProgressPrintPercentage):
+       def __init__(self):
+               ProgressPrintPercentage.__init__(self)
+
+               null = file('/dev/null','w')
+               curses.setupterm(fd=null.fileno())
+
+               self._clear = curses.tigetstr('clear')
+               if not self._clear:
+                       self._debug('missing clear!')
+                       self.show = Display_dumb.show
+                       return
+
+               self._t = {'el':'', 'ed':''}
+               if not self._init_sophisticated():
+                       for k in self._t.keys(): self._t[k] = ''
+                       self._t['ho'] = self._clear
+
+       def _debug(self,m): debug('display overwrite: '+m)
+
+       def _init_sophisticated(self):
+               for k in self._t.keys():
+                       s = curses.tigetstr(k)
+                       self._t[k] = s
+               self._t['ho'] = curses.tigetstr('ho')
+               if not self._t['ho']:
+                       cup = curses.tigetstr('cup')
+                       self._t['ho'] = curses.tparm(cup,0,0)
+               missing = [k for k in self._t.keys() if not self._t[k]]
+               if missing:
+                       self.debug('missing '+(' '.join(missing)))
+                       return 0
+               return 1
+
+       def show(self, s):
+               w = sys.stdout.write
+               def wti(k): w(self._t[k])
+
+               wti('ho')
+               nl = ''
+               for l in s.rstrip().split('\n'):
+                       w(nl)
+                       w(l)
+                       wti('el')
+                       nl = '\r\n'
+               wti('ed')
+               w(' ')
+               sys.stdout.flush()
+
+       def realstart(self):
+               sys.stdout.write(self._clear)
+               sys.stdout.flush()
+                       
 
 def do_ship_aid(args, bu):
        if opts.ship_duty is None: opts.ship_duty = True
@@ -744,6 +853,8 @@ def do_ship_aid(args, bu):
                if t is None: return ' ' * 22
                return " %-4s %-16s" % (format_time_interval(now - t),e)
 
+       displayer.realstart()
+
        while True:
                track.catchup()
                now = time.time()
@@ -751,11 +862,9 @@ def do_ship_aid(args, bu):
                s = "%s" % track.myname()
 
                vn = track.vessel()
-               if vn is None:
-                       s += " not on a vessel?!"
-               else:
-                       s += " on board the %s at %s\n" % (
-                               vn, time.strftime("%Y-%m-%d %H:%M:%S"))
+               if vn is None: s += " not on a vessel?!"
+               else: s += " on board the %s" % vn
+               s += " at %s\n" % time.strftime("%Y-%m-%d %H:%M:%S")
 
                tbl = StandingsTable()
                tbl.headings()
@@ -778,7 +887,7 @@ def do_ship_aid(args, bu):
 
                displayer.show(s)
                time.sleep(1)
-               rotate_nya = rotate_nya[1:2] + rotate_nya[0]
+               rotate_nya = rotate_nya[1:3] + rotate_nya[0]
 
 #---------- main program ----------
 
@@ -806,7 +915,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')
@@ -826,7 +935,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('-','_')