new stuff

Author: ahqsoftwares

web/load.mjs

@@ -22,20 +22,27 @@ const run = async (url, branch, arch) => {
     response.push(data);
 
     if (!data.pkg_webpage) {
-      console.log(`⚠️ Auto guessed pkg_webpage for ${branch}-${arch}/${data.pkg_family}/${data.pkg_name || data.pkg}`)
+      console.log(
+        `⚠️ Auto guessed pkg_webpage for ${branch}-${arch}/${data.pkg_family}/${
+          data.pkg_name || data.pkg
+        }`
+      );
       data.pkg_webpage = `https://pkgs.pkgforge.dev/repo/${branch}/${arch}/${
         data.pkg_family
       }/${data.pkg_name || data.pkg}`;
     }
 
-    if (familyMap[data.pkg_family]) {
-      familyMap[data.pkg_family].push([
-        data.pkg_name || data.pkg,
+    const [, , , , , category, pkg_family, pkg] = data.pkg_webpage.split("/");
+
+    if (familyMap[pkg_family || data.pkg_family]) {
+      familyMap[pkg_family || data.pkg_family].push([
+        category,
+        pkg,
         data.pkg_webpage,
       ]);
     } else {
-      familyMap[data.pkg_family] = [
-        [data.pkg_name || data.pkg, data.pkg_webpage],
+      familyMap[pkg_family || data.pkg_family] = [
+        [category, pkg, data.pkg_webpage],
       ];
     }
   });
@@ -84,7 +91,7 @@ const run = async (url, branch, arch) => {
   await run(binX86, "bincache", "x86_64-linux");
 
   console.log("⏲️ Downloading soarpkgs");
-  await run(soarpkgs, "soarpkgs", "linux");
+  await run(soarpkgs, "soarpkgs", "[category]");
 
   // console.log("⏲️ Downloading Community");
   // await run(community, "community", "universal-linux");

web/src/components/app.tsx

@@ -1,7 +1,7 @@
 import { Table, TableBody, TableCell, TableRow } from "./ui/table";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
 import { Badge } from "./ui/badge";
-import { ExternalLink, Image as ImageIcon, LucideTerminalSquare, Package, ScrollText, Download, Bug } from "lucide-react";
+import { ExternalLink, LucideTerminalSquare, Package, ScrollText, Download, Bug } from "lucide-react";
 import { buttonVariants } from "./ui/button";
 import { useClipboard } from "../hooks/use-clipboard";
 import FormulaLinks from "./formula-links";
@@ -10,9 +10,10 @@ interface AppProps {
   data: { [key: string]: any };
   logs: string;
   repo: string;
+  downloadable?: boolean;
 }
 
-type FieldType = "link" | "version" | "size" | "date" | "hash" | "files" | "number" | "metric" | "category" | "default" | "links" | "tags" | "repology" | "provides" | "string[]";
+type FieldType = "link" | "version" | "size" | "date" | "hash" | "files" | "number" | "metric" | "category" | "default" | "links" | "tags" | "repology" | "provides" | "string[]" | "license";
 
 interface ResolverField {
   label: string;
@@ -29,7 +30,7 @@ const resolver: { [key: string]: ResolverField } = {
   bsum: { label: "BLAKE3SUM", type: "hash" },
   repology: { label: "Repology", type: "repology" },
   appstream: { label: "AppStream", type: "link" },
-  license: { label: "License", type: "string[]", joinWith: ", " },
+  license: { label: "License", type: "license" },
   snapshots: { label: "Snapshots", type: "version" },
   tag: { label: "Tags", type: "tags" },
   app_id: { label: "Application ID", type: "default" },
@@ -49,10 +50,10 @@ const resolver: { [key: string]: ResolverField } = {
   icon: { label: "Icon", type: "link" },
   provides: { label: "Provides", type: "provides" },
   description: { label: "Description", type: "default" },
-  host: { label: "Host", type: "default" },
   pkg_type: { label: "Package Type", type: "default" },
   pkg_webpage: { label: "Package Webpage", type: "link" },
-  maintainer: { label: "Maintainer", type: "string[]", joinWith: ", " },
+  maintainer: { label: "Maintainer", type: "string[]", joinWith: "\n" },
+  host: { label: "Host", type: "tags" },
   rank: { label: "Rank", type: "metric" },
   build_ghactions: { label: "GH Actions Build", type: "link" },
   ghcr_blob: { label: "GHCR Blob", type: "link" },
@@ -175,6 +176,24 @@ function Show({ value, Key, props }: { value: any, props: AppProps, Key?: string
         </div>
       );
 
+    case "license":
+      const l = value as string[];
+      return (
+        <div className="flex flex-wrap gap-1">
+          {l.map((s) => {
+            return (
+              <div key={s} className="flex">
+                <a href={`https://spdx.org/licenses/${s}.html`} target="_blank" rel="noreferrer"
+                  className="underline underline-offset-4">
+                  <Badge className="bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-100">
+                    {s}
+                  </Badge>
+                </a>
+              </div>
+            );
+          })}
+        </div>
+      );
     case "repology":
       const repology = value as string[];
       return (
@@ -256,7 +275,7 @@ function Show({ value, Key, props }: { value: any, props: AppProps, Key?: string
   }
 }
 
-export default function App({ data, logs: build, repo }: AppProps) {
+export default function App({ data, logs: build, repo, downloadable = true }: AppProps) {
   const { copy, copied } = useClipboard();
 
   // Thanks @Azathothas for forcing us to write this hellifying script
@@ -276,7 +295,7 @@ export default function App({ data, logs: build, repo }: AppProps) {
             arch={data.host}
             family={pkg_family}
             name={pkg}
-            download_url={data.download_url}
+            download_url={downloadable ? data.download_url : "none"}
           />
           <Table className="border border-muted/70 mt-4 rounded-xl">
             <TableBody>

web/src/components/data-table.tsx

@@ -39,7 +39,7 @@ import binX86 from "../metadata_bincache_x86_64-linux.json";
 
 const binArm64 = import("../metadata_bincache_aarch64-linux.json");
 
-const soarPkgs = import("../metadata_soarpkgs_linux.json");
+const soarPkgs = import("../metadata_soarpkgs_[category].json");
 
 interface DataTableProps<TData, TValue> {
   columns: ColumnDef<TData, TValue>[]

web/src/components/formula-links.tsx

@@ -37,7 +37,7 @@ const FormulaLinks = ({ webpage_url, family, name, arch, repo, download_url }: P
             </div>
           </a>
 
-          <a
+          {download_url != "none" && <a
             href={downloadUrl.toString()}
             target="_blank"
             rel="noreferrer"
@@ -50,7 +50,7 @@ const FormulaLinks = ({ webpage_url, family, name, arch, repo, download_url }: P
                 /{family}/{name}/raw.dl
               </code>
             </div>
-          </a>
+          </a>}
         </div>
       </div>
     </div>

web/src/metadata_soarpkgs_[category].json

@@ -9,7 +9,7 @@ export async function getStaticPaths() {
     params: { family },
     props: {
       name: family,
-      apps: apps.map(([name, url]) => ({
+      apps: apps.map(([, name, url]) => ({
         name,
         url,
       })),