Naively convert DatabaseFetcher to a class

Author: robertbrignull

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -2,7 +2,7 @@ import { window } from "vscode";
 import type { Octokit } from "@octokit/rest";
 import { showNeverAskAgainDialog } from "../../common/vscode/dialog";
 import { getLanguageDisplayName } from "../../common/query-language";
-import { downloadGitHubDatabaseFromUrl } from "../database-fetcher";
+import type { DatabaseFetcher } from "../database-fetcher";
 import { withProgress } from "../../common/vscode/progress";
 import type { DatabaseManager } from "../local-databases";
 import type { CodeQLCliServer } from "../../codeql-cli/cli";
@@ -59,6 +59,7 @@ export async function downloadDatabaseFromGitHub(
   repo: string,
   databases: CodeqlDatabase[],
   databaseManager: DatabaseManager,
+  databaseFetcher: DatabaseFetcher,
   storagePath: string,
   cliServer: CodeQLCliServer,
   commandManager: AppCommandManager,
@@ -72,7 +73,7 @@ export async function downloadDatabaseFromGitHub(
     selectedDatabases.map((database) =>
       withProgress(
         async (progress) => {
-          await downloadGitHubDatabaseFromUrl(
+          await databaseFetcher.downloadGitHubDatabaseFromUrl(
             database.url,
             database.id,
             database.created_at,

extensions/ql-vscode/src/databases/github-databases/download.ts

@@ -24,6 +24,7 @@ import {
   isNewerDatabaseAvailable,
 } from "./updates";
 import type { Octokit } from "@octokit/rest";
+import type { DatabaseFetcher } from "../database-fetcher";
 
 export class GitHubDatabasesModule extends DisposableObject {
   /**
@@ -33,6 +34,7 @@ export class GitHubDatabasesModule extends DisposableObject {
   constructor(
     private readonly app: App,
     private readonly databaseManager: DatabaseManager,
+    private readonly databaseFetcher: DatabaseFetcher,
     private readonly databaseStoragePath: string,
     private readonly cliServer: CodeQLCliServer,
     private readonly config: GitHubDatabaseConfig,
@@ -43,13 +45,15 @@ export class GitHubDatabasesModule extends DisposableObject {
   public static async initialize(
     app: App,
     databaseManager: DatabaseManager,
+    databaseFetcher: DatabaseFetcher,
     databaseStoragePath: string,
     cliServer: CodeQLCliServer,
     config: GitHubDatabaseConfig,
   ): Promise<GitHubDatabasesModule> {
     const githubDatabasesModule = new GitHubDatabasesModule(
       app,
       databaseManager,
+      databaseFetcher,
       databaseStoragePath,
       cliServer,
       config,
@@ -186,6 +190,7 @@ export class GitHubDatabasesModule extends DisposableObject {
       repo,
       databases,
       this.databaseManager,
+      this.databaseFetcher,
       this.databaseStoragePath,
       this.cliServer,
       this.app.commands,
@@ -212,6 +217,7 @@ export class GitHubDatabasesModule extends DisposableObject {
       repo,
       databaseUpdates,
       this.databaseManager,
+      this.databaseFetcher,
       this.databaseStoragePath,
       this.cliServer,
       this.app.commands,

extensions/ql-vscode/src/databases/github-databases/github-databases-module.ts

@@ -5,7 +5,7 @@ import type { CodeQLCliServer } from "../../codeql-cli/cli";
 import type { AppCommandManager } from "../../common/commands";
 import { getLanguageDisplayName } from "../../common/query-language";
 import { showNeverAskAgainDialog } from "../../common/vscode/dialog";
-import { downloadGitHubDatabaseFromUrl } from "../database-fetcher";
+import type { DatabaseFetcher } from "../database-fetcher";
 import { withProgress } from "../../common/vscode/progress";
 import { window } from "vscode";
 import type { GitHubDatabaseConfig } from "../../config";
@@ -156,6 +156,7 @@ export async function downloadDatabaseUpdateFromGitHub(
   repo: string,
   updates: DatabaseUpdate[],
   databaseManager: DatabaseManager,
+  databaseFetcher: DatabaseFetcher,
   storagePath: string,
   cliServer: CodeQLCliServer,
   commandManager: AppCommandManager,
@@ -179,21 +180,22 @@ export async function downloadDatabaseUpdateFromGitHub(
 
       return withProgress(
         async (progress) => {
-          const newDatabase = await downloadGitHubDatabaseFromUrl(
-            database.url,
-            database.id,
-            database.created_at,
-            database.commit_oid ?? null,
-            owner,
-            repo,
-            octokit,
-            progress,
-            databaseManager,
-            storagePath,
-            cliServer,
-            databaseManager.currentDatabaseItem === update.databaseItem,
-            update.databaseItem.hasSourceArchiveInExplorer(),
-          );
+          const newDatabase =
+            await databaseFetcher.downloadGitHubDatabaseFromUrl(
+              database.url,
+              database.id,
+              database.created_at,
+              database.commit_oid ?? null,
+              owner,
+              repo,
+              octokit,
+              progress,
+              databaseManager,
+              storagePath,
+              cliServer,
+              databaseManager.currentDatabaseItem === update.databaseItem,
+              update.databaseItem.hasSourceArchiveInExplorer(),
+            );
           if (newDatabase === undefined) {
             return;
           }

extensions/ql-vscode/src/databases/github-databases/updates.ts

@@ -42,11 +42,7 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogErrorMessage,
 } from "../common/logging";
-import {
-  importArchiveDatabase,
-  promptImportGithubDatabase,
-  promptImportInternetDatabase,
-} from "./database-fetcher";
+import { DatabaseFetcher } from "./database-fetcher";
 import { asError, asyncFilter, getErrorMessage } from "../common/helpers-pure";
 import type { QueryRunner } from "../query-server";
 import type { App } from "../common/app";
@@ -540,7 +536,7 @@ export class DatabaseUI extends DisposableObject {
   private async handleChooseDatabaseInternet(): Promise<void> {
     return withProgress(
       async (progress) => {
-        await promptImportInternetDatabase(
+        await new DatabaseFetcher().promptImportInternetDatabase(
           this.app.commands,
           this.databaseManager,
           this.storagePath,
@@ -557,7 +553,7 @@ export class DatabaseUI extends DisposableObject {
   private async handleChooseDatabaseGithub(): Promise<void> {
     return withProgress(
       async (progress) => {
-        await promptImportGithubDatabase(
+        await new DatabaseFetcher().promptImportGithubDatabase(
           this.app,
           this.databaseManager,
           this.storagePath,
@@ -712,7 +708,7 @@ export class DatabaseUI extends DisposableObject {
         try {
           // Assume user has selected an archive if the file has a .zip extension
           if (uri.path.endsWith(".zip")) {
-            await importArchiveDatabase(
+            await new DatabaseFetcher().importArchiveDatabase(
               this.app.commands,
               uri.toString(true),
               this.databaseManager,
@@ -959,7 +955,7 @@ export class DatabaseUI extends DisposableObject {
         } else {
           // we are selecting a database archive. Must unzip into a workspace-controlled area
           // before importing.
-          return await importArchiveDatabase(
+          return await new DatabaseFetcher().importArchiveDatabase(
             this.app.commands,
             uri.toString(true),
             this.databaseManager,

extensions/ql-vscode/src/databases/local-databases-ui.ts

@@ -133,6 +133,7 @@ import { OpenReferencedFileCodeLensProvider } from "./local-queries/open-referen
 import { LanguageContextStore } from "./language-context-store";
 import { LanguageSelectionPanel } from "./language-selection-panel/language-selection-panel";
 import { GitHubDatabasesModule } from "./databases/github-databases";
+import { DatabaseFetcher } from "./databases/database-fetcher";
 
 /**
  * extension.ts
@@ -881,6 +882,7 @@ async function activateWithInstalledDistribution(
   await GitHubDatabasesModule.initialize(
     app,
     dbm,
+    new DatabaseFetcher(),
     getContextStoragePath(ctx),
     cliServer,
     githubDatabaseConfigListener,

extensions/ql-vscode/src/extension.ts

@@ -51,6 +51,7 @@ import type { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
 import { tryGetQueryLanguage } from "../common/query-language";
 import type { LanguageContextStore } from "../language-context-store";
 import type { ExtensionApp } from "../common/vscode/vscode-app";
+import { DatabaseFetcher } from "../databases/database-fetcher";
 
 export enum QuickEvalType {
   None,
@@ -330,6 +331,7 @@ export class LocalQueries extends DisposableObject {
           progress,
           this.app,
           this.databaseManager,
+          new DatabaseFetcher(),
           contextStoragePath,
           this.selectedQueryTreeViewItems,
           language,

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -19,10 +19,7 @@ import {
   UserCancellationException,
   withProgress,
 } from "../common/vscode/progress";
-import {
-  askForGitHubRepo,
-  downloadGitHubDatabase,
-} from "../databases/database-fetcher";
+import type { DatabaseFetcher } from "../databases/database-fetcher";
 import {
   getQlPackLocation,
   isCodespacesTemplate,
@@ -62,6 +59,7 @@ export class SkeletonQueryWizard {
     private readonly progress: ProgressCallback,
     private readonly app: App,
     private readonly databaseManager: DatabaseManager,
+    private readonly databaseFetcher: DatabaseFetcher,
     private readonly databaseStoragePath: string | undefined,
     private readonly selectedItems: readonly QueryTreeViewItem[],
     private language: QueryLanguage | undefined = undefined,
@@ -378,13 +376,16 @@ export class SkeletonQueryWizard {
     });
 
     const githubRepoNwo = QUERY_LANGUAGE_TO_DATABASE_REPO[this.language];
-    const chosenRepo = await askForGitHubRepo(undefined, githubRepoNwo);
+    const chosenRepo = await this.databaseFetcher.askForGitHubRepo(
+      undefined,
+      githubRepoNwo,
+    );
 
     if (!chosenRepo) {
       throw new UserCancellationException("No GitHub repository provided");
     }
 
-    await downloadGitHubDatabase(
+    await this.databaseFetcher.downloadGitHubDatabase(
       chosenRepo,
       this.app,
       this.databaseManager,

extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts

@@ -29,7 +29,7 @@ import type {
 } from "../databases/local-databases";
 import type { CodeQLCliServer } from "../codeql-cli/cli";
 import { asError, assertNever, getErrorMessage } from "../common/helpers-pure";
-import { promptImportGithubDatabase } from "../databases/database-fetcher";
+import { DatabaseFetcher } from "../databases/database-fetcher";
 import type { App } from "../common/app";
 import { redactableError } from "../common/errors";
 import {
@@ -916,16 +916,17 @@ export class ModelEditorView extends AbstractWebview<
     // the user to import the library database. We need to have the database
     // imported to the query server, so we need to register it to our workspace.
     const makeSelected = false;
-    const addedDatabase = await promptImportGithubDatabase(
-      this.app,
-      this.databaseManager,
-      this.app.workspaceStoragePath ?? this.app.globalStoragePath,
-      progress,
-      this.cliServer,
-      this.databaseItem.language,
-      makeSelected,
-      false,
-    );
+    const addedDatabase =
+      await new DatabaseFetcher().promptImportGithubDatabase(
+        this.app,
+        this.databaseManager,
+        this.app.workspaceStoragePath ?? this.app.globalStoragePath,
+        progress,
+        this.cliServer,
+        this.databaseItem.language,
+        makeSelected,
+        false,
+      );
     if (!addedDatabase) {
       void this.app.logger.log("No database chosen");
       return;

extensions/ql-vscode/src/model-editor/model-editor-view.ts

@@ -3,10 +3,7 @@ import { Uri, window } from "vscode";
 
 import type { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import type { DatabaseManager } from "../../../../src/databases/local-databases";
-import {
-  importArchiveDatabase,
-  promptImportInternetDatabase,
-} from "../../../../src/databases/database-fetcher";
+import { DatabaseFetcher } from "../../../../src/databases/database-fetcher";
 import {
   cleanDatabases,
   dbLoc,
@@ -49,7 +46,7 @@ describe("database-fetcher", () => {
   describe("importArchiveDatabase", () => {
     it("should add a database from a folder", async () => {
       const uri = Uri.file(dbLoc);
-      let dbItem = await importArchiveDatabase(
+      let dbItem = await new DatabaseFetcher().importArchiveDatabase(
         createMockCommandManager(),
         uri.toString(true),
         databaseManager,
@@ -71,7 +68,7 @@ describe("database-fetcher", () => {
       // Provide a database URL when prompted
       inputBoxStub.mockResolvedValue(DB_URL);
 
-      let dbItem = await promptImportInternetDatabase(
+      let dbItem = await new DatabaseFetcher().promptImportInternetDatabase(
         createMockCommandManager(),
         databaseManager,
         storagePath,