Merge pull request #737 from izzy84075/chanlogs-localtime2

Add the option to use the bot's preferred timezone for logs.

willie/modules/chanlogs.py

@@ -14,6 +14,12 @@
 import threading
 import sys
 from datetime import datetime
+try:
+    from pytz import timezone
+    from pytz import all_timezones
+    import pytz
+except ImportError:
+    pytz = None
 import willie.module
 import willie.tools
 from willie.config import ConfigurationError
@@ -39,10 +45,25 @@ def configure(config):
         config.add_option("chanlogs", "by_day", "Split log files by day", default=True)
         config.add_option("chanlogs", "privmsg", "Record private messages", default=False)
         config.add_option("chanlogs", "microseconds", "Microsecond precision", default=False)
+        config.add_option("chanlogs", "localtime", "Attempt to use preferred timezone", default=False)
         # could ask if user wants to customize message templates,
         # but that seems unnecessary
 
 
+def get_datetime(bot):
+    """
+    Returns a datetime object of the current time.
+    """
+    dt = datetime.utcnow()
+    if pytz:
+        dt = dt.replace(tzinfo=timezone('UTC'))
+        if bot.config.chanlogs.localtime:
+            dt = dt.astimezone(timezone(bot.config.clock.tz))
+    if not bot.config.chanlogs.microseconds:
+        dt = dt.replace(microsecond=0)
+    return dt
+
+
 def get_fpath(bot, trigger, channel=None):
     """
     Returns a string corresponding to the path to the file where the message
@@ -53,9 +74,7 @@ def get_fpath(bot, trigger, channel=None):
     channel = channel.lstrip("#")
     channel = BAD_CHARS.sub('__')
 
-    dt = datetime.utcnow()
-    if not bot.config.chanlogs.microseconds:
-        dt = dt.replace(microsecond=0)
+    dt = get_datetime(bot)
     if bot.config.chanlogs.by_day:
         fname = "{channel}-{date}.log".format(channel=channel, date=dt.date().isoformat())
     else:
@@ -64,9 +83,7 @@ def get_fpath(bot, trigger, channel=None):
 
 
 def _format_template(tpl, bot, trigger, **kwargs):
-    dt = datetime.utcnow()
-    if not bot.config.chanlogs.microseconds:
-        dt = dt.replace(microsecond=0)
+    dt = get_datetime(bot)
 
     formatted = tpl.format(
         trigger=trigger, datetime=dt.isoformat(),