feat(backend): allow regenerating all package data via env var

chaotic-cx · Nov 8, 2024 · 418a76a · 418a76a
1 parent 5cf5e2a
commit 418a76a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/backend/src/config/repo-manager.config.ts b/backend/src/config/repo-manager.config.ts
@@ -7,5 +7,6 @@ export default registerAs("repoMan", () => ({
     gitlabToken: process.env.CAUR_GITLAB_TOKEN,
     globalBlacklist: process.env.REPOMANAGER_NEVER_REBUILD ?? "[]",
     globalTriggers: process.env.REPOMANAGER_ALWAYS_REBUILD ?? "[]",
+    regenDatabase: process.env.REPOMANAGER_REGEN_DB ?? false,
     schedulerInterval: process.env.REPOMANAGER_SCHEDULE ?? "0 * * * *",
 }));
diff --git a/backend/src/interfaces/repo-manager.ts b/backend/src/interfaces/repo-manager.ts
@@ -51,6 +51,7 @@ export interface RepoSettings {
     gitlabToken: string;
     globalBlacklist: string[];
     globalTriggers: string[];
+    regenDatabase: boolean;
 }
 
 export interface RepoUpdateRunParams {

diff --git a/backend/src/repo-manager/repo-manager.entity.ts b/backend/src/repo-manager/repo-manager.entity.ts
@@ -1,7 +1,7 @@
 import { Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, Repository } from "typeorm";
 import { Mutex } from "async-mutex";
 import { Logger } from "@nestjs/common";
-import { BumpType, TriggerType } from "../interfaces/repo-manager";
+import { BumpType, ParsedPackageMetadata, TriggerType } from "../interfaces/repo-manager";
 import { Package } from "../builder/builder.entity";
 
 @Entity()
@@ -22,13 +22,13 @@ export class ArchlinuxPackage {
     arch: string;
 
     @Column({ type: "timestamp", nullable: true })
-    lastUpdated: string;
+    lastUpdated: Date;
 
     @Column({ type: "varchar", nullable: true })
     previousVersion: string;
 
     @Column({ type: "jsonb", nullable: true })
-    metadata: string;
+    metadata: ParsedPackageMetadata;
 }
 
 @Entity()

diff --git a/backend/src/repo-manager/repo-manager.service.ts b/backend/src/repo-manager/repo-manager.service.ts
@@ -169,6 +169,7 @@ export class RepoManagerService {
                 globalTriggers ?? JSON.parse(this.configService.getOrThrow<string>("repoMan.globalTriggers")),
             globalBlacklist:
                 globalBlackList ?? JSON.parse(this.configService.getOrThrow<string>("repoMan.globalBlacklist")),
+            regenDatabase: this.configService.getOrThrow("repoMan.regenDatabase"),
         };
 
         return new RepoManager(
@@ -572,7 +573,6 @@ class RepoManager {
             const configFile: string = path.join(repoDir, pkgbaseDir, ".CI", "config");
             const pkgConfig: PackageConfig = await this.readPackageConfig(configFile, pkgbaseDir);
             const metadata: ParsedPackageMetadata = pkgConfig.pkgInDb.metadata;
-            let dbObject: ArchlinuxPackage;
             let foundTrigger = false;
 
             archRebuildPkg = this.changedArchPackages.filter((pkg) => {
@@ -590,7 +590,7 @@ class RepoManager {
                     triggerFrom: TriggerType.ARCH,
                 });
 
-                Logger.debug(`Rebuilding ${pkgbaseDir} because of explicit trigger ${dbObject.pkgname}`, "RepoManager");
+                Logger.debug(`Rebuilding ${pkgbaseDir} because of explicit trigger ${archRebuildPkg[0].pkgname}`, "RepoManager");
                 continue;
             }
 
@@ -668,6 +668,7 @@ class RepoManager {
                                 provides: string[];
                             } = soProvidingArchPackages.find((pkg) => pkg.provides?.includes(depPkg));
 
+
                             if (foundSoProvider) {
                                 trigger = foundSoProvider.pkg;
                                 break;
@@ -1009,18 +1010,20 @@ class RepoManager {
         for (const pkg of currentArchVersions) {
             archPkg = await archPkgExists(pkg, this.dbConnections.archPkg);
 
-            if (archPkg.version && archPkg.version === pkg.version) {
+            if (!this.repoManagerSettings.regenDatabase && archPkg.version && archPkg.version === pkg.version) {
                 continue;
             }
 
-            Logger.log(`Package ${pkg.name} has changed, updating records`, "RepoManager");
-
-            archPkg.previousVersion = archPkg.version;
-            archPkg.lastUpdated = new Date().toISOString();
+            // If we update records, don't
+            if (!this.repoManagerSettings.regenDatabase) {
+                Logger.log(`Package ${pkg.name} has changed, updating records`, "RepoManager");
+                archPkg.previousVersion = archPkg.version;
+                archPkg.lastUpdated = new Date();
+            }
             archPkg.version = pkg.version;
             archPkg.arch = ARCH;
             archPkg.pkgrel = pkg.pkgrel;
-            archPkg.metadata = JSON.stringify(pkg.metaData);
+            archPkg.metadata = pkg.metaData;
 
             void this.dbConnections.archPkg.save(archPkg);
 
@@ -1067,7 +1070,7 @@ class RepoManager {
     }
 
     /**
-     * Parse the files file of a package and return the shared object names.
+     * Parse the .files file of a package and return the shared object names.
      * @param filesFile The path to the files file
      * @returns An array of shared object names
      * @private
@@ -1388,7 +1391,7 @@ class RepoManager {
         try {
             for (const archPkg of packages) {
                 if (archPkg.metadata) {
-                    const metadata = JSON.parse(archPkg.metadata) as ParsedPackageMetadata;
+                    const metadata: ParsedPackageMetadata = archPkg.metadata;
                     if (metadata.provides) {
                         for (const provided of metadata.provides) {
                             if (provided.match(/\.so=\d+-\d+/)) {

diff --git a/backend/webpack.config.cjs b/backend/webpack.config.cjs
@@ -12,7 +12,7 @@ module.exports = {
             main: "./src/main.ts",
             tsConfig: "./tsconfig.app.json",
             assets: [],
-            optimization: true,
+            optimization: false,
             outputHashing: "none",
             generatePackageJson: true,
         }),