@geekity/cms 0.34.0 → 0.35.0

package/dist/admin/maintenance.js

@@ -1,16 +1,22 @@
+import { STRIP_METADATA_JOB } from '../content/metadata/strip-job.js';
+import { finishedResult } from '../jobs/types.js';
 import { overridden, sourceText } from '../settings/registry.js';
 import { MAINTENANCE } from '../settings/maintenance.js';
 import { stringOrEmpty } from '../util/forms.js';
 import { flash } from './flash.js';
+import { jobStatusView, queueJobFromForm } from './job-status.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 import { TOOLS_PATH, TOOLS_SECTION } from './tools.js';
 export const MAINTENANCE_PATH = `${TOOLS_PATH}/maintenance`;
 export const MAINTENANCE_CHILD = 'maintenance';
+export const STRIP_METADATA_PATH = `${MAINTENANCE_PATH}/strip-metadata`;
+export const STRIP_METADATA_PANEL = `${MAINTENANCE_PATH}#strip-metadata`;
 export function mountMaintenanceScreen(app, options) {
     async function show(c, problems = {}) {
         const { settings } = c.var;
         const on = await settings.resolve(MAINTENANCE.on);
         const until = await settings.get(MAINTENANCE.until);
+        const latestSweep = await c.var.jobs.latest(STRIP_METADATA_JOB.name);
         return options.render(c, ADMIN_TEMPLATES.toolsMaintenance, {
             section: TOOLS_SECTION,
             child: MAINTENANCE_CHILD,
@@ -22,9 +28,17 @@ export function mountMaintenanceScreen(app, options) {
                 : undefined,
             until: MAINTENANCE.until.declaration.type.toText(until),
             problems,
+            stripMetadataUrl: STRIP_METADATA_PATH,
+            sweep: jobStatusView(latestSweep),
+            sweepReport: finishedResult(STRIP_METADATA_JOB, latestSweep),
         });
     }
     app.get(MAINTENANCE_PATH, (c) => show(c));
+    app.post(STRIP_METADATA_PATH, (c) => queueJobFromForm(c, STRIP_METADATA_JOB, null, {
+        panel: STRIP_METADATA_PANEL,
+        queued: 'Queued the sweep. It runs in the background; its progress is below.',
+        busy: 'A sweep is already queued or running. Nothing new was queued.',
+    }));
     app.post(MAINTENANCE_PATH, async (c) => {
         const body = await c.req.parseBody();
         const result = await c.var.settings.set('maintenance', new Map([

package/dist/admin/maintenance.js.map

@@ -1 +1 @@
-{"version":3,"file":"maintenance.js","sourceRoot":"","sources":["../../src/admin/maintenance.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,UAAU,cAAc,CAAC;AAE5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAE/C,MAAM,UAAU,sBAAsB,CACpC,GAAqB,EACrB,OAAgC;IAEhC,KAAK,UAAU,IAAI,CACjB,CAAsB,EACtB,QAAQ,GAAqC,EAAE;QAE/C,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QAC3B,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,gBAAgB,EAAE;YACzD,OAAO,EAAE,aAAa;YACtB,KAAK,EAAE,iBAAiB;YACxB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,gBAAgB;YACzB,EAAE,EAAE,EAAE,CAAC,KAAK;YACZ,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC;gBACjC,CAAC,CAAC,4BAA4B,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC,8BAA8B;gBACjF,CAAC,CAAC,SAAS;YACb,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACvD,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CACrC,aAAa,EACb,IAAI,GAAG,CAAkB;YACvB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;YAChC,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAC/C,CAAC,EACF,OAAO,CACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"maintenance.js","sourceRoot":"","sources":["../../src/admin/maintenance.ts"],"names":[],"mappings":"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"}

package/dist/admin/media.d.ts

@@ -1,32 +1,33 @@
 /**
- * The media screen: what is under `content/uploads/`, what links to it, and
- * the things that can be done to it — add one, describe one, take one away,
- * and queue the sweep that strips metadata from the ones uploaded before
- * uploads were stripped on arrival.
+ * The media screen: what is under `content/uploads/` as a grid of tiles, a
+ * details screen per file with what links to it, and the things that can be
+ * done to one — add one, describe one, take one away.
  */
 import type { Hono } from 'hono';
 import type { CatalogReader } from '../content/store.ts';
 import type { GeekityEnv } from '../web/env.ts';
+import type { UploadKind } from '../files/upload-types.ts';
 import type { RemoveDerived } from '../media/library.ts';
 import type { AdminRender } from './documents.ts';
 /** Where the media screen lives. */
 export declare const MEDIA_PATH = "/admin/media";
 /** The navigation section the screen marks as current. */
 export declare const MEDIA_SECTION = "media";
+/** Where one file's details screen lives, with the file as `?path=`. */
+export declare const MEDIA_FILE_PATH = "/admin/media/file";
 /** Where the screen's upload form posts. */
 export declare const MEDIA_UPLOAD_PATH = "/admin/media/upload";
-/** Where a row's Delete button posts. */
+/** Where a file's Delete button posts. */
 export declare const MEDIA_DELETE_PATH = "/admin/media/delete";
-/** Where a row's alt-text form posts. */
+/** Where a file's alt-text form posts. */
 export declare const MEDIA_ALT_PATH = "/admin/media/alt";
-export declare const MEDIA_STRIP_METADATA_PATH = "/admin/media/strip-metadata";
 /** How many files one page of the library shows. */
 export declare const MEDIA_PER_PAGE = 24;
-/** The fields the forms on the media screen submit. */
+/** The fields the forms on the media screens submit. */
 export declare const MEDIA_FIELDS: {
     /** The file being added, on the upload form. */
     readonly file: 'file';
-    /** The upload being deleted, as a path under `content/uploads/`. */
+    /** The upload being deleted or described, as a path under `content/uploads/`. */
     readonly path: 'path';
     /** Set once the admin has been shown what still references the file. */
     readonly confirm: 'confirm';
@@ -34,10 +35,36 @@ export declare const MEDIA_FIELDS: {
     readonly alt: 'alt';
     /** Present when an image is decorative, which wins over any alt text. */
     readonly decorative: 'decorative';
-    /** The library page an alt-text form was on, so saving it goes back there. */
-    readonly page: 'page';
+    /** The library view a form was posted from, as a query string, so the answer goes back to it. */
+    readonly from: 'from';
 };
-/** One document that mentions an upload, as the confirmation names it. */
+/** The orders the library can be sorted in. Newest is the default and is never written into a URL. */
+declare const SORTS: {
+    readonly newest: 'Newest first';
+    readonly oldest: 'Oldest first';
+    readonly largest: 'Largest first';
+    readonly name: 'Name';
+};
+type MediaSort = keyof typeof SORTS;
+/** One view of the library: what the tabs, the filter form and the page links say. */
+export interface MediaView {
+    kind: UploadKind | undefined;
+    /** Matched against the path and the alt text, ignoring case. Empty matches everything. */
+    search: string;
+    needsAlt: boolean;
+    unused: boolean;
+    sort: MediaSort;
+    page: number;
+}
+/** A view from a query string. Anything it does not recognise is left at its default. */
+export declare function parseMediaView(query: URLSearchParams): MediaView;
+/** A view as a query string, without the `?`, leaving out everything at its default. */
+export declare function mediaViewQuery(view: MediaView): string;
+/** The library showing a view. */
+export declare function mediaLibraryUrl(view: MediaView): string;
+/** One file's details screen, reached from a view of the library. */
+export declare function mediaFileUrl(path: string, view: MediaView): string;
+/** One document that mentions an upload, as the screens name it. */
 export interface MediaReference {
     /** Path relative to the content directory: what identifies the document. */
     path: string;
@@ -48,20 +75,7 @@ export interface MediaReference {
     /** Whether it is in the trash rather than the live tree. */
     trashed: boolean;
 }
-/**
- * Every document whose body mentions an upload's URL, trash included.
- *
- * The trash counts. A trashed post can be restored tomorrow, and restoring one
- * whose picture was deleted in the meantime is a broken post nobody was warned
- * about — so a file the trash still points at asks for confirmation exactly as
- * a published one does.
- *
- * This is the one thing on the screen that comes out of the index rather than
- * off the disk. The index is a cache of the files (decision-1), so it may be a
- * moment behind a hand edit; that is acceptable here because the answer is a
- * warning rather than a decision, and the confirmation step is what makes an
- * out-of-date answer harmless in both directions.
- */
+/** Every document whose body mentions an upload's URL, trash included. */
 export declare function referencesTo(store: CatalogReader, url: string): MediaReference[];
 /** What {@link mountMediaScreen} needs from the admin around it. */
 export interface MountMediaScreenOptions {
@@ -71,13 +85,13 @@ export interface MountMediaScreenOptions {
     removeDerived?: RemoveDerived | undefined;
 }
 /**
- * Register the media screen: the library, the upload form and the delete.
+ * Register the media screens: the library, one file's details, the upload,
+ * the alt text and the delete.
  *
  * Uploading here is {@link storeUpload}, exactly as the editor's control and
  * the avatar are, so what a site accepts is one answer given in one place
  * rather than three screens that might disagree.
  */
 export declare function mountMediaScreen(app: Hono<GeekityEnv>, options: MountMediaScreenOptions): void;
-/** The URL of one page of the library. Page one is the screen's own URL. */
-export declare function mediaPageUrl(page: number): string;
+export {};
 //# sourceMappingURL=media.d.ts.map

package/dist/admin/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/admin/media.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAOhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMlD,oCAAoC;AACpC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,0DAA0D;AAC1D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,4CAA4C;AAC5C,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,cAAc,qBAAsB,CAAC;AAElD,eAAO,MAAM,yBAAyB,gCAAiC,CAAC;AAExE,oDAAoD;AACpD,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,uDAAuD;AACvD,eAAO,MAAM,YAAY;IACvB,gDAAgD;aAChD,IAAI,EAAE,MAAM;IACZ,oEAAoE;aACpE,IAAI,EAAE,MAAM;IACZ,wEAAwE;aACxE,OAAO,EAAE,SAAS;IAClB,2BAA2B;aAC3B,GAAG,EAAE,KAAK;IACV,yEAAyE;aACzE,UAAU,EAAE,YAAY;IACxB,8EAA8E;aAC9E,IAAI,EAAE,MAAM;CACJ,CAAC;AAEX,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CAYhF;AAED,oEAAoE;AACpE,MAAM,WAAW,uBAAuB;IACtC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;IACpB,2FAA2F;IAC3F,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAkI9F;AASD,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/admin/media.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAIhD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI3D,OAAO,KAAK,EAAa,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAOlD,oCAAoC;AACpC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,0DAA0D;AAC1D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,wEAAwE;AACxE,eAAO,MAAM,eAAe,sBAAuB,CAAC;AAEpD,4CAA4C;AAC5C,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,0CAA0C;AAC1C,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,0CAA0C;AAC1C,eAAO,MAAM,cAAc,qBAAsB,CAAC;AAElD,oDAAoD;AACpD,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,wDAAwD;AACxD,eAAO,MAAM,YAAY;IACvB,gDAAgD;aAChD,IAAI,EAAE,MAAM;IACZ,iFAAiF;aACjF,IAAI,EAAE,MAAM;IACZ,wEAAwE;aACxE,OAAO,EAAE,SAAS;IAClB,2BAA2B;aAC3B,GAAG,EAAE,KAAK;IACV,yEAAyE;aACzE,UAAU,EAAE,YAAY;IACxB,iGAAiG;aACjG,IAAI,EAAE,MAAM;CACJ,CAAC;AAWX,sGAAsG;AACtG,QAAA,MAAM,KAAK;aACT,MAAM,EAAE,cAAc;aACtB,MAAM,EAAE,cAAc;aACtB,OAAO,EAAE,eAAe;aACxB,IAAI,EAAE,MAAM;CACJ,CAAC;AAEX,KAAK,SAAS,GAAG,MAAM,OAAO,KAAK,CAAC;AAEpC,sFAAsF;AACtF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,0FAA0F;IAC1F,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,yFAAyF;AACzF,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,CAWhE;AAED,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAStD;AAED,kCAAkC;AAClC,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAGvD;AAED,qEAAqE;AACrE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAGlE;AAED,oEAAoE;AACpE,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;CAClB;AAkCD,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CAEhF;AAsDD,oEAAoE;AACpE,MAAM,WAAW,uBAAuB;IACtC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;IACpB,2FAA2F;IAC3F,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAkN9F"}

package/dist/admin/media.js

@@ -1,16 +1,14 @@
 /**
- * The media screen: what is under `content/uploads/`, what links to it, and
- * the things that can be done to it — add one, describe one, take one away,
- * and queue the sweep that strips metadata from the ones uploaded before
- * uploads were stripped on arrival.
+ * The media screen: what is under `content/uploads/` as a grid of tiles, a
+ * details screen per file with what links to it, and the things that can be
+ * done to one — add one, describe one, take one away.
  */
 import { postLabel } from '../content/post-type.js';
 import { isTrashedPath } from '../content/store.js';
 import { UPLOAD_ASSET_PREFIX } from '../content/uploads.js';
 import { writeAltText } from '../content/alt-text.js';
 import { STRIP_METADATA_JOB } from '../content/metadata/strip-job.js';
-import { finishedResult } from '../jobs/types.js';
-import { removeImageVariants } from '../images/variants.js';
+import { describeImage, removeImageVariants, thumbnailUrl } from '../images/variants.js';
 import { deleteUpload, listUploads, mentionsUpload, resolveUpload } from '../media/library.js';
 import { refusedUpload, storeUpload } from '../media/uploads.js';
 import { isFile } from '../util/files.js';
@@ -18,27 +16,29 @@ import { stringOrEmpty } from '../util/forms.js';
 import { pageCount } from '../web/pagination.js';
 import { documentEditorPath, PAGE_SCREENS, POST_SCREENS } from './documents.js';
 import { flash } from './flash.js';
-import { jobStatusView, queueJobFromForm } from './job-status.js';
+import { jobStatusView } from './job-status.js';
+import { STRIP_METADATA_PANEL, STRIP_METADATA_PATH } from './maintenance.js';
 import { ADMIN_PREFIX } from '../site/admin-paths.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 /** Where the media screen lives. */
 export const MEDIA_PATH = `${ADMIN_PREFIX}/media`;
 /** The navigation section the screen marks as current. */
 export const MEDIA_SECTION = 'media';
+/** Where one file's details screen lives, with the file as `?path=`. */
+export const MEDIA_FILE_PATH = `${MEDIA_PATH}/file`;
 /** Where the screen's upload form posts. */
 export const MEDIA_UPLOAD_PATH = `${MEDIA_PATH}/upload`;
-/** Where a row's Delete button posts. */
+/** Where a file's Delete button posts. */
 export const MEDIA_DELETE_PATH = `${MEDIA_PATH}/delete`;
-/** Where a row's alt-text form posts. */
+/** Where a file's alt-text form posts. */
 export const MEDIA_ALT_PATH = `${MEDIA_PATH}/alt`;
-export const MEDIA_STRIP_METADATA_PATH = `${MEDIA_PATH}/strip-metadata`;
 /** How many files one page of the library shows. */
 export const MEDIA_PER_PAGE = 24;
-/** The fields the forms on the media screen submit. */
+/** The fields the forms on the media screens submit. */
 export const MEDIA_FIELDS = {
     /** The file being added, on the upload form. */
     file: 'file',
-    /** The upload being deleted, as a path under `content/uploads/`. */
+    /** The upload being deleted or described, as a path under `content/uploads/`. */
     path: 'path',
     /** Set once the admin has been shown what still references the file. */
     confirm: 'confirm',
@@ -46,28 +46,86 @@ export const MEDIA_FIELDS = {
     alt: 'alt',
     /** Present when an image is decorative, which wins over any alt text. */
     decorative: 'decorative',
-    /** The library page an alt-text form was on, so saving it goes back there. */
-    page: 'page',
+    /** The library view a form was posted from, as a query string, so the answer goes back to it. */
+    from: 'from',
 };
+/** The kinds the library's tabs pick between. */
+const KIND_TABS = [
+    { kind: undefined, label: 'All' },
+    { kind: 'image', label: 'Images' },
+    { kind: 'audio', label: 'Audio' },
+    { kind: 'video', label: 'Video' },
+    { kind: 'document', label: 'Documents' },
+];
+/** The orders the library can be sorted in. Newest is the default and is never written into a URL. */
+const SORTS = {
+    newest: 'Newest first',
+    oldest: 'Oldest first',
+    largest: 'Largest first',
+    name: 'Name',
+};
+/** A view from a query string. Anything it does not recognise is left at its default. */
+export function parseMediaView(query) {
+    const kind = query.get('kind');
+    const sort = query.get('sort');
+    return {
+        kind: KIND_TABS.find((tab) => tab.kind !== undefined && tab.kind === kind)?.kind,
+        search: (query.get('q') ?? '').trim(),
+        needsAlt: query.get('alt') === 'missing',
+        unused: query.get('unused') === '1',
+        sort: sort !== null && Object.hasOwn(SORTS, sort) ? sort : 'newest',
+        page: pageNumber(query.get('page') ?? undefined),
+    };
+}
+/** A view as a query string, without the `?`, leaving out everything at its default. */
+export function mediaViewQuery(view) {
+    const query = new URLSearchParams();
+    if (view.kind !== undefined)
+        query.set('kind', view.kind);
+    if (view.search !== '')
+        query.set('q', view.search);
+    if (view.needsAlt)
+        query.set('alt', 'missing');
+    if (view.unused)
+        query.set('unused', '1');
+    if (view.sort !== 'newest')
+        query.set('sort', view.sort);
+    if (view.page > 1)
+        query.set('page', String(view.page));
+    return query.toString();
+}
+/** The library showing a view. */
+export function mediaLibraryUrl(view) {
+    const query = mediaViewQuery(view);
+    return query === '' ? MEDIA_PATH : `${MEDIA_PATH}?${query}`;
+}
+/** One file's details screen, reached from a view of the library. */
+export function mediaFileUrl(path, view) {
+    const query = mediaViewQuery(view);
+    return `${MEDIA_FILE_PATH}?path=${encodeURIComponent(path)}${query === '' ? '' : `&${query}`}`;
+}
 /**
- * Every document whose body mentions an upload's URL, trash included.
+ * Every document, live and trashed, that a reference could come from.
  *
  * The trash counts. A trashed post can be restored tomorrow, and restoring one
  * whose picture was deleted in the meantime is a broken post nobody was warned
  * about — so a file the trash still points at asks for confirmation exactly as
  * a published one does.
  *
- * This is the one thing on the screen that comes out of the index rather than
+ * This is the one thing on the screens that comes out of the index rather than
  * off the disk. The index is a cache of the files (decision-1), so it may be a
  * moment behind a hand edit; that is acceptable here because the answer is a
  * warning rather than a decision, and the confirmation step is what makes an
  * out-of-date answer harmless in both directions.
  */
-export function referencesTo(store, url) {
+function referenceSources(store) {
     // Two queries rather than one because `listAll` shows the live tree or the
     // trash and never both, which is the same reason the taxonomy screens ask
     // twice.
-    return [...store.listAll({ trashed: false }), ...store.listAll({ trashed: true })]
+    return [...store.listAll({ trashed: false }), ...store.listAll({ trashed: true })];
+}
+function referencesAmong(documents, url) {
+    return documents
         .filter((document) => mentionsUpload(document.body, url))
         .map((document) => ({
         path: document.path,
@@ -76,8 +134,51 @@ export function referencesTo(store, url) {
         trashed: isTrashedPath(document.path),
     }));
 }
+/** Every document whose body mentions an upload's URL, trash included. */
+export function referencesTo(store, url) {
+    return referencesAmong(referenceSources(store), url);
+}
+function libraryFile(config, documents, file) {
+    const image = file.kind === 'image' ? describeImage(config, file.path) : undefined;
+    return {
+        ...file,
+        references: referencesAmong(documents, file.url),
+        thumbnailUrl: file.kind === 'image' ? thumbnailUrl(config, file.path, file.url) : file.url,
+        width: image?.width,
+        height: image?.height,
+    };
+}
+function needsAlt(file) {
+    return file.kind === 'image' && file.alt === undefined;
+}
+/** Whether a file is in a view, leaving the kind tabs and the page aside. */
+function matches(file, view) {
+    if (view.needsAlt && !needsAlt(file))
+        return false;
+    if (view.unused && file.references.length > 0)
+        return false;
+    if (view.search === '')
+        return true;
+    const search = view.search.toLowerCase();
+    const alt = file.alt?.kind === 'described' ? file.alt.text : '';
+    return file.path.toLowerCase().includes(search) || alt.toLowerCase().includes(search);
+}
+/** `listUploads` is newest first already; the other orders are stable sorts of it. */
+function sorted(files, sort) {
+    switch (sort) {
+        case 'newest':
+            return files;
+        case 'oldest':
+            return files.toReversed();
+        case 'largest':
+            return files.toSorted((left, right) => right.bytes - left.bytes);
+        case 'name':
+            return files.toSorted((left, right) => left.name.localeCompare(right.name));
+    }
+}
 /**
- * Register the media screen: the library, the upload form and the delete.
+ * Register the media screens: the library, one file's details, the upload,
+ * the alt text and the delete.
  *
  * Uploading here is {@link storeUpload}, exactly as the editor's control and
  * the avatar are, so what a site accepts is one answer given in one place
@@ -85,7 +186,16 @@ export function referencesTo(store, url) {
  */
 export function mountMediaScreen(app, options) {
     const { render, removeDerived } = options;
-    app.get(MEDIA_PATH, async (c) => render(c, ADMIN_TEMPLATES.media, await screen(c)));
+    app.get(MEDIA_PATH, async (c) => render(c, ADMIN_TEMPLATES.media, await library(c, viewOf(c.req.url))));
+    app.get(MEDIA_FILE_PATH, async (c) => {
+        const view = viewOf(c.req.url);
+        const details = await fileScreen(c, c.req.query('path') ?? '', view);
+        if (details === undefined) {
+            flash(c, 'error', 'That is not a file in this site’s uploads.');
+            return c.redirect(mediaLibraryUrl(view), 303);
+        }
+        return render(c, ADMIN_TEMPLATES.mediaFile, details);
+    });
     app.post(MEDIA_UPLOAD_PATH, async (c) => {
         const body = await c.req.parseBody();
         const outcome = await storeUpload(body[MEDIA_FIELDS.file], c.var.config);
@@ -98,11 +208,12 @@ export function mountMediaScreen(app, options) {
     });
     app.post(MEDIA_ALT_PATH, async (c) => {
         const body = await c.req.parseBody();
+        const view = postedView(body);
         const relative = stringOrEmpty(body[MEDIA_FIELDS.path]).trim();
         const file = relative === '' ? undefined : resolveUpload(c.var.config.contentDir, relative);
         if (file === undefined || !(await isFile(file))) {
             flash(c, 'error', 'That is not a file in this site’s uploads.');
-            return c.redirect(MEDIA_PATH, 303);
+            return c.redirect(mediaLibraryUrl(view), 303);
         }
         const text = stringOrEmpty(body[MEDIA_FIELDS.alt]).trim().replace(/\s+/g, ' ');
         const alt = body[MEDIA_FIELDS.decorative] !== undefined
@@ -112,20 +223,16 @@ export function mountMediaScreen(app, options) {
                 : { kind: 'described', text };
         await writeAltText(c.var.config.contentDir, relative, alt);
         flash(c, 'notice', altSavedMessage(relative, alt));
-        return c.redirect(mediaPageUrl(pageNumber(stringOrEmpty(body[MEDIA_FIELDS.page]).trim())), 303);
+        return c.redirect(mediaFileUrl(relative, view), 303);
     });
-    app.post(MEDIA_STRIP_METADATA_PATH, (c) => queueJobFromForm(c, STRIP_METADATA_JOB, null, {
-        panel: `${MEDIA_PATH}#strip-metadata`,
-        queued: 'Queued the sweep. It runs in the background; its progress is below.',
-        busy: 'A sweep is already queued or running. Nothing new was queued.',
-    }));
     app.post(MEDIA_DELETE_PATH, async (c) => {
         const body = await c.req.parseBody();
+        const view = postedView(body);
         const relative = stringOrEmpty(body[MEDIA_FIELDS.path]).trim();
         const file = relative === '' ? undefined : resolveUpload(c.var.config.contentDir, relative);
         if (file === undefined) {
             flash(c, 'error', 'That is not a file in this site’s uploads.');
-            return c.redirect(MEDIA_PATH, 303);
+            return c.redirect(mediaLibraryUrl(view), 303);
         }
         const url = `${UPLOAD_ASSET_PREFIX}${relative}`;
         const references = referencesTo(c.var.store, url);
@@ -133,7 +240,12 @@ export function mountMediaScreen(app, options) {
         // bytes do not come back, and the documents naming them are the whole
         // reason to think twice.
         if (references.length > 0 && stringOrEmpty(body[MEDIA_FIELDS.confirm]).trim() === '') {
-            return render(c, ADMIN_TEMPLATES.media, await screen(c, { confirm: { path: relative, url, references } }));
+            const details = await fileScreen(c, relative, view);
+            if (details === undefined) {
+                flash(c, 'error', 'That is not a file in this site’s uploads.');
+                return c.redirect(mediaLibraryUrl(view), 303);
+            }
+            return render(c, ADMIN_TEMPLATES.mediaFile, { ...details, confirm: { url, references } });
         }
         const deleted = await deleteUpload({
             contentDir: c.var.config.contentDir,
@@ -144,43 +256,102 @@ export function mountMediaScreen(app, options) {
             removeDerived: removeDerived ?? ((uploadPath) => removeImageVariants(c.var.config, uploadPath)),
         });
         flash(c, deleted ? 'notice' : 'error', deleted ? `Deleted ${url}.` : `There is no longer a file at ${url}.`);
-        return c.redirect(MEDIA_PATH, 303);
+        return c.redirect(mediaLibraryUrl(view), 303);
     });
-    /** Everything the media template renders. */
-    async function screen(c, extra = {}) {
-        const files = await listUploads(c.var.config.contentDir);
-        const latestSweep = await c.var.jobs.latest(STRIP_METADATA_JOB.name);
-        const page = pageNumber(c.req.query('page'));
-        const start = (page - 1) * MEDIA_PER_PAGE;
+    async function libraryFiles(c) {
+        const documents = referenceSources(c.var.store);
+        return (await listUploads(c.var.config.contentDir)).map((file) => libraryFile(c.var.config, documents, file));
+    }
+    /** Everything the library template renders. */
+    async function library(c, view) {
+        const all = await libraryFiles(c);
+        const matching = all.filter((file) => matches(file, view));
+        const files = sorted(matching.filter((file) => view.kind === undefined || file.kind === view.kind), view.sort);
+        const pages = pageCount(files.length, MEDIA_PER_PAGE);
+        const start = (view.page - 1) * MEDIA_PER_PAGE;
+        const latestSweep = jobStatusView(await c.var.jobs.latest(STRIP_METADATA_JOB.name));
         return {
             section: MEDIA_SECTION,
             child: 'library',
             heading: 'Media',
             listUrl: MEDIA_PATH,
             uploadUrl: MEDIA_UPLOAD_PATH,
-            deleteUrl: MEDIA_DELETE_PATH,
-            altUrl: MEDIA_ALT_PATH,
-            stripMetadataUrl: MEDIA_STRIP_METADATA_PATH,
-            sweep: jobStatusView(latestSweep),
-            sweepReport: finishedResult(STRIP_METADATA_JOB, latestSweep),
             fields: MEDIA_FIELDS,
             accepts: c.var.config.uploadTypes.join(','),
             maxBytes: c.var.config.uploadMaxBytes,
             mediaMaxBytes: c.var.config.uploadMediaMaxBytes,
-            total: files.length,
-            page,
-            pages: pageCount(files.length, MEDIA_PER_PAGE),
-            previousUrl: page > 1 ? mediaPageUrl(page - 1) : undefined,
-            nextUrl: start + MEDIA_PER_PAGE < files.length ? mediaPageUrl(page + 1) : undefined,
-            // Reference counts are one index scan per file on the page rather than
-            // per file in the library, which is what paging is for.
+            // Until a sweep has finished, the older uploads may still carry where
+            // they were taken; after one has, everything since was cleaned on arrival.
+            sweepNotice: latestSweep?.state === 'finished'
+                ? undefined
+                : { sweep: latestSweep, url: STRIP_METADATA_PATH, panelUrl: STRIP_METADATA_PANEL },
+            view,
+            sorts: SORTS,
+            kindTabs: KIND_TABS.map((tab) => ({
+                label: tab.label,
+                url: mediaLibraryUrl({ ...view, kind: tab.kind, page: 1 }),
+                current: tab.kind === view.kind,
+                count: matching.filter((file) => tab.kind === undefined || file.kind === tab.kind).length,
+            })),
+            filtered: view.search !== '' || view.needsAlt || view.unused,
+            clearUrl: mediaLibraryUrl({ ...parseMediaView(new URLSearchParams()), kind: view.kind }),
+            total: all.length,
+            shown: files.length,
+            page: view.page,
+            pages,
+            previousUrl: view.page > 1 ? mediaLibraryUrl({ ...view, page: view.page - 1 }) : undefined,
+            nextUrl: start + MEDIA_PER_PAGE < files.length
+                ? mediaLibraryUrl({ ...view, page: view.page + 1 })
+                : undefined,
             files: files.slice(start, start + MEDIA_PER_PAGE).map((file) => ({
                 ...file,
-                references: referencesTo(c.var.store, file.url),
+                needsAlt: needsAlt(file),
+                detailsUrl: mediaFileUrl(file.path, view),
             })),
-            ...extra,
         };
     }
+    /**
+     * Everything the details template renders, or `undefined` when the path is
+     * not a file in the library.
+     *
+     * Previous and next step through the view the file was opened from. The
+     * file itself always counts as part of that view, so describing the last
+     * image a "needs alt text" view showed does not strand it.
+     */
+    async function fileScreen(c, relative, view) {
+        const all = await libraryFiles(c);
+        const file = all.find((candidate) => candidate.path === relative);
+        if (file === undefined)
+            return undefined;
+        const around = sorted(all.filter((candidate) => candidate === file ||
+            (matches(candidate, view) && (view.kind === undefined || candidate.kind === view.kind))), view.sort);
+        const at = around.indexOf(file);
+        const previous = around[at - 1];
+        const next = around[at + 1];
+        const viewAroundFile = { ...view, page: Math.floor(Math.max(at, 0) / MEDIA_PER_PAGE) + 1 };
+        return {
+            section: MEDIA_SECTION,
+            child: 'library',
+            heading: file.name,
+            file: { ...file, needsAlt: needsAlt(file) },
+            fields: MEDIA_FIELDS,
+            from: mediaViewQuery(view),
+            altUrl: MEDIA_ALT_PATH,
+            deleteUrl: MEDIA_DELETE_PATH,
+            libraryUrl: mediaLibraryUrl(viewAroundFile),
+            selfUrl: mediaFileUrl(file.path, view),
+            previousUrl: previous === undefined ? undefined : mediaFileUrl(previous.path, view),
+            nextUrl: next === undefined ? undefined : mediaFileUrl(next.path, view),
+            position: at + 1,
+            count: around.length,
+        };
+    }
+}
+function viewOf(url) {
+    return parseMediaView(new URL(url).searchParams);
+}
+function postedView(body) {
+    return parseMediaView(new URLSearchParams(stringOrEmpty(body[MEDIA_FIELDS.from])));
 }
 /** What the flash says once an image's alt text has been saved. */
 function altSavedMessage(relative, alt) {
@@ -190,10 +361,6 @@ function altSavedMessage(relative, alt) {
         return `${relative} is marked decorative.`;
     return `Saved the alt text for ${relative}.`;
 }
-/** The URL of one page of the library. Page one is the screen's own URL. */
-export function mediaPageUrl(page) {
-    return page > 1 ? `${MEDIA_PATH}?page=${String(page)}` : MEDIA_PATH;
-}
 /** A `page` query as a page number. Anything that is not one is page one. */
 function pageNumber(value) {
     const parsed = Number(value ?? '1');