mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 06:17:17 +00:00
Merge pull request #7 from apoclyps/docker-support
[ISSUE-3] Adding docker support
This commit is contained in:
@@ -6,16 +6,15 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
dependencies = []
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Setting',
|
||||
name="Setting",
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('name', models.CharField(max_length=50)),
|
||||
('value', models.TextField()),
|
||||
("id", models.AutoField(verbose_name="ID", serialize=False, auto_created=True, primary_key=True)),
|
||||
("name", models.CharField(max_length=50)),
|
||||
("value", models.TextField()),
|
||||
],
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -6,14 +6,8 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0001_initial'),
|
||||
]
|
||||
dependencies = [("comic", "0001_initial")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='setting',
|
||||
name='name',
|
||||
field=models.CharField(unique=True, max_length=50),
|
||||
),
|
||||
migrations.AlterField(model_name="setting", name="name", field=models.CharField(unique=True, max_length=50))
|
||||
]
|
||||
|
||||
@@ -6,27 +6,25 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0002_auto_20150616_1613'),
|
||||
]
|
||||
dependencies = [("comic", "0002_auto_20150616_1613")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='ComicBook',
|
||||
name="ComicBook",
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('file_name', models.CharField(unique=True, max_length=100)),
|
||||
('last_read_page', models.IntegerField()),
|
||||
("id", models.AutoField(verbose_name="ID", serialize=False, auto_created=True, primary_key=True)),
|
||||
("file_name", models.CharField(unique=True, max_length=100)),
|
||||
("last_read_page", models.IntegerField()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ComicPage',
|
||||
name="ComicPage",
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('index', models.IntegerField()),
|
||||
('page_file_name', models.CharField(max_length=100)),
|
||||
('content_type', models.CharField(max_length=30)),
|
||||
('Comic', models.ForeignKey(to='comic.ComicBook', on_delete=models.CASCADE)),
|
||||
("id", models.AutoField(verbose_name="ID", serialize=False, auto_created=True, primary_key=True)),
|
||||
("index", models.IntegerField()),
|
||||
("page_file_name", models.CharField(max_length=100)),
|
||||
("content_type", models.CharField(max_length=30)),
|
||||
("Comic", models.ForeignKey(to="comic.ComicBook", on_delete=models.CASCADE)),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
||||
@@ -6,15 +6,10 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0003_comicbook_comicpage'),
|
||||
]
|
||||
dependencies = [("comic", "0003_comicbook_comicpage")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='comicbook',
|
||||
name='unread',
|
||||
field=models.BooleanField(default=True),
|
||||
preserve_default=False,
|
||||
),
|
||||
model_name="comicbook", name="unread", field=models.BooleanField(default=True), preserve_default=False
|
||||
)
|
||||
]
|
||||
|
||||
@@ -7,36 +7,27 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('comic', '0004_comicbook_unread'),
|
||||
]
|
||||
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("comic", "0004_comicbook_unread")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='ComicStatus',
|
||||
name="ComicStatus",
|
||||
fields=[
|
||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('last_read_page', models.IntegerField()),
|
||||
('unread', models.BooleanField()),
|
||||
("id", models.AutoField(verbose_name="ID", serialize=False, auto_created=True, primary_key=True)),
|
||||
("last_read_page", models.IntegerField()),
|
||||
("unread", models.BooleanField()),
|
||||
],
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='comicbook',
|
||||
name='last_read_page',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='comicbook',
|
||||
name='unread',
|
||||
migrations.RemoveField(model_name="comicbook", name="last_read_page"),
|
||||
migrations.RemoveField(model_name="comicbook", name="unread"),
|
||||
migrations.AddField(
|
||||
model_name="comicstatus",
|
||||
name="comic",
|
||||
field=models.ForeignKey(to="comic.ComicBook", on_delete=models.CASCADE),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='comicstatus',
|
||||
name='comic',
|
||||
field=models.ForeignKey(to='comic.ComicBook', on_delete=models.CASCADE),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='comicstatus',
|
||||
name='user',
|
||||
model_name="comicstatus",
|
||||
name="user",
|
||||
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -6,19 +6,9 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0005_auto_20150625_1400'),
|
||||
]
|
||||
dependencies = [("comic", "0005_auto_20150625_1400")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicstatus',
|
||||
name='last_read_page',
|
||||
field=models.IntegerField(default=0),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='comicstatus',
|
||||
name='unread',
|
||||
field=models.BooleanField(default=True),
|
||||
),
|
||||
migrations.AlterField(model_name="comicstatus", name="last_read_page", field=models.IntegerField(default=0)),
|
||||
migrations.AlterField(model_name="comicstatus", name="unread", field=models.BooleanField(default=True)),
|
||||
]
|
||||
|
||||
@@ -6,14 +6,8 @@ from django.db import models, migrations
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0006_auto_20150625_1411'),
|
||||
]
|
||||
dependencies = [("comic", "0006_auto_20150625_1411")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='setting',
|
||||
name='name',
|
||||
field=models.CharField(unique=True, max_length=100),
|
||||
),
|
||||
migrations.AlterField(model_name="setting", name="name", field=models.CharField(unique=True, max_length=100))
|
||||
]
|
||||
|
||||
@@ -11,39 +11,40 @@ import uuid
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0007_auto_20150626_1820'),
|
||||
]
|
||||
dependencies = [("comic", "0007_auto_20150626_1820")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Directory',
|
||||
name="Directory",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=100)),
|
||||
('selector', models.UUIDField(default=uuid.uuid4, null=True)),
|
||||
('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comic.Directory')),
|
||||
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
|
||||
("name", models.CharField(max_length=100)),
|
||||
("selector", models.UUIDField(default=uuid.uuid4, null=True)),
|
||||
(
|
||||
"parent",
|
||||
models.ForeignKey(
|
||||
blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="comic.Directory"
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='comicbook',
|
||||
name='date_added',
|
||||
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 3, 31, 10, 40, 30, 62170, tzinfo=utc)),
|
||||
model_name="comicbook",
|
||||
name="date_added",
|
||||
field=models.DateTimeField(
|
||||
auto_now_add=True, default=datetime.datetime(2016, 3, 31, 10, 40, 30, 62170, tzinfo=utc)
|
||||
),
|
||||
preserve_default=False,
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='comicbook',
|
||||
name='selector',
|
||||
field=models.UUIDField(default=uuid.uuid4, null=True),
|
||||
model_name="comicbook", name="selector", field=models.UUIDField(default=uuid.uuid4, null=True)
|
||||
),
|
||||
migrations.AddField(model_name="comicbook", name="version", field=models.IntegerField(default=0)),
|
||||
migrations.AddField(
|
||||
model_name='comicbook',
|
||||
name='version',
|
||||
field=models.IntegerField(default=0),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='comicbook',
|
||||
name='directory',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='comic.Directory'),
|
||||
model_name="comicbook",
|
||||
name="directory",
|
||||
field=models.ForeignKey(
|
||||
blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="comic.Directory"
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -8,11 +8,11 @@ import uuid
|
||||
|
||||
|
||||
def gen_uuid(apps, schema_editor):
|
||||
comicbook = apps.get_model('comic', 'comicbook')
|
||||
comicbook = apps.get_model("comic", "comicbook")
|
||||
for row in comicbook.objects.all():
|
||||
row.selector = uuid.uuid4()
|
||||
row.save()
|
||||
directory = apps.get_model('comic', 'directory')
|
||||
directory = apps.get_model("comic", "directory")
|
||||
for row in directory.objects.all():
|
||||
row.selector = uuid.uuid4()
|
||||
row.save()
|
||||
@@ -20,10 +20,6 @@ def gen_uuid(apps, schema_editor):
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0008_auto_20160331_1140'),
|
||||
]
|
||||
dependencies = [("comic", "0008_auto_20160331_1140")]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(gen_uuid, reverse_code=migrations.RunPython.noop),
|
||||
]
|
||||
operations = [migrations.RunPython(gen_uuid, reverse_code=migrations.RunPython.noop)]
|
||||
|
||||
@@ -9,19 +9,13 @@ import uuid
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0009_auto_20160331_1140'),
|
||||
]
|
||||
dependencies = [("comic", "0009_auto_20160331_1140")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicbook',
|
||||
name='selector',
|
||||
field=models.UUIDField(default=uuid.uuid4, unique=True),
|
||||
model_name="comicbook", name="selector", field=models.UUIDField(default=uuid.uuid4, unique=True)
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='directory',
|
||||
name='selector',
|
||||
field=models.UUIDField(default=uuid.uuid4, unique=True),
|
||||
model_name="directory", name="selector", field=models.UUIDField(default=uuid.uuid4, unique=True)
|
||||
),
|
||||
]
|
||||
|
||||
@@ -7,14 +7,6 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0010_auto_20160331_1140'),
|
||||
]
|
||||
dependencies = [("comic", "0010_auto_20160331_1140")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicbook',
|
||||
name='version',
|
||||
field=models.IntegerField(default=1),
|
||||
),
|
||||
]
|
||||
operations = [migrations.AlterField(model_name="comicbook", name="version", field=models.IntegerField(default=1))]
|
||||
|
||||
@@ -8,19 +8,17 @@ import uuid
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0011_auto_20160331_1141'),
|
||||
]
|
||||
dependencies = [("comic", "0011_auto_20160331_1141")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicbook',
|
||||
name='selector',
|
||||
model_name="comicbook",
|
||||
name="selector",
|
||||
field=models.UUIDField(db_index=True, default=uuid.uuid4, unique=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='directory',
|
||||
name='selector',
|
||||
model_name="directory",
|
||||
name="selector",
|
||||
field=models.UUIDField(db_index=True, default=uuid.uuid4, unique=True),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -7,14 +7,8 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0012_auto_20160401_0949'),
|
||||
]
|
||||
dependencies = [("comic", "0012_auto_20160401_0949")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='comicstatus',
|
||||
name='finished',
|
||||
field=models.BooleanField(default=False),
|
||||
),
|
||||
migrations.AddField(model_name="comicstatus", name="finished", field=models.BooleanField(default=False))
|
||||
]
|
||||
|
||||
@@ -5,22 +5,19 @@ from __future__ import unicode_literals
|
||||
from django.db import migrations
|
||||
from django.db.models import Max
|
||||
|
||||
|
||||
def set_finished(apps, schema_editor):
|
||||
comicstatus = apps.get_model('comic', 'comicstatus')
|
||||
comicpage = apps.get_model('comic', 'ComicPage')
|
||||
comicstatus = apps.get_model("comic", "comicstatus")
|
||||
comicpage = apps.get_model("comic", "ComicPage")
|
||||
for row in comicstatus.objects.all():
|
||||
last_page = comicpage.objects.filter(Comic=row.comic).aggregate(Max('index'))
|
||||
if row.last_read_page == last_page['index__max']:
|
||||
last_page = comicpage.objects.filter(Comic=row.comic).aggregate(Max("index"))
|
||||
if row.last_read_page == last_page["index__max"]:
|
||||
row.finished = True
|
||||
row.save()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0013_comicstatus_finished'),
|
||||
]
|
||||
dependencies = [("comic", "0013_comicstatus_finished")]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(set_finished, reverse_code=migrations.RunPython.noop),
|
||||
]
|
||||
operations = [migrations.RunPython(set_finished, reverse_code=migrations.RunPython.noop)]
|
||||
|
||||
@@ -7,14 +7,8 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('comic', '0014_auto_20160404_1402'),
|
||||
]
|
||||
dependencies = [("comic", "0014_auto_20160404_1402")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicbook',
|
||||
name='file_name',
|
||||
field=models.CharField(max_length=100),
|
||||
),
|
||||
migrations.AlterField(model_name="comicbook", name="file_name", field=models.CharField(max_length=100))
|
||||
]
|
||||
|
||||
@@ -6,14 +6,8 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('comic', '0015_auto_20160405_1126'),
|
||||
]
|
||||
dependencies = [("comic", "0015_auto_20160405_1126")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='comicpage',
|
||||
name='page_file_name',
|
||||
field=models.CharField(max_length=200),
|
||||
),
|
||||
migrations.AlterField(model_name="comicpage", name="page_file_name", field=models.CharField(max_length=200))
|
||||
]
|
||||
|
||||
@@ -10,19 +10,18 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('comic', '0016_auto_20160414_1335'),
|
||||
]
|
||||
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("comic", "0016_auto_20160414_1335")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='UserMisc',
|
||||
name="UserMisc",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('feed_id', models.UUIDField(db_index=True, default=uuid.uuid4, unique=True)),
|
||||
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
|
||||
("feed_id", models.UUIDField(db_index=True, default=uuid.uuid4, unique=True)),
|
||||
(
|
||||
'user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
"user",
|
||||
models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -6,17 +6,13 @@ from django.db import migrations
|
||||
|
||||
|
||||
def gen_feeds(apps, schema_editor):
|
||||
user_misc = apps.get_model('comic', 'UserMisc')
|
||||
User = apps.get_model('auth', 'user')
|
||||
user_misc = apps.get_model("comic", "UserMisc")
|
||||
User = apps.get_model("auth", "user")
|
||||
for user in User.objects.all():
|
||||
um = user_misc.objects.create(user=user)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
('comic', '0017_usermisc'),
|
||||
]
|
||||
dependencies = [("comic", "0017_usermisc")]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(gen_feeds, reverse_code=migrations.RunPython.noop),
|
||||
]
|
||||
operations = [migrations.RunPython(gen_feeds, reverse_code=migrations.RunPython.noop)]
|
||||
|
||||
Reference in New Issue
Block a user