Merge remote-tracking branch 'origin/main' into mobile-ffprobe

cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.17 as builder
+FROM golang:1.20-alpine3.17 AS builder
 RUN apk add --no-cache gcc musl-dev git build-base pkgconfig libsodium-dev
 
 ENV GOOS=linux

cli/Dockerfile-x86

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.17@sha256:9c2f89db6fda13c3c480749787f62fed5831699bb2c32881b8f327f1cf7bae42 as builder386
+FROM golang:1.20-alpine3.17@sha256:9c2f89db6fda13c3c480749787f62fed5831699bb2c32881b8f327f1cf7bae42 AS builder386
 RUN apt-get  update
 RUN apt-get  install -y gcc
 RUN apt-get  install -y git

desktop/src/main.ts

@@ -537,7 +537,7 @@ const setupTrayItem = (mainWindow: BrowserWindow) => {
  * old cache dir if it exists.
  *
  * Added May 2024, v1.7.0. This migration code can be removed after some time
- * once most people have upgraded to newer versions.
+ * once most people have upgraded to newer versions (tag: Migration).
  */
 const deleteLegacyDiskCacheDirIfExists = async () => {
     const removeIfExists = async (dirPath: string) => {

desktop/src/main/services/ml-clip.ts

@@ -3,6 +3,7 @@
  *
  * The embeddings are computed using ONNX runtime, with CLIP as the model.
  */
+
 import Tokenizer from "clip-bpe-js";
 import * as ort from "onnxruntime-node";
 import log from "../log";

desktop/src/main/services/ml-face.ts

@@ -6,6 +6,7 @@
  *
  * The runtime used is ONNX.
  */
+
 import * as ort from "onnxruntime-node";
 import log from "../log";
 import { ensure } from "../utils/common";

desktop/src/main/services/ml.ts

@@ -1,5 +1,5 @@
 /**
- * @file AI/ML related functionality, generic layer.
+ * @file ML related functionality, generic layer.
  *
  * @see also `ml-clip.ts`, `ml-face.ts`.
  *
@@ -10,6 +10,7 @@
  * can use the binary ONNX runtime which is 10-20x faster than the WASM based
  * web one.
  */
+
 import { app, net } from "electron/main";
 import { existsSync } from "fs";
 import fs from "node:fs/promises";

desktop/src/main/services/upload.ts

@@ -58,7 +58,7 @@ export const pendingUploads = async (): Promise<PendingUploads | undefined> => {
     const allZipItems = uploadStatusStore.get("zipItems");
     let zipItems: typeof allZipItems;
 
-    // Migration code - May 2024. Remove after a bit.
+    // Migration code - May 2024. Remove after a bit (tag: Migration).
     //
     // The older store formats will not have zipItems and instead will have
     // zipPaths. If we find such a case, read the zipPaths and enqueue all of