Skip to content

Commit 76c10e1

Browse files
committed
Rename Image to FilerImage and makemigrations.
1 parent 353057c commit 76c10e1

File tree

7 files changed

+50
-19
lines changed

7 files changed

+50
-19
lines changed

django_filer_image/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.0.1'
1+
__version__ = '0.0.2'

django_filer_image/convertor.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
from __future__ import annotations
2-
from typing import (
3-
Type,
4-
TYPE_CHECKING,
5-
)
6-
from os.path import splitext
72
from io import BytesIO
83
from math import ceil
94
from PIL import Image
10-
from funcy import first
11-
12-
from .settings import (
13-
IMAGE_QUALITY,
14-
)
155

166

177
def get_image(file):
@@ -21,11 +11,11 @@ def get_image(file):
2111
return image
2212

2313

24-
def get_preview_image(image, preview_size, quailty=100):
14+
def get_preview_image(image, preview_size, quality=100):
2515
size = get_preview_size(image, preview_size)
2616
resized_image = image.resize(size)
2717

28-
preview_progressive_jpeg = get_jpeg(resized_image, progressive=False, quality=quailty)
18+
preview_progressive_jpeg = get_jpeg(resized_image, progressive=False, quality=quality)
2919

3020
return preview_progressive_jpeg
3121

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Generated by Django 2.2.5 on 2019-09-11 09:36
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
import filer.fields.multistorage_file
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = [
13+
('filer', '0011_auto_20190418_0137'),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name='FilerImage',
19+
fields=[
20+
('_height', models.IntegerField(blank=True, null=True)),
21+
('_width', models.IntegerField(blank=True, null=True)),
22+
('default_alt_text', models.CharField(blank=True, max_length=255, null=True, verbose_name='default alt text')),
23+
('default_caption', models.CharField(blank=True, max_length=255, null=True, verbose_name='default caption')),
24+
('subject_location', models.CharField(blank=True, default='', max_length=64, verbose_name='subject location')),
25+
('file_ptr', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='django_filer_image_filerimage_file', serialize=False, to='filer.File')),
26+
('webp', filer.fields.multistorage_file.MultiStorageFileField(blank=True, max_length=255, null=True, upload_to=filer.fields.multistorage_file.generate_filename_multistorage, verbose_name='WebP image')),
27+
('progressive_jpeg', filer.fields.multistorage_file.MultiStorageFileField(blank=True, max_length=255, null=True, upload_to=filer.fields.multistorage_file.generate_filename_multistorage, verbose_name='Progressive jpeg image')),
28+
('preview', filer.fields.multistorage_file.MultiStorageFileField(blank=True, max_length=255, null=True, upload_to=filer.fields.multistorage_file.generate_filename_multistorage, verbose_name='Progressive jpeg preview image')),
29+
],
30+
options={
31+
'verbose_name': 'image',
32+
'verbose_name_plural': 'images',
33+
'abstract': False,
34+
'default_manager_name': 'objects',
35+
},
36+
bases=('filer.file',),
37+
),
38+
]

django_filer_image/models.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
)
2929

3030

31-
class Image(BaseImage):
31+
class FilerImage(BaseImage):
3232
webp = MultiStorageFileField(
3333
verbose_name='WebP image',
3434
null=True,
@@ -76,11 +76,11 @@ def render_image(
7676
return mark_safe(html)
7777

7878
class Meta(BaseImage.Meta):
79-
app_label = 'images'
79+
app_label = 'django_filer_image'
8080

8181

82-
@receiver(pre_save, sender=Image)
83-
def generate_images(sender, instance: Image, **kwargs):
82+
@receiver(pre_save, sender=FilerImage)
83+
def generate_images(sender, instance: FilerImage, **kwargs):
8484
image = get_image(instance.file)
8585
filename = first(splitext(instance.file.name))
8686

example/example/settings.py

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
'django.contrib.sessions',
3838
'django.contrib.messages',
3939
'django.contrib.staticfiles',
40+
'filer',
41+
'django_filer_image',
42+
'easy_thumbnails',
4043
]
4144

4245
MIDDLEWARE = [

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "django-filer-image"
3-
version = "0.0.1"
3+
version = "0.0.2"
44
description = ""
55
authors = ["Дмитрий <[email protected]>"]
66

tests/test_django_filer_image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
def test_version():
5-
assert __version__ == '0.0.1'
5+
assert __version__ == '0.0.2'

0 commit comments

Comments
 (0)