Skip to content

Removed glob usage from JDK Downloader #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Removed glob usage from JDK Downloader #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions vscode/src/jdkDownloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import * as vscode from 'vscode';
import * as crypto from 'crypto';
import { handleLog } from './extension';
import { promisify } from 'util';
import * as glob from 'glob';

let customView: vscode.WebviewPanel;
let logger: vscode.OutputChannel;
Expand Down Expand Up @@ -190,8 +189,9 @@ export async function extractJDK(jdkTarballPath: string, extractionTarget: strin
const downloadedDir = path.join(__dirname, 'jdk_downloads');

// Remove already present version of a particular JDK from temp dir
const oldTempExtractedDirs = glob.sync(`jdk-${jdkVersion}*`, { cwd: downloadedDir });
for await (const oldDirName of oldTempExtractedDirs) {
const oldDirs = await fs.promises.readdir(downloadedDir);
const matchingOldDirs = oldDirs.filter(file => file.startsWith(`jdk-${jdkVersion}`));
for await (const oldDirName of matchingOldDirs) {
await fs.promises.rmdir(path.join(downloadedDir, oldDirName), { recursive: true });
}

Expand All @@ -204,7 +204,9 @@ export async function extractJDK(jdkTarballPath: string, extractionTarget: strin
if (error) {
vscode.window.showErrorMessage('Error: ' + error);
} else {
const tempDirName = glob.sync(`jdk-${jdkVersion}*`, { cwd: downloadedDir })?.[0];
const dirsPresent = await fs.promises.readdir(downloadedDir);
const matchingJdkDir = dirsPresent.filter(file => file.startsWith(`jdk-${jdkVersion}`));
const tempDirName = matchingJdkDir[0] || "";
tempDirectoryPath = path.join(downloadedDir, tempDirName);
// If directory with same name is present in the user selected download location then ask user if they want to delete it or not?
const newDirName = `${jdkType.split(' ').join('_')}-${jdkVersion}`;
Expand Down