From d098bdbdc844d1ebca5516f741f794286d42c539 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 9 Apr 2013 16:29:56 -0500 Subject: [PATCH] Improve error reporting on CLI. --- downloader.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/downloader.py b/downloader.py index 06afd13e..1eed1645 100644 --- a/downloader.py +++ b/downloader.py @@ -33,16 +33,24 @@ if sys.version_info >= (2, 7): rootlogger.addHandler(loghandler) try: - from fanficdownloader import adapters,writers,exceptions - from fanficdownloader.configurable import Configuration - from fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data - from fanficdownloader.geturls import get_urls_from_page + from calibre.constants import numeric_version as calibre_version + is_calibre = True except: + is_calibre = False + +# using try/except directly was masking errors during development. +if is_calibre: # running under calibre from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader import adapters,writers,exceptions from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.configurable import Configuration from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.geturls import get_urls_from_page +else: + from fanficdownloader import adapters,writers,exceptions + from fanficdownloader.configurable import Configuration + from fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data + from fanficdownloader.geturls import get_urls_from_page + if sys.version_info < (2, 5): print "This program requires Python 2.5 or newer."