Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 22:47:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename migrations to depend on account-migrations instead of players

Browse source
This commit is contained in:
Griatch 2017-07-09 09:12:09 +02:00
parent 120ddb7f81
commit a7aa1215cb
18 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/comms/migrations/0003_auto_20140917_0756.py
View file

@ -17,8 +17,8 @@ class Migration(migrations.Migration):
operations = [
migrations.AddField(
model_name='msg',
name='db_hide_from_players',
field=models.ManyToManyField(related_name=b'hide_from_players_set', null=True, to=settings.AUTH_USER_MODEL),
name='db_hide_from_accounts',
field=models.ManyToManyField(related_name=b'hide_from_accounts_set', null=True, to=settings.AUTH_USER_MODEL),
preserve_default=True,
),
migrations.AddField(
@ -35,8 +35,8 @@ class Migration(migrations.Migration):
),
migrations.AddField(
model_name='msg',
name='db_receivers_players',
field=models.ManyToManyField(help_text=b'player receivers', related_name=b'receiver_player_set', null=True, to=settings.AUTH_USER_MODEL),
name='db_receivers_accounts',
field=models.ManyToManyField(help_text=b'account receivers', related_name=b'receiver_account_set', null=True, to=settings.AUTH_USER_MODEL),
preserve_default=True,
),
migrations.AddField(
@ -47,8 +47,8 @@ class Migration(migrations.Migration):
),
migrations.AddField(
model_name='msg',
name='db_sender_players',
field=models.ManyToManyField(related_name=b'sender_player_set', null=True, verbose_name=b'sender(player)', to=settings.AUTH_USER_MODEL, db_index=True),
name='db_sender_accounts',
field=models.ManyToManyField(related_name=b'sender_account_set', null=True, verbose_name=b'sender(account)', to=settings.AUTH_USER_MODEL, db_index=True),
preserve_default=True,
),
migrations.AddField(

12
evennia/comms/migrations/0009_auto_20160921_1731.py
View file

@ -25,8 +25,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_hide_from_players',
field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_players_set', to=settings.AUTH_USER_MODEL),
name='db_hide_from_accounts',
field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='msg',
@ -40,8 +40,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_receivers_players',
field=models.ManyToManyField(blank=True, help_text=b'player receivers', null=True, related_name='receiver_player_set', to=settings.AUTH_USER_MODEL),
name='db_receivers_accounts',
field=models.ManyToManyField(blank=True, help_text=b'account receivers', null=True, related_name='receiver_account_set', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='msg',
@ -55,8 +55,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_sender_players',
field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_player_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(player)'),
name='db_sender_accounts',
field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(account)'),
),
migrations.AlterField(
model_name='msg',

12
evennia/comms/migrations/0011_auto_20170606_1731.py
View file

@ -45,8 +45,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_hide_from_players',
field=models.ManyToManyField(blank=True, related_name='hide_from_players_set', to=settings.AUTH_USER_MODEL),
name='db_hide_from_accounts',
field=models.ManyToManyField(blank=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='msg',
@ -60,8 +60,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_receivers_players',
field=models.ManyToManyField(blank=True, help_text=b'player receivers', related_name='receiver_player_set', to=settings.AUTH_USER_MODEL),
name='db_receivers_accounts',
field=models.ManyToManyField(blank=True, help_text=b'account receivers', related_name='receiver_account_set', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='msg',
@ -70,8 +70,8 @@ class Migration(migrations.Migration):
),
migrations.AlterField(
model_name='msg',
name='db_sender_players',
field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_player_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(player)'),
name='db_sender_accounts',
field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(account)'),
),
migrations.AlterField(
model_name='msg',

18
evennia/comms/migrations/0014_auto_20170705_1736.py
View file

@ -8,27 +8,27 @@ from django.db import migrations
def forwards(apps, schema_editor):
try:
apps.get_model('players', 'PlayerDB')
apps.get_model('accounts', 'AccountDB')
except LookupError:
return
AccountDB = apps.get_model('accounts', 'AccountDB')
Msg = apps.get_model('comms', 'Msg')
for msg in Msg.objects.all():
for player in msg.db_sender_players.all():
account = AccountDB.objects.get(id=player.id)
for account in msg.db_sender_accounts.all():
account = AccountDB.objects.get(id=account.id)
msg.db_sender_accounts.add(account)
for player in msg.db_receivers_players.all():
account = AccountDB.objects.get(id=player.id)
for account in msg.db_receivers_accounts.all():
account = AccountDB.objects.get(id=account.id)
msg.db_receivers_accounts.add(account)
for player in msg.db_hide_from_players.all():
account = AccountDB.objects.get(id=player.id)
for account in msg.db_hide_from_accounts.all():
account = AccountDB.objects.get(id=account.id)
msg.db_hide_from_accounts.add(account)
ChannelDB = apps.get_model('comms', 'ChannelDB')
for channel in ChannelDB.objects.all():
for player in channel.db_subscriptions.all():
account = AccountDB.objects.get(id=player.id)
for account in channel.db_subscriptions.all():
account = AccountDB.objects.get(id=account.id)
channel.db_account_subscriptions.add(account)

4
evennia/comms/migrations/0015_auto_20170706_2041.py
View file

@ -18,10 +18,10 @@ class Migration(migrations.Migration):
),
migrations.RemoveField(
model_name='msg',
name='db_receivers_players',
name='db_receivers_accounts',
),
migrations.RemoveField(
model_name='msg',
name='db_sender_players',
name='db_sender_accounts',
),
]

2
evennia/objects/migrations/0001_initial.py
View file

@ -20,7 +20,7 @@ class Migration(migrations.Migration):
('db_typeclass_path', models.CharField(help_text=b"this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name=b'typeclass')),
('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name=b'creation date')),
('db_lock_storage', models.TextField(help_text=b"locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name=b'locks', blank=True)),
('db_sessid', models.CommaSeparatedIntegerField(help_text=b'csv list of session ids of connected Player, if any.', max_length=32, null=True, verbose_name=b'session id')),
('db_sessid', models.CommaSeparatedIntegerField(help_text=b'csv list of session ids of connected Account, if any.', max_length=32, null=True, verbose_name=b'session id')),
('db_cmdset_storage', models.CharField(help_text=b'optional python path to a cmdset class.', max_length=255, null=True, verbose_name=b'cmdset', blank=True)),
('db_attributes', models.ManyToManyField(help_text=b'attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)),
('db_destination', models.ForeignKey(related_name=b'destinations_set', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='objects.ObjectDB', help_text=b'a destination, used only by exit objects.', null=True, verbose_name=b'destination')),

4
evennia/objects/migrations/0002_auto_20140917_0756.py
View file

@ -17,8 +17,8 @@ class Migration(migrations.Migration):
operations = [
migrations.AddField(
model_name='objectdb',
name='db_player',
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name=b'player', to=settings.AUTH_USER_MODEL, help_text=b'a Player connected to this object, if any.', null=True),
name='db_account',
field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name=b'account', to=settings.AUTH_USER_MODEL, help_text=b'an Account connected to this object, if any.', null=True),
preserve_default=True,
),
migrations.AddField(

2
evennia/objects/migrations/0006_auto_20170606_1731.py
View file

@ -22,7 +22,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='objectdb',
name='db_sessid',
field=models.CharField(help_text=b'csv list of session ids of connected Player, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z'), code='invalid', message='Enter only digits separated by commas.')], verbose_name=b'session id'),
field=models.CharField(help_text=b'csv list of session ids of connected Account, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z'), code='invalid', message='Enter only digits separated by commas.')], verbose_name=b'session id'),
),
migrations.AlterField(
model_name='objectdb',

8
evennia/objects/migrations/0008_auto_20170705_1736.py
View file

@ -8,16 +8,16 @@ from django.db import migrations
def forwards(apps, schema_editor):
try:
apps.get_model('players', 'PlayerDB')
apps.get_model('accounts', 'AccountDB')
except LookupError:
return
AccountDB = apps.get_model('accounts', 'AccountDB')
ObjectDB = apps.get_model('objects', 'ObjectDB')
for object in ObjectDB.objects.all():
player = object.db_player
if player:
account = AccountDB.objects.get(id=player.id)
account = object.db_account
if account:
account = AccountDB.objects.get(id=account.id)
object.db_account = account
object.save(update_fields=['db_account'])

2
evennia/objects/migrations/0009_remove_objectdb_db_player.py
View file

@ -14,6 +14,6 @@ class Migration(migrations.Migration):
operations = [
migrations.RemoveField(
model_name='objectdb',
name='db_player',
name='db_account',
),
]

2
evennia/scripts/migrations/0001_initial.py
View file

@ -30,7 +30,7 @@ class Migration(migrations.Migration):
('db_is_active', models.BooleanField(default=False, verbose_name=b'script active')),
('db_attributes', models.ManyToManyField(help_text=b'attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)),
('db_obj', models.ForeignKey(blank=True, to='objects.ObjectDB', help_text=b'the object to store this script on, if not a global script.', null=True, verbose_name=b'scripted object')),
('db_player', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text=b'the player to store this script on (should not be set if obj is set)', null=True, verbose_name=b'scripted player')),
('db_account', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text=b'the account to store this script on (should not be set if obj is set)', null=True, verbose_name=b'scripted account')),
('db_tags', models.ManyToManyField(help_text=b'tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True)),
],
options={

8
evennia/scripts/migrations/0010_auto_20170705_1736.py
View file

@ -8,16 +8,16 @@ from django.db import migrations
def forwards(apps, schema_editor):
try:
apps.get_model('players', 'PlayerDB')
apps.get_model('accounts', 'AccountDB')
except LookupError:
return
AccountDB = apps.get_model('accounts', 'AccountDB')
ScriptDB = apps.get_model('scripts', 'ScriptDB')
for script in ScriptDB.objects.all():
player = script.db_player
if player:
account = AccountDB.objects.get(id=player.id)
account = script.db_account
if account:
account = AccountDB.objects.get(id=account.id)
script.db_account = account
script.save(update_fields=['db_account'])

2
evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
View file

@ -14,6 +14,6 @@ class Migration(migrations.Migration):
operations = [
migrations.RemoveField(
model_name='scriptdb',
name='db_player',
name='db_account',
),
]

2
evennia/settings_default.py
View file

@ -497,7 +497,7 @@ PERMISSION_HIERARCHY = ["Guest", # note-only used if GUEST_ENABLED=True
"Admin",
"Developer"]
# The default permission given to all new accounts
PERMISSION_PLAYER_DEFAULT = "Player"
PERMISSION_ACCOUNT_DEFAULT = "Player"
# Default sizes for client window (in number of characters), if client
# is not supplying this on its own
CLIENT_DEFAULT_WIDTH = 78

14
evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py
View file

@ -2,7 +2,7 @@
from __future__ import unicode_literals
from django.db import models, migrations
import evennia.players.manager
import evennia.accounts.manager
class Migration(migrations.Migration):
@ -10,7 +10,7 @@ class Migration(migrations.Migration):
dependencies = [
('objects', '0005_auto_20150403_2339'),
('scripts', '0007_auto_20150403_2339'),
('players', '0004_auto_20150403_2339'),
('accounts', '0004_auto_20150403_2339'),
('typeclasses', '0002_auto_20150109_0913'),
]
@ -25,15 +25,15 @@ class Migration(migrations.Migration):
bases=('objects.objectdb',),
),
migrations.CreateModel(
name='DefaultPlayer',
name='DefaultAccount',
fields=[
],
options={
'proxy': True,
},
bases=('players.playerdb',),
bases=('accounts.accountdb',),
managers=[
(b'objects', evennia.players.manager.PlayerManager()),
(b'objects', evennia.accounts.manager.AccountManager()),
],
),
migrations.CreateModel(
@ -70,9 +70,9 @@ class Migration(migrations.Migration):
options={
'proxy': True,
},
bases=('typeclasses.defaultplayer',),
bases=('typeclasses.defaultaccount',),
managers=[
(b'objects', evennia.players.manager.PlayerManager()),
(b'objects', evennia.accounts.manager.AccountManager()),
],
),
migrations.CreateModel(

8
evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py
View file

@ -11,10 +11,10 @@ def update_tags_with_dbmodel(apps, schema_editor):
obj.db_attributes.all().update(db_model="objectdb")
obj.db_tags.all().update(db_model="objectdb")
PlayerDB = apps.get_model('players', 'PlayerDB')
for obj in PlayerDB.objects.all():
obj.db_attributes.all().update(db_model="playerdb")
obj.db_tags.all().update(db_model="playerdb")
AccountDB = apps.get_model('accounts', 'AccountDB')
for obj in AccountDB.objects.all():
obj.db_attributes.all().update(db_model="accountdb")
obj.db_tags.all().update(db_model="accountdb")
ScriptDB = apps.get_model('scripts', 'ScriptDB')
for obj in ScriptDB.objects.all():

8
evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
View file

@ -17,12 +17,12 @@ def update_tags_with_dbmodel(apps, schema_editor):
newtag.save()
obj.db_tags.add(newtag)
PlayerDB = apps.get_model('players', 'PlayerDB')
for obj in PlayerDB.objects.all().exclude(db_tags__db_model="playerdb"):
for tag in obj.db_tags.all().exclude(db_model="playerdb"):
AccountDB = apps.get_model('accounts', 'AccountDB')
for obj in AccountDB.objects.all().exclude(db_tags__db_model="accountdb"):
for tag in obj.db_tags.all().exclude(db_model="accountdb"):
obj.db_tags.remove(tag)
newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="playerdb")
db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="accountdb")
newtag.save()
obj.db_tags.add(newtag)

4
evennia/typeclasses/migrations/0008_lock_and_perm_rename.py
View file

@ -9,7 +9,7 @@ def update_perms_and_locks(apps, schema_editor):
# update all permissions
Tag = apps.get_model('typeclasses', 'Tag')
perm_map = {"guests": "guest", "players": "player", "playerhelpers":"helper",
perm_map = {"guests": "guest", "accounts": "account", "accounthelpers":"helper",
"builders": "builder", "wizards":"admin", "immortals": "developer"}
for perm in Tag.objects.filter(db_tagtype="permission"):
@ -18,7 +18,7 @@ def update_perms_and_locks(apps, schema_editor):
perm.save(update_fields=("db_key",))
# update all locks on all entities
apps_models = [("objects", "ObjectDB"), ("players", "PlayerDB"), ("scripts", "ScriptDB"),
apps_models = [("objects", "ObjectDB"), ("accounts", "AccountDB"), ("scripts", "ScriptDB"),
("comms", "ChannelDB")]
p_reg = re.compile(r"(?<=perm\()(\w+)(?=\))|(?<=perm_above\()(\w+)(?=\))",
re.IGNORECASE + re.UNICODE)