JakeBreath
d0e2901c92
Backend: - TempUpload model: staged files (pending / visual_match / completed / error) with resolution, e621 payload, custom metadata and IQDB data - Files land in a temp folder and only move into the watched library folder once resolved; duplicates resolve immediately without a copy - Endpoints: stage (multipart), list, retrieve, temp file, IQDB save, resolve (link to post or custom metadata), discard/dismiss - cleanup_temp_uploads command for old staged files - Replaces the old direct-to-library upload endpoint Frontend: - Upload page is now a three-column board (Pending & Unmatched / Visual Similarity Detected / Auto-uploaded & Indexed) - After upload: MD5s are batch-checked against e621 and matches auto-complete with full post metadata; remaining files run through IQDB and move to the similarity column when candidates exist - Metadata modal with IQDB candidates, post-ID linking and custom tags/rating/notes; discard and dismiss actions - e621 client gains fetchPostsByMd5 and iqdbSearch helpers Roadmap updated with the completed upload items.
118 lines
4.0 KiB
Python
118 lines
4.0 KiB
Python
from django.conf import settings
|
|
from django.db import models
|
|
|
|
import uuid
|
|
|
|
|
|
class MediaItem(models.Model):
|
|
"""A logical media file, identified by its MD5 fingerprint."""
|
|
|
|
md5 = models.CharField(max_length=32, unique=True)
|
|
size = models.BigIntegerField(default=0)
|
|
# Custom rating: "s" (safe), "q" (questionable), "e" (explicit) or "" (unrated).
|
|
rating = models.CharField(max_length=1, blank=True, default="")
|
|
tags = models.JSONField(default=list, blank=True)
|
|
notes = models.TextField(blank=True, default="")
|
|
uploaded_by = models.ForeignKey(
|
|
settings.AUTH_USER_MODEL,
|
|
null=True,
|
|
blank=True,
|
|
on_delete=models.SET_NULL,
|
|
related_name="uploads",
|
|
)
|
|
# Guests never see items whose tags hit the mirrored default blacklist.
|
|
hidden_from_guests = models.BooleanField(default=False, db_index=True)
|
|
e621_post_id = models.IntegerField(null=True, blank=True, db_index=True)
|
|
e621_data = models.JSONField(null=True, blank=True)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
class Meta:
|
|
ordering = ["-created_at"]
|
|
|
|
def __str__(self):
|
|
return f"J-{self.pk} ({self.md5})"
|
|
|
|
def save(self, *args, **kwargs):
|
|
from .guest_filter import item_is_hidden_for_guests
|
|
|
|
self.hidden_from_guests = item_is_hidden_for_guests(self)
|
|
update_fields = kwargs.get("update_fields")
|
|
if update_fields is not None:
|
|
kwargs["update_fields"] = set(update_fields) | {"hidden_from_guests"}
|
|
super().save(*args, **kwargs)
|
|
|
|
|
|
class MediaLocation(models.Model):
|
|
"""A physical copy of a media item inside the watched folder."""
|
|
|
|
item = models.ForeignKey(
|
|
MediaItem, related_name="locations", on_delete=models.CASCADE
|
|
)
|
|
path = models.CharField(max_length=1024)
|
|
rel_path = models.CharField(max_length=1024)
|
|
mtime = models.FloatField(default=0)
|
|
|
|
class Meta:
|
|
unique_together = ("item", "path")
|
|
ordering = ["rel_path"]
|
|
|
|
def __str__(self):
|
|
return self.rel_path
|
|
|
|
|
|
class TempUpload(models.Model):
|
|
"""A staged upload that has not been accepted into the library yet."""
|
|
|
|
STATUS_PENDING = "pending"
|
|
STATUS_VISUAL_MATCH = "visual_match"
|
|
STATUS_COMPLETED = "completed"
|
|
STATUS_ERROR = "error"
|
|
STATUS_CHOICES = [
|
|
(STATUS_PENDING, "Pending"),
|
|
(STATUS_VISUAL_MATCH, "Visual Similarity Detected"),
|
|
(STATUS_COMPLETED, "Completed"),
|
|
(STATUS_ERROR, "Error"),
|
|
]
|
|
|
|
RESOLUTION_AUTO_MD5 = "auto_md5"
|
|
RESOLUTION_DUPLICATE = "duplicate"
|
|
RESOLUTION_LINKED = "linked"
|
|
RESOLUTION_CUSTOM = "custom"
|
|
|
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
|
user = models.ForeignKey(
|
|
settings.AUTH_USER_MODEL,
|
|
on_delete=models.CASCADE,
|
|
related_name="temp_uploads",
|
|
)
|
|
file = models.FileField(upload_to="uploads/temp/", blank=True)
|
|
original_filename = models.CharField(max_length=255)
|
|
md5 = models.CharField(max_length=32, db_index=True)
|
|
size = models.BigIntegerField(default=0)
|
|
status = models.CharField(
|
|
max_length=20, choices=STATUS_CHOICES, default=STATUS_PENDING
|
|
)
|
|
resolution = models.CharField(max_length=20, blank=True, default="")
|
|
e621_post_id = models.IntegerField(null=True, blank=True)
|
|
e621_data = models.JSONField(null=True, blank=True)
|
|
custom_rating = models.CharField(max_length=1, blank=True, default="")
|
|
custom_tags = models.JSONField(default=list, blank=True)
|
|
custom_notes = models.TextField(blank=True, default="")
|
|
iqdb_data = models.JSONField(null=True, blank=True)
|
|
library_item = models.ForeignKey(
|
|
MediaItem,
|
|
null=True,
|
|
blank=True,
|
|
on_delete=models.SET_NULL,
|
|
related_name="temp_uploads",
|
|
)
|
|
created_at = models.DateTimeField(auto_now_add=True)
|
|
updated_at = models.DateTimeField(auto_now=True)
|
|
|
|
class Meta:
|
|
ordering = ["-created_at"]
|
|
|
|
def __str__(self):
|
|
return f"{self.original_filename} ({self.status})"
|