source file policy has a new semantic

1 files changed, 13 insertions, 15 deletions

diff --git a/src/rhimportd/ctrlTelnet.go b/src/rhimportd/ctrlTelnet.go
index eb8d39a..7371f7c 100644
--- a/src/rhimportd/ctrlTelnet.go
+++ b/src/rhimportd/ctrlTelnet.go
@@ -60,7 +60,7 @@ func telnetHelp(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.
 			c.Sayln("    UserName             string   username to use for rdxport interface")
 			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("    SourceFilePolicy     enum     one of: keep, delete")
 			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")
@@ -102,20 +102,18 @@ func telnetHelp(c *telgo.Client, args []string, conf *rhimport.Config, db *rddb.
 			c.Sayln("  Carts which got deleted because of ClearShowCarts or ClearCart are however")
 			c.Sayln("  gone for good.")
 			c.Sayln("")
-			c.Sayln("  The SourceFilePolicy specifies how to deal with temporary files which might")
-			c.Sayln("  got fetched from remote sources. In 'auto' mode, which is the default, it")
-			c.Sayln("  depends on the fetch uri. Remote fetcher such as http://, archiv://, etc.")
-			c.Sayln("  will create a temporary directory and store the fetched file inside that")
-			c.Sayln("  directory. After the import, successful or not, the file gets deleted. If")
-			c.Sayln("  a local fetcher like tmp:// and local:// are used the file will be left")
-			c.Sayln("  untouched.")
-			c.Sayln("  The 'keep' mode tells rhimportd to leave the file as it is regardless of it")
-			c.Sayln("  being created by rhimportd or not.")
-			c.Sayln("  'delete' tells rhimportd to delete the file in any case, even if the import")
-			c.Sayln("  has failed or the file was supplied using local://. A directory which might")
-			c.Sayln("  got created by rhimportd will be kept.")
-			c.Sayln("  'delete-with-dir' also deletes the directory where the source file is in.")
-			c.Sayln("  This might fail if the directory is not empty.")
+			c.Sayln("  The SourceFilePolicy specifies how to deal with temporary files which get")
+			c.Sayln("  created during the import process.")
+			c.Sayln("  The policy 'delete', which is the default, deletes all temporary files")
+			c.Sayln("  regardless of whether the import was a success or not.")
+			c.Sayln("  The 'keep' mode tells rhimportd to leave temporary files after successfull")
+			c.Sayln("  imports. In this case the result will contain a tmp:// fetch-uri which can")
+			c.Sayln("  be used to re-import the file to a different show, pool or jingle.")
+			c.Sayln("  Mind that tmp:// fetch-uris will bypass the fetch-converter as well as the")
+			c.Sayln("  normalizer and just import the file as it is. This is because files inside")
+			c.Sayln("  tmp:// have already been processed before. Also mind that even in 'keep'")
+			c.Sayln("  mode files might get deleted if the fetching or normalizing fails. Only the")
+			c.Sayln("  last step, the actual import, may fail.")
 			c.Sayln("  ")
 			return false
 		case "show":