Changeset 14 for trunk

Timestamp:

06/21/06 13:01:35 (18 years ago)

Author:

atzm

Message:

 

File:

• trunk/amazonbot/amazonbot.py (modified) (13 diffs)

trunk/amazonbot/amazonbot.py

@@ -83 +83 @@
 しお Amazon ぞク゚リを投げるべし
 
-        サブクラスには onmsg_HOGEHOGE(self, conn, ev, args) ãƒ¡ã‚œãƒƒãƒ‰ã‚’äœœã‚‹ã“ãšã§ã‚³ãƒžãƒ³ãƒ‰è¿œåŠ å¯èƒœ
+        サブクラスには onmsg_HOGEHOGE(self, conn, ev, to, args) ãƒ¡ã‚œãƒƒãƒ‰ã‚’äœœã‚‹ã“ãšã§ã‚³ãƒžãƒ³ãƒ‰è¿œåŠ å¯èƒœ
         コマンド曞匏は !HOGEHOGE arg [, arg2, ...] ずなる
+        ヘルプはメ゜ッドに docstring を曞けば OK
         """
         def __init__(self):
@@ -109 +110 @@
 
         def on_privmsg(self, c, e):
-                return self.on_pubmsg(c, e)
-
-        def on_pubmsg(self, c, e):
+                return self.on_pubmsg(c, e, to=nm_to_n(e.source()))
+
+        def on_pubmsg(self, c, e, to=config.get('irc', 'channel')):
                 msg = unicoding(e.arguments()[0])
+
+                if __debug__:
+                        print >> sys.stderr, 'DEBUG> pubmsg incoming "%s", reply to %s' % (ununicoding(msg, 'euc-jp'), to)
+
                 if msg[0] == '!':
                         words = shlex.split(ununicoding(msg, 'utf-8')[1:])
                         method = getattr(self, 'onmsg_%s' % words[0], lambda *arg: False)
-                        return method(c, e, words[1:]) # words[0] == command name
+                        return method(c, e, to, words[1:]) # words[0] == command name
 
                 _current_time = time.time()
                 if _current_time < self._prev_time + config.get('bot', 'freq', 'int'):
                         if __debug__:
-                                prev = time.strftime('%y/%m/%d %H:%M:%S', time.localtime(self._prev_time))
-                                print >> sys.stderr, 'DEBUG> Not expired: prev time is %s' % prev
+                                prev = time.strftime('%H:%M:%S', time.localtime(self._prev_time))
+                                go = time.strftime('%H:%M:%S', time.localtime(self._prev_time + config.get('bot', 'freq', 'int')))
+                                print >> sys.stderr, 'DEBUG> Not expired: prev time is %s, be expired at: %s' % (prev, go)
                         return False
                 self._prev_time = _current_time
 
-                self.silence(msg, c, e)
+                self.silence(msg, c, e, to)
                 if self._silent:
                         return False
@@ -138 +144 @@
                 title, url = self.process_keyword(' '.join(nominals))
                 if title and url:
-                        channel = e.target()
                         content = unicoding(config.get('bot', 'content'))
                         try:
@@ -148 +153 @@
                                 return False
 
-                        c.privmsg(channel, message)
+                        c.notice(to, message)
                         return True
                 return False
@@ -154 +159 @@
         ACTIVE_PATTERN = re.compile(unicoding(config.get('bot', 'active_pattern')))
         SILENT_PATTERN = re.compile(unicoding(config.get('bot', 'silent_pattern')))
-        def silence(self, msg, c, e):
-                ch = e.target()
+        def silence(self, msg, c, e, to):
                 active = self.ACTIVE_PATTERN.search(msg)
                 silent = self.SILENT_PATTERN.search(msg)
@@ -163 +167 @@
                 if active:
                         self._silent = False
-                        c.privmsg(ch, ununicoding(config.get('bot', 'thanks')))
+                        c.notice(to, ununicoding(config.get('bot', 'thanks')))
                 elif silent:
                         self._silent = True
-                        c.privmsg(ch, ununicoding(config.get('bot', 'sorry')))
+                        c.notice(to, ununicoding(config.get('bot', 'sorry')))
 
         def process_keyword(self, keyword):
@@ -176 +180 @@
         process_keyword メ゜ッドで Amazon ぞク゚リを投げお結果を返す
         """
+        _AVAIL_PRODUCT_LINES = {
+                'books-jp': '(和曞, default)',
+                'books-us': '(掋曞)',
+                'music-jp': '(ポピュラヌ音楜)',
+                'classical-jp': '(クラシック音楜)',
+                'dvd-jp': '(DVD)',
+                'vhs-jp': '(ビデオ)',
+                'electronics-jp': '(゚レクトロニクス)',
+                'kitchen-jp': '(ホヌムキッチン)',
+                'software-jp': '(゜フトりェア)',
+                'videogames-jp': '(ゲヌム)',
+                'magazines-jp': '(雑誌)',
+                'toys-jp': '(おもちゃホビヌ)',
+        }
+
         def __init__(self):
                 AmazonBotBase.__init__(self)
@@ -182 +201 @@
                 return 'AmazonBot by %s, based on python-irclib' % __author__
 
-        def onmsg_isbn(self, c, e, args):
+        def onmsg_isbn(self, c, e, to, args):
                 """Syntax: !isbn <ISBN number>
                 """
-                return self.onmsg_asin(c, e, args)
-        def onmsg_asin(self, c, e, args): # FIXME: arg ãŒãªã‹ã£ãŸãšãã®ã‚šãƒ©ãƒŒå‡Šç†ã‚’è¿œåŠ ã™ã‚‹ã“ãš
+                return self.onmsg_asin(c, e, to, args)
+        def onmsg_asin(self, c, e, to, args):
                 """Syntax: !asin <ASIN number>
                 """
@@ -195 +214 @@
                         data = my_amazon.searchByASIN(args[0])
                 except my_amazon.AmazonError, err:
-                        ch = e.target()
-                        c.privmsg(ch, ununicoding(config.get('bot', 'no_products')))
+                        c.notice(to, ununicoding(config.get('bot', 'no_products')))
                         if __debug__:
                                 print >> sys.stderr, 'DEBUG> Caught AmazonError in onmsg_asin: %s' % str(err)
                         return False
-
-                return self._process_onmsg(c, e, data)
-
-        def onmsg_a(self, c, e, args):
-                """Syntax: !a [-h] [-t type] keyword1 [, keyword2, ...]
+                except IndexError, err:
+                        c.notice(to, 'Please specify an argument.')
+                        return False
+
+                return self._process_onmsg(c, e, to, data)
+
+        def onmsg_k(self, c, e, to, args): return self.onmsg_keyword(c, e, to, args)
+        def onmsg_keyword(self, c, e, to, args):
+                """Syntax: !keyword [-h] [-t type] <keyword1> [, keyword2, ...]
                 """
-                return self.onmsg_amazon(c, e, args)
-        def onmsg_amazon(self, c, e, args): # FIXME: arg ãŒãªã‹ã£ãŸãšãã®ã‚šãƒ©ãƒŒå‡Šç†ã‚’è¿œåŠ ã™ã‚‹ã“ãš
-                """Syntax: !amazon [-h] [-t type] keyword1 [, keyword2, ...]
-                """
-                if __debug__:
-                        print >> sys.stderr, 'DEBUG> in amazon command: %s' % str(args)
+                if __debug__:
+                        print >> sys.stderr, 'DEBUG> in keyword command: %s' % str(args)
 
                 try:
@@ -217 +235 @@
                 except getopt.GetoptError, err:
                         if __debug__:
-                                print >> sys.stderr, 'DEBUG> Caught GetoptError in onmsg_amazon: %s' % str(err)
-                        return False
-
-                keyword = ' '.join(rest)
+                                print >> sys.stderr, 'DEBUG> Caught GetoptError in onmsg_keyword: %s' % str(err)
+                        return False
+
+                keyword = ' '.join(rest).strip()
                 product_line = 'books-jp'
                 for opt, val in options:
                         if opt in ['-t', '--type']:
+                                if val not in self._AVAIL_PRODUCT_LINES.keys():
+                                        c.notice(to, 'Type "%s" is not available.' % val)
+                                        return False
+
                                 product_line = val
                                 break
+
                         elif opt in ['-h', '--help']:
-                                available = [
-                                        'books-jp (和曞, default)', 'books-us (掋曞)',
-                                        'music-jp (ポピュラヌ音楜)', 'classical-jp (クラシック音楜)',
-                                        'dvd-jp (DVD)', 'vhs-jp (ビデオ)',
-                                        'electronics-jp (゚レクトロニクス)', 'kitchen-jp (ホヌムキッチン)',
-                                        'software-jp (゜フトりェア)', 'videogames-jp (ゲヌム)',
-                                        'magazines-jp (雑誌)', 'toys-jp (おもちゃホビヌ)',
-                                        ]
-                                ch = e.target()
-                                c.privmsg(ch, ununicoding('Available types: ' + ', '.join(available)))
+                                _from = nm_to_n(e.source()) # ログを流しおしたうのでヘルプは盎接送信å
+ƒãž
+                                c.notice(_from, ununicoding('Available types:'))
+
+                                for key, val in self._AVAIL_PRODUCT_LINES.iteritems():
+                                        time.sleep(1) # XXX: 連続投皿するず匟かれるこずがあるので暫定察凊
+                                        c.notice(_from, ununicoding(' * %s: %s' % (key, val)))
+
                                 return True
+
+                if not keyword:
+                        c.notice(to, 'Please specify keywords.')
+                        return False
 
                 if __debug__:
@@ -246 +271 @@
                         data = my_amazon.searchByKeyword(keyword, product_line=product_line)
                 except my_amazon.AmazonError, err:
-                        ch = e.target()
-                        c.privmsg(ch, ununicoding(config.get('bot', 'no_products')))
+                        c.notice(to, ununicoding(config.get('bot', 'no_products')))
                         if __debug__:
                                 print >> sys.stderr, 'DEBUG> Caught AmazonError in onmsg_amazon: %s' % str(err)
                         return False
 
-                return self._process_onmsg(c, e, data)
-
-        def onmsg_help(self, c, e, data):
-                pass
-
-        def _process_onmsg(self, c, e, data):
+                return self._process_onmsg(c, e, to, data)
+
+        def onmsg_h(self, c, e, to, args): return self.onmsg_help(c, e, to, args)
+        def onmsg_help(self, c, e, to, args):
+                """Syntax: !help
+                """
+                if __debug__:
+                        print >> sys.stderr, 'DEBUG> in help command: %s' % str(args)
+
+                _from = nm_to_n(e.source()) # ログを流しおしたうのでヘルプは盎接送信å
+ƒãž
+                docs = []
+                for key in dir(self):
+                        val = getattr(self, key, '')
+                        if __debug__:
+                                print >> sys.stderr, 'DEBUG> key=%s, val=%s' % (key, ununicoding(str(val), 'euc-jp'))
+
+                        if key[:6] != 'onmsg_':
+                                continue
+
+                        doc = val.__doc__
+                        if doc:
+                                doc = doc.strip()
+                                if not doc:
+                                        continue
+                                time.sleep(1) # XXX: 連続投皿するず匟かれるっぜいので暫定察凊
+                                c.notice(_from, doc)
+
+                return True
+
+        def _process_onmsg(self, c, e, to, data):
                 if type(data.Details) is not list:
                         data.Details = [data.Details]
@@ -264 +313 @@
                 title = ununicoding(detail.ProductName)
                 url = ununicoding(detail.URL)
-                channel = config.get('irc', 'channel')
-                c.privmsg(channel, '%(title)s: %(url)s' % locals())
+                c.notice(to, '%(title)s: %(url)s' % locals())
 
                 return True
@@ -294 +342 @@
         bot = AmazonBot()
         bot.start()
+        print '> Bye ;)'