Sfoglia il codice sorgente

fix broken wget user agents

Nick Sweeting 6 anni fa
parent
commit
4e5b466bb2
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      archivebox/archive_methods.py

+ 2 - 2
archivebox/archive_methods.py

@@ -222,7 +222,7 @@ def fetch_wget(link_dir, link, requisites=FETCH_WGET_REQUISITES, warc=FETCH_WARC
         *(() if warc else ('--timestamping',)),
         *(() if warc else ('--timestamping',)),
         *(('--warc-file={}'.format(warc_path),) if warc else ()),
         *(('--warc-file={}'.format(warc_path),) if warc else ()),
         *(('--page-requisites',) if FETCH_WGET_REQUISITES else ()),
         *(('--page-requisites',) if FETCH_WGET_REQUISITES else ()),
-        *(('--user-agent="{}"'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()),
+        *(('--user-agent={}'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()),
         *((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))),
         *((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))),
         link['url'],
         link['url'],
     ]
     ]
@@ -257,7 +257,7 @@ def fetch_wget(link_dir, link, requisites=FETCH_WGET_REQUISITES, warc=FETCH_WARC
         print('        {}Some resources were skipped: {}{}'.format(ANSI['lightyellow'], e, ANSI['reset']))
         print('        {}Some resources were skipped: {}{}'.format(ANSI['lightyellow'], e, ANSI['reset']))
         print('        Run to see full output:')
         print('        Run to see full output:')
         print('            cd {};'.format(link_dir))
         print('            cd {};'.format(link_dir))
-        print('            {}'.format(' '.join(CMD)))
+        print('            {}'.format(' '.join(CMD).replace(WGET_USER_AGENT, '"{}"'.format(WGET_USER_AGENT))))
         output = e
         output = e
 
 
     return {
     return {