From a0d6df759df3e6bbbef12ef4f9b10c49b74a9f7d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 19 Jul 2009 10:55:35 -0600
Subject: [PATCH] Fix #2863 (ebook-convert --list-recipes requires input and
 output files to be specified (0.6.0b14))

---
 src/calibre/ebooks/conversion/cli.py     | 16 ++++++++++++++++
 src/calibre/ebooks/conversion/plumber.py | 13 -------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 0650fc73e9..32bb26dbed 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -193,6 +193,22 @@ class ProgressBar(object):
             self.log('%d%% %s'%(percent, msg))
 
 def create_option_parser(args, log):
+    if '--version' in args:
+        from calibre.constants import __appname__, __version__, __author__
+        log(os.path.basename(args[0]), '('+__appname__, __version__+')')
+        log('Created by:', __author__)
+        raise SystemExit(0)
+    if '--list-recipes' in args:
+        from calibre.web.feeds.recipes import titles
+        log('Available recipes:')
+        for title in sorted(titles):
+            try:
+                log('\t'+title)
+            except:
+                log('\t'+repr(title))
+        log('%d recipes available'%len(titles))
+        raise SystemExit(0)
+
     parser = option_parser()
     if len(args) < 3:
         print_help(parser, log)
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index cfceda1cf9..af4f53e33b 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -406,9 +406,6 @@ OptionRecommendation(name='language',
     recommended_value=None, level=OptionRecommendation.LOW,
     help=_('Set the language.')),
 
-OptionRecommendation(name='list_recipes',
-    recommended_value=False, help=_('List available recipes.')),
-
 ]
 
         input_fmt = os.path.splitext(self.input)[1]
@@ -611,16 +608,6 @@ OptionRecommendation(name='list_recipes',
         self.setup_options()
         if self.opts.verbose:
             self.log.filter_level = self.log.DEBUG
-        if self.opts.list_recipes:
-            from calibre.web.feeds.recipes import titles
-            self.log('Available recipes:')
-            for title in sorted(titles):
-                try:
-                    self.log('\t'+title)
-                except:
-                    self.log('\t'+repr(title))
-            self.log('%d recipes available'%len(titles))
-            raise SystemExit(0)
         self.flush()
 
         # Run any preprocess plugins