ravensight-playtest 0.2.6 → 0.2.8

package/src/upload/index.js

@@ -274,7 +274,7 @@ export async function uploadRunDir(runDir, options) {
   const {
     api, gameId, jobId, runId = null,
     includeVideo = false, includeTranscript = false,
-    dryRun = false, force = false, only = null, allowedPaths = null,
+    dryRun = false, force = false, only = null, allowedPaths = null, exclude = null, excludeReason = 'excluded',
     onFile, repoRoot, fetch: fetchImpl, sleep
   } = options;
 
@@ -295,6 +295,14 @@ export async function uploadRunDir(runDir, options) {
     files = files.filter(file => wanted.has(file.path));
   }
 
+  if (Array.isArray(exclude) && exclude.length > 0) {
+    const unwanted = new Set(exclude);
+    for (const file of files) {
+      if (unwanted.has(file.path)) skipped.push({ path: file.path, reason: excludeReason });
+    }
+    files = files.filter(file => !unwanted.has(file.path));
+  }
+
   if (!force) {
     const done = await uploadedKeys(jobId, journalOptions);
     const remaining = [];

package/src/upload/queue.js

@@ -14,7 +14,10 @@ import { paths } from '../paths.js';
  * was.
  *
  * Each line is `{ at, kind, run_id, path, sha256, size, status, detail }`.
- * `status` is one of `queued`, `uploaded`, `failed`, `skipped`.
+ * `status` is one of `queued`, `uploaded`, `failed`, `skipped`, `local_edit`.
+ * A `local_edit` is a file the CLI changed on disk after it was delivered
+ * (dropped findings marked in a run's report): the delivered copy is the
+ * record, so the new hash counts as done and is never sent again.
  *
  * Idempotency is by sha256: a path recorded `uploaded` with the same hash is
  * not sent again, which is what makes `resume` and the manual `upload <job>`
@@ -25,9 +28,13 @@ export const STATUS = Object.freeze({
   QUEUED: 'queued',
   UPLOADED: 'uploaded',
   FAILED: 'failed',
-  SKIPPED: 'skipped'
+  SKIPPED: 'skipped',
+  LOCAL_EDIT: 'local_edit'
 });
 
+/** Statuses that mean "nothing left to send at this hash". */
+const DONE = new Set([STATUS.UPLOADED, STATUS.LOCAL_EDIT]);
+
 /**
  * Append one entry.
  * @param {string} jobId
@@ -70,7 +77,8 @@ export async function readQueue(jobId, options = {}) {
 }
 
 /**
- * The set of `<runId>|<path>|<sha256>` triples already recorded as uploaded.
+ * The set of `<runId>|<path>|<sha256>` triples already recorded as uploaded,
+ * or as a local edit of a file that was.
  * The sha256 is part of the key on purpose: a corrected file at the same path
  * has a different hash and must be sent again.
  * @param {string} jobId
@@ -80,7 +88,7 @@ export async function readQueue(jobId, options = {}) {
 export async function uploadedKeys(jobId, options = {}) {
   const done = new Set();
   for (const entry of await readQueue(jobId, options)) {
-    if (entry.status === STATUS.UPLOADED) {
+    if (DONE.has(entry.status)) {
       done.add(keyFor(entry.run_id || null, entry.path, entry.sha256));
     }
   }
@@ -105,7 +113,7 @@ export async function pending(jobId, options = {}) {
   for (const entry of entries) {
     if (!entry.path) continue;
     const key = keyFor(entry.run_id || null, entry.path, entry.sha256);
-    if (entry.status === STATUS.UPLOADED) done.add(key);
+    if (DONE.has(entry.status)) done.add(key);
     latest.set(key, entry);
   }
   return [...latest.entries()]