Import/export network from/to folder #3092
Open
+268
−132
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonenst
force-pushed
the
disambiguateimport
branch
from
2dbe40a
to
2c21ab3
Compare
jonenst
force-pushed
the
importfolders2
branch
from
90d5275
to
c99bf83
Compare
jonenst
force-pushed
the
importfolders2
branch
from
c99bf83
to
38d18e8
Compare
Signed-off-by: HARPER Jon <jon.harper87@gmail.com>
jonenst
force-pushed
the
importfolders2
branch
from
38d18e8
to
91efeeb
Compare
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
flo-dup
changed the title
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
flo-dup
approved these changes
Sep 24, 2024
rolnico
approved these changes
Sep 24, 2024
|
jonenst
commented
Sep 24, 2024
| filter filenames to only keep those starting with the base name. This behaviour basename-filtering only occurs if | ||
| `allFiles` is set to `false` in the datasource. | ||
| Setting `allFiles` to `true` is for example very useful for the CGMES use case, in which a network is defined by | ||
| several files (TP, EQ, SV, SSH, GL, ...), often without a common prefix (base name). |
There was a problem hiding this comment.
Suggested change
| several files (TP, EQ, SV, SSH, GL, ...), often without a common prefix (base name). | |
| several files (TP, EQ, SV, SSH, GL, ...), often without a common prefix (base name). This makes the DirectoryDataSource behave just like an ArchiveDataSource. |
jonenst
commented
Sep 24, 2024
| DataSourceBuilder dataSourceBuilder = new DataSourceBuilder().withObserver(observer); | ||
| if (Files.isDirectory(fileOrDirectory)) { | ||
| dataSourceBuilder.withDirectory(fileOrDirectory) | ||
| .withBaseName(fileOrDirectory.getFileName().toString()) |
There was a problem hiding this comment.
Suggested change
| .withBaseName(fileOrDirectory.getFileName().toString()) | |
| // we use the full directoryname here instead of a parsed representation using FileInformation | |
| // this is required for now to allow directories with dots but without the dataextension (like "microgrid.v1.complete/") | |
| // otherwise Fileinformation interprets the part after the dot as the dataextension. This has the drawback that | |
| // directories with a dataextension (e.g. "network.xiidm/") will be rejected/mishandled because we will use | |
| // a file named "network.xiidm.xiidm" inside it | |
| // NOTE: this does not occur if the directory has a dot and also has the dataextension: "microgrid.v1.complete.xml/" works | |
| // NOTE2: Maybe this can be fixed in the future by looking more at what is inside the directory and we can remove this | |
| .withBaseName(fileOrDirectory.getFileName().toString()) |
There was a problem hiding this comment.
This should go in the javadoc more than in a simple comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
No
What kind of change does this PR introduce?
feature
What is the current behavior?
Impossible to import a CGMES network described by several files in the same folder (one needs to zip the files)
What is the new behavior (if this is a feature change)?
It is now possible to import/export a CGMES network by giving the corresponding folder using
Network::readorNetwork::writemethodsDoes this PR introduce a breaking change or deprecate an API?
Other information:
alternative to #3086