added normalization step

1 files changed, 9 insertions, 1 deletions

diff --git a/src/rhimportd/ctrlTelnet.go b/src/rhimportd/ctrlTelnet.go
index fa0ce65..4177128 100644
--- a/src/rhimportd/ctrlTelnet.go
+++ b/src/rhimportd/ctrlTelnet.go
@@ -59,7 +59,8 @@ func telnetHelp(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.
 			c.Sayln("    Password             string   password to use for rdxport interface")
 			c.Sayln("    SourceUri            string   uri to the file to import")
 			c.Sayln("    SourceFilePolicy     enum     one of: auto, keep, delete, delete-with-dir")
-			c.Sayln("    FetchConverter       string   fetch converter to use (one of null, ffmpeg)")
+			c.Sayln("    FetchConverter       string   fetch converter to use")
+			c.Sayln("                                  (one of: null, ffmpeg, bs1770, ffmpeg-bs1770)")
 			c.Sayln("    ShowId               uint     the RHRD show id to import to")
 			c.Sayln("    ClearShowCarts       bool     clear all show-carts before importing?")
 			c.Sayln("    GroupName            string   name of music-pool group to import to")
@@ -294,6 +295,13 @@ func telnetRun(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.D
 	}
 
 	c.Sayln("")
+	c.Sayln("normalizing file '%s'", ctx.SourceFile)
+	if err := rhimport.NormalizeFile(ctx); err != nil {
+		c.Sayln("normalize file error: %s", err)
+		return false
+	}
+
+	c.Sayln("")
 	c.Sayln("importing file '%s'", ctx.SourceFile)
 	if res, err := rhimport.ImportFile(ctx); err != nil {
 		c.Sayln("")