-
Notifications
You must be signed in to change notification settings - Fork 1
FEAT: Select specific ODF format #275
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
48 changes: 48 additions & 0 deletions
48
odf-apps/src/main/java/org/openpreservation/odf/apps/FormatsConverter.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.openpreservation.odf.apps; | ||
|
|
||
| import org.openpreservation.odf.fmt.Formats; | ||
| import org.openpreservation.odf.xml.DocumentType; | ||
|
|
||
| import picocli.CommandLine.ITypeConverter; | ||
|
|
||
|
carlwilson marked this conversation as resolved.
|
||
| public class FormatsConverter implements ITypeConverter<Formats> { | ||
| @Override | ||
| public Formats convert(final String value) throws Exception { | ||
|
carlwilson marked this conversation as resolved.
|
||
| final String search = value.toLowerCase().trim(); | ||
| Formats format = Formats.fromExtension(search); | ||
| if (format != Formats.UNKNOWN) { | ||
| return format; | ||
| } | ||
| format = Formats.fromMime(search); | ||
| if (format != Formats.UNKNOWN) { | ||
| return format; | ||
| } | ||
| DocumentType dt = null; | ||
| try { | ||
| dt = DocumentType.valueOf(search.toUpperCase()); | ||
| } catch (final IllegalArgumentException e) { | ||
|
carlwilson marked this conversation as resolved.
|
||
| /** | ||
| * Simply means that the document type was not found by name, continue searching. | ||
| */ | ||
| } | ||
| if (dt != null) { | ||
| return getFirstFormatFromDocumentType(dt); | ||
| } | ||
| dt = DocumentType.getTypeByBodyElement(search); | ||
| if (dt != null) { | ||
| return getFirstFormatFromDocumentType(dt); | ||
| } | ||
| dt = DocumentType.getTypeByMimeString(search); | ||
| if (dt != null) { | ||
|
carlwilson marked this conversation as resolved.
|
||
| return getFirstFormatFromDocumentType(dt); | ||
| } | ||
| return Formats.UNKNOWN; | ||
| } | ||
|
|
||
| final static private Formats getFirstFormatFromDocumentType(final DocumentType dt) { | ||
|
carlwilson marked this conversation as resolved.
|
||
| // NOTE: If the DocumentType has multiple associated formats, this will select the first format in the set, | ||
| // which may not align with user expectations. To ensure a specific format is chosen, specify the format | ||
| // extension or MIME type directly instead of the document type name. | ||
| return dt.getFormats().iterator().next(); | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Grammatical issue: "a document element name" should be "a document element name" - the example "e.g. spreadsheet" should use "e.g., spreadsheet" (with comma after "e.g.") for proper grammatical style.