new cover type

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index b257b79..9a9e23e 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -10,6 +10,8 @@ import re
 import shutil
 import urllib
 
 import shutil
 import urllib
 

+from util import makedirs
+

 
 class UnicodeException(Exception):
     def __str__(self):
 
 class UnicodeException(Exception):
     def __str__(self):


@@ -82,7 +84,7 @@ class WLURI(object):
     slug = None
 
     example = 'http://wolnelektury.pl/katalog/lektura/template/'
     slug = None
 
     example = 'http://wolnelektury.pl/katalog/lektura/template/'

-    _re_wl_uri = re.compile(r'http://(www\.)?wolnelektury.pl/katalog/lektura/'
+    _re_wl_uri = re.compile(r'http://(www\.)?wolnelektury.pl/katalog/lektur[ay]/'

             '(?P<slug>[-a-z0-9]+)/?$')
 
     def __init__(self, uri):
             '(?P<slug>[-a-z0-9]+)/?$')
 
     def __init__(self, uri):


@@ -273,8 +275,7 @@ class OutputFile(object):
         """Save file to a path. Create directories, if necessary."""
 
         dirname = os.path.dirname(os.path.abspath(path))
         """Save file to a path. Create directories, if necessary."""
 
         dirname = os.path.dirname(os.path.abspath(path))

-        if not os.path.isdir(dirname):
-            os.makedirs(dirname)
+        makedirs(dirname)

         shutil.copy(self.get_filename(), path)
 
 
         shutil.copy(self.get_filename(), path)