From 41b81fee429662e7c7701a3f32f1ab40ee87e931 Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Tue, 18 Jun 2024 16:22:52 +0200
Subject: [PATCH] feat: modpack stats

---
 components/Charts.vue                   | 10 ++++--
 layouts/default.vue                     | 45 +++++++++++++++++++------
 pages/{ => [type]}/counts/[mode].vue    |  3 +-
 pages/{ => [type]}/downloads/[mode].vue |  3 +-
 server/api/counts.ts                    |  6 ----
 server/api/downloads.ts                 |  7 ----
 server/api/stats.ts                     | 14 ++++++++
 server/utils/api/stats.ts               | 12 +++----
 server/utils/fetchData.ts               |  4 +--
 server/utils/statistics.ts              | 29 +++++++++++++---
 10 files changed, 91 insertions(+), 42 deletions(-)
 rename pages/{ => [type]}/counts/[mode].vue (69%)
 rename pages/{ => [type]}/downloads/[mode].vue (68%)
 delete mode 100644 server/api/counts.ts
 delete mode 100644 server/api/downloads.ts
 create mode 100644 server/api/stats.ts

diff --git a/components/Charts.vue b/components/Charts.vue
index 3e367bd..4ae3162 100644
--- a/components/Charts.vue
+++ b/components/Charts.vue
@@ -2,9 +2,15 @@
 import {Bar} from 'vue-chartjs'
 import type {StatExport} from "~/server/utils/api/stats";
 
-const props = defineProps<{ url: string, mode: string, explanation: string }>();
+const props = defineProps<{ stat: string, type: string, mode: string, explanation: string }>();
 
-const {data} = await useFetch<StatExport>(props.url, {query: {mode: props.mode}});
+const {data} = await useFetch<StatExport>("/api/stats", {
+  query: {
+    mode: props.mode,
+    type: props.type,
+    stat: props.stat
+  }
+});
 let downloadData = computed(() => {
   if (data.value) {
     return data.value
diff --git a/layouts/default.vue b/layouts/default.vue
index 0e4e9ae..650d3f7 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -5,16 +5,28 @@ async function onUpdateData() {
   await $fetch("/api/update")
 }
 
-const downloadUrls = [
-  {title: "Major Versions", url: "/downloads/major"},
-  {title: "Minor Versions", url: "/downloads/minor"},
-  {title: "All Versions", url: "/downloads/all"},
+const modDownloadUrls = [
+  {title: "Major Versions", url: "/mod/downloads/major"},
+  {title: "Minor Versions", url: "/mod/downloads/minor"},
+  {title: "All Versions", url: "/mod/downloads/all"},
 ]
 
-const countUrls = [
-  {title: "Major Versions", url: "/counts/major"},
-  {title: "Minor Versions", url: "/counts/minor"},
-  {title: "All Versions", url: "/counts/all"},
+const modCountUrls = [
+  {title: "Major Versions", url: "/mod/counts/major"},
+  {title: "Minor Versions", url: "/mod/counts/minor"},
+  {title: "All Versions", url: "/mod/counts/all"},
+]
+
+const modpackDownloadUrls = [
+  {title: "Major Versions", url: "/modpack/downloads/major"},
+  {title: "Minor Versions", url: "/modpack/downloads/minor"},
+  {title: "All Versions", url: "/modpack/downloads/all"},
+]
+
+const modpackCountUrls = [
+  {title: "Major Versions", url: "/modpack/counts/major"},
+  {title: "Minor Versions", url: "/modpack/counts/minor"},
+  {title: "All Versions", url: "/modpack/counts/all"},
 ]
 
 </script>
@@ -25,8 +37,14 @@ const countUrls = [
       Modrinth Statistics
     </NuxtLink>
     <div id="links">
-      <DropDownLink :urls="downloadUrls" title="Mod Downloads"/>
-      <DropDownLink :urls="countUrls" title="Mod Counts"/>
+      <div class="groups">
+        <DropDownLink :urls="modDownloadUrls" title="Mod Downloads"/>
+        <DropDownLink :urls="modCountUrls" title="Mod Counts"/>
+      </div>
+      <div class="groups">
+        <DropDownLink :urls="modpackDownloadUrls" title="Modpack Downloads"/>
+        <DropDownLink :urls="modpackCountUrls" title="Modpack Counts"/>
+      </div>
     </div>
     <button @click="onUpdateData">
       update Data
@@ -56,7 +74,12 @@ const countUrls = [
 
   #links {
     display: flex;
-    gap: 25px;
+    gap: 50px;
+
+    .groups {
+      display: flex;
+      gap: 20px;
+    }
   }
 
   button {
diff --git a/pages/counts/[mode].vue b/pages/[type]/counts/[mode].vue
similarity index 69%
rename from pages/counts/[mode].vue
rename to pages/[type]/counts/[mode].vue
index b6bd47b..21a0c20 100644
--- a/pages/counts/[mode].vue
+++ b/pages/[type]/counts/[mode].vue
@@ -12,5 +12,6 @@ the version will be counted every loader/game-version.
 </script>
 
 <template>
-  <Charts :mode="route.params.mode as string" url="/api/counts" :explanation="explanation"/>
+  <Charts :mode="route.params.mode as string" stat="count" :type="route.params.type as string" url="/api/counts"
+          :explanation="explanation"/>
 </template>
\ No newline at end of file
diff --git a/pages/downloads/[mode].vue b/pages/[type]/downloads/[mode].vue
similarity index 68%
rename from pages/downloads/[mode].vue
rename to pages/[type]/downloads/[mode].vue
index 2a90ce1..d36f3a5 100644
--- a/pages/downloads/[mode].vue
+++ b/pages/[type]/downloads/[mode].vue
@@ -11,5 +11,6 @@ the downloads will be divided equally between each loader/game-version.
 </script>
 
 <template>
-  <Charts :mode="route.params.mode as string" url="/api/downloads" :explanation="explanation"/>
+  <Charts :mode="route.params.mode as string" stat="downloads" :type="route.params.type as string" url="/api/downloads"
+          :explanation="explanation"/>
 </template>
\ No newline at end of file
diff --git a/server/api/counts.ts b/server/api/counts.ts
deleted file mode 100644
index e22aede..0000000
--- a/server/api/counts.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {exportStats, StatExport} from "~/server/utils/api/stats";
-
-export default defineEventHandler(async (event): Promise<StatExport> => {
-    return exportStats(event, value => value.count)
-})
-
diff --git a/server/api/downloads.ts b/server/api/downloads.ts
deleted file mode 100644
index f04e29a..0000000
--- a/server/api/downloads.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {Stats} from "~/server/utils/types/stats";
-import {exportStats, StatExport} from "~/server/utils/api/stats";
-
-export default defineEventHandler(async (event): Promise<StatExport> => {
-    return exportStats(event, value => value.count)
-})
-
diff --git a/server/api/stats.ts b/server/api/stats.ts
new file mode 100644
index 0000000..beee681
--- /dev/null
+++ b/server/api/stats.ts
@@ -0,0 +1,14 @@
+import {exportStats, StatExport} from "~/server/utils/api/stats";
+
+export default defineEventHandler(async (event): Promise<StatExport> => {
+    let query = getQuery(event);
+
+    let mode = query.mode as string;
+    let type = query.type as string;
+
+    if (query.stat == "count") {
+        return exportStats(mode, type, value => value.count)
+    } else {
+        return exportStats(mode, type, value => value.downloads)
+    }
+})
\ No newline at end of file
diff --git a/server/utils/api/stats.ts b/server/utils/api/stats.ts
index df4dab3..c92e8d7 100644
--- a/server/utils/api/stats.ts
+++ b/server/utils/api/stats.ts
@@ -10,21 +10,19 @@ export type StatExport = {
     }[]
 }
 
-export async function exportStats(event: H3Event, fn: (value: StatsValue) => number): Promise<StatExport> {
+export async function exportStats(mode: string, type: string, fn: (value: StatsValue) => number): Promise<StatExport> {
     const storage = useStorage("statistics");
-    let query = getQuery(event);
-
     let stats
 
-    switch (query.mode) {
+    switch (mode) {
         case "minor" :
-            stats = await storage.getItem<Stats>("versionStatsMinor")
+            stats = await storage.getItem<Stats>(`${type}StatsMinor`)
             break
         case "all" :
-            stats = await storage.getItem<Stats>("versionStatsAll")
+            stats = await storage.getItem<Stats>(`${type}StatsAll`)
             break
         default:
-            stats = await storage.getItem<Stats>("versionStatsMajor")
+            stats = await storage.getItem<Stats>(`${type}StatsMajor`)
     }
 
     if (!stats) {
diff --git a/server/utils/fetchData.ts b/server/utils/fetchData.ts
index 7e7763d..290aa84 100644
--- a/server/utils/fetchData.ts
+++ b/server/utils/fetchData.ts
@@ -1,13 +1,13 @@
 import {$modrinthFetch} from "~/utils/modrinthFetch";
 
-export async function getProjectIds(offset: number): Promise<string[]> {
+export async function getProjectIds(offset: number, type: string): Promise<string[]> {
     const data = await $modrinthFetch<SimpleProjects>("/search", {
         query: {
             limit: 100,
             offset: offset,
             //todo - remove newest
             index: "newest",
-            facets: "[[\"project_types:mod\"]]"
+            facets: `[[\"project_types:${type}\"]]`
         }
     })
 
diff --git a/server/utils/statistics.ts b/server/utils/statistics.ts
index 1fa8268..a5cfd3c 100644
--- a/server/utils/statistics.ts
+++ b/server/utils/statistics.ts
@@ -3,8 +3,26 @@ import {GameVersion, Version} from "~/server/utils/fetchData";
 
 type StatsData = Map<string, Map<string, { downloads: number, count: number }>>
 
+type AllStats = { all: Stats, minor: Stats, major: Stats };
+
 export async function updateStatistics() {
-    const projectIds = await getProjectIds(0);
+    const modStats = await getStatistics("mod")
+    await saveStats(modStats, "mod")
+
+    const modpackStats = await getStatistics("modpack")
+    await saveStats(modpackStats, "modpack")
+}
+
+async function saveStats(stats: AllStats, type: string) {
+    const storage = useStorage("statistics");
+    await storage.setItem<Stats>(`${type}StatsAll`, stats.all)
+    await storage.setItem<Stats>(`${type}StatsMinor`, stats.minor)
+    await storage.setItem<Stats>(`${type}StatsMajor`, stats.major
+    )
+}
+
+async function getStatistics(type: string): Promise<AllStats> {
+    const projectIds = await getProjectIds(0, type);
     console.log("project ids", projectIds.length);
 
     const versionIds = (await getVersionIds(projectIds))
@@ -19,10 +37,11 @@ export async function updateStatistics() {
     let {gameVersions: minorGameVersions, downloads: minorVersionDownloads} = onlyMinorVersions(versions, allDownloads);
     let majorVersionDownloads = onlyMajorVersions(minorGameVersions, minorVersionDownloads);
 
-    const storage = useStorage("statistics");
-    await storage.setItem<Stats>("versionStatsAll", allDownloads)
-    await storage.setItem<Stats>("versionStatsMinor", minorVersionDownloads)
-    await storage.setItem<Stats>("versionStatsMajor", majorVersionDownloads)
+    return {
+        all: allDownloads,
+        major: majorVersionDownloads,
+        minor: minorVersionDownloads
+    }
 }
 
 async function analyzeVersionsFromIds(versionIds: string[], data: StatsData) {
-- 
2.51.2