From 5c68e2b34b7c9792cea9adcd86016d7166a30354 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Wed, 7 Oct 2009 22:34:38 -0200
Subject: [PATCH] fixed bug in images pipeline bug in win32 systems, and added
 regression tests

---
 scrapy/contrib/pipeline/images.py    |  3 ++-
 scrapy/tests/test_pipeline_images.py | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/scrapy/contrib/pipeline/images.py b/scrapy/contrib/pipeline/images.py
index 28aed2eeb..8d1cfad0c 100644
--- a/scrapy/contrib/pipeline/images.py
+++ b/scrapy/contrib/pipeline/images.py
@@ -67,7 +67,8 @@ class FSImagesStore(object):
         return {'last_modified': last_modified, 'checksum': checksum}
 
     def _get_filesystem_path(self, key):
-        return os.path.join(self.basedir, key)
+        path_comps = key.split('/')
+        return os.path.join(self.basedir, *path_comps)
 
     def _mkdir(self, dirname, domain=None):
         seen = self.created_directories[domain] if domain else set()
diff --git a/scrapy/tests/test_pipeline_images.py b/scrapy/tests/test_pipeline_images.py
index 97a647531..49d44bba4 100644
--- a/scrapy/tests/test_pipeline_images.py
+++ b/scrapy/tests/test_pipeline_images.py
@@ -1,9 +1,9 @@
+import os
 from twisted.trial import unittest
 from scrapy.conf import settings
 from tempfile import mkdtemp
 from shutil import rmtree
 
-SETTINGS_DISABLED = settings.disabled
 
 class ImagesPipelineTestCase(unittest.TestCase):
     def setUp(self):
@@ -14,6 +14,7 @@ class ImagesPipelineTestCase(unittest.TestCase):
 
         from scrapy.contrib.pipeline.images import ImagesPipeline
         self.tempdir = mkdtemp()
+        self.settings_disabled_before = settings.disabled
         settings.disabled = False
         settings.overrides['IMAGES_STORE'] = self.tempdir
         self.pipeline = ImagesPipeline()
@@ -21,7 +22,7 @@ class ImagesPipelineTestCase(unittest.TestCase):
     def tearDown(self):
         del self.pipeline
         rmtree(self.tempdir)
-        settings.disabled = SETTINGS_DISABLED
+        settings.disabled = self.settings_disabled_before
 
     def test_image_path(self):
         image_path = self.pipeline.image_key
@@ -50,5 +51,16 @@ class ImagesPipelineTestCase(unittest.TestCase):
         self.assertEqual(thumbnail_name("/tmp/some.name/foo", name),
                          'thumbs/50/92dac2a6a2072c5695a5dff1f865b3cb70c657bb.jpg')
 
+    def test_fs_store(self):
+        from scrapy.contrib.pipeline.images import FSImagesStore
+        assert isinstance(self.pipeline.store, FSImagesStore)
+        self.assertEqual(self.pipeline.store.basedir, self.tempdir)
+
+        key = 'some/image/key.jpg'
+        path = os.path.join(self.tempdir, 'some', 'image', 'key.jpg')
+        self.assertEqual(self.pipeline.store._get_filesystem_path(key),
+            path)
+
+
 if __name__ == "__main__":
     unittest.main()