Skip to content

Commit

Permalink
handle errors from extract-outlinks.js, which happens on polyvore.com…
Browse files Browse the repository at this point in the history
… because it changes the definition of Set 😭
  • Loading branch information
nlevitt committed Feb 22, 2017
1 parent 0d0da22 commit 3c4ab83
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
14 changes: 11 additions & 3 deletions brozzler/browser.py
@@ -1,7 +1,7 @@
'''
brozzler/browser.py - manages the browsers for brozzler
Copyright (C) 2014-2016 Internet Archive
Copyright (C) 2014-2017 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -485,9 +485,17 @@ def extract_outlinks(self, timeout=60):
lambda: self.websock_thread.received_result(msg_id),
timeout=timeout)
message = self.websock_thread.pop_result(msg_id)
if message['result']['result']['value']:
return frozenset(message['result']['result']['value'].split('\n'))
if ('result' in message and 'result' in message['result']
and 'value' in message['result']['result']):
if message['result']['result']['value']:
return frozenset(
message['result']['result']['value'].split('\n'))
else:
# no links found
return frozenset()
else:
self.logger.error(
'problem extracting outlinks, result message: %s', message)
return frozenset()

def screenshot(self, timeout=30):
Expand Down
2 changes: 2 additions & 0 deletions brozzler/js-templates/extract-outlinks.js
@@ -1,3 +1,5 @@
// we have problems if the page has changed the definition of Set or Array
// http://www.polyvore.com/ does this for example
var __brzl_framesDone = new Set();
var __brzl_compileOutlinks = function(frame) {
__brzl_framesDone.add(frame);
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -32,7 +32,7 @@ def find_package_data(package):

setuptools.setup(
name='brozzler',
version='1.1b9.dev191',
version='1.1b9.dev192',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',
Expand Down

0 comments on commit 3c4ab83

Please sign in to comment.