Merge branch 'master' of github.com:internetarchive/brozzler

This commit is contained in:
Barbara Miller 2017-10-04 20:07:08 -07:00
commit 6dc6e71ddc
2 changed files with 2 additions and 3 deletions

View File

@ -196,7 +196,7 @@ def brozzle_page(argv=None):
enable_youtube_dl = False if args.skip_youtube_dl else True
outlinks = worker.brozzle_page(
browser, site, page, on_screenshot=on_screenshot,
enable_youtube_dl=enable_youtube_dl)
enable_youtube_dl=not args.skip_youtube_dl)
logging.info('outlinks: \n\t%s', '\n\t'.join(sorted(outlinks)))
except brozzler.ReachedLimit as e:
logging.error('reached limit %s', e)

View File

@ -487,9 +487,8 @@ class BrozzlerWorker:
page.blocked_by_robots = True
self._frontier.completed_page(site, page)
else:
enable_youtube_dl = False if self._skip_youtube_dl else True
outlinks = self.brozzle_page(browser, site, page,
enable_youtube_dl=enable_youtube_dl)
enable_youtube_dl=not self._skip_youtube_dl)
self._frontier.completed_page(site, page)
self._frontier.scope_and_schedule_outlinks(
site, page, outlinks)