diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index e386589f..c17e9b3a 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -200,8 +200,9 @@ def get_valid_set_options(): ## currently, browser_cache_path is assumed to be ## shared and only ffnet uses it so far 'browser_cache_path':(['defaults'],None,None), - 'use_browser_cache':(['fanfiction.net','fictionpress.com','ficbook.net'],None,boollist), - 'use_browser_cache_only':(['fanfiction.net','fictionpress.com','ficbook.net'],None,boollist), + 'use_browser_cache':(None,None,boollist), + 'use_browser_cache_only':(None,None,boollist), + 'open_pages_in_browser':(None,None,boollist), 'continue_on_chapter_error':(None,None,boollist), 'conditionals_use_lists':(None,None,boollist), @@ -494,6 +495,7 @@ def get_valid_keywords(): 'use_basic_cache', 'use_browser_cache', 'use_browser_cache_only', + 'open_pages_in_browser', 'use_nsapa_proxy', 'nsapa_proxy_address', 'nsapa_proxy_port', diff --git a/fanficfare/fetchers/cache_browser.py b/fanficfare/fetchers/cache_browser.py index e5323892..3f1f0f23 100644 --- a/fanficfare/fetchers/cache_browser.py +++ b/fanficfare/fetchers/cache_browser.py @@ -53,7 +53,7 @@ class BrowserCacheDecorator(FetcherDecorator): ## cases of pointing to wrong cache/etc? sleeptries = [ 3, 10 ] while( fetcher.getConfig("use_browser_cache_only") and - fetcher.getConfig("open_page_in_browser",False) and + fetcher.getConfig("open_pages_in_browser",False) and not d and sleeptries ): logger.debug("\n\nopen page in browser here %s\n"%url) webbrowser.open(url)