Skip to content

GitLab

Commit 392515fa authored by Seb's avatar Seb
Browse files

reset migrations and use custom video model for dev

parent 7a4cf265
Show whitespace changes
Inline Side-by-side
settings.py
View file @ 392515fa
...@@ -10,3 +10,5 @@ DATABASES = { ...@@ -10,3 +10,5 @@ DATABASES = {
INSTALLED_APPS += [ INSTALLED_APPS += [
'wagtail.contrib.styleguide', 'wagtail.contrib.styleguide',
] ]
WAGTAILVIDEOS_VIDEO_MODEL = 'app.CustomVideoModel'
\ No newline at end of file
tests/app/migrations/0001_initial.py
View file @ 392515fa
# -*- coding: utf-8 -*- # Generated by Django 2.2.17 on 2021-01-28 00:22
# Generated by Django 1.9.7 on 2016-07-11 02:19
from __future__ import unicode_literals
import django.db.models.deletion from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion
import enumchoicefield.fields
import taggit.managers
import wagtail.core.fields
import wagtail.core.models
import wagtail.search.index
import wagtailvideos.blocks
import wagtailvideos.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
...@@ -11,15 +17,39 @@ class Migration(migrations.Migration): ...@@ -11,15 +17,39 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
('wagtailcore', '0028_merge'), ('taggit', '0003_taggeditem_add_unique_index'),
('wagtailvideos', '0007_video_duration'), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('wagtailvideos', '0010_video_ordering'),
('wagtailcore', '0059_apply_collection_ordering'),
] ]
operations = [ operations = [
migrations.CreateModel(
name='CustomVideoModel',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='title')),
('file', models.FileField(upload_to=wagtailvideos.models.get_upload_to, verbose_name='file')),
('thumbnail', models.ImageField(blank=True, null=True, upload_to=wagtailvideos.models.get_upload_to)),
('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')),
('duration', models.DurationField(blank=True, null=True)),
('file_size', models.PositiveIntegerField(editable=False, null=True)),
('attribution', models.TextField(blank=True)),
('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')),
('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')),
('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')),
],
options={
'ordering': ['-created_at'],
'abstract': False,
},
bases=(wagtail.search.index.Indexed, models.Model),
),
migrations.CreateModel( migrations.CreateModel(
name='TestPage', name='TestPage',
fields=[ fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
('video_streamfield', wagtail.core.fields.StreamField([('video', wagtailvideos.blocks.VideoChooserBlock())], blank=True)),
('video_field', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailvideos.Video')), ('video_field', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailvideos.Video')),
], ],
options={ options={
...@@ -27,4 +57,19 @@ class Migration(migrations.Migration): ...@@ -27,4 +57,19 @@ class Migration(migrations.Migration):
}, },
bases=('wagtailcore.page',), bases=('wagtailcore.page',),
), ),
migrations.CreateModel(
name='CustomVideoTranscode',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('media_format', enumchoicefield.fields.EnumChoiceField(enum_class=wagtailvideos.models.MediaFormats, max_length=4)),
('quality', enumchoicefield.fields.EnumChoiceField(default=wagtailvideos.models.VideoQuality(1), enum_class=wagtailvideos.models.VideoQuality, max_length=7)),
('processing', models.BooleanField(default=False)),
('file', models.FileField(blank=True, null=True, upload_to=wagtailvideos.models.get_upload_to, verbose_name='file')),
('error_message', models.TextField(blank=True)),
('video', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transcodes', to='app.CustomVideoModel')),
],
options={
'unique_together': {('video', 'media_format')},
},
),
] ]
tests/app/migrations/0002_testpage_video_streamfield.py deleted 100644 → 0
View file @ 7a4cf265
# Generated by Django 3.1.5 on 2021-01-21 22:54
from django.db import migrations
import wagtail.core.fields
import wagtailvideos.blocks
class Migration(migrations.Migration):
dependencies = [
('app', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='testpage',
name='video_streamfield',
field=wagtail.core.fields.StreamField([('video', wagtailvideos.blocks.VideoChooserBlock())], blank=True),
),
]
tests/app/migrations/0003_customvideomodel_customvideotranscode.py deleted 100644 → 0
View file @ 7a4cf265
# Generated by Django 2.2.17 on 2021-01-27 23:53
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import enumchoicefield.fields
import taggit.managers
import wagtail.core.models
import wagtail.search.index
import wagtailvideos.models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('taggit', '0003_taggeditem_add_unique_index'),
('wagtailcore', '0059_apply_collection_ordering'),
('app', '0002_testpage_video_streamfield'),
]
operations = [
migrations.CreateModel(
name='CustomVideoModel',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='title')),
('file', models.FileField(upload_to=wagtailvideos.models.get_upload_to, verbose_name='file')),
('thumbnail', models.ImageField(blank=True, null=True, upload_to=wagtailvideos.models.get_upload_to)),
('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')),
('duration', models.DurationField(blank=True, null=True)),
('file_size', models.PositiveIntegerField(editable=False, null=True)),
('attribution', models.TextField()),
('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')),
('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')),
('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')),
],
options={
'ordering': ['-created_at'],
'abstract': False,
},
bases=(wagtail.search.index.Indexed, models.Model),
),
migrations.CreateModel(
name='CustomVideoTranscode',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('media_format', enumchoicefield.fields.EnumChoiceField(enum_class=wagtailvideos.models.MediaFormats, max_length=4)),
('quality', enumchoicefield.fields.EnumChoiceField(default=wagtailvideos.models.VideoQuality(1), enum_class=wagtailvideos.models.VideoQuality, max_length=7)),
('processing', models.BooleanField(default=False)),
('file', models.FileField(blank=True, null=True, upload_to=wagtailvideos.models.get_upload_to, verbose_name='file')),
('error_message', models.TextField(blank=True)),
('video', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transcodes', to='app.CustomVideoModel')),
],
options={
'unique_together': {('video', 'media_format')},
},
),
]
tests/app/models.py
View file @ 392515fa
...@@ -9,7 +9,7 @@ from wagtailvideos.models import AbstractVideo, AbstractVideoTranscode ...@@ -9,7 +9,7 @@ from wagtailvideos.models import AbstractVideo, AbstractVideoTranscode
class CustomVideoModel(AbstractVideo): class CustomVideoModel(AbstractVideo):
attribution = models.TextField() attribution = models.TextField(blank=True)
admin_form_fields = ( admin_form_fields = (
'title', 'title',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment