From 68096028d37e27133fd836e9c6ee8ecfa9a9df3e Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 24 Mar 2021 12:56:28 +0100 Subject: [PATCH] improve file migration --- apps/remix-ide/src/migrateFileSystem.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide/src/migrateFileSystem.js b/apps/remix-ide/src/migrateFileSystem.js index 00143368f5..797d581eaa 100644 --- a/apps/remix-ide/src/migrateFileSystem.js +++ b/apps/remix-ide/src/migrateFileSystem.js @@ -26,13 +26,24 @@ export async function migrateToWorkspace (fileManager, filePanel) { const workspaceProvider = fileManager.getProvider('workspace') const files = await browserProvider.copyFolderToJson('/') console.log(files) + + if (Object.keys(files).length === 0) { + // we don't have any root file, only .workspaces + // don't need to create a workspace + throw new Error('No file to migrate') + } + + if (Object.keys(files).length === 1 && files['/.workspaces']) { + // we don't have any root file, only .workspaces + // don't need to create a workspace + throw new Error('No file to migrate') + } + const workspaceName = 'workspace_migrated_' + Date.now() await filePanel.processCreateWorkspace(workspaceName) filePanel.getWorkspaces() // refresh list - if (Object.keys(files).length > 0) { - const workspacePath = joinPath('browser', workspaceProvider.workspacesPath, workspaceName) - await populateWorkspace(workspacePath, files, browserProvider) - } + const workspacePath = joinPath('browser', workspaceProvider.workspacesPath, workspaceName) + await populateWorkspace(workspacePath, files, browserProvider) return workspaceName }