All: Apply Black coding rules

This commit is contained in:
2018-10-04 21:29:19 +02:00
parent 0581c667de
commit cb58b00b6e
204 changed files with 13173 additions and 6376 deletions

View File

@ -38,14 +38,20 @@ from core.utils import resize_image, exif_auto_rotate
class SASPictureManager(models.Manager):
def get_queryset(self):
return super(SASPictureManager, self).get_queryset().filter(is_in_sas=True,
is_folder=False)
return (
super(SASPictureManager, self)
.get_queryset()
.filter(is_in_sas=True, is_folder=False)
)
class SASAlbumManager(models.Manager):
def get_queryset(self):
return super(SASAlbumManager, self).get_queryset().filter(is_in_sas=True,
is_folder=True)
return (
super(SASAlbumManager, self)
.get_queryset()
.filter(is_in_sas=True, is_folder=True)
)
class Picture(SithFile):
@ -56,7 +62,9 @@ class Picture(SithFile):
@property
def is_vertical(self):
with open(os.path.join(settings.MEDIA_ROOT, self.file.name).encode('utf-8'), 'rb') as f:
with open(
os.path.join(settings.MEDIA_ROOT, self.file.name).encode("utf-8"), "rb"
) as f:
im = Image.open(BytesIO(f.read()))
(w, h) = im.size
return (w / h) < 1
@ -64,24 +72,27 @@ class Picture(SithFile):
def can_be_edited_by(self, user):
# file = SithFile.objects.filter(id=self.id).first()
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) # or user.can_edit(file)
return user.is_in_group(
settings.SITH_GROUP_SAS_ADMIN_ID
) # or user.can_edit(file)
def can_be_viewed_by(self, user):
# file = SithFile.objects.filter(id=self.id).first()
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
user.was_subscribed) # or user.can_view(file)
return self.can_be_edited_by(user) or (
self.is_in_sas and self.is_moderated and user.was_subscribed
) # or user.can_view(file)
def get_download_url(self):
return reverse('sas:download', kwargs={'picture_id': self.id})
return reverse("sas:download", kwargs={"picture_id": self.id})
def get_download_compressed_url(self):
return reverse('sas:download_compressed', kwargs={'picture_id': self.id})
return reverse("sas:download_compressed", kwargs={"picture_id": self.id})
def get_download_thumb_url(self):
return reverse('sas:download_thumb', kwargs={'picture_id': self.id})
return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
def get_absolute_url(self):
return reverse('sas:picture', kwargs={'picture_id': self.id})
return reverse("sas:picture", kwargs={"picture_id": self.id})
def generate_thumbnails(self, overwrite=False):
im = Image.open(BytesIO(self.file.read()))
@ -89,9 +100,9 @@ class Picture(SithFile):
im = exif_auto_rotate(im)
except:
pass
file = resize_image(im, max(im.size), self.mime_type.split('/')[-1])
thumb = resize_image(im, 200, self.mime_type.split('/')[-1])
compressed = resize_image(im, 1200, self.mime_type.split('/')[-1])
file = resize_image(im, max(im.size), self.mime_type.split("/")[-1])
thumb = resize_image(im, 200, self.mime_type.split("/")[-1])
compressed = resize_image(im, 1200, self.mime_type.split("/")[-1])
if overwrite:
self.file.delete()
self.thumbnail.delete()
@ -105,28 +116,60 @@ class Picture(SithFile):
self.save()
def rotate(self, degree):
for attr in ['file', 'compressed', 'thumbnail']:
for attr in ["file", "compressed", "thumbnail"]:
name = self.__getattribute__(attr).name
with open(os.path.join(settings.MEDIA_ROOT, name).encode('utf-8'), 'r+b') as file:
with open(
os.path.join(settings.MEDIA_ROOT, name).encode("utf-8"), "r+b"
) as file:
if file:
im = Image.open(BytesIO(file.read()))
file.seek(0)
im = im.rotate(degree, expand=True)
im.save(fp=file, format=self.mime_type.split('/')[-1].upper(), quality=90, optimize=True, progressive=True)
im.save(
fp=file,
format=self.mime_type.split("/")[-1].upper(),
quality=90,
optimize=True,
progressive=True,
)
def get_next(self):
if self.is_moderated:
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
id__gt=self.id).order_by('id').first()
return (
self.parent.children.filter(
is_moderated=True,
asked_for_removal=False,
is_folder=False,
id__gt=self.id,
)
.order_by("id")
.first()
)
else:
return Picture.objects.filter(id__gt=self.id, is_moderated=False).order_by('id').first()
return (
Picture.objects.filter(id__gt=self.id, is_moderated=False)
.order_by("id")
.first()
)
def get_previous(self):
if self.is_moderated:
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
id__lt=self.id).order_by('id').last()
return (
self.parent.children.filter(
is_moderated=True,
asked_for_removal=False,
is_folder=False,
id__lt=self.id,
)
.order_by("id")
.last()
)
else:
return Picture.objects.filter(id__lt=self.id, is_moderated=False).order_by('-id').first()
return (
Picture.objects.filter(id__lt=self.id, is_moderated=False)
.order_by("-id")
.first()
)
class Album(SithFile):
@ -145,25 +188,34 @@ class Album(SithFile):
def can_be_edited_by(self, user):
# file = SithFile.objects.filter(id=self.id).first()
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) # or user.can_edit(file)
return user.is_in_group(
settings.SITH_GROUP_SAS_ADMIN_ID
) # or user.can_edit(file)
def can_be_viewed_by(self, user):
# file = SithFile.objects.filter(id=self.id).first()
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
user.was_subscribed) # or user.can_view(file)
return self.can_be_edited_by(user) or (
self.is_in_sas and self.is_moderated and user.was_subscribed
) # or user.can_view(file)
def get_absolute_url(self):
return reverse('sas:album', kwargs={'album_id': self.id})
return reverse("sas:album", kwargs={"album_id": self.id})
def get_download_url(self):
return reverse('sas:album_preview', kwargs={'album_id': self.id})
return reverse("sas:album_preview", kwargs={"album_id": self.id})
def generate_thumbnail(self):
p = self.children_pictures.order_by('?').first() or self.children_albums.exclude(file=None).exclude(file="").order_by('?').first()
p = (
self.children_pictures.order_by("?").first()
or self.children_albums.exclude(file=None)
.exclude(file="")
.order_by("?")
.first()
)
if p and p.file:
im = Image.open(BytesIO(p.file.read()))
self.file = resize_image(im, 200, "jpeg")
self.file.name = self.name + '/thumb.jpg'
self.file.name = self.name + "/thumb.jpg"
self.save()
@ -182,11 +234,20 @@ class PeoplePictureRelation(models.Model):
The PeoplePictureRelation class makes the connection between User and Picture
"""
user = models.ForeignKey(User, verbose_name=_('user'), related_name="pictures", null=False, blank=False)
picture = models.ForeignKey(Picture, verbose_name=_('picture'), related_name="people", null=False, blank=False)
user = models.ForeignKey(
User, verbose_name=_("user"), related_name="pictures", null=False, blank=False
)
picture = models.ForeignKey(
Picture,
verbose_name=_("picture"),
related_name="people",
null=False,
blank=False,
)
class Meta:
unique_together = ['user', 'picture']
unique_together = ["user", "picture"]
def __str__(self):
return self.user.get_display_name() + " - " + str(self.picture)