make --debug-fd work

[ypp-sc-tools.db-live.git] / yoweb-scrape

diff --git a/yoweb-scrape b/yoweb-scrape
index c99b2b0c684362f3db3b4507823bba7af6bb2ce9..577b3b8d50234349760b2c5b4b58d6da5aba461a 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -39,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)
@@ -482,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:
@@ -492,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):
@@ -502,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
@@ -547,7 +562,34 @@ class ChatLogTracker:
                                pa.last_chat_time = timestamp
                                pa.last_chat_chan = what
                                self.force_redisplay()
-                               return d(what+' chat')
+                               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');
@@ -558,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:
@@ -579,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')
@@ -635,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):
@@ -717,9 +761,9 @@ def prep_chat_log(args, bu,
        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()
 
@@ -843,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 ----------
 
@@ -871,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')
@@ -891,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('-','_')