From 580d82468e3baae6aa71c88bf5c3e91047758d70 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Fri, 6 Nov 2009 14:29:37 -0200 Subject: [PATCH] fixed images pipeline bug caused by recent api changes --- scrapy/contrib/pipeline/images.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scrapy/contrib/pipeline/images.py b/scrapy/contrib/pipeline/images.py index e5d5bbe03..4fc137c03 100644 --- a/scrapy/contrib/pipeline/images.py +++ b/scrapy/contrib/pipeline/images.py @@ -207,28 +207,28 @@ class ImagesPipeline(MediaPipeline): if response.status != 200: log.msg('Image (http-error): Error downloading image from %s referred in <%s>' \ - % (request, referer), level=log.WARNING, domain=info.domain) + % (request, referer), level=log.WARNING, spider=info.spider) raise ImageException if not response.body: log.msg('Image (empty-content): Empty image from %s referred in <%s>: no-content' \ - % (request, referer), level=log.WARNING, domain=info.domain) + % (request, referer), level=log.WARNING, spider=info.spider) raise ImageException status = 'cached' if 'cached' in response.flags else 'downloaded' msg = 'Image (%s): Downloaded image from %s referred in <%s>' % \ (status, request, referer) - log.msg(msg, level=log.DEBUG, domain=info.domain) - self.inc_stats(info.domain, status) + log.msg(msg, level=log.DEBUG, spider=info.spider) + self.inc_stats(info.spider.domain_name, status) try: key = self.image_key(request.url) checksum = self.image_downloaded(response, request, info) except ImageException, ex: - log.msg(str(ex), level=log.WARNING, domain=info.domain) + log.msg(str(ex), level=log.WARNING, spider=info.spider) raise except Exception: - log.err(domain=info.domain) + log.err(spider=info.spider) raise ImageException return {'url': request.url, 'path': key, 'checksum': checksum} @@ -238,7 +238,7 @@ class ImagesPipeline(MediaPipeline): referer = request.headers.get('Referer') msg = 'Image (unknown-error): Error downloading %s from %s referred in <%s>: %s' \ % (self.MEDIA_NAME, request, referer, str(failure)) - log.msg(msg, level=log.WARNING, domain=info.domain) + log.msg(msg, level=log.WARNING, spider=info.spider) raise ImageException def media_to_download(self, request, info): @@ -257,8 +257,8 @@ class ImagesPipeline(MediaPipeline): referer = request.headers.get('Referer') log.msg('Image (uptodate): Downloaded %s from <%s> referred in <%s>' % \ - (self.MEDIA_NAME, request.url, referer), level=log.DEBUG, domain=info.domain) - self.inc_stats(info.domain, 'uptodate') + (self.MEDIA_NAME, request.url, referer), level=log.DEBUG, spider=info.spider) + self.inc_stats(info.spider.domain_name, 'uptodate') checksum = result.get('checksum', None) return {'url': request.url, 'path': key, 'checksum': checksum}