[
https://issues.apache.org/jira/browse/DOXIATOOLS-75?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17683363#comment-17683363
]
ASF GitHub Bot commented on DOXIATOOLS-75:
------------------------------------------
michael-o commented on code in PR #38:
URL:
https://github.com/apache/maven-doxia-converter/pull/38#discussion_r1094401251
##########
src/main/java/org/apache/maven/doxia/cli/CLIManager.java:
##########
@@ -159,8 +164,12 @@ private static String getSupportedFormatAndEncoding()
private static String getSupportedFormat()
{
- return "\nSupported Formats:\n from: " + join(
DefaultConverter.SUPPORTED_FROM_FORMAT, ", " )
- + " or autodetect" + "\n to: " + join(
DefaultConverter.SUPPORTED_TO_FORMAT, ", " )
+ String fromFormats = EnumSet.allOf(
DefaultConverter.ParserFormat.class ).stream()
+ .map( f -> f.toString().toLowerCase() ).collect(
Collectors.joining( ", " ) );
+ String toFormats = EnumSet.allOf( DefaultConverter.SinkFormat.class
).stream()
+ .map( f -> f.toString().toLowerCase() ).collect(
Collectors.joining( ", " ) );
+ return "\nSupported Formats:\n from: " + fromFormats
+ + " or " + AUTO_FORMAT + "\n to: " + toFormats
+ "\n";
Review Comment:
use system LS
##########
src/main/java/org/apache/maven/doxia/DefaultConverter.java:
##########
@@ -125,10 +120,172 @@
private static final String MARKDOWN_SINK = "markdown";
- /** Supported output format, i.e. supported Doxia Sink */
- public static final String[] SUPPORTED_TO_FORMAT =
- { APT_SINK, CONFLUENCE_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK,
LATEX_SINK, MARKDOWN_SINK, RTF_SINK, TWIKI_SINK,
- XDOC_SINK, XHTML_SINK, XHTML5_SINK };
+ /**
+ * All supported source formats
+ */
+ public enum ParserFormat
+ {
+ APT( APT_PARSER, "apt" ),
+ CONFLUENCE( CONFLUENCE_PARSER, "confluence" ),
+ DOCBOOK( DOCBOOK_PARSER, "xml", "article" ),
+ FML( FML_PARSER, "fml", "faqs" ),
+ TWIKI( TWIKI_PARSER, "twiki" ),
+ XDOC( XDOC_PARSER, "xml", "document" ),
+ XHTML( XHTML_PARSER, "html", "html" ),
+ XHTML5( XHTML5_PARSER, "html" ), // no autodetect support
+ MARKDOWN( MARKDOWN_PARSER, "md" );
Review Comment:
Wouldn't it make sense to move Doxia 2.0 first before handling removed
format?
> Replace extensions and keep subdirectories when converting directories
> ----------------------------------------------------------------------
>
> Key: DOXIATOOLS-75
> URL: https://issues.apache.org/jira/browse/DOXIATOOLS-75
> Project: Maven Doxia Tools
> Issue Type: Bug
> Components: Doxia Converter
> Affects Versions: doxia-converter-1.3
> Reporter: Konrad Windszus
> Assignee: Konrad Windszus
> Priority: Major
> Fix For: doxia-converter-1.4
>
>
> When a full directory is given to the CLI argument {{in}} the output files
> don't replace the extension of the input files but just append the one of the
> target format. In addition the subfolder structure is lost. Also only files
> having an extension which is equal to the given {{-from}} value are found.
> For example when using
> {code:java}
> java -jar doxia-converter-1.3-jar-with-dependencies.jar -in
> maven-site/content/apt -from apt -out maven-site/content/markdown -to markdown
> {code}
> the following files are created:
> {{maven-site/content/markdown/central-index.apt.markdown}} (from source file
> [https://github.com/apache/maven-site/blob/master/content/apt/repository/central-index.apt]),
> while the expected target file name would rather be
> {{maven-site/content/markdown/repository/central-index.markdown}}
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
