Selaa lähdekoodia

Photos: Handle SITEURL.

Joaquim Baptista 8 vuotta sitten
vanhempi
commit
f9ffe66228
2 muutettua tiedostoa jossa 8 lisäystä ja 7 poistoa
  1. 1 1
      photos/photos.py
  2. 7 6
      photos/test_photos.py

+ 1 - 1
photos/photos.py

@@ -105,7 +105,7 @@ def detect_content(content):
                 logger.error('photos: No photo %s', path)
             else:
                 photo = os.path.splitext(value)[0].lower() + 'a.jpg'
-                origin = os.path.join('/photos', photo)
+                origin = os.path.join(settings['SITEURL'], 'photos', photo)
                 enqueue_resize(
                     path,
                     os.path.join('photos', photo),

+ 7 - 6
photos/test_photos.py

@@ -24,6 +24,7 @@ class TestPhotos(unittest.TestCase):
         cls.settings['PLUGINS'] = [photos]
         cls.settings['CACHE_CONTENT'] = False
         cls.settings['OUTPUT_PATH'] = cls.temp_path
+        cls.settings['SITEURL'] = 'http://getpelican.com/sub'
         photos.initialized(cls)
         cls.generator = ArticlesGenerator(
             context=cls.settings.copy(), settings=cls.settings,
@@ -78,7 +79,7 @@ class TestPhotos(unittest.TestCase):
 
     def test_photo_article_body(self):
         expected = ('<p>Here is my best photo, again.</p>\n'
-                    '<p><img alt="" src="/photos/agallery/besta.jpg" />.</p>')
+                    '<p><img alt="" src="http://getpelican.com/sub/photos/agallery/besta.jpg" />.</p>')
         self.assertEqual(expected, self.get_article('photo').content)
 
     def test_filename_article_image(self):
@@ -106,15 +107,15 @@ class TestPhotos(unittest.TestCase):
     def test_queue_resize(self):
         expected = [
             ('photos/agallery/best.jpg',
-                ('test_data/agallery/best.jpg', (1024, 768, 80))),
+                ('./test_data/agallery/best.jpg', (1024, 768, 80))),
             ('photos/agallery/besta.jpg',
-                ('test_data/agallery/best.jpg', (760, 506, 80))),
+                ('./test_data/agallery/best.jpg', (760, 506, 80))),
             ('photos/agallery/bestt.jpg',
-                ('test_data/agallery/best.jpg', (192, 144, 60))),
+                ('./test_data/agallery/best.jpg', (192, 144, 60))),
             ('photos/agallery/night.jpg',
-                ('test_data/agallery/night.png', (1024, 768, 80))),
+                ('./test_data/agallery/night.png', (1024, 768, 80))),
             ('photos/agallery/nightt.jpg',
-                ('test_data/agallery/night.png', (192, 144, 60)))]
+                ('./test_data/agallery/night.png', (192, 144, 60)))]
         self.assertEqual(sorted(expected), sorted(photos.queue_resize.items()))
 
 if __name__ == '__main__':