From c14c52f670dabbdb437b45871e6103fc1547197f Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 29 Feb 2016 22:46:07 -0600 Subject: [PATCH] Fix cli import, output chapter url list with -m (metadata only) option. --- fanficfare/cli.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fanficfare/cli.py b/fanficfare/cli.py index 6c49c32d..d22eb0ed 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -31,7 +31,7 @@ if sys.version_info < (2, 5): sys.exit(1) if sys.version_info >= (2, 7): - # suppresses default logger. Logging is setup in fanficdownload/__init__.py so it works in calibre, too. + # suppresses default logger. Logging is setup in fanficfare/__init__.py so it works in calibre, too. rootlogger = logging.getLogger() loghandler = logging.NullHandler() loghandler.setFormatter(logging.Formatter('(=====)(levelname)s:%(message)s')) @@ -39,11 +39,11 @@ if sys.version_info >= (2, 7): try: # running under calibre - from calibre_plugins.fanfictiondownloader_plugin.fanficfare import adapters, writers, exceptions - from calibre_plugins.fanfictiondownloader_plugin.fanficfare.configurable import Configuration - from calibre_plugins.fanfictiondownloader_plugin.fanficfare.epubutils import ( + from calibre_plugins.fanficfare_plugin.fanficfare import adapters, writers, exceptions + from calibre_plugins.fanficfare_plugin.fanficfare.configurable import Configuration + from calibre_plugins.fanficfare_plugin.fanficfare.epubutils import ( get_dcsource_chaptercount, get_update_data, reset_orig_chapters_epub) - from calibre_plugins.fanfictiondownloader_plugin.fanficfare.geturls import get_urls_from_page + from calibre_plugins.fanficfare_plugin.fanficfare.geturls import get_urls_from_page except ImportError: from fanficfare import adapters, writers, exceptions from fanficfare.configurable import Configuration @@ -355,6 +355,7 @@ def do_download(arg, # regular download if options.metaonly: pprint.pprint(adapter.getStoryMetadataOnly().getAllMetadata()) + pprint.pprint(adapter.chapterUrls) output_filename = write_story(configuration, adapter, options.format, options.metaonly)