Skip to content

Studio: Remove wp-content on import #489

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
kozer merged 4 commits into from
Sep 2, 2024
Merged

Studio: Remove wp-content on import #489

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c64387
Studio: Remove wp-content on import
kozer Aug 20, 2024
89da63a
Update: fix lint errors
kozer Aug 21, 2024
33b0867
Update: Delete file instead of moving to trash
kozer Aug 26, 2024
110efd8
Merge branch 'trunk' into fix/delete_wp_content_import
kozer Sep 2, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Studio: Remove wp-content on import
  • Loading branch information
@kozer
kozer committed Aug 20, 2024
commit 3c64387ecda54eec8bbfa41bab5254add1e1cd26
25 changes: 25 additions & 0 deletions src/lib/import-export/import/importers/importer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ abstract class BaseBackupImporter extends BaseImporter {
const dbPath = path.join( databaseDir, '.ht.sqlite' );

await this.moveExistingDatabaseToTrash( dbPath );
await this.moveExistingWpContentToTrash( rootPath );
await this.createEmptyDatabase( dbPath );
await this.importWpConfig( rootPath );
await this.importWpContent( rootPath );
Expand Down Expand Up @@ -156,6 +157,30 @@ abstract class BaseBackupImporter extends BaseImporter {
await shell.trashItem( dbPath );
}

protected async moveExistingWpContentToTrash( rootPath: string ): Promise< void > {
const wpContentDir = path.join( rootPath, 'wp-content' );
try {
if ( ! fs.existsSync( wpContentDir ) ) {
return;
}
const contentToKeep = [ 'mu-plugins', 'database', 'db.php' ];

const contents = await fsPromises.readdir( wpContentDir );

for ( const content of contents ) {
const contentPath = path.join( wpContentDir, content );

if ( contentToKeep.includes( content ) ) {
continue;
}

await shell.trashItem( contentPath );

@wojtekn wojtekn Aug 21, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's delete those instead of trashing them. Running multiple imports produces many plugins/themes/uploads entries in the trash, which can be confusing. The confirmation window already makes it clear that import will replace all files and the database.

Ideally, we back up the whole site directory before import starts and revert to that state if import fails, but it would be an idea for another issue. The current solution tries to implement that, but not in a robust way.
}
} catch {
return
}
}

protected async importWpConfig( rootPath: string ): Promise< void > {
if ( ! this.backup.wpConfig ) {
return;
Expand Down