mirror of
https://github.com/daniviga/django-ram.git
synced 2025-08-04 21:27:49 +02:00
Keep media folder clean (#28)
* Reorg roster, portal and bookshelf media * Extend media reorg to consists * Delete roster and bookshelf images on delte. Do not delete others data that might be dedup! * Bump version
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
from uuid import uuid4
|
||||
from django.db import models
|
||||
from django.urls import reverse
|
||||
@@ -8,7 +10,7 @@ from django.dispatch import receiver
|
||||
from ckeditor_uploader.fields import RichTextUploadingField
|
||||
|
||||
from ram.models import Document, Image, PropertyInstance
|
||||
from ram.utils import get_image_preview
|
||||
from ram.utils import DeduplicatedStorage
|
||||
from metadata.models import (
|
||||
Scale,
|
||||
Manufacturer,
|
||||
@@ -106,6 +108,15 @@ class RollingStock(models.Model):
|
||||
def company(self):
|
||||
return str(self.rolling_class.company)
|
||||
|
||||
def delete(self, *args, **kwargs):
|
||||
shutil.rmtree(
|
||||
os.path.join(
|
||||
settings.MEDIA_ROOT, "images", "rollingstock", str(self.uuid)
|
||||
),
|
||||
ignore_errors=True
|
||||
)
|
||||
super(RollingStock, self).delete(*args, **kwargs)
|
||||
|
||||
|
||||
@receiver(models.signals.pre_save, sender=RollingStock)
|
||||
def pre_save_running_number(sender, instance, *args, **kwargs):
|
||||
@@ -126,10 +137,25 @@ class RollingStockDocument(Document):
|
||||
unique_together = ("rolling_stock", "file")
|
||||
|
||||
|
||||
def rolling_stock_image_upload(instance, filename):
|
||||
return os.path.join(
|
||||
"images",
|
||||
"rollingstock",
|
||||
str(instance.rolling_stock.uuid),
|
||||
filename
|
||||
)
|
||||
|
||||
|
||||
class RollingStockImage(Image):
|
||||
rolling_stock = models.ForeignKey(
|
||||
RollingStock, on_delete=models.CASCADE, related_name="image"
|
||||
)
|
||||
image = models.ImageField(
|
||||
upload_to=rolling_stock_image_upload,
|
||||
storage=DeduplicatedStorage,
|
||||
null=True,
|
||||
blank=True,
|
||||
)
|
||||
|
||||
|
||||
class RollingStockProperty(PropertyInstance):
|
||||
|
Reference in New Issue
Block a user