diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands.py | 8 | ||||
| -rw-r--r-- | modules/define.py | 2 | ||||
| -rw-r--r-- | modules/google.py | 2 | ||||
| -rw-r--r-- | modules/logging.py | 55 | ||||
| -rw-r--r-- | modules/print_activity.py | 4 | ||||
| -rw-r--r-- | modules/soundcloud.py | 2 | ||||
| -rw-r--r-- | modules/title.py | 2 | ||||
| -rw-r--r-- | modules/translate.py | 2 | ||||
| -rw-r--r-- | modules/twitter.py | 2 | ||||
| -rw-r--r-- | modules/youtube.py | 2 |
10 files changed, 12 insertions, 69 deletions
diff --git a/modules/commands.py b/modules/commands.py index 610a0bfd..c0158287 100644 --- a/modules/commands.py +++ b/modules/commands.py @@ -102,7 +102,7 @@ class Module(object): if is_channel and hook.kwargs.get("private_only"): return - log = target.log + buffer = target.buffer module_name = hook.function.__self__._name stdout, stderr = StdOut(module_name, target), StdErr(module_name, @@ -114,7 +114,7 @@ class Module(object): for returned in returns: if returned: stderr.write(returned).send() - log.skip_next() + buffer.skip_next() return args_split = list(filter(None, event["message_split"][args_index:])) min_args = hook.kwargs.get("min_args") @@ -130,7 +130,7 @@ class Module(object): server = event["server"] user = event["user"] self.bot.events.on("received").on("command").on(command).call( - 1, user=user, server=server, target=target, log=log, + 1, user=user, server=server, target=target, buffer=buffer, args=args, args_split=args_split, stdout=stdout, stderr=stderr, command=command.lower(), is_channel=is_channel) if not hook.kwargs.get("skip_out", False): @@ -138,7 +138,7 @@ class Module(object): stderr.send() target.last_stdout = stdout target.last_stderr = stderr - log.skip_next() + buffer.skip_next() def channel_message(self, event): diff --git a/modules/define.py b/modules/define.py index b452e0fa..c5e62b6a 100644 --- a/modules/define.py +++ b/modules/define.py @@ -15,7 +15,7 @@ class Module(object): if event["args"]: word = event["args"] else: - word = event["log"].get(from_self=False) + word = event["buffer"].get(from_self=False) page = Utils.get_url(URL_WORDNIK % event["args"], get_params={ "useCanonical": "true", "limit": 1, "sourceDictionaries": "wiktionary", "api_key": self.bot.config[ diff --git a/modules/google.py b/modules/google.py index 237a1c58..b961186e 100644 --- a/modules/google.py +++ b/modules/google.py @@ -13,7 +13,7 @@ class Module(object): usage="[search term]") def google(self, event): - phrase = event["args"] or event["log"].get() + phrase = event["args"] or event["buffer"].get() if phrase: page = Utils.get_url(URL_GOOGLESEARCH, get_params={ "q": phrase, "key": self.bot.config[ diff --git a/modules/logging.py b/modules/logging.py deleted file mode 100644 index 46f8bb29..00000000 --- a/modules/logging.py +++ /dev/null @@ -1,55 +0,0 @@ -import logging, logging.handlers, sys, time - -class BitBotFormatter(logging.Formatter): - def formatTime(self, record, datefmt=None): - ct = self.converter(record.created) - if datefmt: - if "%f" in datefmt: - msec = "%03d" % record.msecs - datefmt = datefmt.replace("%f", msec) - s = time.strftime(datefmt, ct) - else: - t = time.strftime("%Y-%m-%d %H:%M:%S", ct) - s = "%s.%03d" % (t, record.msecs) - return s - -class Module(object): - def __init__(self, bot): - self.logger = logging.getLogger(__name__) - self.logger.setLevel(logging.DEBUG) - - formatter = BitBotFormatter( - "%(asctime)s - %(levelname)s - %(message)s", - "%Y-%m-%dT%H:%M:%S.%f%z") - - stdout_handler = logging.StreamHandler(sys.stdout) - stdout_handler.setLevel(logging.INFO) - stdout_handler.setFormatter(formatter) - self.logger.addHandler(stdout_handler) - - file_handler = logging.handlers.TimedRotatingFileHandler( - "bot.log", when="midnight", backupCount=5) - file_handler.setLevel(logging.DEBUG) - file_handler.setFormatter(formatter) - self.logger.addHandler(file_handler) - - bot.events.on("log.debug").hook(self.debug) - bot.events.on("log.info").hook(self.info) - bot.events.on("log.warn").hook(self.warn) - bot.events.on("log.error").hook(self.error) - bot.events.on("log.critical").hook(self.critical) - - def debug(self, event): - self._log(event, logging.DEBUG) - def info(self, event): - self._log(event, logging.INFO) - def warn(self, event): - self._log(event, logging.WARN) - def error(self, event): - self._log(event, logging.ERROR) - def critical(self, event): - self._log(event, logging.CRITICAL) - def _log(self, event, level): - message = event["message"] - params = event.get("params", []) - self.logger.log(level, message, *params) diff --git a/modules/print_activity.py b/modules/print_activity.py index 8344255e..21ce9796 100644 --- a/modules/print_activity.py +++ b/modules/print_activity.py @@ -36,9 +36,7 @@ class Module(object): target = str(event["server"]) if not channel == None: target += channel - self.bot.events.on("log.info").call( - message="%s | %s", - params=[target, line]) + self.bot.log.info("%s | %s", [target, line]) def _on_message(self, event, nickname): if not self.bot.args.verbose: diff --git a/modules/soundcloud.py b/modules/soundcloud.py index 97125255..2bdd4276 100644 --- a/modules/soundcloud.py +++ b/modules/soundcloud.py @@ -25,7 +25,7 @@ class Module(object): else: query = event["args"] else: - last_soundcloud = event["log"].find(REGEX_SOUNDCLOUD) + last_soundcloud = event["buffer"].find(REGEX_SOUNDCLOUD) if last_soundcloud: url = re.match(REGEX_SOUNDCLOUD, last_soundcloud.message).string diff --git a/modules/title.py b/modules/title.py index 6ccc7044..df19a6ec 100644 --- a/modules/title.py +++ b/modules/title.py @@ -14,7 +14,7 @@ class Module(object): if len(event["args"]) > 0: url = event["args_split"][0] else: - url = event["log"].find(REGEX_URL) + url = event["buffer"].find(REGEX_URL) if url: url = re.search(REGEX_URL, url.message).group(0) if not url: diff --git a/modules/translate.py b/modules/translate.py index c1345500..a4b72785 100644 --- a/modules/translate.py +++ b/modules/translate.py @@ -14,7 +14,7 @@ class Module(object): def translate(self, event): phrase = event["args"] if not phrase: - phrase = event["log"].get() + phrase = event["buffer"].get() if phrase: phrase = phrase.message if not phrase: diff --git a/modules/twitter.py b/modules/twitter.py index a1308df5..d5b451db 100644 --- a/modules/twitter.py +++ b/modules/twitter.py @@ -32,7 +32,7 @@ class Module(object): if event["args"]: target = event["args"] else: - target = event["log"].find(REGEX_TWITTERURL) + target = event["buffer"].find(REGEX_TWITTERURL) if target: target = target.message if target: diff --git a/modules/youtube.py b/modules/youtube.py index 96f25689..51bcac38 100644 --- a/modules/youtube.py +++ b/modules/youtube.py @@ -72,7 +72,7 @@ class Module(object): if event["args"]: search = event["args"] else: - last_youtube = event["log"].find(REGEX_YOUTUBE) + last_youtube = event["buffer"].find(REGEX_YOUTUBE) if last_youtube: video_id = re.search(REGEX_YOUTUBE, last_youtube.message).group(1) if search or video_id: |