anonfunc/mumo3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Source plugin ini diverged from py defaults.

Browse Source
This commit is contained in:
Stefan Hacker
2013-02-26 23:56:34 +01:00
parent 0efae58454
commit e02206b022
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules-available/source.ini
View File

@@ -46,9 +46,7 @@ teams = Lobby, Spectator, Team one, Team two, Team three, Team four
; When creating a channel setup ACLs to restrict it to players ; When creating a channel setup ACLs to restrict it to players
restrict = true restrict = true
; Create base/server-channels on-demand ; Delete server channels as soon as the last player is gone
createifmissing = true
; Delete channels as soon as the last player is gone
deleteifunused = true deleteifunused = true
; Regular expression for server restriction. ; Regular expression for server restriction.

9
modules/source/source.py
View File

@@ -50,18 +50,17 @@ class source(MumoModule):
('name', str, "%(game)s"), ('name', str, "%(game)s"),
('servername', str, "%(server)s"), ('servername', str, "%(server)s"),
('teams', commaSeperatedStrings, ["Lobby", "Spectator", "Team one", "Team two", "Team three", "Team four"]), ('teams', commaSeperatedStrings, ["Lobby", "Spectator", "Team one", "Team two", "Team three", "Team four"]),
('groups', commaSeperatedStrings, ["%(game)s", "%(game)s_%(team)s", "%(game)s_%(team)s_%(channelid)d"]),
('restrict', x2bool, True), ('restrict', x2bool, True),
('serverregex', re.compile, re.compile("^\[[\w\d\-\(\):]{1,20}\]$")), ('serverregex', re.compile, re.compile("^\[[\w\d\-\(\):]{1,20}\]$")),
('createifmissing', x2bool, True),
('deleteifunused', x2bool, True) ('deleteifunused', x2bool, True)
) )
default_config = {'source':( default_config = {'source':(
('database', str, "source.sqlite"), ('database', str, "source.sqlite"),
('basechannelid', int, 0), ('basechannelid', int, 0),
('servers', commaSeperatedIntegers, []), ('mumbleservers', commaSeperatedIntegers, []),
('gameregex', re.compile, re.compile("^(tf|dod|cstrike)$")) ('gameregex', re.compile, re.compile("^(tf|dod|cstrike)$")),
('groupprefix', str, "source_")
), ),
# The generic section defines default values which can be overridden in # The generic section defines default values which can be overridden in
@@ -93,7 +92,7 @@ class source(MumoModule):
self.meta = manager.getMeta() self.meta = manager.getMeta()
servers = set(cfg.source.servers) servers = set(cfg.source.mumbleservers)
if not servers: if not servers:
servers = manager.SERVERS_ALL servers = manager.SERVERS_ALL