for --import-picture-from, allow MIME type in specification to be blank and filled in automatically; allow specification to be just the filename, with other fields filled in automatically

2 files changed, 17 insertions, 13 deletions

diff --git a/man/metaflac.sgml b/man/metaflac.sgml
index cb686f3b..57f9b6b5 100644
--- a/man/metaflac.sgml
+++ b/man/metaflac.sgml
@@ -311,10 +311,10 @@ manpage.1: manpage.sgml
         </listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>--import-picture-from</option>=<replaceable>SPECIFICATION</replaceable></term>
+	<term><option>--import-picture-from</option>={<replaceable>FILENAME</replaceable>|<replaceable>SPECIFICATION</replaceable>}</term>
 	<listitem>
-	  <para>Import a picture and store it in a PICTURE metadata block.  More than one --import-picture-from command can be specified.  The SPECIFICATION is a string whose parts are separated by | (pipe) characters.  Some parts may be left empty to invoke default values.  The format of SPECIFICATION is</para>
-	  <para>[TYPE]|MIME-TYPE|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE</para>
+	  <para>Import a picture and store it in a PICTURE metadata block.  More than one --import-picture-from command can be specified.  Either a filename for the picture file or a more complete specification form can be used.  The SPECIFICATION is a string whose parts are separated by | (pipe) characters.  Some parts may be left empty to invoke default values.  FILENAME is just shorthand for "||||FILENAME".  The format of SPECIFICATION is</para>
+	  <para>[TYPE]|[MIME-TYPE]|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE</para>
 	  <para>TYPE is optional; it is a number from one of:</para>
 	  <para>0: Other</para>
 	  <para>1: 32x32 pixels 'file icon' (PNG only)</para>
@@ -339,7 +339,7 @@ manpage.1: manpage.sgml
 	  <para>20: Publisher/Studio logotype</para>
 	  <para>The default is 3 (front cover).  There may only be one picture each of type 1 and 2 in a file.</para>
 
-	  <para>MIME-TYPE is mandatory; for best compatibility with players, use pictures with MIME type image/jpeg or image/png.  The MIME type can also be --&gt; to mean that FILE is actually a URL to an image, though this use is discouraged.</para>
+	  <para>MIME-TYPE is optional; if left blank, it will be detected from the file.  For best compatibility with players, use pictures with MIME type image/jpeg or image/png.  The MIME type can also be --&gt; to mean that FILE is actually a URL to an image, though this use is discouraged.</para>
 
 	  <para>DESCRIPTION is optional; the default is an empty string.</para>
 
diff --git a/src/metaflac/usage.c b/src/metaflac/usage.c
index f85d3957..b4babd56 100644
--- a/src/metaflac/usage.c
+++ b/src/metaflac/usage.c
@@ -150,11 +150,14 @@ int long_usage(const char *message, ...)
 	fprintf(out, "--export-cuesheet-to=FILE  Export CUESHEET block to a cuesheet file, suitable\n");
 	fprintf(out, "                      for use by CD authoring software.  Use '-' for stdout.\n");
 	fprintf(out, "                      Only one FLAC file may be specified on the command line.\n");
-	fprintf(out, "--import-picture-from=SPECIFICATION  Import a picture and store it in a PICTURE\n");
-	fprintf(out, "                      block.  The SPECIFICATION is a string whose parts are\n");
-	fprintf(out, "                      separated by | characters.  Some parts may be left empty\n");
-	fprintf(out, "                      to invoke default values.  The specification format is:\n");
-	fprintf(out, "         [TYPE]|MIME-TYPE|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE\n");
+	fprintf(out, "--import-picture-from=FILENAME|SPECIFICATION  Import a picture and store it in a\n");
+	fprintf(out, "                      PICTURE block.  Either a filename for the picture file or\n");
+	fprintf(out, "                      a more complete specification form can be used.  The\n");
+	fprintf(out, "                      SPECIFICATION is a string whose parts are separated by |\n");
+	fprintf(out, "                      characters.  Some parts may be left empty to invoke\n");
+	fprintf(out, "                      default values.  FILENAME is just shorthand for\n");
+	fprintf(out, "                      \"||||FILENAME\".  The format of SPECIFICATION is:\n");
+	fprintf(out, "         [TYPE]|[MIME-TYPE]|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE\n");
 	fprintf(out, "           TYPE is optional; it is a number from one of:\n");
 	fprintf(out, "              0: Other\n");
 	fprintf(out, "              1: 32x32 pixels 'file icon' (PNG only)\n");
@@ -179,10 +182,11 @@ int long_usage(const char *message, ...)
 	fprintf(out, "             20: Publisher/Studio logotype\n");
 	fprintf(out, "             The default is 3 (front cover).  There may only be one picture each\n");
 	fprintf(out, "             of type 1 and 2 in a file.\n");
-	fprintf(out, "           MIME-TYPE is mandatory; for best compatibility with players, use\n");
-	fprintf(out, "             pictures with MIME type image/jpeg or image/png.  The MIME type can\n");
-	fprintf(out, "             also be --> to mean that FILE is actually a URL to an image, though\n");
-	fprintf(out, "             this use is discouraged.\n");
+	fprintf(out, "           MIME-TYPE is optional; if left blank, it will be detected from the\n");
+	fprintf(out, "             file.  For best compatibility with players, use pictures with MIME\n");
+	fprintf(out, "             type image/jpeg or image/png.  The MIME type can also be --> to\n");
+	fprintf(out, "             mean that FILE is actually a URL to an image, though this use is\n");
+	fprintf(out, "             discouraged.\n");
 	fprintf(out, "           DESCRIPTION is optional; the default is an empty string\n");
 	fprintf(out, "           The next part specfies the resolution and color information.  If\n");
 	fprintf(out, "             the MIME-TYPE is image/jpeg, image/png, or image/gif, you can\n");