also dont add tuples to lists sleepy man.

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 9c48a02..feb9974 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -67,19 +67,61 @@ WLNS = EmptyNamespace()
 
 class WLURI(object):
     """Represents a WL URI. Extracts slug and language from it."""
 
 class WLURI(object):
     """Represents a WL URI. Extracts slug and language from it."""

+    DEFAULT_LANGUAGE = u'pol'

 
     slug = None
     language = None
 
 
     slug = None
     language = None
 

+    example = 'http://wolnelektury.pl/katalog/lektura/template/'

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

-            '(?P<slug>[-a-z]+)(/(?P<lang>[a-z]{3})/?)?')
+            '(?P<slug>[-a-z0-9]+)(/(?P<lang>[a-z]{3}))?/?$')
+
+    def __init__(self, uri=None):
+        if uri is not None:
+            uri = unicode(uri)
+            self.uri = uri
+            match = self._re_wl_uri.match(uri)
+            if not match:
+                raise ValueError('Supplied URI (%s) does not match '
+                        'the WL document URI template.' % uri)
+            self.slug = match.group('slug')
+            self.language = match.group('lang') or self.DEFAULT_LANGUAGE

 
 

-    def __init__(self, uri):
-        self.uri = uri
-        match = self._re_wl_uri.match(uri)
-        assert match
-        self.slug = match.group('slug')
-        self.language = match.group('lang')
+    @classmethod
+    def from_slug_and_lang(cls, slug, lang):
+        """Contructs an URI from slug and language code.
+
+        >>> WLURI.from_slug_and_lang('a-slug', WLURI.DEFAULT_LANGUAGE).uri
+        u'http://wolnelektury.pl/katalog/lektura/a-slug/'
+        >>> WLURI.from_slug_and_lang('a-slug', 'deu').uri
+        u'http://wolnelektury.pl/katalog/lektura/a-slug/deu/'
+
+        """
+        if lang is None:
+            lang = cls.DEFAULT_LANGUAGE
+        uri = 'http://wolnelektury.pl/katalog/lektura/%s/' % slug
+        if lang is not None and lang != cls.DEFAULT_LANGUAGE:
+            uri += lang + '/'
+        return cls(uri)
+
+    def __unicode__(self):
+        return self.uri
+
+    def __str__(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 validate_language(self, language):
+        if language != self.language:
+            raise ValidationError("Incorrect language definition in URI")

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


@@ -96,9 +138,9 @@ class DocProvider(object):
         """Should return a file-like object with a WL document XML."""
         return self.by_slug_and_lang(slug)
 
         """Should return a file-like object with a WL document XML."""
         return self.by_slug_and_lang(slug)
 

-    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)
+        wluri = wluri(uri)

         return self.by_slug_and_lang(wluri.slug, wluri.language)
 
 
         return self.by_slug_and_lang(wluri.slug, wluri.language)
 
 


@@ -108,10 +150,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):
 
     def by_slug_and_lang(self, slug, lang=None):

-        fname = "%s%s.xml" % (slug, ".%s" % lang if lang else "")
+        fname = WLURI.from_slug_and_lang(slug, lang).filename_stem() + '.xml'

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


@@ -126,7 +167,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'): [u'pol'],
+          DCNS('language'): [WLURI.DEFAULT_LANGUAGE],

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


@@ -134,8 +175,7 @@ DEFAULT_BOOKINFO = dcparser.BookInfo(
              Wolne Lektury (http://wolnelektury.pl). Reprodukcja cyfrowa
              wykonana przez Bibliotekę Narodową z egzemplarza
              pochodzącego ze zbiorów BN."""],
              Wolne Lektury (http://wolnelektury.pl). Reprodukcja cyfrowa
              wykonana przez Bibliotekę Narodową z egzemplarza
              pochodzącego ze zbiorów BN."""],

-          DCNS('identifier.url'):
-            [u"http://wolnelektury.pl/katalog/lektura/template"],
+          DCNS('identifier.url'): [WLURI.example],

           DCNS('rights'):
             [u"Domena publiczna - zm. [OPIS STANU PRAWNEGO TEKSTU]"] })
 
           DCNS('rights'):
             [u"Domena publiczna - zm. [OPIS STANU PRAWNEGO TEKSTU]"] })