Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added migration to rename the default channels. If those were already changed, the settings file will need to be updated with the changed name.

Browse source
This commit is contained in:
Griatch 2015-02-23 16:26:41 +01:00
parent 68e8062007
commit b8daff0663
2 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

24
evennia/comms/migrations/0005_auto_20150223_1517.py Normal file
View file

@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
def convert_channelnames(apps, schema_editor):
ChannelDB = apps.get_model("comms", "ChannelDB")
for chan in ChannelDB.objects.filter(db_key="MUDinfo"):
# remove the old MUDinfo default channel
chan.delete()
for chan in ChannelDB.objects.filter(db_key__iexact="MUDconnections"):
# change the old mudconnections to MudInfo instead
chan.db_key = "MudInfo"
chan.save()
class Migration(migrations.Migration):
dependencies = [
('comms', '0004_auto_20150118_1631'),
]
operations = [
migrations.RunPython(convert_channelnames),
]

32
evennia/players/players.py
View file

@ -613,7 +613,6 @@ class DefaultPlayer(PlayerDB):
global _CONNECT_CHANNEL global _CONNECT_CHANNEL
if not _CONNECT_CHANNEL: if not _CONNECT_CHANNEL:
try: try:
print "all channels:", ChannelDB.objects.all()
_CONNECT_CHANNEL = ChannelDB.objects.filter(db_key=settings.DEFAULT_CHANNELS[1]["key"])[0] _CONNECT_CHANNEL = ChannelDB.objects.filter(db_key=settings.DEFAULT_CHANNELS[1]["key"])[0]
except Exception: except Exception:
logger.log_trace() logger.log_trace()
@ -625,37 +624,6 @@ class DefaultPlayer(PlayerDB):
else: else:
logger.log_infomsg("[%s]: %s" % (now, message)) logger.log_infomsg("[%s]: %s" % (now, message))
#def _go_ic_at_login(self, sessid=None):
# new_character = self.db._last_puppet
# # permission checks
# if self.get_puppet(sessid) == new_character:
# return
# if new_character.player:
# # may not puppet an already puppeted character
# if new_character.sessid.count() and new_character.player == self:
# # as a safeguard we allow "taking over" chars from your own sessions.
# if _MULTISESSION_MODE in (1, 3):
# txt1 = "{c%s{n{G is now shared from another of your sessions.{n"
# txt2 = "Sharing {c%s{n with another of your sessions."
# else:
# txt1 = "{c%s{n{R is now acted from another of your sessions.{n"
# txt2 = "Taking over {c%s{n from another of your sessions."
# self.unpuppet_object(new_character.sessid.get())
# self.msg(txt1 % new_character.name, sessid=new_character.sessid.get())
# self.msg(txt2 % new_character.name, sessid=sessid)
# elif new_character.player != self and new_character.player.is_connected:
# self.msg("{c%s{r is already acted by another player{n." % new_character.name, sessid=sessid)
# return
# if not new_character.access(self, 'puppet'):
# # main acccess check
# self.msg("{rYou may not become {C%s{n." % new_character.name, sessid=sessid)
# return
# if self.puppet_object(sessid, new_character):
# self.db._last_puppet = new_character
# else:
# self.msg("{rYou cannot become {C%s{n." % new_character.name, sessid=sessid)
def at_post_login(self, sessid=None): def at_post_login(self, sessid=None):
""" """
Called at the end of the login process, just before letting Called at the end of the login process, just before letting