Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ca84f4fea | ||
|
|
5f237aa2e3 | ||
|
|
90ba2ecff7 | ||
|
|
73bf4f9e38 | ||
|
|
7c2569522f | ||
|
|
a62195ffce | ||
|
|
c73a81a5f4 | ||
|
|
af378e7d71 | ||
|
|
59f397a96c | ||
|
|
9ababb8b48 | ||
|
|
37085c5dac | ||
|
|
ecac4cb8b4 | ||
|
|
2eb7af0d41 |
+47
-13
@@ -1,15 +1,18 @@
|
|||||||
# J621 CD — manual release workflow (Actions tab -> "Run workflow").
|
# J621 CD — manual release workflow (Actions tab -> "Run workflow").
|
||||||
#
|
#
|
||||||
# One dispatch does everything:
|
# One dispatch does everything; each half can be skipped with the `images`
|
||||||
|
# and `desktop` inputs:
|
||||||
# * builds and pushes the backend + frontend images (multi-arch, :latest
|
# * builds and pushes the backend + frontend images (multi-arch, :latest
|
||||||
# and :<short-sha>, GIT_HASH baked in for the version pill),
|
# and :<short-sha>, GIT_HASH baked in for the version pill),
|
||||||
# * builds the desktop packages and attaches them (plus the update
|
# * builds the desktop packages and attaches them (plus the update
|
||||||
# metadata) to the Gitea release tagged `desktop-v<package.json version>`.
|
# metadata) to the Gitea release tagged `desktop-v<package.json version>`.
|
||||||
#
|
#
|
||||||
# The live update feed (deploy/data/desktop, served by the frontend nginx at
|
# The desktop build also attaches the update metadata (latest*.yml) to the
|
||||||
# /desktop/) is not touched here: it is runtime state on the deploy host and
|
# release; that is the desktop updater's feed, resolved through the Gitea API
|
||||||
# is still published with `deploy/push_desktop.sh --no-build` from a machine
|
# at check time (see desktop/README.md). The older website feed
|
||||||
# that can reach it.
|
# (deploy/data/desktop, served at /desktop/) is runtime state on the deploy
|
||||||
|
# host and only needed for installs before 0.1.2; it is refreshed with
|
||||||
|
# `deploy/push_desktop.sh` from a machine that can reach the deploy host.
|
||||||
#
|
#
|
||||||
# Registry login uses a repo PAT with the minimal write:package scope (the
|
# Registry login uses a repo PAT with the minimal write:package scope (the
|
||||||
# Gitea registry rejects the automatic job token, go-gitea/gitea#23642);
|
# Gitea registry rejects the automatic job token, go-gitea/gitea#23642);
|
||||||
@@ -21,6 +24,14 @@ name: CD
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
|
images:
|
||||||
|
description: Build and push the Docker images
|
||||||
|
required: false
|
||||||
|
default: "true"
|
||||||
|
desktop:
|
||||||
|
description: Build the desktop release
|
||||||
|
required: false
|
||||||
|
default: "true"
|
||||||
platforms:
|
platforms:
|
||||||
description: Image platforms (comma separated)
|
description: Image platforms (comma separated)
|
||||||
required: false
|
required: false
|
||||||
@@ -37,6 +48,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
images:
|
images:
|
||||||
name: Build & push images
|
name: Build & push images
|
||||||
|
if: ${{ inputs.images != 'false' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# The Gitea container registry does not accept the automatic job token
|
# The Gitea container registry does not accept the automatic job token
|
||||||
# (go-gitea/gitea#23642 is still open), so the push uses a repo PAT with
|
# (go-gitea/gitea#23642 is still open), so the push uses a repo PAT with
|
||||||
@@ -73,6 +85,7 @@ jobs:
|
|||||||
|
|
||||||
desktop:
|
desktop:
|
||||||
name: Desktop release
|
name: Desktop release
|
||||||
|
if: ${{ inputs.desktop != 'false' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# Creating the release and uploading its assets uses the automatic job
|
# Creating the release and uploading its assets uses the automatic job
|
||||||
# token, so it needs write access to the repository's releases.
|
# token, so it needs write access to the repository's releases.
|
||||||
@@ -90,7 +103,12 @@ jobs:
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends fakeroot libarchive-tools
|
sudo apt-get install -y --no-install-recommends fakeroot libarchive-tools
|
||||||
if [ "${{ inputs.windows }}" = "true" ]; then
|
if [ "${{ inputs.windows }}" = "true" ]; then
|
||||||
sudo apt-get install -y --no-install-recommends wine
|
# electron-builder runs the 32-bit NSIS installer under wine to
|
||||||
|
# build the uninstaller: that needs a virtual display (Xvfb) and
|
||||||
|
# 32-bit wine libraries.
|
||||||
|
sudo dpkg --add-architecture i386
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y --no-install-recommends xvfb wine wine32:i386
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Install frontend + desktop dependencies
|
- name: Install frontend + desktop dependencies
|
||||||
@@ -99,9 +117,12 @@ jobs:
|
|||||||
npm --prefix desktop ci --no-audit --no-fund
|
npm --prefix desktop ci --no-audit --no-fund
|
||||||
|
|
||||||
- name: Build desktop packages
|
- name: Build desktop packages
|
||||||
|
env:
|
||||||
|
# Keep wine from trying to fetch Gecko/Mono on first run.
|
||||||
|
WINEDLLOVERRIDES: mscoree,mshtml=
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ inputs.windows }}" = "true" ]; then
|
if [ "${{ inputs.windows }}" = "true" ]; then
|
||||||
./deploy/build_desktop.sh --all
|
xvfb-run -a ./deploy/build_desktop.sh --all
|
||||||
else
|
else
|
||||||
./deploy/build_desktop.sh --linux
|
./deploy/build_desktop.sh --linux
|
||||||
fi
|
fi
|
||||||
@@ -143,8 +164,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
EXISTING="$(curl -sf -H "$AUTH" "$API/releases/$RELEASE_ID/assets" \
|
EXISTING="$(curl -sf -H "$AUTH" "$API/releases/$RELEASE_ID/assets" \
|
||||||
| python3 -c 'import json,sys; print("\n".join(a["name"] for a in json.load(sys.stdin)))' \
|
|| echo '[]')"
|
||||||
|| true)"
|
|
||||||
for FILE in desktop/release/*"$VERSION"*.deb \
|
for FILE in desktop/release/*"$VERSION"*.deb \
|
||||||
desktop/release/*"$VERSION"*.pkg.tar.zst \
|
desktop/release/*"$VERSION"*.pkg.tar.zst \
|
||||||
desktop/release/latest-linux.yml \
|
desktop/release/latest-linux.yml \
|
||||||
@@ -153,11 +173,25 @@ jobs:
|
|||||||
desktop/release/*"$VERSION"*.exe.blockmap; do
|
desktop/release/*"$VERSION"*.exe.blockmap; do
|
||||||
[ -e "$FILE" ] || continue
|
[ -e "$FILE" ] || continue
|
||||||
NAME="$(basename "$FILE")"
|
NAME="$(basename "$FILE")"
|
||||||
case "$EXISTING" in
|
# Replace the asset when it is already there: latest*.yml must
|
||||||
*"$NAME"*) echo " already attached: $NAME"; continue ;;
|
# reference the installers built by *this* run (NSIS builds are
|
||||||
esac
|
# not bit-reproducible), so old copies are deleted first.
|
||||||
|
ASSET_ID="$(printf '%s' "$EXISTING" | python3 -c '
|
||||||
|
import json, sys
|
||||||
|
name = sys.argv[1]
|
||||||
|
print(next((str(a["id"]) for a in json.load(sys.stdin) if a["name"] == name), ""))
|
||||||
|
' "$NAME")"
|
||||||
|
if [ -n "$ASSET_ID" ]; then
|
||||||
|
echo " replacing $NAME"
|
||||||
|
curl -sf -X DELETE -H "$AUTH" \
|
||||||
|
"$API/releases/$RELEASE_ID/assets/$ASSET_ID" >/dev/null
|
||||||
|
else
|
||||||
echo " attaching $NAME"
|
echo " attaching $NAME"
|
||||||
|
fi
|
||||||
|
# Names like "J621 Setup 0.1.1.exe" contain spaces: encode them
|
||||||
|
# or curl refuses the URL (exit 3).
|
||||||
|
ENCODED="$(python3 -c 'import sys, urllib.parse; print(urllib.parse.quote(sys.argv[1]))' "$NAME")"
|
||||||
curl -sf -X POST -H "$AUTH" -H "Content-Type: application/octet-stream" \
|
curl -sf -X POST -H "$AUTH" -H "Content-Type: application/octet-stream" \
|
||||||
--data-binary @"$FILE" "$API/releases/$RELEASE_ID/assets?name=$NAME" >/dev/null
|
--data-binary @"$FILE" "$API/releases/$RELEASE_ID/assets?name=$ENCODED" >/dev/null
|
||||||
done
|
done
|
||||||
echo "Release: ${{ github.server_url }}/${{ github.repository }}/releases/tag/$TAG"
|
echo "Release: ${{ github.server_url }}/${{ github.repository }}/releases/tag/$TAG"
|
||||||
|
|||||||
@@ -56,9 +56,10 @@ Project constraints (do not regress):
|
|||||||
`desktop-v<version>`). Jobs run on the user-scoped runners: `ubuntu-latest`
|
`desktop-v<version>`). Jobs run on the user-scoped runners: `ubuntu-latest`
|
||||||
on nitro-ci, `desktop` on msi-mortar-ci. Do not add actions/cache
|
on nitro-ci, `desktop` on msi-mortar-ci. Do not add actions/cache
|
||||||
(`cache: pip`/`npm`) to these workflows: Gitea's cache service hangs the job
|
(`cache: pip`/`npm`) to these workflows: Gitea's cache service hangs the job
|
||||||
on restore/save. The live desktop update feed (deploy/data/desktop) is still
|
on restore/save. Desktop updates read the release assets (latest*.yml) from
|
||||||
published with `deploy/push_desktop.sh --no-build` from a machine with SSH
|
the Gitea API at check time; the older website feed (deploy/data/desktop)
|
||||||
to the deploy host — CI has no key for that.
|
only matters for installs before 0.1.2 and is refreshed with
|
||||||
|
`deploy/push_desktop.sh` from a machine with SSH to the deploy host.
|
||||||
- Security/permission tests live in backend/apps/core/tests and need a
|
- Security/permission tests live in backend/apps/core/tests and need a
|
||||||
one-time grant: GRANT ALL ON `test_j621`.* TO 'j621'@'%';
|
one-time grant: GRANT ALL ON `test_j621`.* TO 'j621'@'%';
|
||||||
|
|
||||||
|
|||||||
+14
-3
@@ -20,6 +20,13 @@ they land.
|
|||||||
- [x] Tag cloud in the sidebar (click to search, hidden from guests for
|
- [x] Tag cloud in the sidebar (click to search, hidden from guests for
|
||||||
blacklisted items)
|
blacklisted items)
|
||||||
- [x] Status filter (matched / not_found / deleted / custom / unknown)
|
- [x] Status filter (matched / not_found / deleted / custom / unknown)
|
||||||
|
- [x] **Cacheable media serving**
|
||||||
|
- [x] Stable signed URLs (7 d TTL, 24 h rotation) plus a `v=<md5>` cache
|
||||||
|
buster, so replacing a file under the same J-ID invalidates it
|
||||||
|
- [x] ETag/Last-Modified and a private `Cache-Control` (immutable for
|
||||||
|
versioned media), conditional 304s
|
||||||
|
- [x] Real 480 px image thumbnails (cached by MD5) instead of serving
|
||||||
|
full-size originals through the thumbnail endpoint
|
||||||
|
|
||||||
- [x] **Random image** endpoint and page: `GET /api/random/` (aliases
|
- [x] **Random image** endpoint and page: `GET /api/random/` (aliases
|
||||||
`/random`, `/random/`) with `rating=s,q,e` filters; fastfetch mode
|
`/random`, `/random/`) with `rating=s,q,e` filters; fastfetch mode
|
||||||
@@ -104,12 +111,16 @@ Files now stage first and are resolved before entering the library.
|
|||||||
shell indicator; rate-limited runs retry with backoff
|
shell indicator; rate-limited runs retry with backoff
|
||||||
- [x] Perceptual-hash comparison against the library, loaded once per batch
|
- [x] Perceptual-hash comparison against the library, loaded once per batch
|
||||||
- [x] IQDB candidates stored with one batched enrichment request
|
- [x] IQDB candidates stored with one batched enrichment request
|
||||||
|
- [x] Indexed uploads are announced through a bounded per-run feed and the
|
||||||
|
staged row is deleted; nothing persists on the board to dismiss
|
||||||
- [x] **Upload UI**
|
- [x] **Upload UI**
|
||||||
- [x] Three-column board: Pending & Unmatched / Visual Similarity Detected /
|
- [x] Four-column board: Pending & Unmatched / Visual Similarity Detected /
|
||||||
Auto-uploaded & Indexed, private per user (staff included)
|
Auto-uploaded & Indexed (session feed) / Failed, private per user
|
||||||
|
(staff included)
|
||||||
- [x] Metadata modal (link to e621 post, IQDB candidates, custom metadata)
|
- [x] Metadata modal (link to e621 post, IQDB candidates, custom metadata)
|
||||||
- [x] Per-file progress plus background pipeline status
|
- [x] Per-file progress plus background pipeline status
|
||||||
- [x] Bulk actions: bulk rate, discard all (pending/visual), dismiss all
|
- [x] Bulk actions: bulk rate and discard all (chunked past the API's
|
||||||
|
1000-id cap)
|
||||||
|
|
||||||
## 4. Staff tools
|
## 4. Staff tools
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ from apps.library.models import (
|
|||||||
TempUpload,
|
TempUpload,
|
||||||
)
|
)
|
||||||
from apps.library.services import MEDIA_FILE_SALT
|
from apps.library.services import MEDIA_FILE_SALT
|
||||||
|
from apps.library.signing_urls import sign_payload
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
@@ -122,21 +123,15 @@ class SecurityTestCase(TestCase):
|
|||||||
return item
|
return item
|
||||||
|
|
||||||
def old_signature(self, item, action="raw", age=3 * 86400):
|
def old_signature(self, item, action="raw", age=3 * 86400):
|
||||||
"""A valid signature minted `age` seconds ago."""
|
"""A signed media URL whose expiry is `age` seconds in the past."""
|
||||||
real_time = signing.time
|
return signing.Signer(salt=MEDIA_FILE_SALT).sign_object(
|
||||||
|
{
|
||||||
class Backdated:
|
"item": item.id,
|
||||||
def time(self):
|
"user": self.users["sec-uploader"].id,
|
||||||
return real_time.time() - age
|
"action": action,
|
||||||
|
"exp": int(time.time()) - age,
|
||||||
try:
|
}
|
||||||
signing.time = Backdated()
|
|
||||||
return signing.dumps(
|
|
||||||
{"item": item.id, "user": self.users["sec-uploader"].id, "action": action},
|
|
||||||
salt=MEDIA_FILE_SALT,
|
|
||||||
)
|
)
|
||||||
finally:
|
|
||||||
signing.time = real_time
|
|
||||||
|
|
||||||
|
|
||||||
class GuestVisibilityTests(SecurityTestCase):
|
class GuestVisibilityTests(SecurityTestCase):
|
||||||
@@ -183,9 +178,9 @@ class GuestVisibilityTests(SecurityTestCase):
|
|||||||
def test_authenticated_users_and_signed_urls_see_protected_items(self):
|
def test_authenticated_users_and_signed_urls_see_protected_items(self):
|
||||||
uploader = self.client_for("sec-uploader")
|
uploader = self.client_for("sec-uploader")
|
||||||
self.assertEqual(uploader.get(f"/api/files/J-{self.hidden.id}/").status_code, 200)
|
self.assertEqual(uploader.get(f"/api/files/J-{self.hidden.id}/").status_code, 200)
|
||||||
signed = signing.dumps(
|
signed = sign_payload(
|
||||||
{"item": self.hidden.id, "user": self.users["sec-uploader"].id, "action": "raw"},
|
{"item": self.hidden.id, "user": self.users["sec-uploader"].id, "action": "raw"},
|
||||||
salt=MEDIA_FILE_SALT,
|
MEDIA_FILE_SALT,
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
self.guest.get(f"/api/files/J-{self.hidden.id}/raw/?sig={signed}").status_code,
|
self.guest.get(f"/api/files/J-{self.hidden.id}/raw/?sig={signed}").status_code,
|
||||||
@@ -193,9 +188,9 @@ class GuestVisibilityTests(SecurityTestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def test_signature_integrity(self):
|
def test_signature_integrity(self):
|
||||||
signed = signing.dumps(
|
signed = sign_payload(
|
||||||
{"item": self.hidden.id, "user": self.users["sec-uploader"].id, "action": "raw"},
|
{"item": self.hidden.id, "user": self.users["sec-uploader"].id, "action": "raw"},
|
||||||
salt=MEDIA_FILE_SALT,
|
MEDIA_FILE_SALT,
|
||||||
)
|
)
|
||||||
raw = f"/api/files/J-{self.hidden.id}/raw/"
|
raw = f"/api/files/J-{self.hidden.id}/raw/"
|
||||||
thumbnail = f"/api/files/J-{self.hidden.id}/thumbnail/"
|
thumbnail = f"/api/files/J-{self.hidden.id}/thumbnail/"
|
||||||
@@ -203,10 +198,29 @@ class GuestVisibilityTests(SecurityTestCase):
|
|||||||
self.assertEqual(self.guest.get(f"{raw}?sig={signed[:-4]}AAAA").status_code, 404)
|
self.assertEqual(self.guest.get(f"{raw}?sig={signed[:-4]}AAAA").status_code, 404)
|
||||||
# Valid signature, wrong action.
|
# Valid signature, wrong action.
|
||||||
self.assertEqual(self.guest.get(f"{thumbnail}?sig={signed}").status_code, 404)
|
self.assertEqual(self.guest.get(f"{thumbnail}?sig={signed}").status_code, 404)
|
||||||
# Expired signature (minted three days ago).
|
# Expired signature (expiry three days ago).
|
||||||
expired = self.old_signature(self.hidden)
|
expired = self.old_signature(self.hidden)
|
||||||
self.assertEqual(self.guest.get(f"{raw}?sig={expired}").status_code, 404)
|
self.assertEqual(self.guest.get(f"{raw}?sig={expired}").status_code, 404)
|
||||||
|
|
||||||
|
def test_signed_media_urls_are_stable_and_versioned(self):
|
||||||
|
"""The same item must keep the same URL across responses.
|
||||||
|
|
||||||
|
A per-second signature made browsers re-download every image on every
|
||||||
|
poll; the MD5 version parameter busts caches only when the file itself
|
||||||
|
changes (the optimize flow rewrites files under the same J-ID).
|
||||||
|
"""
|
||||||
|
item = self.visible
|
||||||
|
first = services.signed_media_url(item, self.users["sec-uploader"])
|
||||||
|
time.sleep(1.1)
|
||||||
|
second = services.signed_media_url(item, self.users["sec-uploader"])
|
||||||
|
self.assertEqual(first, second)
|
||||||
|
self.assertIn(f"v={item.md5}", first)
|
||||||
|
MediaItem.objects.filter(pk=item.pk).update(md5="b" * 32)
|
||||||
|
item.refresh_from_db()
|
||||||
|
self.assertNotEqual(
|
||||||
|
services.signed_media_url(item, self.users["sec-uploader"]), first
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class RoleBoundaryTests(SecurityTestCase):
|
class RoleBoundaryTests(SecurityTestCase):
|
||||||
def test_non_uploader_is_read_only(self):
|
def test_non_uploader_is_read_only(self):
|
||||||
@@ -451,9 +465,9 @@ class ThrottleTests(SecurityTestCase):
|
|||||||
md5=hashlib.md5(b"throttle-temp").hexdigest(),
|
md5=hashlib.md5(b"throttle-temp").hexdigest(),
|
||||||
size=6,
|
size=6,
|
||||||
)
|
)
|
||||||
signature = signing.dumps(
|
signature = sign_payload(
|
||||||
{"temp": str(temp.id), "user": self.users["sec-uploader"].id},
|
{"temp": str(temp.id), "user": self.users["sec-uploader"].id},
|
||||||
salt=services.UPLOAD_FILE_SALT,
|
services.UPLOAD_FILE_SALT,
|
||||||
)
|
)
|
||||||
url = f"/api/uploads/{temp.id}/file/?sig={signature}"
|
url = f"/api/uploads/{temp.id}/file/?sig={signature}"
|
||||||
codes = {self.guest.get(url).status_code for _ in range(150)}
|
codes = {self.guest.get(url).status_code for _ in range(150)}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
# Generated by Django 6.1.1 on 2026-09-23
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def purge_completed_uploads(apps, schema_editor):
|
||||||
|
"""Completed staged uploads are notifications, not records.
|
||||||
|
|
||||||
|
The board used to keep every auto-uploaded/indexed row until it was
|
||||||
|
dismissed by hand, so they accumulated without bound (and bulk dismissal
|
||||||
|
is capped at 1000 ids). Completions now live in a small per-run feed, so
|
||||||
|
the old rows are removed here.
|
||||||
|
"""
|
||||||
|
TempUpload = apps.get_model("library", "TempUpload")
|
||||||
|
for temp in TempUpload.objects.filter(status="completed").iterator():
|
||||||
|
if temp.file:
|
||||||
|
temp.file.delete(save=False)
|
||||||
|
temp.delete()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("library", "0011_upload_pipeline"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="uploadrun",
|
||||||
|
name="recent_completions",
|
||||||
|
field=models.JSONField(blank=True, default=list),
|
||||||
|
),
|
||||||
|
migrations.RunPython(purge_completed_uploads, migrations.RunPython.noop),
|
||||||
|
]
|
||||||
@@ -229,6 +229,11 @@ class UploadRun(models.Model):
|
|||||||
matched = models.IntegerField(default=0)
|
matched = models.IntegerField(default=0)
|
||||||
failed = models.IntegerField(default=0)
|
failed = models.IntegerField(default=0)
|
||||||
error = models.TextField(blank=True, default="")
|
error = models.TextField(blank=True, default="")
|
||||||
|
# Rolling feed of recent completions for the upload board. Completed
|
||||||
|
# staged uploads are deleted as soon as they are indexed; this only tells
|
||||||
|
# the live page "filename -> J-x" while it watches. Bounded, never
|
||||||
|
# dismissed, and ignored by fresh page loads.
|
||||||
|
recent_completions = models.JSONField(default=list, blank=True)
|
||||||
started_at = models.DateTimeField(null=True, blank=True)
|
started_at = models.DateTimeField(null=True, blank=True)
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from datetime import timedelta
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import signing
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from .models import (
|
from .models import (
|
||||||
@@ -20,6 +19,7 @@ from .services import (
|
|||||||
VIDEO_EXTENSIONS,
|
VIDEO_EXTENSIONS,
|
||||||
signed_media_url,
|
signed_media_url,
|
||||||
)
|
)
|
||||||
|
from .signing_urls import sign_payload
|
||||||
|
|
||||||
|
|
||||||
class MediaLocationSerializer(serializers.ModelSerializer):
|
class MediaLocationSerializer(serializers.ModelSerializer):
|
||||||
@@ -150,6 +150,7 @@ class TempUploadSerializer(serializers.ModelSerializer):
|
|||||||
iqdb_checked = serializers.SerializerMethodField()
|
iqdb_checked = serializers.SerializerMethodField()
|
||||||
processing = serializers.SerializerMethodField()
|
processing = serializers.SerializerMethodField()
|
||||||
similar_count = serializers.SerializerMethodField()
|
similar_count = serializers.SerializerMethodField()
|
||||||
|
visual_matches = serializers.SerializerMethodField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = TempUpload
|
model = TempUpload
|
||||||
@@ -199,9 +200,9 @@ class TempUploadSerializer(serializers.ModelSerializer):
|
|||||||
user = self._request_user()
|
user = self._request_user()
|
||||||
if user is None:
|
if user is None:
|
||||||
return None
|
return None
|
||||||
signature = signing.dumps(
|
signature = sign_payload(
|
||||||
{"temp": str(obj.id), "user": user.id},
|
{"temp": str(obj.id), "user": user.id},
|
||||||
salt=UPLOAD_FILE_SALT,
|
UPLOAD_FILE_SALT,
|
||||||
)
|
)
|
||||||
url = f"/api/uploads/{obj.id}/file/?sig={signature}"
|
url = f"/api/uploads/{obj.id}/file/?sig={signature}"
|
||||||
request = self.context.get("request")
|
request = self.context.get("request")
|
||||||
@@ -242,6 +243,57 @@ class TempUploadSerializer(serializers.ModelSerializer):
|
|||||||
def get_similar_count(self, obj):
|
def get_similar_count(self, obj):
|
||||||
return len(obj.iqdb_data or []) + len(obj.visual_matches or [])
|
return len(obj.iqdb_data or []) + len(obj.visual_matches or [])
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _visual_item_id(entry):
|
||||||
|
if not isinstance(entry, dict):
|
||||||
|
return None
|
||||||
|
item_id = entry.get("item_id")
|
||||||
|
if item_id is None:
|
||||||
|
j_id = str(entry.get("j_id") or "")
|
||||||
|
if j_id.upper().startswith("J-"):
|
||||||
|
j_id = j_id[2:]
|
||||||
|
item_id = j_id if j_id.isdigit() else None
|
||||||
|
try:
|
||||||
|
return int(item_id)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_visual_matches(self, obj):
|
||||||
|
"""Rebuild match rows with fresh signed thumbnail URLs.
|
||||||
|
|
||||||
|
Storing the signed URL meant it aged out (or came from an older
|
||||||
|
signing scheme) and the "Already in your library" grid showed broken
|
||||||
|
tiles. The stored rows only carry the item reference now.
|
||||||
|
"""
|
||||||
|
entries = obj.visual_matches or []
|
||||||
|
if not entries:
|
||||||
|
return entries
|
||||||
|
wanted = {}
|
||||||
|
for entry in entries:
|
||||||
|
item_id = self._visual_item_id(entry)
|
||||||
|
if item_id is not None:
|
||||||
|
wanted[item_id] = None
|
||||||
|
items = MediaItem.objects.in_bulk(list(wanted))
|
||||||
|
user = self._request_user()
|
||||||
|
request = self.context.get("request")
|
||||||
|
matches = []
|
||||||
|
for entry in entries:
|
||||||
|
item_id = self._visual_item_id(entry)
|
||||||
|
item = items.get(item_id) if item_id is not None else None
|
||||||
|
if item is None:
|
||||||
|
continue
|
||||||
|
matches.append(
|
||||||
|
{
|
||||||
|
"j_id": f"J-{item.id}",
|
||||||
|
"filename": entry.get("filename") or item.md5,
|
||||||
|
"similarity": entry.get("similarity"),
|
||||||
|
"thumbnail_url": signed_media_url(
|
||||||
|
item, user, "thumbnail", request=request
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return matches
|
||||||
|
|
||||||
|
|
||||||
class TempUploadListSerializer(TempUploadSerializer):
|
class TempUploadListSerializer(TempUploadSerializer):
|
||||||
"""Compact staged-upload row for the board and the status polling.
|
"""Compact staged-upload row for the board and the status polling.
|
||||||
@@ -339,9 +391,9 @@ class SimilarityCheckSerializer(serializers.ModelSerializer):
|
|||||||
user = self._request_user()
|
user = self._request_user()
|
||||||
if user is None or not obj.file:
|
if user is None or not obj.file:
|
||||||
return None
|
return None
|
||||||
signature = signing.dumps(
|
signature = sign_payload(
|
||||||
{"check": str(obj.id), "user": user.id},
|
{"check": str(obj.id), "user": user.id},
|
||||||
salt=UPLOAD_FILE_SALT,
|
UPLOAD_FILE_SALT,
|
||||||
)
|
)
|
||||||
url = f"/api/similarity/{obj.id}/file/?sig={signature}"
|
url = f"/api/similarity/{obj.id}/file/?sig={signature}"
|
||||||
request = self.context.get("request")
|
request = self.context.get("request")
|
||||||
|
|||||||
@@ -6,16 +6,21 @@ import os
|
|||||||
import re
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime, timezone
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
import imagehash
|
import imagehash
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import signing
|
|
||||||
from django.http import FileResponse, Http404, HttpResponse
|
from django.http import FileResponse, Http404, HttpResponse
|
||||||
|
from django.utils.cache import get_conditional_response
|
||||||
|
from django.utils.http import http_date
|
||||||
from django.utils.text import get_valid_filename
|
from django.utils.text import get_valid_filename
|
||||||
from PIL import Image
|
from PIL import Image, ImageOps
|
||||||
|
|
||||||
from .models import MediaItem, MediaLocation
|
from .models import MediaItem, MediaLocation
|
||||||
|
from .signing_urls import sign_payload
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -37,6 +42,11 @@ UPLOAD_FILE_SALT = "j621.upload-file"
|
|||||||
MEDIA_FILE_SALT = "j621.media-file"
|
MEDIA_FILE_SALT = "j621.media-file"
|
||||||
CHUNK_SIZE = 1024 * 1024
|
CHUNK_SIZE = 1024 * 1024
|
||||||
RANGE_RE = re.compile(r"bytes=(\d*)-(\d*)$")
|
RANGE_RE = re.compile(r"bytes=(\d*)-(\d*)$")
|
||||||
|
# Versioned media URLs are immutable, so they may sit in the browser cache for
|
||||||
|
# as long as the signature is guaranteed to stay valid (7 days).
|
||||||
|
MEDIA_CACHE_SECONDS = 6 * 86400
|
||||||
|
# Staged uploads and similarity files can be deleted at any moment.
|
||||||
|
TEMP_CACHE_SECONDS = 3600
|
||||||
|
|
||||||
|
|
||||||
def compute_md5(path):
|
def compute_md5(path):
|
||||||
@@ -78,14 +88,24 @@ def signed_media_url(item, user, action="raw", request=None):
|
|||||||
|
|
||||||
With a ``request`` the URL is absolute, so the SPA also works when it is
|
With a ``request`` the URL is absolute, so the SPA also works when it is
|
||||||
served from a different origin; without one it stays relative.
|
served from a different origin; without one it stays relative.
|
||||||
|
|
||||||
|
The ``v`` parameter is the item's MD5: it busts the browser cache exactly
|
||||||
|
when the file is replaced (the optimize flow rewrites files under the same
|
||||||
|
J-ID), which is what lets the URL be cached for days instead of re-minted
|
||||||
|
on every response.
|
||||||
"""
|
"""
|
||||||
path = f"/api/files/J-{item.id}/{action}/"
|
path = f"/api/files/J-{item.id}/{action}/"
|
||||||
|
params = {}
|
||||||
if user is not None and getattr(user, "is_authenticated", False):
|
if user is not None and getattr(user, "is_authenticated", False):
|
||||||
signature = signing.dumps(
|
params = {
|
||||||
|
"v": item.md5,
|
||||||
|
"sig": sign_payload(
|
||||||
{"item": item.id, "user": user.id, "action": action},
|
{"item": item.id, "user": user.id, "action": action},
|
||||||
salt=MEDIA_FILE_SALT,
|
MEDIA_FILE_SALT,
|
||||||
)
|
),
|
||||||
path = f"{path}?sig={signature}"
|
}
|
||||||
|
if params:
|
||||||
|
path = f"{path}?{urlencode(params)}"
|
||||||
if request is None:
|
if request is None:
|
||||||
return path
|
return path
|
||||||
return request.build_absolute_uri(path)
|
return request.build_absolute_uri(path)
|
||||||
@@ -207,12 +227,36 @@ class RangeFileWrapper:
|
|||||||
self.file.close()
|
self.file.close()
|
||||||
|
|
||||||
|
|
||||||
def serve_file(request, path, download=False):
|
def _apply_cache_headers(response, cache_control, etag, mtime):
|
||||||
"""Serve a file with HTTP range support (needed for video seeking)."""
|
response["Cache-Control"] = cache_control
|
||||||
|
response["ETag"] = etag
|
||||||
|
response["Last-Modified"] = http_date(mtime)
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
def serve_file(request, path, download=False, *, max_age=TEMP_CACHE_SECONDS, immutable=False):
|
||||||
|
"""Serve a file with HTTP range support (needed for video seeking).
|
||||||
|
|
||||||
|
Responses carry validators (ETag/Last-Modified) and a private
|
||||||
|
``Cache-Control`` so browsers reuse media instead of re-downloading it on
|
||||||
|
every SPA poll. ``max_age``/``immutable`` are chosen by the caller: versioned
|
||||||
|
library media can be cached hard, staged files only briefly.
|
||||||
|
"""
|
||||||
path = Path(path)
|
path = Path(path)
|
||||||
if not path.is_file():
|
if not path.is_file():
|
||||||
raise Http404
|
raise Http404
|
||||||
size = path.stat().st_size
|
stat = path.stat()
|
||||||
|
size = stat.st_size
|
||||||
|
etag = f'W/"{size:x}-{stat.st_mtime_ns:x}"'
|
||||||
|
last_modified = datetime.fromtimestamp(stat.st_mtime, tz=timezone.utc)
|
||||||
|
conditional = get_conditional_response(
|
||||||
|
request, etag=etag, last_modified=last_modified
|
||||||
|
)
|
||||||
|
if conditional is not None:
|
||||||
|
return conditional
|
||||||
|
cache_control = f"private, max-age={int(max_age)}"
|
||||||
|
if immutable:
|
||||||
|
cache_control += ", immutable"
|
||||||
content_type = mimetypes.guess_type(str(path))[0] or "application/octet-stream"
|
content_type = mimetypes.guess_type(str(path))[0] or "application/octet-stream"
|
||||||
range_header = request.headers.get("Range", "").strip()
|
range_header = request.headers.get("Range", "").strip()
|
||||||
if range_header:
|
if range_header:
|
||||||
@@ -240,7 +284,9 @@ def serve_file(request, path, download=False):
|
|||||||
response["Content-Length"] = str(length)
|
response["Content-Length"] = str(length)
|
||||||
response["Content-Range"] = f"bytes {start}-{end}/{size}"
|
response["Content-Range"] = f"bytes {start}-{end}/{size}"
|
||||||
response["Accept-Ranges"] = "bytes"
|
response["Accept-Ranges"] = "bytes"
|
||||||
return response
|
return _apply_cache_headers(
|
||||||
|
response, cache_control, etag, stat.st_mtime
|
||||||
|
)
|
||||||
response = FileResponse(
|
response = FileResponse(
|
||||||
open(path, "rb"),
|
open(path, "rb"),
|
||||||
content_type=content_type,
|
content_type=content_type,
|
||||||
@@ -248,7 +294,7 @@ def serve_file(request, path, download=False):
|
|||||||
filename=path.name,
|
filename=path.name,
|
||||||
)
|
)
|
||||||
response["Accept-Ranges"] = "bytes"
|
response["Accept-Ranges"] = "bytes"
|
||||||
return response
|
return _apply_cache_headers(response, cache_control, etag, stat.st_mtime)
|
||||||
|
|
||||||
|
|
||||||
class DownloadCancelled(Exception):
|
class DownloadCancelled(Exception):
|
||||||
@@ -436,15 +482,38 @@ def sanitize_iqdb_results(results):
|
|||||||
return cleaned
|
return cleaned
|
||||||
|
|
||||||
|
|
||||||
|
def _thumbnail_is_fresh(target, path):
|
||||||
|
"""True when the cached thumbnail exists and is at least as new as source."""
|
||||||
|
try:
|
||||||
|
stat = target.stat()
|
||||||
|
if stat.st_size <= 0:
|
||||||
|
return False
|
||||||
|
return stat.st_mtime >= os.path.getmtime(path)
|
||||||
|
except OSError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def _thumbs_dir():
|
||||||
|
thumbs_dir = Path(settings.MEDIA_ROOT) / "thumbs"
|
||||||
|
thumbs_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
return thumbs_dir
|
||||||
|
|
||||||
|
|
||||||
def generate_video_thumbnail(md5, path):
|
def generate_video_thumbnail(md5, path):
|
||||||
"""Extract a JPEG thumbnail from a video, cached under MEDIA_ROOT/thumbs."""
|
"""Extract a JPEG thumbnail from a video, cached under MEDIA_ROOT/thumbs."""
|
||||||
if not shutil.which("ffmpeg"):
|
if not shutil.which("ffmpeg"):
|
||||||
return None
|
return None
|
||||||
thumbs_dir = Path(settings.MEDIA_ROOT) / "thumbs"
|
try:
|
||||||
thumbs_dir.mkdir(parents=True, exist_ok=True)
|
thumbs_dir = _thumbs_dir()
|
||||||
|
except OSError:
|
||||||
|
logger.exception("Could not create the thumbnail folder")
|
||||||
|
return None
|
||||||
target = thumbs_dir / f"{md5}.jpg"
|
target = thumbs_dir / f"{md5}.jpg"
|
||||||
if target.exists() and target.stat().st_mtime >= os.path.getmtime(path):
|
if _thumbnail_is_fresh(target, path):
|
||||||
return target
|
return target
|
||||||
|
# Write beside the target and move it into place, so a concurrent request
|
||||||
|
# can never read a half-written JPEG.
|
||||||
|
temp = thumbs_dir / f".{md5}.{uuid.uuid4().hex}.part.jpg"
|
||||||
command = [
|
command = [
|
||||||
"ffmpeg",
|
"ffmpeg",
|
||||||
"-y",
|
"-y",
|
||||||
@@ -458,10 +527,63 @@ def generate_video_thumbnail(md5, path):
|
|||||||
"scale=480:-2",
|
"scale=480:-2",
|
||||||
"-loglevel",
|
"-loglevel",
|
||||||
"error",
|
"error",
|
||||||
str(target),
|
str(temp),
|
||||||
]
|
]
|
||||||
try:
|
try:
|
||||||
subprocess.run(command, check=True, capture_output=True, timeout=60)
|
subprocess.run(command, check=True, capture_output=True, timeout=60)
|
||||||
|
os.replace(temp, target)
|
||||||
except (subprocess.SubprocessError, OSError):
|
except (subprocess.SubprocessError, OSError):
|
||||||
|
logger.exception("Could not build a video thumbnail for %s", path)
|
||||||
|
temp.unlink(missing_ok=True)
|
||||||
return None
|
return None
|
||||||
return target if target.exists() else None
|
return target if target.exists() else None
|
||||||
|
|
||||||
|
|
||||||
|
def generate_image_thumbnail(md5, path):
|
||||||
|
"""Downscale an image, cached under MEDIA_ROOT/thumbs like video thumbs.
|
||||||
|
|
||||||
|
The thumbnail action used to serve full-size originals for images; a
|
||||||
|
cached 480px JPEG keeps the library grid light without touching the
|
||||||
|
original file. Returns ``None`` when the source is missing or Pillow
|
||||||
|
cannot decode it, so callers can fall back to the original.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
thumbs_dir = _thumbs_dir()
|
||||||
|
except OSError:
|
||||||
|
logger.exception("Could not create the thumbnail folder")
|
||||||
|
return None
|
||||||
|
target = thumbs_dir / f"{md5}.jpg"
|
||||||
|
if _thumbnail_is_fresh(target, path):
|
||||||
|
return target
|
||||||
|
temp = thumbs_dir / f".{md5}.{uuid.uuid4().hex}.part.jpg"
|
||||||
|
try:
|
||||||
|
with Image.open(path) as image:
|
||||||
|
# Animated formats: the first frame is the preview.
|
||||||
|
image.seek(0)
|
||||||
|
frame = ImageOps.exif_transpose(image) or image
|
||||||
|
frame = frame.convert("RGB")
|
||||||
|
frame.thumbnail((480, 480))
|
||||||
|
frame.save(temp, "JPEG", quality=82, optimize=True)
|
||||||
|
os.replace(temp, target)
|
||||||
|
except Exception: # noqa: BLE001 - previews must never break serving
|
||||||
|
logger.exception("Could not build an image thumbnail for %s", path)
|
||||||
|
temp.unlink(missing_ok=True)
|
||||||
|
return None
|
||||||
|
return target if target.exists() else None
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_thumbnail(item):
|
||||||
|
"""Generate an item's cached thumbnail if it is missing or stale.
|
||||||
|
|
||||||
|
Warming thumbnails when a file is indexed keeps image decoding out of the
|
||||||
|
request path, where the upload pipeline's hashing used to starve it.
|
||||||
|
"""
|
||||||
|
location = item.locations.first()
|
||||||
|
if location is None:
|
||||||
|
return None
|
||||||
|
path = Path(location.path)
|
||||||
|
if not path.is_file():
|
||||||
|
return None
|
||||||
|
if path.suffix.lower() in VIDEO_EXTENSIONS:
|
||||||
|
return generate_video_thumbnail(item.md5, path)
|
||||||
|
return generate_image_thumbnail(item.md5, path)
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
"""Stable, expiring signatures for media URLs.
|
||||||
|
|
||||||
|
The SPA loads media with ``<img>``/``<video>`` tags, which cannot send the
|
||||||
|
API's ``Authorization`` header, so those URLs carry a signature instead. The
|
||||||
|
signature has to be *stable*: a URL that changes on every response makes the
|
||||||
|
browser treat every refetch as a new resource and re-download the file.
|
||||||
|
|
||||||
|
URLs are signed with a plain ``Signer`` (no per-second timestamp) plus an
|
||||||
|
explicit ``exp`` claim quantized to a bucket, so every request inside a bucket
|
||||||
|
mints the exact same URL. The URL rotates once per bucket and is valid for at
|
||||||
|
least ``URL_TTL_SECONDS`` and at most ``URL_TTL_SECONDS + URL_BUCKET_SECONDS``.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import time
|
||||||
|
|
||||||
|
from django.core import signing
|
||||||
|
|
||||||
|
URL_TTL_SECONDS = 7 * 86400
|
||||||
|
URL_BUCKET_SECONDS = 24 * 3600
|
||||||
|
_BUCKETS = URL_TTL_SECONDS // URL_BUCKET_SECONDS
|
||||||
|
|
||||||
|
|
||||||
|
def _expiry(now=None):
|
||||||
|
current = time.time() if now is None else now
|
||||||
|
bucket = int(current // URL_BUCKET_SECONDS)
|
||||||
|
return (bucket + _BUCKETS + 1) * URL_BUCKET_SECONDS
|
||||||
|
|
||||||
|
|
||||||
|
def sign_payload(payload, salt, now=None):
|
||||||
|
"""Sign a payload with a stable, bucket-quantized expiry."""
|
||||||
|
return signing.Signer(salt=salt).sign_object(
|
||||||
|
{**payload, "exp": _expiry(now)}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def load_payload(signature, salt, legacy_max_age=86400):
|
||||||
|
"""Verify a signed payload; ``None`` when missing, tampered with or expired.
|
||||||
|
|
||||||
|
Legacy ``TimestampSigner`` values are still accepted for one release.
|
||||||
|
Detect them by their extra separator (``payload:timestamp:signature``):
|
||||||
|
a plain ``Signer`` accepts the HMAC a ``TimestampSigner`` computed over
|
||||||
|
``payload:timestamp`` and then chokes on the embedded timestamp while
|
||||||
|
decoding the JSON payload, which used to surface as a 500.
|
||||||
|
"""
|
||||||
|
if not signature:
|
||||||
|
return None
|
||||||
|
if signature.count(":") >= 2:
|
||||||
|
try:
|
||||||
|
return signing.TimestampSigner(salt=salt).unsign_object(
|
||||||
|
signature, max_age=legacy_max_age
|
||||||
|
)
|
||||||
|
except (signing.BadSignature, ValueError):
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
data = signing.Signer(salt=salt).unsign_object(signature)
|
||||||
|
except (signing.BadSignature, ValueError):
|
||||||
|
return None
|
||||||
|
if not isinstance(data, dict):
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
expired = int(data.get("exp", 0)) < time.time()
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return None
|
||||||
|
return None if expired else data
|
||||||
@@ -11,7 +11,6 @@ from datetime import timedelta
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import signing
|
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from rest_framework import mixins, status, viewsets
|
from rest_framework import mixins, status, viewsets
|
||||||
from rest_framework.decorators import action
|
from rest_framework.decorators import action
|
||||||
@@ -22,6 +21,7 @@ from rest_framework.response import Response
|
|||||||
from . import services
|
from . import services
|
||||||
from .models import MediaItem, SimilarityCheck
|
from .models import MediaItem, SimilarityCheck
|
||||||
from .serializers import SimilarityCheckSerializer
|
from .serializers import SimilarityCheckSerializer
|
||||||
|
from .signing_urls import load_payload
|
||||||
from .tools import item_brief
|
from .tools import item_brief
|
||||||
from .uploads import find_library_matches
|
from .uploads import find_library_matches
|
||||||
|
|
||||||
@@ -149,14 +149,7 @@ class SimilarityCheckViewSet(
|
|||||||
check = self.get_queryset().filter(pk=pk).first()
|
check = self.get_queryset().filter(pk=pk).first()
|
||||||
else:
|
else:
|
||||||
signature = request.query_params.get("sig")
|
signature = request.query_params.get("sig")
|
||||||
payload = None
|
payload = load_payload(signature, services.UPLOAD_FILE_SALT) if signature else None
|
||||||
if signature:
|
|
||||||
try:
|
|
||||||
payload = signing.loads(
|
|
||||||
signature, salt=services.UPLOAD_FILE_SALT, max_age=86400
|
|
||||||
)
|
|
||||||
except signing.BadSignature:
|
|
||||||
payload = None
|
|
||||||
if payload and payload.get("check") == str(pk):
|
if payload and payload.get("check") == str(pk):
|
||||||
check = SimilarityCheck.objects.filter(pk=pk).first()
|
check = SimilarityCheck.objects.filter(pk=pk).first()
|
||||||
if check is None or not check.file:
|
if check is None or not check.file:
|
||||||
|
|||||||
@@ -0,0 +1,188 @@
|
|||||||
|
"""Signed media URLs must be stable, versioned and cacheable.
|
||||||
|
|
||||||
|
Regression: signatures embedded the current second, so every API response
|
||||||
|
re-minted every URL and browsers re-downloaded each image on every poll; the
|
||||||
|
file responses also carried no cache headers at all.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import base64
|
||||||
|
import hashlib
|
||||||
|
import io
|
||||||
|
import shutil
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.core import signing
|
||||||
|
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||||
|
from django.test import Client, TestCase, override_settings
|
||||||
|
|
||||||
|
from PIL import Image
|
||||||
|
|
||||||
|
from rest_framework.authtoken.models import Token
|
||||||
|
|
||||||
|
from apps.library import services
|
||||||
|
from apps.library.models import MediaItem, MediaLocation, TempUpload
|
||||||
|
from apps.library.signing_urls import load_payload, sign_payload
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
TINY_PNG = base64.b64decode(
|
||||||
|
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg=="
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def png_bytes(width=1200, height=800, color=(20, 120, 200)):
|
||||||
|
buffer = io.BytesIO()
|
||||||
|
Image.new("RGB", (width, height), color).save(buffer, format="PNG")
|
||||||
|
return buffer.getvalue()
|
||||||
|
|
||||||
|
|
||||||
|
class MediaCacheTests(TestCase):
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
super().setUpClass()
|
||||||
|
cls._tmp = tempfile.mkdtemp(prefix="j621-cache-")
|
||||||
|
cls._media = Path(cls._tmp) / "media"
|
||||||
|
cls._watched = cls._media / "library"
|
||||||
|
cls._watched.mkdir(parents=True, exist_ok=True)
|
||||||
|
cls._settings = override_settings(
|
||||||
|
MEDIA_ROOT=str(cls._media), WATCHED_FOLDER=str(cls._watched)
|
||||||
|
)
|
||||||
|
cls._settings.enable()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def tearDownClass(cls):
|
||||||
|
cls._settings.disable()
|
||||||
|
shutil.rmtree(cls._tmp, ignore_errors=True)
|
||||||
|
super().tearDownClass()
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.user = User.objects.create_user(
|
||||||
|
username="cache-uploader", password="cache-pass-123456"
|
||||||
|
)
|
||||||
|
self.user.role = "uploader"
|
||||||
|
self.user.save(update_fields=["role"])
|
||||||
|
self.token = Token.objects.create(user=self.user).key
|
||||||
|
payload = png_bytes()
|
||||||
|
path = self._watched / "cache-image.png"
|
||||||
|
path.write_bytes(payload)
|
||||||
|
self.item = MediaItem.objects.create(
|
||||||
|
md5=hashlib.md5(payload).hexdigest(), size=len(payload)
|
||||||
|
)
|
||||||
|
MediaLocation.objects.create(
|
||||||
|
item=self.item, path=str(path), rel_path=path.name, mtime=time.time()
|
||||||
|
)
|
||||||
|
self.client = Client()
|
||||||
|
|
||||||
|
def signed(self, action):
|
||||||
|
return {
|
||||||
|
"sig": sign_payload(
|
||||||
|
{"item": self.item.id, "user": self.user.id, "action": action},
|
||||||
|
services.MEDIA_FILE_SALT,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
def test_media_response_carries_cache_headers(self):
|
||||||
|
response = self.client.get(
|
||||||
|
f"/api/files/J-{self.item.id}/raw/", self.signed("raw")
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertIn("private", response["Cache-Control"])
|
||||||
|
self.assertIn(
|
||||||
|
f"max-age={services.MEDIA_CACHE_SECONDS}", response["Cache-Control"]
|
||||||
|
)
|
||||||
|
self.assertIn("immutable", response["Cache-Control"])
|
||||||
|
self.assertTrue(response["ETag"])
|
||||||
|
self.assertTrue(response["Last-Modified"])
|
||||||
|
|
||||||
|
def test_media_revalidation_returns_304(self):
|
||||||
|
url = f"/api/files/J-{self.item.id}/raw/"
|
||||||
|
first = self.client.get(url, self.signed("raw"))
|
||||||
|
second = self.client.get(
|
||||||
|
url, self.signed("raw"), HTTP_IF_NONE_MATCH=first["ETag"]
|
||||||
|
)
|
||||||
|
self.assertEqual(second.status_code, 304)
|
||||||
|
self.assertEqual(second.content, b"")
|
||||||
|
|
||||||
|
def test_image_thumbnail_is_generated_and_reused(self):
|
||||||
|
url = f"/api/files/J-{self.item.id}/thumbnail/"
|
||||||
|
response = self.client.get(url, self.signed("thumbnail"))
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertEqual(response["Content-Type"], "image/jpeg")
|
||||||
|
thumb = self._media / "thumbs" / f"{self.item.md5}.jpg"
|
||||||
|
self.assertTrue(thumb.exists())
|
||||||
|
with Image.open(thumb) as image:
|
||||||
|
self.assertLessEqual(max(image.size), 480)
|
||||||
|
before = thumb.stat().st_mtime_ns
|
||||||
|
self.client.get(url, self.signed("thumbnail"))
|
||||||
|
self.assertEqual(thumb.stat().st_mtime_ns, before)
|
||||||
|
|
||||||
|
def test_ensure_thumbnail_reuses_the_cache(self):
|
||||||
|
first = services.ensure_thumbnail(self.item)
|
||||||
|
self.assertIsNotNone(first)
|
||||||
|
self.assertTrue(first.exists())
|
||||||
|
mtime = first.stat().st_mtime_ns
|
||||||
|
second = services.ensure_thumbnail(self.item)
|
||||||
|
self.assertEqual(second, first)
|
||||||
|
self.assertEqual(second.stat().st_mtime_ns, mtime)
|
||||||
|
|
||||||
|
def test_thumbnail_of_a_missing_source_does_not_error(self):
|
||||||
|
"""Regression: getmtime() on a vanished source used to raise a 500."""
|
||||||
|
thumbs = self._media / "thumbs"
|
||||||
|
thumbs.mkdir(parents=True, exist_ok=True)
|
||||||
|
(thumbs / f"{self.item.md5}.jpg").write_bytes(b"stale")
|
||||||
|
Path(self.item.locations.first().path).unlink()
|
||||||
|
self.assertIsNone(services.ensure_thumbnail(self.item))
|
||||||
|
response = self.client.get(
|
||||||
|
f"/api/files/J-{self.item.id}/thumbnail/", self.signed("thumbnail")
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 404)
|
||||||
|
|
||||||
|
def test_staged_files_cache_briefly(self):
|
||||||
|
temp = TempUpload.objects.create(
|
||||||
|
user=self.user,
|
||||||
|
file=SimpleUploadedFile("staged.png", TINY_PNG, content_type="image/png"),
|
||||||
|
original_filename="staged.png",
|
||||||
|
md5=hashlib.md5(b"staged").hexdigest(),
|
||||||
|
size=len(TINY_PNG),
|
||||||
|
)
|
||||||
|
signature = sign_payload(
|
||||||
|
{"temp": str(temp.id), "user": self.user.id}, services.UPLOAD_FILE_SALT
|
||||||
|
)
|
||||||
|
response = self.client.get(
|
||||||
|
f"/api/uploads/{temp.id}/file/", {"sig": signature}
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertIn(
|
||||||
|
f"max-age={services.TEMP_CACHE_SECONDS}", response["Cache-Control"]
|
||||||
|
)
|
||||||
|
self.assertNotIn("immutable", response["Cache-Control"])
|
||||||
|
|
||||||
|
def test_legacy_timestamp_signatures_are_accepted(self):
|
||||||
|
"""URLs minted before the stable scheme must not 500.
|
||||||
|
|
||||||
|
A TimestampSigner HMAC also passes a plain Signer's check, so the
|
||||||
|
embedded timestamp used to reach the JSON decoder and blow up.
|
||||||
|
"""
|
||||||
|
payload = {"item": self.item.id, "user": self.user.id, "action": "raw"}
|
||||||
|
legacy = signing.dumps(payload, salt=services.MEDIA_FILE_SALT)
|
||||||
|
self.assertEqual(
|
||||||
|
load_payload(legacy, services.MEDIA_FILE_SALT)["item"], self.item.id
|
||||||
|
)
|
||||||
|
response = self.client.get(
|
||||||
|
f"/api/files/J-{self.item.id}/raw/", {"sig": legacy}
|
||||||
|
)
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
|
def test_expired_and_malformed_signatures_return_none(self):
|
||||||
|
payload = {"item": self.item.id, "user": self.user.id, "action": "raw"}
|
||||||
|
with mock.patch.object(signing, "time") as clock:
|
||||||
|
clock.time.return_value = time.time() - 3 * 86400
|
||||||
|
expired = signing.dumps(payload, salt=services.MEDIA_FILE_SALT)
|
||||||
|
self.assertIsNone(load_payload(expired, services.MEDIA_FILE_SALT))
|
||||||
|
self.assertIsNone(load_payload("bogus", services.MEDIA_FILE_SALT))
|
||||||
|
self.assertIsNone(load_payload("a:b", services.MEDIA_FILE_SALT))
|
||||||
|
self.assertIsNone(load_payload("", services.MEDIA_FILE_SALT))
|
||||||
@@ -170,12 +170,18 @@ class StagedUploadWorkflowTests(TestCase):
|
|||||||
self.assertEqual(len(body["resolved"]), 2)
|
self.assertEqual(len(body["resolved"]), 2)
|
||||||
self.assertEqual(body["errors"], [])
|
self.assertEqual(body["errors"], [])
|
||||||
|
|
||||||
for temp in (first, second):
|
# Completed uploads are notifications now: the staged rows are gone
|
||||||
temp.refresh_from_db()
|
# and the live feed carries the filename -> J-ID mapping.
|
||||||
self.assertEqual(temp.status, TempUpload.STATUS_COMPLETED)
|
self.assertFalse(
|
||||||
self.assertIsNotNone(temp.library_item_id)
|
TempUpload.objects.filter(pk__in=[first.id, second.id]).exists()
|
||||||
self.assertEqual(temp.library_item.rating, "q")
|
)
|
||||||
self.assertEqual(temp.library_item.uploaded_by_id, self.uploader.id)
|
feed = UploadRun.objects.get(user=self.uploader).recent_completions
|
||||||
|
self.assertEqual(
|
||||||
|
{entry["filename"] for entry in feed}, {"one.png", "two.png"}
|
||||||
|
)
|
||||||
|
for item in MediaItem.objects.all():
|
||||||
|
self.assertEqual(item.rating, "q")
|
||||||
|
self.assertEqual(item.uploaded_by_id, self.uploader.id)
|
||||||
untouched.refresh_from_db()
|
untouched.refresh_from_db()
|
||||||
self.assertEqual(untouched.status, TempUpload.STATUS_PENDING)
|
self.assertEqual(untouched.status, TempUpload.STATUS_PENDING)
|
||||||
|
|
||||||
@@ -231,6 +237,25 @@ class StagedUploadWorkflowTests(TestCase):
|
|||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
return seed
|
return seed
|
||||||
|
|
||||||
|
def test_duplicate_upload_returns_a_completion_without_a_record(self):
|
||||||
|
client = self.api_client(self.uploader)
|
||||||
|
first = self.upload_via_api(client, "same.png")
|
||||||
|
self.assertEqual(first.status_code, 201)
|
||||||
|
# Index the first upload so the second one is byte-identical.
|
||||||
|
seed = TempUpload.objects.get(pk=first.json()["temp_id"])
|
||||||
|
self.resolve_bulk(client, [seed.id], "s")
|
||||||
|
|
||||||
|
response = self.upload_via_api(client, "same.png")
|
||||||
|
self.assertEqual(response.status_code, 201)
|
||||||
|
body = response.json()
|
||||||
|
self.assertEqual(body["status"], TempUpload.STATUS_COMPLETED)
|
||||||
|
self.assertEqual(body["resolution"], TempUpload.RESOLUTION_DUPLICATE)
|
||||||
|
self.assertTrue(body["library_j_id"].startswith("J-"))
|
||||||
|
# Duplicates never become board records; the feed announces them.
|
||||||
|
self.assertFalse(TempUpload.objects.filter(pk=body["temp_id"]).exists())
|
||||||
|
feed = UploadRun.objects.get(user=self.uploader).recent_completions
|
||||||
|
self.assertEqual(feed[-1]["filename"], "same.png")
|
||||||
|
|
||||||
def test_upload_defers_visual_similarity_to_its_phase(self):
|
def test_upload_defers_visual_similarity_to_its_phase(self):
|
||||||
client = self.api_client(self.uploader)
|
client = self.api_client(self.uploader)
|
||||||
self.seed_library_item(client, "seed-defer")
|
self.seed_library_item(client, "seed-defer")
|
||||||
@@ -262,6 +287,37 @@ class StagedUploadWorkflowTests(TestCase):
|
|||||||
self.assertEqual(body["visual_matches"], [])
|
self.assertEqual(body["visual_matches"], [])
|
||||||
self.assertEqual(body["status"], TempUpload.STATUS_PENDING)
|
self.assertEqual(body["status"], TempUpload.STATUS_PENDING)
|
||||||
|
|
||||||
|
def test_detail_resigns_stored_visual_match_urls(self):
|
||||||
|
"""Stored matches carry only the item reference; URLs are re-minted.
|
||||||
|
|
||||||
|
Embedding the signed URL meant it expired (or used an older signing
|
||||||
|
scheme) and the modal showed alt text instead of thumbnails.
|
||||||
|
"""
|
||||||
|
client = self.api_client(self.uploader)
|
||||||
|
self.seed_library_item(client, "seed-resign")
|
||||||
|
item = MediaItem.objects.get()
|
||||||
|
temp = self.make_temp(self.uploader, "resign")
|
||||||
|
TempUpload.objects.filter(pk=temp.pk).update(
|
||||||
|
visual_matches=[
|
||||||
|
{
|
||||||
|
"item_id": item.id,
|
||||||
|
"j_id": f"J-{item.id}",
|
||||||
|
"filename": "seed-resign.png",
|
||||||
|
"similarity": 96.5,
|
||||||
|
"thumbnail_url": "/api/files/J-x/thumbnail/?sig=stale",
|
||||||
|
},
|
||||||
|
{"item_id": 999999, "j_id": "J-999999", "filename": "gone.png"},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
body = client.get(f"/api/uploads/{temp.id}/").json()
|
||||||
|
self.assertEqual(len(body["visual_matches"]), 1)
|
||||||
|
match = body["visual_matches"][0]
|
||||||
|
self.assertEqual(match["j_id"], f"J-{item.id}")
|
||||||
|
self.assertEqual(match["similarity"], 96.5)
|
||||||
|
self.assertNotIn("stale", match["thumbnail_url"])
|
||||||
|
self.assertIn("/thumbnail/", match["thumbnail_url"])
|
||||||
|
self.assertIn(f"v={item.md5}", match["thumbnail_url"])
|
||||||
|
|
||||||
def test_visual_match_phase_rejects_completed_uploads(self):
|
def test_visual_match_phase_rejects_completed_uploads(self):
|
||||||
client = self.api_client(self.uploader)
|
client = self.api_client(self.uploader)
|
||||||
temp = self.make_temp(
|
temp = self.make_temp(
|
||||||
@@ -312,14 +368,23 @@ class StagedUploadWorkflowTests(TestCase):
|
|||||||
body = response.json()
|
body = response.json()
|
||||||
self.assertEqual(body["errors"], [])
|
self.assertEqual(body["errors"], [])
|
||||||
self.assertEqual(len(body["updated"]), 2)
|
self.assertEqual(len(body["updated"]), 2)
|
||||||
for temp, post_id in ((first, 900001), (second, 900002)):
|
for entry, post_id in zip(body["updated"], (900001, 900002)):
|
||||||
temp.refresh_from_db()
|
self.assertEqual(entry["resolution"], TempUpload.RESOLUTION_AUTO_MD5)
|
||||||
self.assertEqual(temp.status, TempUpload.STATUS_COMPLETED)
|
self.assertEqual(entry["e621_post_id"], post_id)
|
||||||
self.assertEqual(temp.library_item_id is not None, True)
|
self.assertTrue(entry["library_j_id"].startswith("J-"))
|
||||||
self.assertEqual(temp.e621_post_id, post_id)
|
# Indexed uploads no longer leave a board record; the completion feed
|
||||||
self.assertEqual(temp.resolution, TempUpload.RESOLUTION_AUTO_MD5)
|
# carries them for the live page instead.
|
||||||
self.assertEqual(temp.library_item.e621_post_id, post_id)
|
self.assertFalse(TempUpload.objects.exists())
|
||||||
self.assertEqual(MediaItem.objects.count(), 2)
|
self.assertEqual(
|
||||||
|
{item.e621_post_id for item in MediaItem.objects.all()},
|
||||||
|
{900001, 900002},
|
||||||
|
)
|
||||||
|
feed = UploadRun.objects.get(user=self.uploader).recent_completions
|
||||||
|
self.assertEqual(len(feed), 2)
|
||||||
|
self.assertEqual(
|
||||||
|
{entry["filename"] for entry in feed},
|
||||||
|
{"bulk-link-1.png", "bulk-link-2.png"},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class IqdbRecordingTests(TestCase):
|
class IqdbRecordingTests(TestCase):
|
||||||
@@ -461,6 +526,7 @@ class UploadPipelineTests(TestCase):
|
|||||||
|
|
||||||
def test_md5_match_auto_imports_the_file(self):
|
def test_md5_match_auto_imports_the_file(self):
|
||||||
temp = self.stage(label="match")
|
temp = self.stage(label="match")
|
||||||
|
temp_id = temp.id
|
||||||
post = {
|
post = {
|
||||||
"id": 123456,
|
"id": 123456,
|
||||||
"rating": "s",
|
"rating": "s",
|
||||||
@@ -477,17 +543,42 @@ class UploadPipelineTests(TestCase):
|
|||||||
):
|
):
|
||||||
upload_pipeline.run_pipeline(self.uploader.id)
|
upload_pipeline.run_pipeline(self.uploader.id)
|
||||||
|
|
||||||
temp.refresh_from_db()
|
# The indexed upload leaves no board record; the feed reports it.
|
||||||
self.assertEqual(temp.status, TempUpload.STATUS_COMPLETED)
|
self.assertFalse(TempUpload.objects.filter(pk=temp_id).exists())
|
||||||
self.assertEqual(temp.resolution, TempUpload.RESOLUTION_AUTO_MD5)
|
item = MediaItem.objects.get(e621_post_id=123456)
|
||||||
self.assertEqual(temp.e621_post_id, 123456)
|
self.assertEqual(item.uploaded_by_id, self.uploader.id)
|
||||||
self.assertIsNotNone(temp.library_item_id)
|
|
||||||
self.assertIsNotNone(temp.e621_checked_at)
|
|
||||||
self.assertIsNone(temp.claimed_at)
|
|
||||||
run = UploadRun.objects.get(user=self.uploader)
|
run = UploadRun.objects.get(user=self.uploader)
|
||||||
self.assertEqual(run.status, UploadRun.STATUS_IDLE)
|
self.assertEqual(run.status, UploadRun.STATUS_IDLE)
|
||||||
self.assertEqual(run.matched, 1)
|
self.assertEqual(run.matched, 1)
|
||||||
self.assertEqual(run.processed, 1)
|
self.assertEqual(run.processed, 1)
|
||||||
|
self.assertEqual(len(run.recent_completions), 1)
|
||||||
|
entry = run.recent_completions[0]
|
||||||
|
self.assertEqual(entry["id"], str(temp_id))
|
||||||
|
self.assertEqual(entry["item_id"], item.id)
|
||||||
|
self.assertEqual(entry["filename"], "match.png")
|
||||||
|
self.assertEqual(entry["resolution"], TempUpload.RESOLUTION_AUTO_MD5)
|
||||||
|
|
||||||
|
def test_status_reports_the_completion_feed(self):
|
||||||
|
temp = self.stage(label="feed")
|
||||||
|
client = self.api_client(self.uploader)
|
||||||
|
post = {
|
||||||
|
"id": 654321,
|
||||||
|
"rating": "s",
|
||||||
|
"file": {"md5": temp.md5, "url": "https://static1.e621.net/data/f.png"},
|
||||||
|
}
|
||||||
|
with mock.patch.object(
|
||||||
|
upload_pipeline.e621,
|
||||||
|
"check_md5_batch",
|
||||||
|
return_value={temp.md5: post},
|
||||||
|
):
|
||||||
|
upload_pipeline.run_pipeline(self.uploader.id)
|
||||||
|
|
||||||
|
body = client.get("/api/uploads/status/").json()
|
||||||
|
completions = body["recent_completions"]
|
||||||
|
self.assertEqual(len(completions), 1)
|
||||||
|
self.assertEqual(completions[0]["filename"], "feed.png")
|
||||||
|
self.assertEqual(completions[0]["j_id"], f"J-{MediaItem.objects.get().id}")
|
||||||
|
self.assertIn("/thumbnail/", completions[0]["thumbnail_url"])
|
||||||
|
|
||||||
def test_unmatched_file_runs_every_phase(self):
|
def test_unmatched_file_runs_every_phase(self):
|
||||||
temp = self.stage(label="nomatch")
|
temp = self.stage(label="nomatch")
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ from django.db.models import F, Q
|
|||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from . import e621, services
|
from . import e621, services
|
||||||
from .models import TempUpload, UploadRun
|
from .models import MediaItem, TempUpload, UploadRun
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -46,6 +46,9 @@ MAX_ATTEMPTS = 3
|
|||||||
# Round-level e621 retries before the run is paused.
|
# Round-level e621 retries before the run is paused.
|
||||||
ROUND_ATTEMPTS = 3
|
ROUND_ATTEMPTS = 3
|
||||||
ROUND_RETRY_SECONDS = 20
|
ROUND_RETRY_SECONDS = 20
|
||||||
|
# Completions kept in the live feed. The board only shows what happened while
|
||||||
|
# the page was open, so a bounded rolling window is plenty.
|
||||||
|
COMPLETION_FEED_LIMIT = 200
|
||||||
|
|
||||||
WORK_STATUSES = (TempUpload.STATUS_PENDING, TempUpload.STATUS_VISUAL_MATCH)
|
WORK_STATUSES = (TempUpload.STATUS_PENDING, TempUpload.STATUS_VISUAL_MATCH)
|
||||||
VIDEO_RE = r"\.(mp4|webm)$"
|
VIDEO_RE = r"\.(mp4|webm)$"
|
||||||
@@ -116,7 +119,7 @@ def waiting_counts(user):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def status_payload(user):
|
def status_payload(user, request=None):
|
||||||
"""Cheap state for the shell/upload page to poll."""
|
"""Cheap state for the shell/upload page to poll."""
|
||||||
run = UploadRun.objects.filter(user=user).first()
|
run = UploadRun.objects.filter(user=user).first()
|
||||||
outstanding = count_outstanding(user)
|
outstanding = count_outstanding(user)
|
||||||
@@ -141,10 +144,67 @@ def status_payload(user):
|
|||||||
"error": run.error if run is not None else "",
|
"error": run.error if run is not None else "",
|
||||||
"outstanding": outstanding,
|
"outstanding": outstanding,
|
||||||
"waiting": waiting_counts(user),
|
"waiting": waiting_counts(user),
|
||||||
|
"recent_completions": completion_payload(run, user, request=request),
|
||||||
"updated_at": run.updated_at.isoformat() if run is not None else None,
|
"updated_at": run.updated_at.isoformat() if run is not None else None,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def completion_payload(run, user, request=None):
|
||||||
|
"""The live completion feed: filename -> J-ID for freshly indexed uploads.
|
||||||
|
|
||||||
|
Completed ``TempUpload`` rows are deleted, so this is the only place the
|
||||||
|
board learns about them. It is a notification feed, not durable state:
|
||||||
|
bounded, never dismissed, and ignored by fresh page loads.
|
||||||
|
"""
|
||||||
|
entries = list(run.recent_completions or []) if run is not None else []
|
||||||
|
if not entries:
|
||||||
|
return []
|
||||||
|
ids = [entry.get("item_id") for entry in entries if entry.get("item_id")]
|
||||||
|
items = MediaItem.objects.in_bulk(ids)
|
||||||
|
out = []
|
||||||
|
for entry in reversed(entries): # newest first
|
||||||
|
item = items.get(entry.get("item_id"))
|
||||||
|
if item is None:
|
||||||
|
continue
|
||||||
|
out.append(
|
||||||
|
{
|
||||||
|
"id": entry.get("id"),
|
||||||
|
"filename": entry.get("filename"),
|
||||||
|
"j_id": f"J-{item.id}",
|
||||||
|
"resolution": entry.get("resolution", ""),
|
||||||
|
"post_id": entry.get("post_id"),
|
||||||
|
"thumbnail_url": services.signed_media_url(
|
||||||
|
item, user, "thumbnail", request=request
|
||||||
|
),
|
||||||
|
"at": entry.get("at"),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def record_completion(temp, item, resolution=""):
|
||||||
|
"""Append one completion to the owner's feed; never fails an import."""
|
||||||
|
entry = {
|
||||||
|
"id": str(temp.pk),
|
||||||
|
"filename": temp.original_filename,
|
||||||
|
"item_id": item.pk,
|
||||||
|
"resolution": resolution or temp.resolution or "",
|
||||||
|
"post_id": temp.e621_post_id,
|
||||||
|
"at": timezone.now().isoformat(),
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
with transaction.atomic():
|
||||||
|
run, _ = UploadRun.objects.select_for_update().get_or_create(
|
||||||
|
user_id=temp.user_id
|
||||||
|
)
|
||||||
|
feed = list(run.recent_completions or [])
|
||||||
|
feed.append(entry)
|
||||||
|
run.recent_completions = feed[-COMPLETION_FEED_LIMIT:]
|
||||||
|
run.save(update_fields=["recent_completions", "updated_at"])
|
||||||
|
except Exception: # noqa: BLE001 - a notification must not break an import
|
||||||
|
logger.exception("Could not record the completion of %s", temp.pk)
|
||||||
|
|
||||||
|
|
||||||
def reap_stale_claims():
|
def reap_stale_claims():
|
||||||
"""Queue rows left claimed by a recycled worker and pause dead runs."""
|
"""Queue rows left claimed by a recycled worker and pause dead runs."""
|
||||||
cutoff = timezone.now() - STALE_CLAIM_AFTER
|
cutoff = timezone.now() - STALE_CLAIM_AFTER
|
||||||
@@ -237,20 +297,17 @@ def run_pipeline(user_id):
|
|||||||
break
|
break
|
||||||
process_round(run, user, rows)
|
process_round(run, user, rows)
|
||||||
except PipelinePaused as exc:
|
except PipelinePaused as exc:
|
||||||
run.status = UploadRun.STATUS_PAUSED
|
_save_run(run, status=UploadRun.STATUS_PAUSED, phase="", error=str(exc))
|
||||||
run.phase = ""
|
|
||||||
run.error = str(exc)
|
|
||||||
run.save()
|
|
||||||
except Exception as exc: # noqa: BLE001 - surface crashes as a run error
|
except Exception as exc: # noqa: BLE001 - surface crashes as a run error
|
||||||
logger.exception("Upload pipeline for user %s failed", user_id)
|
logger.exception("Upload pipeline for user %s failed", user_id)
|
||||||
run.status = UploadRun.STATUS_ERROR
|
_save_run(
|
||||||
run.phase = ""
|
run,
|
||||||
run.error = f"The upload pipeline stopped: {exc}"
|
status=UploadRun.STATUS_ERROR,
|
||||||
run.save()
|
phase="",
|
||||||
|
error=f"The upload pipeline stopped: {exc}",
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
run.status = UploadRun.STATUS_IDLE
|
_save_run(run, status=UploadRun.STATUS_IDLE, phase="")
|
||||||
run.phase = ""
|
|
||||||
run.save()
|
|
||||||
|
|
||||||
|
|
||||||
def claim_round(user, size=CLAIM_SIZE):
|
def claim_round(user, size=CLAIM_SIZE):
|
||||||
@@ -460,7 +517,9 @@ def finalize_round(run, ids, matched):
|
|||||||
TempUpload.objects.filter(pk__in=release).update(claimed_at=None)
|
TempUpload.objects.filter(pk__in=release).update(claimed_at=None)
|
||||||
_save_run(
|
_save_run(
|
||||||
run,
|
run,
|
||||||
processed=run.processed + len(finished),
|
# Completed rows are deleted as they are imported, so they cannot be
|
||||||
|
# seen in the refreshed rows; count the matches explicitly.
|
||||||
|
processed=run.processed + len(finished) + matched,
|
||||||
failed=run.failed + len(failed - finished),
|
failed=run.failed + len(failed - finished),
|
||||||
matched=run.matched + matched,
|
matched=run.matched + matched,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ from urllib.parse import urlparse
|
|||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.core import signing
|
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
@@ -30,6 +29,7 @@ from . import services
|
|||||||
from .models import MediaItem, TempUpload
|
from .models import MediaItem, TempUpload
|
||||||
from .permissions import CanUpload
|
from .permissions import CanUpload
|
||||||
from .serializers import TempUploadListSerializer, TempUploadSerializer
|
from .serializers import TempUploadListSerializer, TempUploadSerializer
|
||||||
|
from .signing_urls import load_payload
|
||||||
from .tools import HASH_FIELDS, hashed_items, hashes_similarity
|
from .tools import HASH_FIELDS, hashed_items, hashes_similarity
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -60,6 +60,7 @@ def match_hashes(hashes, index, limit=10, user=None, request=None):
|
|||||||
location = item.locations.first()
|
location = item.locations.first()
|
||||||
matches.append(
|
matches.append(
|
||||||
{
|
{
|
||||||
|
"item_id": item.id,
|
||||||
"j_id": f"J-{item.id}",
|
"j_id": f"J-{item.id}",
|
||||||
"filename": Path(location.rel_path).name if location else item.md5,
|
"filename": Path(location.rel_path).name if location else item.md5,
|
||||||
"similarity": round(similarity * 100, 1),
|
"similarity": round(similarity * 100, 1),
|
||||||
@@ -127,6 +128,12 @@ def complete_temp_upload(temp, download_url=None):
|
|||||||
services.ensure_visual_hashes(item)
|
services.ensure_visual_hashes(item)
|
||||||
temp.file.delete(save=False)
|
temp.file.delete(save=False)
|
||||||
|
|
||||||
|
# Warm the preview while the import is still off the request path.
|
||||||
|
try:
|
||||||
|
services.ensure_thumbnail(item)
|
||||||
|
except Exception: # noqa: BLE001 - a preview must not fail the import
|
||||||
|
logger.exception("Could not warm the thumbnail for J-%s", item.id)
|
||||||
|
|
||||||
temp.library_item = item
|
temp.library_item = item
|
||||||
temp.status = TempUpload.STATUS_COMPLETED
|
temp.status = TempUpload.STATUS_COMPLETED
|
||||||
|
|
||||||
@@ -158,6 +165,13 @@ def complete_temp_upload(temp, download_url=None):
|
|||||||
item.save(update_fields=update_fields + ["updated_at"])
|
item.save(update_fields=update_fields + ["updated_at"])
|
||||||
|
|
||||||
temp.save()
|
temp.save()
|
||||||
|
from .upload_pipeline import record_completion
|
||||||
|
|
||||||
|
record_completion(temp, item)
|
||||||
|
# The board learns about completions from the live feed, so the record is
|
||||||
|
# deleted as soon as the file is indexed: nothing left to dismiss. Delete
|
||||||
|
# through the queryset so callers keep ``temp.pk`` for their response.
|
||||||
|
TempUpload.objects.filter(pk=temp.pk).delete()
|
||||||
return item
|
return item
|
||||||
|
|
||||||
|
|
||||||
@@ -190,6 +204,28 @@ class TempUploadViewSet(
|
|||||||
user=self.request.user
|
user=self.request.user
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _completed_payload(self, temp, item):
|
||||||
|
"""Synthetic row for an upload that is indexed immediately.
|
||||||
|
|
||||||
|
Duplicates and resolved uploads never leave a board record; the SPA
|
||||||
|
turns this response (or the live completion feed) into a "J-x
|
||||||
|
uploaded" card that lives only in the page session.
|
||||||
|
"""
|
||||||
|
return {
|
||||||
|
"temp_id": str(temp.pk),
|
||||||
|
"original_filename": temp.original_filename,
|
||||||
|
"md5": temp.md5,
|
||||||
|
"size": temp.size,
|
||||||
|
"status": TempUpload.STATUS_COMPLETED,
|
||||||
|
"resolution": temp.resolution,
|
||||||
|
"e621_post_id": temp.e621_post_id,
|
||||||
|
"library_j_id": f"J-{item.id}",
|
||||||
|
"file_url": None,
|
||||||
|
"preview_url": services.signed_media_url(
|
||||||
|
item, self.request.user, "thumbnail", request=self.request
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
def create(self, request):
|
def create(self, request):
|
||||||
upload = request.FILES.get("file")
|
upload = request.FILES.get("file")
|
||||||
if upload is None:
|
if upload is None:
|
||||||
@@ -217,6 +253,13 @@ class TempUploadViewSet(
|
|||||||
temp.resolution = TempUpload.RESOLUTION_DUPLICATE
|
temp.resolution = TempUpload.RESOLUTION_DUPLICATE
|
||||||
temp.library_item = existing
|
temp.library_item = existing
|
||||||
temp.file.delete(save=False)
|
temp.file.delete(save=False)
|
||||||
|
temp.save()
|
||||||
|
from .upload_pipeline import record_completion
|
||||||
|
|
||||||
|
record_completion(temp, existing)
|
||||||
|
payload = self._completed_payload(temp, existing)
|
||||||
|
TempUpload.objects.filter(pk=temp.pk).delete()
|
||||||
|
return Response(payload, status=status.HTTP_201_CREATED)
|
||||||
# Visual similarity and IQDB run in the background pipeline so a large
|
# Visual similarity and IQDB run in the background pipeline so a large
|
||||||
# batch uploads at full speed and the work survives the browser.
|
# batch uploads at full speed and the work survives the browser.
|
||||||
temp.save()
|
temp.save()
|
||||||
@@ -257,7 +300,7 @@ class TempUploadViewSet(
|
|||||||
"""Cheap pipeline state for the shell indicator and the upload page."""
|
"""Cheap pipeline state for the shell indicator and the upload page."""
|
||||||
from .upload_pipeline import status_payload
|
from .upload_pipeline import status_payload
|
||||||
|
|
||||||
return Response(status_payload(request.user))
|
return Response(status_payload(request.user, request=request))
|
||||||
|
|
||||||
@action(detail=False, methods=["post"])
|
@action(detail=False, methods=["post"])
|
||||||
def process(self, request):
|
def process(self, request):
|
||||||
@@ -269,7 +312,7 @@ class TempUploadViewSet(
|
|||||||
from .upload_pipeline import start_pipeline, status_payload
|
from .upload_pipeline import start_pipeline, status_payload
|
||||||
|
|
||||||
start_pipeline(request.user)
|
start_pipeline(request.user)
|
||||||
return Response(status_payload(request.user))
|
return Response(status_payload(request.user, request=request))
|
||||||
|
|
||||||
@action(detail=True, methods=["post"])
|
@action(detail=True, methods=["post"])
|
||||||
def retry(self, request, pk=None):
|
def retry(self, request, pk=None):
|
||||||
@@ -314,7 +357,7 @@ class TempUploadViewSet(
|
|||||||
update["status"] = TempUpload.STATUS_PENDING
|
update["status"] = TempUpload.STATUS_PENDING
|
||||||
TempUpload.objects.filter(pk=temp.pk).update(**update)
|
TempUpload.objects.filter(pk=temp.pk).update(**update)
|
||||||
start_pipeline(request.user)
|
start_pipeline(request.user)
|
||||||
return Response(status_payload(request.user))
|
return Response(status_payload(request.user, request=request))
|
||||||
|
|
||||||
@action(detail=False, methods=["post"], url_path="retry-all")
|
@action(detail=False, methods=["post"], url_path="retry-all")
|
||||||
def retry_all(self, request):
|
def retry_all(self, request):
|
||||||
@@ -340,7 +383,7 @@ class TempUploadViewSet(
|
|||||||
e621_checked_at=None,
|
e621_checked_at=None,
|
||||||
)
|
)
|
||||||
start_pipeline(request.user)
|
start_pipeline(request.user)
|
||||||
return Response(status_payload(request.user))
|
return Response(status_payload(request.user, request=request))
|
||||||
|
|
||||||
@action(detail=False, methods=["post"], url_path="discard-bulk")
|
@action(detail=False, methods=["post"], url_path="discard-bulk")
|
||||||
def discard_bulk(self, request):
|
def discard_bulk(self, request):
|
||||||
@@ -393,14 +436,7 @@ class TempUploadViewSet(
|
|||||||
if user is None:
|
if user is None:
|
||||||
signature = request.query_params.get("sig")
|
signature = request.query_params.get("sig")
|
||||||
if signature:
|
if signature:
|
||||||
try:
|
payload = load_payload(signature, services.UPLOAD_FILE_SALT)
|
||||||
payload = signing.loads(
|
|
||||||
signature,
|
|
||||||
salt=services.UPLOAD_FILE_SALT,
|
|
||||||
max_age=86400,
|
|
||||||
)
|
|
||||||
except signing.BadSignature:
|
|
||||||
payload = None
|
|
||||||
if payload and str(payload.get("temp")) == str(pk):
|
if payload and str(payload.get("temp")) == str(pk):
|
||||||
user = (
|
user = (
|
||||||
get_user_model()
|
get_user_model()
|
||||||
@@ -501,7 +537,7 @@ class TempUploadViewSet(
|
|||||||
|
|
||||||
temp.save()
|
temp.save()
|
||||||
try:
|
try:
|
||||||
complete_temp_upload(temp, download_url=download_url)
|
item = complete_temp_upload(temp, download_url=download_url)
|
||||||
except Exception as exc: # noqa: BLE001 - report completion failures
|
except Exception as exc: # noqa: BLE001 - report completion failures
|
||||||
logger.exception("Could not complete staged upload %s", temp.id)
|
logger.exception("Could not complete staged upload %s", temp.id)
|
||||||
temp.status = TempUpload.STATUS_ERROR
|
temp.status = TempUpload.STATUS_ERROR
|
||||||
@@ -510,8 +546,7 @@ class TempUploadViewSet(
|
|||||||
{"detail": f"Could not finish the upload: {exc}"},
|
{"detail": f"Could not finish the upload: {exc}"},
|
||||||
status=status.HTTP_400_BAD_REQUEST,
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
)
|
)
|
||||||
temp.refresh_from_db()
|
return Response(self._completed_payload(temp, item))
|
||||||
return Response(self.get_serializer(temp).data)
|
|
||||||
|
|
||||||
@action(detail=False, methods=["post"], url_path="link-bulk")
|
@action(detail=False, methods=["post"], url_path="link-bulk")
|
||||||
def link_bulk(self, request):
|
def link_bulk(self, request):
|
||||||
@@ -583,15 +618,14 @@ class TempUploadViewSet(
|
|||||||
candidate_url = ""
|
candidate_url = ""
|
||||||
temp.save()
|
temp.save()
|
||||||
try:
|
try:
|
||||||
complete_temp_upload(temp, download_url=candidate_url or None)
|
item = complete_temp_upload(temp, download_url=candidate_url or None)
|
||||||
except Exception as exc: # noqa: BLE001 - report per-file failures
|
except Exception as exc: # noqa: BLE001 - report per-file failures
|
||||||
logger.exception("Could not complete staged upload %s", temp.id)
|
logger.exception("Could not complete staged upload %s", temp.id)
|
||||||
temp.status = TempUpload.STATUS_ERROR
|
temp.status = TempUpload.STATUS_ERROR
|
||||||
temp.save(update_fields=["status", "updated_at"])
|
temp.save(update_fields=["status", "updated_at"])
|
||||||
errors.append({"temp_id": temp_id, "error": str(exc)})
|
errors.append({"temp_id": temp_id, "error": str(exc)})
|
||||||
continue
|
continue
|
||||||
temp.refresh_from_db()
|
updated.append(self._completed_payload(temp, item))
|
||||||
updated.append(self.get_serializer(temp).data)
|
|
||||||
|
|
||||||
return Response({"updated": updated, "errors": errors})
|
return Response({"updated": updated, "errors": errors})
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ from pathlib import Path
|
|||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import signing
|
|
||||||
from django.db.models import Min, Q
|
from django.db.models import Min, Q
|
||||||
from django.http import Http404, StreamingHttpResponse
|
from django.http import Http404, StreamingHttpResponse
|
||||||
from django.shortcuts import get_object_or_404
|
from django.shortcuts import get_object_or_404
|
||||||
@@ -31,6 +30,7 @@ from .serializers import (
|
|||||||
MatchTaskSerializer,
|
MatchTaskSerializer,
|
||||||
MediaItemSerializer,
|
MediaItemSerializer,
|
||||||
)
|
)
|
||||||
|
from .signing_urls import load_payload
|
||||||
|
|
||||||
LIST_ORDERINGS = {"name", "-name", "size", "-size", "created_at", "-created_at"}
|
LIST_ORDERINGS = {"name", "-name", "size", "-size", "created_at", "-created_at"}
|
||||||
MD5_RE = re.compile(r"[0-9a-fA-F]{32}")
|
MD5_RE = re.compile(r"[0-9a-fA-F]{32}")
|
||||||
@@ -132,11 +132,8 @@ class MediaItemViewSet(
|
|||||||
signature = request.query_params.get("sig")
|
signature = request.query_params.get("sig")
|
||||||
if not signature:
|
if not signature:
|
||||||
return None
|
return None
|
||||||
try:
|
payload = load_payload(signature, services.MEDIA_FILE_SALT)
|
||||||
payload = signing.loads(
|
if payload is None:
|
||||||
signature, salt=services.MEDIA_FILE_SALT, max_age=86400
|
|
||||||
)
|
|
||||||
except signing.BadSignature:
|
|
||||||
return None
|
return None
|
||||||
if payload.get("action") != action_name:
|
if payload.get("action") != action_name:
|
||||||
return None
|
return None
|
||||||
@@ -158,7 +155,11 @@ class MediaItemViewSet(
|
|||||||
status=status.HTTP_404_NOT_FOUND,
|
status=status.HTTP_404_NOT_FOUND,
|
||||||
)
|
)
|
||||||
return services.serve_file(
|
return services.serve_file(
|
||||||
request, location.path, download=request.query_params.get("download") == "1"
|
request,
|
||||||
|
location.path,
|
||||||
|
download=request.query_params.get("download") == "1",
|
||||||
|
max_age=services.MEDIA_CACHE_SECONDS,
|
||||||
|
immutable=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
@action(detail=True, methods=["get"], throttle_classes=[])
|
@action(detail=True, methods=["get"], throttle_classes=[])
|
||||||
@@ -173,13 +174,26 @@ class MediaItemViewSet(
|
|||||||
path = Path(location.path)
|
path = Path(location.path)
|
||||||
if path.suffix.lower() in services.VIDEO_EXTENSIONS:
|
if path.suffix.lower() in services.VIDEO_EXTENSIONS:
|
||||||
thumbnail = services.generate_video_thumbnail(item.md5, path)
|
thumbnail = services.generate_video_thumbnail(item.md5, path)
|
||||||
if thumbnail is None:
|
else:
|
||||||
|
thumbnail = services.generate_image_thumbnail(item.md5, path)
|
||||||
|
if thumbnail is not None:
|
||||||
|
return services.serve_file(
|
||||||
|
request,
|
||||||
|
thumbnail,
|
||||||
|
max_age=services.MEDIA_CACHE_SECONDS,
|
||||||
|
immutable=True,
|
||||||
|
)
|
||||||
|
if path.suffix.lower() in services.VIDEO_EXTENSIONS:
|
||||||
return Response(
|
return Response(
|
||||||
{"detail": "Thumbnail unavailable."},
|
{"detail": "Thumbnail unavailable."},
|
||||||
status=status.HTTP_404_NOT_FOUND,
|
status=status.HTTP_404_NOT_FOUND,
|
||||||
)
|
)
|
||||||
return services.serve_file(request, thumbnail)
|
return services.serve_file(
|
||||||
return services.serve_file(request, path)
|
request,
|
||||||
|
path,
|
||||||
|
max_age=services.MEDIA_CACHE_SECONDS,
|
||||||
|
immutable=True,
|
||||||
|
)
|
||||||
|
|
||||||
@action(detail=False, methods=["post"], permission_classes=[AllowAny])
|
@action(detail=False, methods=["post"], permission_classes=[AllowAny])
|
||||||
def lookup(self, request):
|
def lookup(self, request):
|
||||||
|
|||||||
+9
-12
@@ -145,9 +145,12 @@ Build the desktop installers without publishing anything:
|
|||||||
```
|
```
|
||||||
|
|
||||||
Hand the files out or attach them to a Gitea release manually — the script
|
Hand the files out or attach them to a Gitea release manually — the script
|
||||||
prints sizes and SHA-256 sums for the release notes.
|
prints sizes and SHA-256 sums for the release notes. The release assets are
|
||||||
|
also the desktop update feed; the app resolves the newest `desktop-v*`
|
||||||
|
release on Gitea at check time (see `desktop/README.md`).
|
||||||
|
|
||||||
Push the desktop builds and their update metadata to the frontend's feed:
|
The frontend's `/desktop/` feed is optional now — kept for manual downloads
|
||||||
|
and for installs older than 0.1.2. To publish it:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./push_desktop.sh # build Linux packages + copy the feed to jakerasp
|
./push_desktop.sh # build Linux packages + copy the feed to jakerasp
|
||||||
@@ -160,19 +163,13 @@ The remote copy defaults to `jakerasp:/home/jake/servers/J621`, or
|
|||||||
`$J621_DESKTOP_FEED_HOST` when set. Artifacts land in `deploy/data/desktop/`,
|
`$J621_DESKTOP_FEED_HOST` when set. Artifacts land in `deploy/data/desktop/`,
|
||||||
which the frontend nginx mounts read-only and serves at `/desktop/`. The
|
which the frontend nginx mounts read-only and serves at `/desktop/`. The
|
||||||
remote copy uses rsync when both ends have it, tar over ssh when the server
|
remote copy uses rsync when both ends have it, tar over ssh when the server
|
||||||
does not. The desktop app's "Check for updates…" menu item reads
|
does not. Backend-only composes have no frontend, so no website feed.
|
||||||
`latest-linux.yml` / `latest.yml` from there (see `desktop/README.md`).
|
|
||||||
Backend-only composes have no frontend, so no feed.
|
|
||||||
|
|
||||||
The manual **CD** workflow (Actions tab) builds the desktop packages on the
|
The manual **CD** workflow (Actions tab) builds the desktop packages on the
|
||||||
runner and attaches them plus the update metadata to the Gitea release
|
runner and attaches them plus the update metadata to the Gitea release
|
||||||
`desktop-v<version>`; it does not touch the live feed, because that is
|
`desktop-v<version>`; that is what the desktop updater reads. The website feed
|
||||||
runtime state on the deploy host and CI has no SSH key for it. After a CD run,
|
is not touched by CI (runtime state on the deploy host, no SSH key there); use
|
||||||
publish the feed from a machine that can reach the deploy checkout:
|
`push_desktop.sh` when it needs refreshing for old installs.
|
||||||
|
|
||||||
```bash
|
|
||||||
./push_desktop.sh --no-build --local # or without --local to also copy it
|
|
||||||
```
|
|
||||||
|
|
||||||
## Scheduled jobs
|
## Scheduled jobs
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Build the J621 desktop packages and publish them to the update feed.
|
# Build the J621 desktop packages, optionally publish them to the website
|
||||||
|
# feed.
|
||||||
#
|
#
|
||||||
# Locally the feed is deploy/data/desktop, which the frontend nginx mounts
|
# Desktop updates no longer depend on this: the app resolves the newest
|
||||||
# read-only and serves at /desktop/. With --host the same directory is also
|
# `desktop-v*` release on Gitea at check time (see desktop/README.md). This
|
||||||
# copied to a remote deploy checkout (rsync, or tar over ssh when the server
|
# script builds the packages and can copy them to deploy/data/desktop, which
|
||||||
# has no rsync). electron-updater reads latest-linux.yml / latest.yml from
|
# the frontend nginx mounts read-only and serves at /desktop/ for manual
|
||||||
# there; the feed URL comes from desktop/electron-builder.yml.
|
# downloads and for pre-0.1.2 installs.
|
||||||
#
|
#
|
||||||
# Usage: ./push_desktop.sh [--win] [--no-build] [--local] [--host user@server:/path]
|
# Usage: ./push_desktop.sh [--win] [--no-build] [--local] [--host user@server:/path]
|
||||||
# --win also cross-build the Windows NSIS installer (needs wine)
|
# --win also cross-build the Windows NSIS installer (needs wine)
|
||||||
|
|||||||
+19
-8
@@ -49,7 +49,8 @@ npm run dist:all
|
|||||||
|
|
||||||
`deploy/build_desktop.sh` wraps the same commands, installs dependencies on
|
`deploy/build_desktop.sh` wraps the same commands, installs dependencies on
|
||||||
first run and prints sizes plus SHA-256 sums for release notes. Nothing is
|
first run and prints sizes plus SHA-256 sums for release notes. Nothing is
|
||||||
published by it; `deploy/push_desktop.sh` is the one that feeds auto-updates.
|
published by it; the CD workflow attaches the artifacts to the Gitea release,
|
||||||
|
which is also the update feed.
|
||||||
|
|
||||||
The Arch package can be installed and removed with pacman:
|
The Arch package can be installed and removed with pacman:
|
||||||
|
|
||||||
@@ -68,19 +69,29 @@ will warn, and it has not been smoke-tested on real Windows.
|
|||||||
|
|
||||||
The app checks only when asked (**J621 → Check for updates…** in the menu):
|
The app checks only when asked (**J621 → Check for updates…** in the menu):
|
||||||
Linux packages install through pacman/dpkg, which needs administrator rights,
|
Linux packages install through pacman/dpkg, which needs administrator rights,
|
||||||
and the Windows build is unsigned, so nothing installs silently. The check
|
and the Windows build is unsigned, so nothing installs silently.
|
||||||
reads `latest-linux.yml` / `latest.yml` from the feed configured in
|
|
||||||
`electron-builder.yml` (`publish.url`, baked into `app-update.yml`); set
|
The check resolves the feed itself: it asks the Gitea API for the newest
|
||||||
`J621_UPDATE_URL` to point a build at another feed (the smoke test uses this).
|
non-draft `desktop-v*` release (`J621_UPDATE_REPO`, default
|
||||||
|
`https://gitea.rainbow-herring.ts.net/jakebreath/j621` — lowercase on purpose,
|
||||||
|
the API path is case-sensitive), picks the `latest-linux.yml` / `latest.yml`
|
||||||
|
asset for the platform and uses that release as an electron-updater generic
|
||||||
|
feed. The baked `publish.url` in `electron-builder.yml` is metadata only.
|
||||||
|
`J621_UPDATE_URL` overrides the whole lookup (the smoke test uses this).
|
||||||
|
|
||||||
Publishing a release:
|
Publishing a release:
|
||||||
|
|
||||||
1. Bump `version` in `desktop/package.json` — that is what the updater compares.
|
1. Bump `version` in `desktop/package.json` — that is what the updater compares.
|
||||||
2. `./deploy/push_desktop.sh --win` builds deb/pacman/NSIS and copies the
|
2. Run the manual CD workflow, which builds the packages and attaches them
|
||||||
artifacts plus both channel files into `deploy/data/desktop/`, which the
|
plus both channel files to the Gitea release `desktop-v<version>`.
|
||||||
frontend nginx serves read-only at `/desktop/`.
|
`./deploy/push_desktop.sh --win` does the same build locally (and can also
|
||||||
|
copy the files to the website feed, which is optional now).
|
||||||
3. Existing installs find the new version on their next manual check.
|
3. Existing installs find the new version on their next manual check.
|
||||||
|
|
||||||
|
Note for the 0.1.1 → 0.1.2 step: 0.1.1 only knows the old `/desktop/` feed, so
|
||||||
|
publish 0.1.2 there once (`./deploy/push_desktop.sh --no-build`, or install it
|
||||||
|
manually). From 0.1.2 on, updates come from Gitea.
|
||||||
|
|
||||||
`package-type` in the app resources tells electron-updater whether to run
|
`package-type` in the app resources tells electron-updater whether to run
|
||||||
`pacman -U` or `dpkg -i` (both via pkexec/sudo); the per-user NSIS install
|
`pacman -U` or `dpkg -i` (both via pkexec/sudo); the per-user NSIS install
|
||||||
updates without elevation.
|
updates without elevation.
|
||||||
|
|||||||
@@ -2,12 +2,13 @@ appId: io.j621.desktop
|
|||||||
productName: J621
|
productName: J621
|
||||||
copyright: Copyright (c) 2026 JakeBreath — Jake Labs Non-Commercial Software Licence
|
copyright: Copyright (c) 2026 JakeBreath — Jake Labs Non-Commercial Software Licence
|
||||||
|
|
||||||
# Update feed served by the frontend nginx (deploy/data/desktop, published
|
# Update feed: desktop/src/main.ts resolves the newest desktop-v* release on
|
||||||
# with deploy/push_desktop.sh). Baked into resources/app-update.yml; override
|
# Gitea at check time (J621_UPDATE_REPO). This block only tells electron-builder
|
||||||
# at runtime with J621_UPDATE_URL for a fork or a test feed.
|
# to emit latest.yml/latest-linux.yml next to the installers; J621_UPDATE_URL
|
||||||
|
# overrides the feed for a fork or a test.
|
||||||
publish:
|
publish:
|
||||||
provider: generic
|
provider: generic
|
||||||
url: https://j621.rainbow-herring.ts.net/desktop
|
url: https://gitea.rainbow-herring.ts.net/JakeBreath/J621/releases
|
||||||
|
|
||||||
directories:
|
directories:
|
||||||
output: release
|
output: release
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "j621-desktop",
|
"name": "j621-desktop",
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "j621-desktop",
|
"name": "j621-desktop",
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"license": "LicenseRef-Jake-Labs-Non-Commercial",
|
"license": "LicenseRef-Jake-Labs-Non-Commercial",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"electron-updater": "^6.8.9"
|
"electron-updater": "^6.8.9"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "j621-desktop",
|
"name": "j621-desktop",
|
||||||
"productName": "J621",
|
"productName": "J621",
|
||||||
"version": "0.1.1",
|
"version": "0.1.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "Desktop shell for the J621 self-hosted media archive",
|
"description": "Desktop shell for the J621 self-hosted media archive",
|
||||||
"author": {
|
"author": {
|
||||||
|
|||||||
+82
-4
@@ -238,8 +238,9 @@ function isDownloadNavigation(url: URL): boolean {
|
|||||||
/**
|
/**
|
||||||
* Updates are manual by design: Linux packages install through pacman/dpkg
|
* Updates are manual by design: Linux packages install through pacman/dpkg
|
||||||
* (pkexec/sudo) and the Windows build is unsigned, so the app asks before
|
* (pkexec/sudo) and the Windows build is unsigned, so the app asks before
|
||||||
* downloading and again before installing. The feed comes from `publish` in
|
* downloading and again before installing. The feed is resolved at check time
|
||||||
* electron-builder.yml and can be overridden with J621_UPDATE_URL.
|
* from the newest `desktop-v*` release on Gitea (`J621_UPDATE_REPO`);
|
||||||
|
* `J621_UPDATE_URL` overrides it for forks and the smoke test.
|
||||||
*/
|
*/
|
||||||
type UpdateEvent =
|
type UpdateEvent =
|
||||||
| { state: "available"; version: string }
|
| { state: "available"; version: string }
|
||||||
@@ -250,9 +251,84 @@ type UpdateEvent =
|
|||||||
let updateReporter: ((event: UpdateEvent) => void) | null = null;
|
let updateReporter: ((event: UpdateEvent) => void) | null = null;
|
||||||
let updateCheckRunning = false;
|
let updateCheckRunning = false;
|
||||||
|
|
||||||
function setUpUpdates(win: BrowserWindow): void {
|
const UPDATE_REPO =
|
||||||
|
process.env.J621_UPDATE_REPO?.trim() ||
|
||||||
|
"https://gitea.rainbow-herring.ts.net/jakebreath/j621";
|
||||||
|
|
||||||
|
interface ReleaseAsset {
|
||||||
|
name: string;
|
||||||
|
browser_download_url: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Release {
|
||||||
|
tag_name: string;
|
||||||
|
draft: boolean;
|
||||||
|
prerelease: boolean;
|
||||||
|
assets?: ReleaseAsset[];
|
||||||
|
}
|
||||||
|
|
||||||
|
function releaseVersion(tag: string): [number, number, number] | null {
|
||||||
|
const match = /^desktop-v(\d+)\.(\d+)\.(\d+)$/.exec(tag);
|
||||||
|
if (!match) return null;
|
||||||
|
return [Number(match[1]), Number(match[2]), Number(match[3])];
|
||||||
|
}
|
||||||
|
|
||||||
|
function compareVersions(
|
||||||
|
a: [number, number, number],
|
||||||
|
b: [number, number, number],
|
||||||
|
): number {
|
||||||
|
for (let index = 0; index < 3; index += 1) {
|
||||||
|
if (a[index] !== b[index]) return a[index] - b[index];
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve the generic feed base electron-updater should use.
|
||||||
|
*
|
||||||
|
* Gitea's API path is case-sensitive (owner/repo must match the login), while
|
||||||
|
* the asset URLs it returns are canonical, so the base is derived from the
|
||||||
|
* platform's metadata asset (`latest-linux.yml` / `latest.yml`).
|
||||||
|
*/
|
||||||
|
async function resolveReleaseFeed(): Promise<string> {
|
||||||
const override = process.env.J621_UPDATE_URL?.trim();
|
const override = process.env.J621_UPDATE_URL?.trim();
|
||||||
if (override) autoUpdater.setFeedURL({ provider: "generic", url: override });
|
if (override) return override;
|
||||||
|
const match = /^(https?:\/\/[^/]+)\/([^/]+)\/([^/]+?)\/?$/.exec(UPDATE_REPO);
|
||||||
|
if (!match) {
|
||||||
|
throw new Error(
|
||||||
|
`J621_UPDATE_REPO must be <origin>/<owner>/<repo> (got ${UPDATE_REPO}).`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const [, origin, owner, repo] = match;
|
||||||
|
const response = await fetch(
|
||||||
|
`${origin}/api/v1/repos/${owner}/${repo}/releases?limit=50`,
|
||||||
|
{ headers: { Accept: "application/json" } },
|
||||||
|
);
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Release lookup on Gitea failed (HTTP ${response.status}).`);
|
||||||
|
}
|
||||||
|
const releases = (await response.json()) as Release[];
|
||||||
|
const assetName =
|
||||||
|
process.platform === "win32" ? "latest.yml" : "latest-linux.yml";
|
||||||
|
let best: { version: [number, number, number]; asset: ReleaseAsset } | null =
|
||||||
|
null;
|
||||||
|
for (const release of releases) {
|
||||||
|
if (release.draft || release.prerelease) continue;
|
||||||
|
const version = releaseVersion(release.tag_name);
|
||||||
|
if (!version) continue;
|
||||||
|
const asset = release.assets?.find((entry) => entry.name === assetName);
|
||||||
|
if (!asset) continue;
|
||||||
|
if (!best || compareVersions(version, best.version) > 0) {
|
||||||
|
best = { version, asset };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!best) {
|
||||||
|
throw new Error(`No ${assetName} asset found in ${UPDATE_REPO} releases.`);
|
||||||
|
}
|
||||||
|
return best.asset.browser_download_url.replace(/\/[^/]*$/, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
function setUpUpdates(win: BrowserWindow): void {
|
||||||
if (!app.isPackaged) autoUpdater.forceDevUpdateConfig = true;
|
if (!app.isPackaged) autoUpdater.forceDevUpdateConfig = true;
|
||||||
autoUpdater.autoDownload = false;
|
autoUpdater.autoDownload = false;
|
||||||
autoUpdater.autoInstallOnAppQuit = false;
|
autoUpdater.autoInstallOnAppQuit = false;
|
||||||
@@ -336,6 +412,8 @@ async function checkForUpdates(win: BrowserWindow): Promise<void> {
|
|||||||
if (updateCheckRunning) return;
|
if (updateCheckRunning) return;
|
||||||
updateCheckRunning = true;
|
updateCheckRunning = true;
|
||||||
try {
|
try {
|
||||||
|
const feed = await resolveReleaseFeed();
|
||||||
|
autoUpdater.setFeedURL({ provider: "generic", url: feed });
|
||||||
await autoUpdater.checkForUpdates();
|
await autoUpdater.checkForUpdates();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ export function AppShell() {
|
|||||||
return (
|
return (
|
||||||
<div className="flex min-h-screen flex-col">
|
<div className="flex min-h-screen flex-col">
|
||||||
<header className="sticky top-0 z-40 border-b border-ctp-surface0 bg-ctp-crust/95 backdrop-blur">
|
<header className="sticky top-0 z-40 border-b border-ctp-surface0 bg-ctp-crust/95 backdrop-blur">
|
||||||
<div className="mx-auto flex h-14 w-full max-w-[1600px] items-center gap-4 px-4">
|
<div className="flex h-14 w-full items-center gap-4 px-3 sm:px-4">
|
||||||
<Link to="/" className="flex shrink-0 items-center">
|
<Link to="/" className="flex shrink-0 items-center">
|
||||||
<span className="rounded bg-ctp-mauve px-2 py-1 font-mono text-xs font-bold tracking-wide text-ctp-crust">
|
<span className="rounded bg-ctp-mauve px-2 py-1 font-mono text-xs font-bold tracking-wide text-ctp-crust">
|
||||||
J621
|
J621
|
||||||
|
|||||||
@@ -18,9 +18,9 @@ const ratingLabels: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function MediaCard({ item }: { item: MediaItem }) {
|
export function MediaCard({ item }: { item: MediaItem }) {
|
||||||
const preview = apiUrl(
|
// The thumbnail endpoint now builds real 480px previews for images too, so
|
||||||
item.kind === "video" ? item.thumbnail_url : item.raw_url,
|
// the grid no longer pulls full-size originals.
|
||||||
);
|
const preview = apiUrl(item.thumbnail_url);
|
||||||
const rating = item.display_rating;
|
const rating = item.display_rating;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||||
import { Eye, StarOff } from "lucide-react";
|
import { ChevronDown, ChevronRight, Eye, StarOff } from "lucide-react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
|
|
||||||
@@ -148,28 +148,43 @@ function BlacklistCloudPanel() {
|
|||||||
q.state.data?.status === "building" ? 2000 : false,
|
q.state.data?.status === "building" ? 2000 : false,
|
||||||
});
|
});
|
||||||
const cloud = query.data;
|
const cloud = query.data;
|
||||||
|
const [expanded, setExpanded] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="rounded-lg border border-ctp-surface0 bg-ctp-base p-4">
|
<section className="rounded-lg border border-ctp-surface0 bg-ctp-base p-4">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-2">
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setExpanded((value) => !value)}
|
||||||
|
title={expanded ? "Hide the tags" : "Show the tags"}
|
||||||
|
className="flex w-full items-center justify-between gap-2 text-left"
|
||||||
|
>
|
||||||
<h2 className="text-sm font-semibold text-ctp-subtext1">
|
<h2 className="text-sm font-semibold text-ctp-subtext1">
|
||||||
Blacklisted tags
|
Blacklisted tags
|
||||||
</h2>
|
</h2>
|
||||||
<p className="text-xs text-ctp-overlay0">
|
<span className="flex items-center gap-1.5 font-mono text-[11px] text-ctp-overlay0">
|
||||||
|
{cloud ? `${cloud.blacklist_count} entries` : "…"}
|
||||||
|
{cloud?.status === "building" ? (
|
||||||
|
<Spinner className="h-3 w-3" />
|
||||||
|
) : null}
|
||||||
|
{expanded ? (
|
||||||
|
<ChevronDown className="h-3.5 w-3.5" />
|
||||||
|
) : (
|
||||||
|
<ChevronRight className="h-3.5 w-3.5" />
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{expanded ? (
|
||||||
|
<>
|
||||||
|
<p className="mt-2 text-xs text-ctp-overlay0">
|
||||||
{cloud?.source === "user"
|
{cloud?.source === "user"
|
||||||
? "From your e621 blacklist"
|
? "From your e621 blacklist"
|
||||||
: "From e621's anonymous default blacklist"}
|
: "From e621's anonymous default blacklist"}
|
||||||
{cloud ? ` · ${cloud.blacklist_count} entries` : ""}
|
|
||||||
{cloud ? ` · ${cloud.posts} feed post(s) scanned` : ""}
|
{cloud ? ` · ${cloud.posts} feed post(s) scanned` : ""}
|
||||||
{cloud?.computed_at ? ` · computed ${formatDate(cloud.computed_at)}` : ""}
|
{cloud?.computed_at
|
||||||
{cloud?.status === "building" ? (
|
? ` · computed ${formatDate(cloud.computed_at)}`
|
||||||
<span className="ml-2 inline-flex items-center gap-1.5">
|
: ""}
|
||||||
<Spinner className="h-3 w-3" /> building…
|
|
||||||
</span>
|
|
||||||
) : null}
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
|
||||||
|
|
||||||
{query.isPending ? (
|
{query.isPending ? (
|
||||||
<div className="mt-3 flex justify-center py-4">
|
<div className="mt-3 flex justify-center py-4">
|
||||||
<Spinner className="h-4 w-4" />
|
<Spinner className="h-4 w-4" />
|
||||||
@@ -190,6 +205,8 @@ function BlacklistCloudPanel() {
|
|||||||
No blacklisted tags in your feeds.
|
No blacklisted tags in your feeds.
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { keepPreviousData, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
import { keepPreviousData, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||||
import { X } from "lucide-react";
|
import { ChevronDown, ChevronRight, X } from "lucide-react";
|
||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { Link, useLocation, useSearchParams } from "react-router-dom";
|
import { Link, useLocation, useSearchParams } from "react-router-dom";
|
||||||
|
|
||||||
@@ -43,6 +43,7 @@ export default function OnlinePage() {
|
|||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
const [draft, setDraft] = useState<string | null>(null);
|
const [draft, setDraft] = useState<string | null>(null);
|
||||||
const [blacklistDraft, setBlacklistDraft] = useState("");
|
const [blacklistDraft, setBlacklistDraft] = useState("");
|
||||||
|
const [showBlacklist, setShowBlacklist] = useState(false);
|
||||||
const tagInput = draft ?? tags;
|
const tagInput = draft ?? tags;
|
||||||
const zoom = useUi((state) => state.zoom);
|
const zoom = useUi((state) => state.zoom);
|
||||||
const perPage = useUi((state) => state.e621PerPage);
|
const perPage = useUi((state) => state.e621PerPage);
|
||||||
@@ -271,10 +272,27 @@ export default function OnlinePage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowBlacklist((value) => !value)}
|
||||||
|
title={showBlacklist ? "Hide the blacklist" : "Show the blacklist"}
|
||||||
|
className="flex items-center justify-between gap-2 text-left"
|
||||||
|
>
|
||||||
<span className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
<span className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
||||||
Your blacklist
|
Your blacklist
|
||||||
</span>
|
</span>
|
||||||
{credentials?.configured ? (
|
<span className="flex items-center gap-1 font-mono text-[11px] text-ctp-overlay0">
|
||||||
|
{blacklistEntries.length} tag
|
||||||
|
{blacklistEntries.length === 1 ? "" : "s"}
|
||||||
|
{showBlacklist ? (
|
||||||
|
<ChevronDown className="h-3.5 w-3.5" />
|
||||||
|
) : (
|
||||||
|
<ChevronRight className="h-3.5 w-3.5" />
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
{showBlacklist ? (
|
||||||
|
credentials?.configured ? (
|
||||||
<>
|
<>
|
||||||
{blacklistEntries.length > 0 ? (
|
{blacklistEntries.length > 0 ? (
|
||||||
<div className="flex flex-wrap gap-1.5">
|
<div className="flex flex-wrap gap-1.5">
|
||||||
@@ -337,7 +355,8 @@ export default function OnlinePage() {
|
|||||||
</Link>{" "}
|
</Link>{" "}
|
||||||
to manage your blacklist.
|
to manage your blacklist.
|
||||||
</p>
|
</p>
|
||||||
)}
|
)
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
||||||
import {
|
import {
|
||||||
CheckCircle2,
|
CheckCircle2,
|
||||||
|
ImageOff,
|
||||||
ListChecks,
|
ListChecks,
|
||||||
Trash2,
|
Trash2,
|
||||||
UploadCloud,
|
UploadCloud,
|
||||||
@@ -28,7 +29,13 @@ import {
|
|||||||
RATING_LABELS,
|
RATING_LABELS,
|
||||||
} from "@/lib/e621";
|
} from "@/lib/e621";
|
||||||
import { formatBytes } from "@/lib/format";
|
import { formatBytes } from "@/lib/format";
|
||||||
import type { E621IqdbCandidate, Rating, TempUpload } from "@/lib/types";
|
import type {
|
||||||
|
E621IqdbCandidate,
|
||||||
|
Rating,
|
||||||
|
TempUpload,
|
||||||
|
UploadCompletion,
|
||||||
|
UploadStagingResult,
|
||||||
|
} from "@/lib/types";
|
||||||
import {
|
import {
|
||||||
postProcessUploads,
|
postProcessUploads,
|
||||||
uploadStatusQueryKey,
|
uploadStatusQueryKey,
|
||||||
@@ -272,6 +279,21 @@ function TempCard({
|
|||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
|
{temp.status === "error" ? (
|
||||||
|
<div className="mt-2 flex flex-wrap items-center gap-1.5">
|
||||||
|
<Button className="px-2 py-1 text-xs" onClick={onRetry}>
|
||||||
|
Retry
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="secondary"
|
||||||
|
className="px-2 py-1 text-xs"
|
||||||
|
onClick={onOpen}
|
||||||
|
>
|
||||||
|
Set metadata
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onDismiss}
|
onClick={onDismiss}
|
||||||
@@ -289,6 +311,106 @@ function TempCard({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Image with a spinner/broken-image placeholder instead of alt-text fallback. */
|
||||||
|
function ThumbImage({
|
||||||
|
src,
|
||||||
|
className,
|
||||||
|
}: {
|
||||||
|
src: string;
|
||||||
|
className?: string;
|
||||||
|
}) {
|
||||||
|
const [loadedSrc, setLoadedSrc] = useState<string | null>(null);
|
||||||
|
const [failedSrc, setFailedSrc] = useState<string | null>(null);
|
||||||
|
// Derived from the current src: no effect needed when it changes.
|
||||||
|
const ready = Boolean(src) && loadedSrc === src;
|
||||||
|
const failed = !src || failedSrc === src;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={cn(
|
||||||
|
"relative block overflow-hidden bg-ctp-surface0/60",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{src ? (
|
||||||
|
<img
|
||||||
|
src={src}
|
||||||
|
alt=""
|
||||||
|
loading="lazy"
|
||||||
|
onLoad={() => setLoadedSrc(src)}
|
||||||
|
onError={() => setFailedSrc(src)}
|
||||||
|
className={cn(
|
||||||
|
"h-full w-full object-cover transition-opacity duration-200",
|
||||||
|
ready ? "opacity-100" : "opacity-0",
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
{!ready && !failed ? (
|
||||||
|
<span className="absolute inset-0 flex items-center justify-center">
|
||||||
|
<Spinner className="h-3.5 w-3.5 text-ctp-overlay0" />
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
{failed ? (
|
||||||
|
<span className="absolute inset-0 flex items-center justify-center text-ctp-overlay0">
|
||||||
|
<ImageOff className="h-4 w-4" />
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A "J-x uploaded" notification.
|
||||||
|
*
|
||||||
|
* Completions are not stored on the board: the pipeline deletes the staged
|
||||||
|
* record and announces it through the status feed, so these cards only exist
|
||||||
|
* while the page is open.
|
||||||
|
*/
|
||||||
|
function CompletionCard({ completion }: { completion: UploadCompletion }) {
|
||||||
|
const preview = apiUrl(completion.thumbnail_url ?? "");
|
||||||
|
return (
|
||||||
|
<div className="rounded-lg border border-ctp-surface0 bg-ctp-base p-2.5">
|
||||||
|
<div className="relative aspect-video overflow-hidden rounded-md bg-ctp-mantle">
|
||||||
|
{preview ? (
|
||||||
|
<img
|
||||||
|
src={preview}
|
||||||
|
alt={completion.filename}
|
||||||
|
loading="lazy"
|
||||||
|
className="h-full w-full object-cover"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="flex h-full w-full items-center justify-center text-xs text-ctp-overlay0">
|
||||||
|
No preview
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<span className="absolute right-2 top-2 flex items-center gap-1 rounded-full bg-ctp-green/90 px-1.5 py-0.5 font-mono text-[10px] font-medium text-ctp-crust">
|
||||||
|
<CheckCircle2 className="h-2.5 w-2.5" />
|
||||||
|
indexed
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
className="mt-2 truncate font-mono text-xs text-ctp-subtext1"
|
||||||
|
title={completion.filename}
|
||||||
|
>
|
||||||
|
{completion.filename}
|
||||||
|
</p>
|
||||||
|
<p className="mt-1 flex items-center gap-1.5 text-xs text-ctp-green">
|
||||||
|
<CheckCircle2 className="h-3.5 w-3.5 shrink-0" />
|
||||||
|
<Link
|
||||||
|
to={`/detail/${completion.j_id}`}
|
||||||
|
className="font-mono hover:underline"
|
||||||
|
>
|
||||||
|
{completion.j_id}
|
||||||
|
</Link>
|
||||||
|
<span className="truncate text-ctp-overlay0">
|
||||||
|
{RESOLUTION_LABELS[completion.resolution] ?? completion.resolution}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Full metadata editor for one staged upload.
|
* Full metadata editor for one staged upload.
|
||||||
*
|
*
|
||||||
@@ -305,7 +427,6 @@ function MetadataForm({
|
|||||||
}) {
|
}) {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
const credentials = useE621((state) => state.credentials);
|
const credentials = useE621((state) => state.credentials);
|
||||||
const [tab, setTab] = useState<"link" | "custom">("link");
|
|
||||||
const [postId, setPostId] = useState("");
|
const [postId, setPostId] = useState("");
|
||||||
const [selected, setSelected] = useState<E621IqdbCandidate | null>(null);
|
const [selected, setSelected] = useState<E621IqdbCandidate | null>(null);
|
||||||
const [rating, setRating] = useState<Rating>(temp.custom_rating);
|
const [rating, setRating] = useState<Rating>(temp.custom_rating);
|
||||||
@@ -412,8 +533,8 @@ function MetadataForm({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<div className="flex min-h-0 flex-1 flex-col">
|
||||||
<div className="flex items-start justify-between gap-3">
|
<div className="flex items-start justify-between gap-3 border-b border-ctp-surface0 px-5 py-3">
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<h2 className="text-sm font-semibold text-ctp-subtext1">
|
<h2 className="text-sm font-semibold text-ctp-subtext1">
|
||||||
Set metadata
|
Set metadata
|
||||||
@@ -422,6 +543,12 @@ function MetadataForm({
|
|||||||
{temp.original_filename}
|
{temp.original_filename}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{temp.processing ? (
|
||||||
|
<span className="flex items-center gap-1.5 font-mono text-[10px] text-ctp-overlay0">
|
||||||
|
<Spinner className="h-3 w-3" /> working
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
@@ -431,22 +558,24 @@ function MetadataForm({
|
|||||||
<X className="h-4 w-4" />
|
<X className="h-4 w-4" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="mt-4 grid gap-4 sm:grid-cols-[minmax(0,320px)_minmax(0,1fr)]">
|
<div className="grid min-h-0 flex-1 overflow-y-auto lg:grid-cols-[minmax(0,1fr)_minmax(0,34rem)] lg:overflow-hidden">
|
||||||
<div className="w-fit max-w-full overflow-hidden rounded-md border border-ctp-surface0 bg-ctp-mantle">
|
<div className="flex min-w-0 flex-col gap-5 p-5 lg:overflow-y-auto">
|
||||||
|
<div className="w-fit max-w-full self-start overflow-hidden rounded-md border border-ctp-surface0 bg-ctp-mantle">
|
||||||
{mediaUrl ? (
|
{mediaUrl ? (
|
||||||
isVideo ? (
|
isVideo ? (
|
||||||
<video
|
<video
|
||||||
src={mediaUrl}
|
src={mediaUrl}
|
||||||
controls
|
controls
|
||||||
muted
|
muted
|
||||||
className="block h-auto max-h-[55vh] w-auto max-w-full"
|
className="block h-auto max-h-[70vh] w-auto max-w-full"
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<img
|
<img
|
||||||
src={mediaUrl}
|
src={mediaUrl}
|
||||||
alt={temp.original_filename}
|
alt={temp.original_filename}
|
||||||
className="block h-auto max-h-[55vh] w-auto max-w-full"
|
className="block h-auto max-h-[70vh] w-auto max-w-full"
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
) : (
|
) : (
|
||||||
@@ -456,57 +585,32 @@ function MetadataForm({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex min-w-0 flex-col gap-3">
|
|
||||||
<div className="flex gap-1.5">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setTab("link")}
|
|
||||||
className={cn(
|
|
||||||
"rounded-md px-3 py-1.5 text-sm font-medium transition",
|
|
||||||
tab === "link"
|
|
||||||
? "bg-ctp-surface0 text-ctp-text"
|
|
||||||
: "text-ctp-subtext0 hover:bg-ctp-surface0/60 hover:text-ctp-text",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
Link to e621 post
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setTab("custom")}
|
|
||||||
className={cn(
|
|
||||||
"rounded-md px-3 py-1.5 text-sm font-medium transition",
|
|
||||||
tab === "custom"
|
|
||||||
? "bg-ctp-surface0 text-ctp-text"
|
|
||||||
: "text-ctp-subtext0 hover:bg-ctp-surface0/60 hover:text-ctp-text",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
Custom metadata
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{tab === "link" ? (
|
|
||||||
<div className="flex flex-col gap-3">
|
|
||||||
{visualMatches.length > 0 ? (
|
{visualMatches.length > 0 ? (
|
||||||
<div>
|
<div>
|
||||||
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
||||||
Already in your library
|
Already in your library
|
||||||
</p>
|
</p>
|
||||||
<div className="mt-2 flex flex-col gap-2">
|
<div className="mt-2 grid grid-cols-2 gap-3 sm:grid-cols-3 2xl:grid-cols-4">
|
||||||
{visualMatches.map((match) => (
|
{visualMatches.map((match) => (
|
||||||
<div
|
<div
|
||||||
key={match.j_id}
|
key={match.j_id}
|
||||||
className="flex items-center gap-3 rounded-md border border-ctp-surface0 bg-ctp-surface0/40 p-2"
|
className="overflow-hidden rounded-lg border border-ctp-surface0 bg-ctp-surface0/30"
|
||||||
>
|
>
|
||||||
<img
|
<Link
|
||||||
|
to={`/detail/${match.j_id}`}
|
||||||
|
className="block"
|
||||||
|
title={match.filename}
|
||||||
|
>
|
||||||
|
<ThumbImage
|
||||||
src={apiUrl(
|
src={apiUrl(
|
||||||
match.thumbnail_url ??
|
match.thumbnail_url ??
|
||||||
`/api/files/${match.j_id}/thumbnail/`,
|
`/api/files/${match.j_id}/thumbnail/`,
|
||||||
)}
|
)}
|
||||||
alt={match.j_id}
|
className="aspect-square w-full"
|
||||||
loading="lazy"
|
|
||||||
className="h-12 w-12 shrink-0 rounded object-cover"
|
|
||||||
/>
|
/>
|
||||||
<span className="min-w-0 flex-1">
|
</Link>
|
||||||
|
<div className="flex items-center justify-between gap-2 px-2 py-1.5">
|
||||||
|
<span className="min-w-0">
|
||||||
<Link
|
<Link
|
||||||
to={`/detail/${match.j_id}`}
|
to={`/detail/${match.j_id}`}
|
||||||
className="font-mono text-[11px] text-ctp-blue hover:underline"
|
className="font-mono text-[11px] text-ctp-blue hover:underline"
|
||||||
@@ -514,7 +618,7 @@ function MetadataForm({
|
|||||||
{match.j_id}
|
{match.j_id}
|
||||||
</Link>
|
</Link>
|
||||||
<span
|
<span
|
||||||
className="block truncate font-mono text-[11px] text-ctp-subtext0"
|
className="block truncate font-mono text-[10px] text-ctp-overlay0"
|
||||||
title={match.filename}
|
title={match.filename}
|
||||||
>
|
>
|
||||||
{match.filename}
|
{match.filename}
|
||||||
@@ -524,11 +628,12 @@ function MetadataForm({
|
|||||||
{match.similarity}%
|
{match.similarity}%
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<p className="mt-2 text-[11px] text-ctp-overlay0">
|
<p className="mt-2 text-[11px] text-ctp-overlay0">
|
||||||
This upload looks like it is already in the library — you
|
This upload looks like it is already in the library — you can
|
||||||
can discard it below.
|
discard it below.
|
||||||
</p>
|
</p>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -539,11 +644,13 @@ function MetadataForm({
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex min-w-0 flex-col gap-5 border-t border-ctp-surface0 p-5 lg:overflow-y-auto lg:border-l lg:border-t-0">
|
||||||
<div>
|
<div>
|
||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
||||||
IQDB candidates
|
e621 IQDB candidates
|
||||||
</p>
|
</p>
|
||||||
{isVideo ? null : (
|
{isVideo ? null : (
|
||||||
<button
|
<button
|
||||||
@@ -572,7 +679,7 @@ function MetadataForm({
|
|||||||
</p>
|
</p>
|
||||||
) : iqdbData && iqdbData.length > 0 ? (
|
) : iqdbData && iqdbData.length > 0 ? (
|
||||||
<>
|
<>
|
||||||
<div className="mt-2 grid grid-cols-3 gap-2">
|
<div className="mt-2 grid grid-cols-2 gap-2 sm:grid-cols-3">
|
||||||
{iqdbData.map((candidate) => (
|
{iqdbData.map((candidate) => (
|
||||||
<button
|
<button
|
||||||
key={`${candidate.post_id}-${candidate.md5}`}
|
key={`${candidate.post_id}-${candidate.md5}`}
|
||||||
@@ -588,11 +695,9 @@ function MetadataForm({
|
|||||||
>
|
>
|
||||||
<span className="relative block aspect-square overflow-hidden">
|
<span className="relative block aspect-square overflow-hidden">
|
||||||
{candidate.preview_url ? (
|
{candidate.preview_url ? (
|
||||||
<img
|
<ThumbImage
|
||||||
src={candidate.preview_url}
|
src={candidate.preview_url}
|
||||||
alt={`Post #${candidate.post_id}`}
|
className="h-full w-full"
|
||||||
loading="lazy"
|
|
||||||
className="h-full w-full object-cover"
|
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<span className="flex h-full w-full items-center justify-center text-[10px] text-ctp-overlay0">
|
<span className="flex h-full w-full items-center justify-center text-[10px] text-ctp-overlay0">
|
||||||
@@ -622,14 +727,13 @@ function MetadataForm({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{selected ? (
|
{selected ? (
|
||||||
<div className="mt-2 rounded-md border border-ctp-surface0 bg-ctp-surface0/40 p-3">
|
<div className="mt-3 rounded-md border border-ctp-surface0 bg-ctp-surface0/40 p-3">
|
||||||
<p className="font-mono text-xs text-ctp-subtext1">
|
<p className="font-mono text-xs text-ctp-subtext1">
|
||||||
Post #{selected.post_id}
|
Post #{selected.post_id}
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1 text-xs text-ctp-overlay0">
|
<p className="mt-1 text-xs text-ctp-overlay0">
|
||||||
{selected.rating
|
{selected.rating
|
||||||
? (RATING_LABELS[selected.rating] ??
|
? (RATING_LABELS[selected.rating] ?? selected.rating)
|
||||||
selected.rating)
|
|
||||||
: "Unknown rating"}
|
: "Unknown rating"}
|
||||||
{selected.score_total !== null &&
|
{selected.score_total !== null &&
|
||||||
selected.score_total !== undefined
|
selected.score_total !== undefined
|
||||||
@@ -671,10 +775,6 @@ function MetadataForm({
|
|||||||
View post
|
View post
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<p className="mt-2 text-[11px] text-ctp-overlay0">
|
|
||||||
Linking downloads the post's file into the library
|
|
||||||
and drops this staged upload.
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
</>
|
</>
|
||||||
@@ -690,7 +790,11 @@ function MetadataForm({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex gap-2">
|
<div>
|
||||||
|
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
||||||
|
Link to an e621 post
|
||||||
|
</p>
|
||||||
|
<div className="mt-2 flex gap-2">
|
||||||
<input
|
<input
|
||||||
className={cn(inputClass, "font-mono")}
|
className={cn(inputClass, "font-mono")}
|
||||||
placeholder="e621 post ID"
|
placeholder="e621 post ID"
|
||||||
@@ -701,9 +805,17 @@ function MetadataForm({
|
|||||||
Link
|
Link
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
<p className="mt-2 text-[11px] text-ctp-overlay0">
|
||||||
|
Linking downloads the post's file into the library and drops this
|
||||||
|
staged upload.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
|
||||||
<div className="flex flex-col gap-3">
|
<div>
|
||||||
|
<p className="text-xs font-medium uppercase tracking-wide text-ctp-overlay1">
|
||||||
|
Custom metadata
|
||||||
|
</p>
|
||||||
|
<div className="mt-2 flex flex-col gap-3">
|
||||||
<div className="flex flex-wrap gap-1.5">
|
<div className="flex flex-wrap gap-1.5">
|
||||||
{ratingChoices.map((choice) => (
|
{ratingChoices.map((choice) => (
|
||||||
<button
|
<button
|
||||||
@@ -737,7 +849,7 @@ function MetadataForm({
|
|||||||
Save custom metadata
|
Save custom metadata
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
</div>
|
||||||
|
|
||||||
{error ? <p className="text-xs text-ctp-red">{error}</p> : null}
|
{error ? <p className="text-xs text-ctp-red">{error}</p> : null}
|
||||||
{temp.pipeline_error ? (
|
{temp.pipeline_error ? (
|
||||||
@@ -752,7 +864,7 @@ function MetadataForm({
|
|||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -772,11 +884,11 @@ function MetadataModal({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="fixed inset-0 z-[70] flex items-start justify-center overflow-y-auto bg-ctp-crust/70 px-4 py-10 backdrop-blur-sm"
|
className="fixed inset-0 z-[70] flex items-start justify-center overflow-y-auto bg-ctp-crust/70 px-3 py-6 backdrop-blur-sm"
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="w-full max-w-2xl rounded-lg border border-ctp-surface1 bg-ctp-base p-5"
|
className="flex max-h-[92vh] w-full max-w-[min(1400px,96vw)] flex-col overflow-hidden rounded-xl border border-ctp-surface1 bg-ctp-base"
|
||||||
onClick={(event) => event.stopPropagation()}
|
onClick={(event) => event.stopPropagation()}
|
||||||
>
|
>
|
||||||
{detailQuery.data ? (
|
{detailQuery.data ? (
|
||||||
@@ -786,11 +898,11 @@ function MetadataModal({
|
|||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
/>
|
/>
|
||||||
) : detailQuery.isError ? (
|
) : detailQuery.isError ? (
|
||||||
<p className="text-sm text-ctp-red">
|
<p className="p-5 text-sm text-ctp-red">
|
||||||
Could not load this upload's details.
|
Could not load this upload's details.
|
||||||
</p>
|
</p>
|
||||||
) : (
|
) : (
|
||||||
<p className="flex items-center gap-2 text-sm text-ctp-overlay0">
|
<p className="flex items-center gap-2 p-5 text-sm text-ctp-overlay0">
|
||||||
<Spinner className="h-4 w-4" /> Loading…
|
<Spinner className="h-4 w-4" /> Loading…
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
@@ -816,6 +928,10 @@ export default function UploadPage() {
|
|||||||
const [discarding, setDiscarding] = useState(false);
|
const [discarding, setDiscarding] = useState(false);
|
||||||
const [modalId, setModalId] = useState<string | null>(null);
|
const [modalId, setModalId] = useState<string | null>(null);
|
||||||
const [bulkOpen, setBulkOpen] = useState(false);
|
const [bulkOpen, setBulkOpen] = useState(false);
|
||||||
|
// Indexed uploads shown while this page is open (never persisted).
|
||||||
|
const [completions, setCompletions] = useState<UploadCompletion[]>([]);
|
||||||
|
const completionsSeeded = useRef(false);
|
||||||
|
const seenCompletions = useRef<Set<string>>(new Set());
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const urls = objectUrls.current;
|
const urls = objectUrls.current;
|
||||||
@@ -836,6 +952,27 @@ export default function UploadPage() {
|
|||||||
});
|
});
|
||||||
const uploads = uploadsQuery.data ?? [];
|
const uploads = uploadsQuery.data ?? [];
|
||||||
|
|
||||||
|
// Completions are session notifications. Seed what the server already has
|
||||||
|
// when the page opens (so a reload does not resurrect old ones) and append
|
||||||
|
// only what happens while the page is watching.
|
||||||
|
useEffect(() => {
|
||||||
|
const feed = status?.recent_completions;
|
||||||
|
if (!feed) return;
|
||||||
|
if (!completionsSeeded.current) {
|
||||||
|
completionsSeeded.current = true;
|
||||||
|
// Merge: a staging duplicate may have been added before the first poll.
|
||||||
|
seenCompletions.current = new Set([
|
||||||
|
...seenCompletions.current,
|
||||||
|
...feed.map((entry) => entry.id),
|
||||||
|
]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const fresh = feed.filter((entry) => !seenCompletions.current.has(entry.id));
|
||||||
|
if (fresh.length === 0) return;
|
||||||
|
for (const entry of fresh) seenCompletions.current.add(entry.id);
|
||||||
|
setCompletions((current) => [...fresh, ...current].slice(0, 200));
|
||||||
|
}, [status]);
|
||||||
|
|
||||||
function cacheStatus(data: unknown) {
|
function cacheStatus(data: unknown) {
|
||||||
queryClient.setQueryData(uploadStatusQueryKey, data);
|
queryClient.setQueryData(uploadStatusQueryKey, data);
|
||||||
}
|
}
|
||||||
@@ -892,9 +1029,7 @@ export default function UploadPage() {
|
|||||||
|
|
||||||
const pending = uploads.filter((temp) => temp.status === "pending");
|
const pending = uploads.filter((temp) => temp.status === "pending");
|
||||||
const visual = uploads.filter((temp) => temp.status === "visual_match");
|
const visual = uploads.filter((temp) => temp.status === "visual_match");
|
||||||
const completed = uploads.filter(
|
const failed = uploads.filter((temp) => temp.status === "error");
|
||||||
(temp) => temp.status === "completed" || temp.status === "error",
|
|
||||||
);
|
|
||||||
|
|
||||||
// Active work stays in insertion order (the grid must not reshuffle while
|
// Active work stays in insertion order (the grid must not reshuffle while
|
||||||
// you scroll it); the in-flight files get their own strip above it.
|
// you scroll it); the in-flight files get their own strip above it.
|
||||||
@@ -1001,10 +1136,26 @@ export default function UploadPage() {
|
|||||||
error: undefined,
|
error: undefined,
|
||||||
});
|
});
|
||||||
try {
|
try {
|
||||||
await uploadFile(entry.file, {}, (percent) =>
|
const result = await uploadFile<UploadStagingResult>(
|
||||||
reportProgress(entry.id, percent),
|
entry.file,
|
||||||
|
{},
|
||||||
|
(percent) => reportProgress(entry.id, percent),
|
||||||
);
|
);
|
||||||
finishEntry(entry);
|
finishEntry(entry);
|
||||||
|
// An exact duplicate completes during staging: show its card now.
|
||||||
|
if (result?.status === "completed" && result.library_j_id) {
|
||||||
|
const completion: UploadCompletion = {
|
||||||
|
id: result.temp_id,
|
||||||
|
filename: result.original_filename,
|
||||||
|
j_id: result.library_j_id,
|
||||||
|
resolution: result.resolution,
|
||||||
|
post_id: result.e621_post_id ?? null,
|
||||||
|
thumbnail_url: result.preview_url ?? null,
|
||||||
|
at: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
seenCompletions.current.add(completion.id);
|
||||||
|
setCompletions((current) => [completion, ...current].slice(0, 200));
|
||||||
|
}
|
||||||
// Processing starts while the rest of the drop is still uploading.
|
// Processing starts while the rest of the drop is still uploading.
|
||||||
kickPipeline();
|
kickPipeline();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -1060,39 +1211,40 @@ export default function UploadPage() {
|
|||||||
.catch((error) => toast.error(errorMessage(error)));
|
.catch((error) => toast.error(errorMessage(error)));
|
||||||
}
|
}
|
||||||
|
|
||||||
async function discardAll(
|
async function discardAll(items: TempUpload[]) {
|
||||||
items: TempUpload[],
|
|
||||||
kind: "discard" | "dismiss",
|
|
||||||
) {
|
|
||||||
if (items.length === 0 || discarding) return;
|
if (items.length === 0 || discarding) return;
|
||||||
const noun = kind === "discard" ? "Discard" : "Dismiss";
|
|
||||||
const confirmed = await confirmAction({
|
const confirmed = await confirmAction({
|
||||||
title: `${noun} ${items.length} record${items.length === 1 ? "" : "s"}?`,
|
title: `Discard ${items.length} record${items.length === 1 ? "" : "s"}?`,
|
||||||
description:
|
description:
|
||||||
kind === "discard"
|
"The staged files are deleted from the staging folder and never enter the library. Files the pipeline is importing right now are skipped.",
|
||||||
? "The staged files are deleted from the staging folder and never enter the library. Files the pipeline is importing right now are skipped."
|
confirmLabel: "Discard all",
|
||||||
: "This only removes the board records; library files are untouched.",
|
danger: true,
|
||||||
confirmLabel: `${noun} all`,
|
|
||||||
danger: kind === "discard",
|
|
||||||
});
|
});
|
||||||
if (!confirmed) return;
|
if (!confirmed) return;
|
||||||
setDiscarding(true);
|
setDiscarding(true);
|
||||||
try {
|
try {
|
||||||
|
// The endpoint caps one request at 1000 ids; large staging backlogs
|
||||||
|
// must still be discardable in one go.
|
||||||
|
const ids = items.map((temp) => temp.temp_id);
|
||||||
|
const chunkSize = 500;
|
||||||
|
const discarded: string[] = [];
|
||||||
|
const errors: { temp_id: string; error: string }[] = [];
|
||||||
|
for (let start = 0; start < ids.length; start += chunkSize) {
|
||||||
const result = await api<{
|
const result = await api<{
|
||||||
discarded: string[];
|
discarded: string[];
|
||||||
errors: { temp_id: string; error: string }[];
|
errors: { temp_id: string; error: string }[];
|
||||||
}>("/api/uploads/discard-bulk/", {
|
}>("/api/uploads/discard-bulk/", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
json: { temp_ids: items.map((temp) => temp.temp_id) },
|
json: { temp_ids: ids.slice(start, start + chunkSize) },
|
||||||
});
|
});
|
||||||
const verb = kind === "discard" ? "Discarded" : "Dismissed";
|
discarded.push(...result.discarded);
|
||||||
if (result.discarded.length > 0) {
|
errors.push(...result.errors);
|
||||||
toast.ok(`${verb} ${result.discarded.length} record(s).`);
|
|
||||||
}
|
}
|
||||||
if (result.errors.length > 0) {
|
if (discarded.length > 0) {
|
||||||
toast.error(
|
toast.ok(`Discarded ${discarded.length} record(s).`);
|
||||||
`${result.errors.length} record(s) could not be removed.`,
|
}
|
||||||
);
|
if (errors.length > 0) {
|
||||||
|
toast.error(`${errors.length} record(s) could not be removed.`);
|
||||||
}
|
}
|
||||||
void queryClient.invalidateQueries({ queryKey: ["uploads"] });
|
void queryClient.invalidateQueries({ queryKey: ["uploads"] });
|
||||||
void queryClient.invalidateQueries({ queryKey: ["upload-status"] });
|
void queryClient.invalidateQueries({ queryKey: ["upload-status"] });
|
||||||
@@ -1127,10 +1279,11 @@ export default function UploadPage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const column = (
|
const column = <T,>(
|
||||||
title: string,
|
title: string,
|
||||||
items: TempUpload[],
|
items: T[],
|
||||||
emptyText: string,
|
emptyText: string,
|
||||||
|
render: (item: T) => ReactNode,
|
||||||
action?: ReactNode,
|
action?: ReactNode,
|
||||||
) => (
|
) => (
|
||||||
<section className="flex min-w-0 flex-col gap-3">
|
<section className="flex min-w-0 flex-col gap-3">
|
||||||
@@ -1148,17 +1301,7 @@ export default function UploadPage() {
|
|||||||
{emptyText}
|
{emptyText}
|
||||||
</p>
|
</p>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex flex-col gap-3">
|
<div className="flex flex-col gap-3">{items.map(render)}</div>
|
||||||
{items.map((temp) => (
|
|
||||||
<TempCard
|
|
||||||
key={temp.temp_id}
|
|
||||||
temp={temp}
|
|
||||||
onOpen={() => setModalId(temp.temp_id)}
|
|
||||||
onRetry={() => retry(temp, "iqdb")}
|
|
||||||
onDismiss={() => dismiss(temp)}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
@@ -1387,11 +1530,20 @@ export default function UploadPage() {
|
|||||||
</section>
|
</section>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<div className="grid gap-6 lg:grid-cols-3">
|
<div className="grid gap-6 lg:grid-cols-4">
|
||||||
{column(
|
{column(
|
||||||
"Pending & Unmatched",
|
"Pending & Unmatched",
|
||||||
pending,
|
pending,
|
||||||
"Nothing waiting.",
|
"Nothing waiting.",
|
||||||
|
(temp) => (
|
||||||
|
<TempCard
|
||||||
|
key={temp.temp_id}
|
||||||
|
temp={temp}
|
||||||
|
onOpen={() => setModalId(temp.temp_id)}
|
||||||
|
onRetry={() => retry(temp, "iqdb")}
|
||||||
|
onDismiss={() => dismiss(temp)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
pending.length > 0 ? (
|
pending.length > 0 ? (
|
||||||
<span className="flex items-center gap-1.5">
|
<span className="flex items-center gap-1.5">
|
||||||
<Button
|
<Button
|
||||||
@@ -1407,7 +1559,7 @@ export default function UploadPage() {
|
|||||||
variant="danger"
|
variant="danger"
|
||||||
className="px-2 py-0.5 text-[11px]"
|
className="px-2 py-0.5 text-[11px]"
|
||||||
disabled={discarding}
|
disabled={discarding}
|
||||||
onClick={() => void discardAll(pending, "discard")}
|
onClick={() => void discardAll(pending)}
|
||||||
title="Delete every staged file in this column"
|
title="Delete every staged file in this column"
|
||||||
>
|
>
|
||||||
<Trash2 className="h-3.5 w-3.5" />
|
<Trash2 className="h-3.5 w-3.5" />
|
||||||
@@ -1420,12 +1572,21 @@ export default function UploadPage() {
|
|||||||
"Visual Similarity Detected",
|
"Visual Similarity Detected",
|
||||||
visual,
|
visual,
|
||||||
"No IQDB matches right now.",
|
"No IQDB matches right now.",
|
||||||
|
(temp) => (
|
||||||
|
<TempCard
|
||||||
|
key={temp.temp_id}
|
||||||
|
temp={temp}
|
||||||
|
onOpen={() => setModalId(temp.temp_id)}
|
||||||
|
onRetry={() => retry(temp, "iqdb")}
|
||||||
|
onDismiss={() => dismiss(temp)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
visual.length > 0 ? (
|
visual.length > 0 ? (
|
||||||
<Button
|
<Button
|
||||||
variant="danger"
|
variant="danger"
|
||||||
className="px-2 py-0.5 text-[11px]"
|
className="px-2 py-0.5 text-[11px]"
|
||||||
disabled={discarding}
|
disabled={discarding}
|
||||||
onClick={() => void discardAll(visual, "discard")}
|
onClick={() => void discardAll(visual)}
|
||||||
title="Delete every staged file in this column"
|
title="Delete every staged file in this column"
|
||||||
>
|
>
|
||||||
<Trash2 className="h-3.5 w-3.5" />
|
<Trash2 className="h-3.5 w-3.5" />
|
||||||
@@ -1435,20 +1596,48 @@ export default function UploadPage() {
|
|||||||
)}
|
)}
|
||||||
{column(
|
{column(
|
||||||
"Auto-uploaded & Indexed",
|
"Auto-uploaded & Indexed",
|
||||||
completed,
|
completions,
|
||||||
"Nothing indexed yet.",
|
"Nothing indexed while you were watching.",
|
||||||
completed.length > 0 ? (
|
(completion) => (
|
||||||
|
<CompletionCard key={completion.id} completion={completion} />
|
||||||
|
),
|
||||||
|
completions.length > 0 ? (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={discarding}
|
onClick={() => setCompletions([])}
|
||||||
onClick={() => void discardAll(completed, "dismiss")}
|
title="Clear these notifications (nothing is stored)"
|
||||||
title="Dismiss every indexed record"
|
|
||||||
className="rounded-md px-1.5 py-0.5 font-mono text-[10px] text-ctp-overlay0 transition hover:bg-ctp-surface0 hover:text-ctp-text"
|
className="rounded-md px-1.5 py-0.5 font-mono text-[10px] text-ctp-overlay0 transition hover:bg-ctp-surface0 hover:text-ctp-text"
|
||||||
>
|
>
|
||||||
dismiss all
|
clear
|
||||||
</button>
|
</button>
|
||||||
) : null,
|
) : null,
|
||||||
)}
|
)}
|
||||||
|
{column(
|
||||||
|
"Failed",
|
||||||
|
failed,
|
||||||
|
"No failed uploads.",
|
||||||
|
(temp) => (
|
||||||
|
<TempCard
|
||||||
|
key={temp.temp_id}
|
||||||
|
temp={temp}
|
||||||
|
onOpen={() => setModalId(temp.temp_id)}
|
||||||
|
onRetry={() => retry(temp)}
|
||||||
|
onDismiss={() => dismiss(temp)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
failed.length > 0 ? (
|
||||||
|
<Button
|
||||||
|
variant="danger"
|
||||||
|
className="px-2 py-0.5 text-[11px]"
|
||||||
|
disabled={discarding}
|
||||||
|
onClick={() => void discardAll(failed)}
|
||||||
|
title="Delete every failed staged file in this column"
|
||||||
|
>
|
||||||
|
<Trash2 className="h-3.5 w-3.5" />
|
||||||
|
discard all
|
||||||
|
</Button>
|
||||||
|
) : null,
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{modalId ? (
|
{modalId ? (
|
||||||
|
|||||||
@@ -388,6 +388,28 @@ export interface TempUpload {
|
|||||||
updated_at: string;
|
updated_at: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** One upload the pipeline indexed while the page was watching. */
|
||||||
|
export interface UploadCompletion {
|
||||||
|
id: string;
|
||||||
|
filename: string;
|
||||||
|
j_id: string;
|
||||||
|
resolution: string;
|
||||||
|
post_id: number | null;
|
||||||
|
thumbnail_url: string | null;
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Response of POST /api/uploads/ — a pending row or an instant completion. */
|
||||||
|
export interface UploadStagingResult {
|
||||||
|
temp_id: string;
|
||||||
|
original_filename: string;
|
||||||
|
status: "pending" | "visual_match" | "completed" | "error";
|
||||||
|
resolution: string;
|
||||||
|
library_j_id: string | null;
|
||||||
|
preview_url: string | null;
|
||||||
|
e621_post_id?: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
/** Progress of the server-side staged-upload pipeline. */
|
/** Progress of the server-side staged-upload pipeline. */
|
||||||
export interface UploadStatus {
|
export interface UploadStatus {
|
||||||
status: "idle" | "running" | "paused" | "error";
|
status: "idle" | "running" | "paused" | "error";
|
||||||
@@ -400,6 +422,8 @@ export interface UploadStatus {
|
|||||||
error: string;
|
error: string;
|
||||||
outstanding: number;
|
outstanding: number;
|
||||||
waiting: { md5: number; visual: number; iqdb: number };
|
waiting: { md5: number; visual: number; iqdb: number };
|
||||||
|
/** Session notification feed: indexed uploads, newest first. */
|
||||||
|
recent_completions: UploadCompletion[];
|
||||||
updated_at: string | null;
|
updated_at: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user