#1913: tags in section titles break table of contents

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 52234fe..dd09ce4 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -66,60 +66,45 @@ WLNS = EmptyNamespace()
 
 
 class WLURI(object):
 
 
 class WLURI(object):

-    """Represents a WL URI. Extracts slug and language from it."""
-    DEFAULT_LANGUAGE = u'pol'
-
+    """Represents a WL URI. Extracts slug from it."""

     slug = None
     slug = None

-    language = None

 
     example = 'http://wolnelektury.pl/katalog/lektura/template/'
     _re_wl_uri = re.compile('http://wolnelektury.pl/katalog/lektura/'
 
     example = 'http://wolnelektury.pl/katalog/lektura/template/'
     _re_wl_uri = re.compile('http://wolnelektury.pl/katalog/lektura/'

-            '(?P<slug>[-a-z]+)(/(?P<lang>[a-z]{3})/?)?')
+            '(?P<slug>[-a-z0-9]+)/?$')

 
 

-    def __init__(self, uri=None):
-        if uri is not None:
-            self.uri = uri
-            match = self._re_wl_uri.match(uri)
-            assert match
-            self.slug = match.group('slug')
-            self.language = match.group('lang') or self.DEFAULT_LANGUAGE
+    def __init__(self, uri):
+        uri = unicode(uri)
+        self.uri = uri
+        self.slug = uri.rstrip('/').rsplit('/', 1)[-1]
+
+    @classmethod
+    def strict(cls, uri):
+        match = cls._re_wl_uri.match(uri)
+        if not match:
+            raise ValueError('Supplied URI (%s) does not match '
+                'the template: %s.' % (uri, cls._re_wl_uri))
+        return cls(uri)

 
     @classmethod
 
     @classmethod

-    def from_slug_and_lang(cls, slug, lang):
-        """Contructs an URI from slug and language code.
+    def from_slug(cls, slug):
+        """Contructs an URI from slug.

 
 

-        >>> WLURI.from_slug_and_lang('a-slug', WLURI.DEFAULT_LANGUAGE).uri
-        'http://wolnelektury.pl/katalog/lektura/a-slug/'
-        >>> WLURI.from_slug_and_lang('a-slug', 'deu').uri
-        'http://wolnelektury.pl/katalog/lektura/a-slug/deu/'
+        >>> WLURI.from_slug('a-slug').uri
+        u'http://wolnelektury.pl/katalog/lektura/a-slug/'

 
         """
 
         """

-        if lang is None:
-            lang = self.DEFAULT_LANGUAGE

         uri = 'http://wolnelektury.pl/katalog/lektura/%s/' % slug
         uri = 'http://wolnelektury.pl/katalog/lektura/%s/' % slug

-        if lang is not None and lang != cls.DEFAULT_LANGUAGE:
-            uri += lang + '/'
-        instance = cls()
-        instance.slug = slug
-        instance.language = lang
-        instance.uri = uri
-        return instance
+        return cls(uri)

 
     def __unicode__(self):
         return self.uri
 
 
     def __unicode__(self):
         return self.uri
 

-    def __eq__(self, other):
-        return self.slug, self.language == other.slug, other.language
-
-    def filename_stem(self):
-        stem = self.slug
-        if self.language != self.DEFAULT_LANGUAGE:
-            stem += '_' + self.language
-        return stem
+    def __str__(self):
+        return self.uri

 
 

-    def validate_language(self, language):
-        if language != self.language:
-            raise ValidationError("Incorrect language definition in URI")
+    def __eq__(self, other):
+        return self.slug == other.slug

 
 
 class DocProvider(object):
 
 
 class DocProvider(object):


@@ -128,18 +113,14 @@ class DocProvider(object):
     Used for generating joined files, like EPUBs.
     """
 
     Used for generating joined files, like EPUBs.
     """
 

-    def by_slug_and_lang(self, slug, lang=None):
-        """Should return a file-like object with a WL document XML."""
-        raise NotImplementedError
-

     def by_slug(self, slug):
         """Should return a file-like object with a WL document XML."""
     def by_slug(self, slug):
         """Should return a file-like object with a WL document XML."""

-        return self.by_slug_and_lang(slug)
+        raise NotImplementedError

 
 

-    def by_uri(self, uri):
+    def by_uri(self, uri, wluri=WLURI):

         """Should return a file-like object with a WL document XML."""
         """Should return a file-like object with a WL document XML."""

-        wluri = WLURI(uri)
-        return self.by_slug_and_lang(wluri.slug, wluri.language)
+        wluri = wluri(uri)
+        return self.by_slug(wluri.slug)

 
 
 class DirDocProvider(DocProvider):
 
 
 class DirDocProvider(DocProvider):


@@ -148,10 +129,9 @@ class DirDocProvider(DocProvider):
     def __init__(self, dir_):
         self.dir = dir_
         self.files = {}
     def __init__(self, dir_):
         self.dir = dir_
         self.files = {}

-        return super(DirDocProvider, self).__init__()

 
 

-    def by_slug_and_lang(self, slug, lang=None):
-        fname = WLURI.from_slug_and_lang(slug, lang).filename_stem() + '.xml'
+    def by_slug(self, slug):
+        fname = slug + '.xml'

         return open(os.path.join(self.dir, fname))
 
 
         return open(os.path.join(self.dir, fname))
 
 


@@ -166,7 +146,7 @@ DEFAULT_BOOKINFO = dcparser.BookInfo(
           DCNS('subject.type'): [u'Unknown'],
           DCNS('subject.genre'): [u'Unknown'],
           DCNS('date'): ['1970-01-01'],
           DCNS('subject.type'): [u'Unknown'],
           DCNS('subject.genre'): [u'Unknown'],
           DCNS('date'): ['1970-01-01'],

-          DCNS('language'): [WLURI.DEFAULT_LANGUAGE],
+          DCNS('language'): [u'pol'],

           # DCNS('date'): [creation_date],
           DCNS('publisher'): [u"Fundacja Nowoczesna Polska"],
           DCNS('description'):
           # DCNS('date'): [creation_date],
           DCNS('publisher'): [u"Fundacja Nowoczesna Polska"],
           DCNS('description'):