Skip to content

IEP-1585: Fixed eim old config import handling #1263

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
kolipakakondal merged 2 commits into from
Jul 4, 2025
Merged

IEP-1585: Fixed eim old config import handling #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ddbfe
IEP-1585: Fixed eim old config import handling
alirana01 Jul 3, 2025
b685003
fix for eim paths
alirana01 Jul 3, 2025
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
19 changes: 15 additions & 4 deletions bundles/com.espressif.idf.core/src/com/espressif/idf/core/tools/ToolInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,26 @@ public boolean isOldEspIdfConfigPresent()
return getOldConfigFile().exists();
}

public IStatus exportOldConfig(String eimPath) throws IOException
public IStatus exportOldConfig(Path eimPath) throws IOException
{
File oldConfig = getOldConfigFile();
if (oldConfig.exists())
{
// eim import pathToOldConfigJson
List<String> commands = new ArrayList<>();
commands.add(StringUtil.isEmpty(eimPath) ?
idfEnvironmentVariables.getEnvValue(IDFEnvironmentVariables.EIM_PATH) : eimPath);
String eimPathStr = StringUtil.EMPTY;

if (eimPath != null && Files.exists(eimPath))
{
eimPathStr = eimPath.toString();
}
else
{
return new Status(IStatus.ERROR, IDFCorePlugin.getId(), -1, "Cannot Convert EIM is not installed", null); //$NON-NLS-1$
}


commands.add(eimPathStr);
commands.add("import"); //$NON-NLS-1$
commands.add(oldConfig.getAbsolutePath());
Logger.log("Running: " + commands.toString()); //$NON-NLS-1$
Expand Down Expand Up @@ -123,7 +134,7 @@ public boolean isEspIdfSet()
return preferences.getBoolean(EimConstants.INSTALL_TOOLS_FLAG, false);
}

private Path getDefaultEimPath()
public Path getDefaultEimPath()
{
String userHome = System.getProperty("user.home"); //$NON-NLS-1$
Path defaultEimPath;
Expand Down
19 changes: 18 additions & 1 deletion bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/EspressifToolStartup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import org.eclipse.core.runtime.IProgressMonitor;
Expand Down Expand Up @@ -161,7 +162,23 @@ private void handleOldConfigExport()
{
try
{
IStatus status = toolInitializer.exportOldConfig(eimJson != null ? eimJson.getEimPath() : StringUtil.EMPTY);
// if eim json is present it means that it contains the updated path and we use that else we fallback to finding eim in default paths
Path eimPath;
String eimPathEnvVar = idfEnvironmentVariables.getEnvValue(IDFEnvironmentVariables.EIM_PATH);
if (eimJson != null)
{
eimPath = Paths.get(eimJson.getEimPath());
}
else if (!StringUtil.isEmpty(eimPathEnvVar))
{
eimPath = Paths.get(eimPathEnvVar);
}
else
{
eimPath = toolInitializer.getDefaultEimPath();
}

IStatus status = toolInitializer.exportOldConfig(eimPath);
Logger.log("Tools Conversion Process Message: ");
Logger.log(status.getMessage());
if (status.getSeverity() != IStatus.ERROR)
Expand Down
Loading