From: Marcin Koziej <marcin@lolownia.org>
Date: Wed, 13 Nov 2013 09:19:51 +0000 (+0100)
Subject: genre for pictures
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/b2422020bc864b75f31c215b34692468cc03ce92?ds=sidebyside

genre for pictures
---

diff --git a/apps/picture/tests/picture_import.py b/apps/picture/tests/picture_import.py
index 785aa6d28..68c875391 100644
--- a/apps/picture/tests/picture_import.py
+++ b/apps/picture/tests/picture_import.py
@@ -22,3 +22,12 @@ class PictureTest(WLTestCase):
 
         picture.delete()
         
+
+    def test_import_2(self):
+        picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.xml"),
+                                        path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.jpg"),
+                                        overwrite=True)
+        cats = set([t.category for t in picture.tags])
+        assert 'genre' in cats
+        assert 'kind' in cats
+
diff --git a/lib/librarian b/lib/librarian
index 8f62bd3a1..6ab2b1634 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 8f62bd3a1a38a25e860740dc4054fd034719b477
+Subproject commit 6ab2b1634713a84c9c73905893b25abaa643c08a