Merge pull request #93 from loathers/complete-kiwi

create mechanism for "completing" projects
loathers · Jun 20, 2024 · 6238579 · 6238579
2 parents 1dd3322 + e1a00e6
commit 6238579
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/packages/excavator-projects/projects/miniKiwi.ts b/packages/excavator-projects/projects/miniKiwi.ts
@@ -58,4 +58,5 @@ export const MINI_KIWI: ExcavatorProject = {
     COMBAT_ROUND: spadeKiwi,
   },
   since: 27973, // mini kiwi familiar equipment added
+  completed: true,
 };
diff --git a/packages/excavator-projects/type.ts b/packages/excavator-projects/type.ts
@@ -19,4 +19,5 @@ export type ExcavatorProject = {
   author: string;
   hooks: Partial<Hooks>;
   since?: number;
+  completed?: boolean;
 };
diff --git a/packages/excavator-script/src/excavator.ts b/packages/excavator-script/src/excavator.ts
@@ -14,7 +14,10 @@ type Event = keyof ExcavatorProject["hooks"];
 
 function main(event: Event, meta: string, page: string) {
   projects
-    .filter(({ hooks, since = 0 }) => event in hooks && since <= getRevision())
+    .filter(
+      ({ hooks, since = 0, completed }) =>
+        !completed && event in hooks && since <= getRevision(),
+    )
     .map(({ name, hooks }) => [name, hooks[event]!(meta, page)] as const)
     .filter(tupleNotNull)
     .forEach(([name, data]) => {

diff --git a/packages/excavator-web/app/routes/projects.$project.tsx b/packages/excavator-web/app/routes/projects.$project.tsx
@@ -52,6 +52,11 @@ export default function Project() {
   return (
     <Stack spacing={8} mt={8}>
       <ProjectHeader project={project} projects={projectNames} />
+      {project.completed && (
+        <Alert>
+          This project is completed. It is no longer accepting data.
+        </Alert>
+      )}
       {data.length === 0 ? (
         <Alert>No data for this project yet - you better get excavating!</Alert>
       ) : (

diff --git a/packages/excavator-web/etl.ts b/packages/excavator-web/etl.ts
@@ -1,5 +1,6 @@
 import { PrismaClient } from "@prisma/client";
 import "dotenv/config";
+import { projects } from "excavator-projects";
 import makeFetchCookie from "fetch-cookie";
 import crypto from "node:crypto";
 
@@ -113,6 +114,10 @@ function applyFixes(data: SpadingData) {
   if (data._PROJECT === "Fresh Coat Of Paint")
     data._PROJECT = "Fresh Coat of Paint";
 
+  // 24-06-20: Some projects are "completed"
+  const project = projects.find(({ name }) => name === data._PROJECT);
+  if (project?.completed) return null;
+
   // 2024-04-02: Accidentally zero-indexed this item count
   if (data._PROJECT === "Continental Juice Bar" && "item0" in data) {
     data["item3"] = data["item2"];