Skip to content

Improve available RDF format printing #83

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
Ostrzyciel merged 1 commit into from
Apr 16, 2025
Merged

Improve available RDF format printing #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/scala/eu/neverblink/jelly/cli/command/rdf/RdfValidate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ case class RdfValidateOptions(
compareToRdfFile: Option[String] = None,
@HelpMessage(
"Format of the RDF file to compare the input stream to. If not specified, the format is " +
"inferred from the file name.",
"inferred from the file name. " + RdfValidatePrint.validFormatsString,
)
compareToFormat: Option[String] = None,
@HelpMessage(
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/eu/neverblink/jelly/cli/command/rdf/util/RdfCommandPrintUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trait RdfCommandPrintUtil[F <: RdfFormat](using tt: TypeTest[RdfFormat, F]):
/** Prints the available RDF formats to the user.
*/
lazy val validFormatsString: String =
validFormats.map(RdfFormat.optionString).mkString(", ")
validFormats.map(RdfFormat.optionString).mkString("; ")

lazy val helpMsg: String =
f"Possible values: ${validFormatsString}. Default format: ${defaultFormat.fullName}"
f"Possible values: ${validFormatsString}. Default: ${defaultFormat.fullName}"
6 changes: 3 additions & 3 deletions src/main/scala/eu/neverblink/jelly/cli/command/rdf/util/RdfFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ object RdfFormat:
// We do not ever want to write or read from Jelly to Jelly
// So better not have it as Writeable or Readable, just mark that it's integrated into Jena
case object JellyBinary extends RdfFormat.Jena:
override val fullName: String = "Jelly binary format"
override val fullName: String = "Jelly binary"
override val cliOptions: List[String] = List("jelly")
override val jenaLang: Lang = JellyLanguage.JELLY

case object JellyText extends RdfFormat, RdfFormat.Writeable, RdfFormat.Readable:
override val fullName: String = "Jelly text format"
override val fullName: String = "Jelly text"
override val cliOptions: List[String] = List("jelly-text")
val extension = ".jelly.txt"

Expand All @@ -79,7 +79,7 @@ object RdfFormat:
/** Returns a string representation of the option for the user.
*/
def optionString(option: RdfFormat): String =
f"${option.cliOptions.map(s => f"\"${s}\"").mkString(", ")} for ${option.fullName}"
f"${option.fullName}: ${option.cliOptions.map(s => f"$s").mkString(", ")}"

/** Finds the appropriate RdfFormat based on supplied option string.
*/
Expand Down