Skip to content

EDM converter: Create output path folders #3572

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
kasemir merged 3 commits into from
Sep 30, 2025
Merged

EDM converter: Create output path folders #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7aa72
EDM auto converter: Create output folders
Sep 29, 2025
6f6bd26
EDM converter: Strip some prefs
Sep 30, 2025
6229c41
typo
Sep 30, 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
7 changes: 4 additions & 3 deletions ...ay/convert-edm/src/main/java/org/csstudio/display/converter/edm/ConverterPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019-2022 Oak Ridge National Laboratory.
* Copyright (c) 2019-2025 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -66,6 +66,7 @@ public FontMapping(final String pattern, final String font_name)
logger.log(Level.WARNING, "Cannot parse font_mappings", ex);
}

edm_paths_config = edm_paths_config.strip();
if (! edm_paths_config.isEmpty())
try
{
Expand All @@ -76,8 +77,8 @@ public FontMapping(final String pattern, final String font_name)
logger.log(Level.WARNING, "Cannot parse paths from " + edm_paths_config, ex);
}

final String dir = prefs.get("auto_converter_dir");
if (dir.isBlank())
final String dir = prefs.get("auto_converter_dir").strip();
if (dir.isEmpty())
auto_converter_dir = null;
else
{
Expand Down
9 changes: 7 additions & 2 deletions ...isplay/convert-edm/src/main/java/org/csstudio/display/converter/edm/EdmAutoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019-2022 Oak Ridge National Laboratory.
* Copyright (c) 2019-2025 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -10,6 +10,7 @@
import static org.csstudio.display.converter.edm.Converter.logger;

import java.io.File;
import java.nio.file.Files;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Semaphore;
import java.util.logging.Level;
Expand Down Expand Up @@ -142,7 +143,11 @@ private DisplayModel doConvert(final String display_path) throws Exception
// Convert EDM input
logger.log(Level.INFO, "Converting " + input + " into " + output);
locator.setPrefix(new File(display_file).getParent());
new EdmConverter(input, locator).write(output);
final EdmConverter converter = new EdmConverter(input, locator);

// Save EDM file to potentially new folder
Files.createDirectories(output.getParentFile().toPath());
converter.write(output);

// Return DisplayModel of the converted file
return ModelLoader.loadModel(output.getPath());
Expand Down