Add %(channel) replacement to filenamesupstream

- Allows configuration of saving on a per-network basis.

darcs-hash:20091125085704-82ea9-6068d1ae3eb521f19447c6e07f8dd46390ad6868.gz

1 files changed, 7 insertions, 2 deletions

diff --git a/meeting.py b/meeting.py
index 002e4b4..9a11c9f 100644
--- a/meeting.py
+++ b/meeting.py
@@ -148,11 +148,13 @@ class Config(object):
         else:
             pattern = self.filenamePattern
         channel = self.M.channel.strip('# ').lower().replace('/', '')
+        network = self.M.network.strip(' ').lower().replace('/', '')
         if self.M._meetingname:
             meetingname = self.M._meetingname.replace('/', '')
         else:
             meetingname = channel
-        path = pattern%locals()
+        path = pattern%{'channel':channel, 'network':network,
+                        'meetingname':meetingname}
         path = time.strftime(path, self.M.starttime)
         # If we want the URL name, append URL prefix and return
         if url:
@@ -428,7 +430,7 @@ class Meeting(MeetingCommands, object):
                  filename=None, writeRawLog=False,
                  setTopic=None, sendReply=None, getRegistryValue=None,
                  safeMode=False, channelNicks=None,
-                 extraConfig={}):
+                 extraConfig={}, network='nonetwork'):
         self.config = Config(self, writeRawLog=writeRawLog, safeMode=safeMode,
                             extraConfig=extraConfig)
         if getRegistryValue is not None:
@@ -439,6 +441,7 @@ class Meeting(MeetingCommands, object):
             self._setTopic = setTopic
         self.owner = owner
         self.channel = channel
+        self.network = network
         self.currenttopic = ""
         if oldtopic:
             self.oldtopic = self.config.dec(oldtopic)
@@ -540,6 +543,8 @@ class Meeting(MeetingCommands, object):
         self.minutes.append(m)
     def replacements(self):
         repl = { }
+        repl['channel'] = self.channel
+        repl['network'] = self.network
         repl['MeetBotInfoURL'] = self.config.MeetBotInfoURL
         repl['timeZone'] = self.config.timeZone
         repl['starttime'] = repl['endtime'] = "None"