diff --git a/archivebox/config.py b/archivebox/config.py index ec970a22..0d49a5d2 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -47,7 +47,7 @@ WGET_BINARY = os.getenv('WGET_BINARY', 'wget') YOUTUBEDL_BINARY = os.getenv('YOUTUBEDL_BINARY', 'youtube-dl') CHROME_BINARY = os.getenv('CHROME_BINARY', None) -URL_BLACKLIST = os.getenv('URL_BLACKLIST', '.*youtube.com.*,.*facebook.com/.*,.*.exe') +URL_BLACKLIST = os.getenv('URL_BLACKLIST', None) try: OUTPUT_DIR = os.path.abspath(os.getenv('OUTPUT_DIR')) @@ -76,6 +76,8 @@ USE_CHROME = FETCH_PDF or FETCH_SCREENSHOT or FETCH_DOM USE_WGET = FETCH_WGET or FETCH_WGET_REQUISITES or FETCH_WARC WGET_AUTO_COMPRESSION = USE_WGET and WGET_BINARY and (not run([WGET_BINARY, "--compression=auto", "--help"], stdout=DEVNULL).returncode) +URL_BLACKLIST = URL_BLACKLIST and re.compile(URL_BLACKLIST, re.IGNORECASE) + ########################### Environment & Dependencies ######################### try: @@ -268,11 +270,3 @@ except KeyboardInterrupt: except: print('[X] There was an error during the startup procedure, your archive data is unaffected.') raise - -URL_BLACKLIST = re.compile( - r'(.*\.youtube\.com)|' - r'(.*\.facebook\.com)|' - r'(.*\.amazon\.com)|' - r'(.*\.reddit\.com)', - re.IGNORECASE, - ) \ No newline at end of file