chiark / gitweb /
overwriting displayer works
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 17 May 2009 01:02:45 +0000 (02:02 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 17 May 2009 01:02:45 +0000 (02:02 +0100)
yoweb-scrape

index 2a35590..1eeb8a3 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
@@ -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)
@@ -691,6 +692,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()
@@ -705,9 +709,11 @@ def prep_chat_log(args, bu,
        logfn_re = '(?:.*/)?([A-Z][a-z]+)_([a-z]+)_chat-log-\\w+$'
        match = regexp.match(logfn_re, logfn)
        if not match: bu('chat log filename is not in default format')
-       (pirate, fetcher.ocean) = match.groups()
+       (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
@@ -731,6 +737,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 +806,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()