Skip to content

CLI: Lock language pack setup #3492

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

Open
chubes4 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CLI: Lock language pack setup #3492

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
42 changes: 31 additions & 11 deletions apps/cli/lib/dependency-management/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
import fs from 'fs';
import path from 'path';
import { LOCKFILE_STALE_TIME, LOCKFILE_WAIT_TIME } from '@studio/common/constants';
import { recursiveCopyDirectory } from '@studio/common/lib/fs-utils';
import { lockFileAsync, unlockFileAsync } from '@studio/common/lib/lockfile';
import semver from 'semver';
import { readCliConfig, updateCliConfigWithPartial } from 'cli/lib/cli-config/core';
import { getLanguagePacksPath, getWordPressVersionPath, getWpFilesPath } from './paths';
import { areDirectoriesDifferentBySizeAndMtime } from './utils';
import { getWordPressVersionFromInstallation, updateLatestWordPressVersion } from './wordpress';

async function withLanguagePacksSetupLock< T >(
lockPath: string,
fn: () => Promise< T >
): Promise< T > {
await fs.promises.mkdir( path.dirname( lockPath ), { recursive: true } );
await lockFileAsync( lockPath, {
wait: LOCKFILE_WAIT_TIME,
stale: LOCKFILE_STALE_TIME,
} );
try {
return await fn();
} finally {
await unlockFileAsync( lockPath );
}
}

// Compare the WordPress version in the bundled `wp-files/latest/wordpress` directory (that ships
// with the CLI) to `~/.studio/server-files/wordpress-versions/latest`. If the bundled directory is
// newer, rename the old `wordpress-versions/latest` directory to `wordpress-versions/$VERSION` and
Expand Down Expand Up @@ -42,18 +60,20 @@ async function copyBundledLanguagePacks() {
return;
}
const targetLanguagePacksPath = getLanguagePacksPath();
const isSourceDirectoryDifferent = await areDirectoriesDifferentBySizeAndMtime(
sourceLanguagePacksPath,
targetLanguagePacksPath
);
if ( isSourceDirectoryDifferent ) {
try {
await fs.promises.rm( targetLanguagePacksPath, { recursive: true, force: true } );
} catch {
// Do nothing if the target directory is missing or corrupted
await withLanguagePacksSetupLock( `${ targetLanguagePacksPath }.lock`, async () => {
const isSourceDirectoryDifferent = await areDirectoriesDifferentBySizeAndMtime(
sourceLanguagePacksPath,
targetLanguagePacksPath
);
if ( isSourceDirectoryDifferent ) {
try {
await fs.promises.rm( targetLanguagePacksPath, { recursive: true, force: true } );
} catch {
// Do nothing if the target directory is missing or corrupted
}
await recursiveCopyDirectory( sourceLanguagePacksPath, targetLanguagePacksPath );
}
await recursiveCopyDirectory( sourceLanguagePacksPath, targetLanguagePacksPath );
}
} );
}

export async function setupServerFiles() {
Expand Down