X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a0af4cad2e33a60a2baa132938dbd67a470e730f..b10cdf123648beb76120194d7f9bb69fc8433ede:/librarian/__init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 09bdcd7..215cacb 100644
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -80,7 +80,7 @@ class WLURI(object):
     slug = None
 
     example = 'http://edukacjamedialna.edu.pl/'
-    _re_wl_uri = re.compile(r'http://(www\.)?edukacjamedialna.edu.pl/'
+    _re_wl_uri = re.compile(r'http://(www\.)?edukacjamedialna.edu.pl/(lekcje/)?'
             '(?P<slug>[-a-z0-9]+)/?$')
 
     def __init__(self, uri):
@@ -142,7 +142,7 @@ class DirDocProvider(DocProvider):
 
     def by_slug(self, slug):
         fname = slug + '.xml'
-        return open(os.path.join(self.dir, fname))
+        return IOFile.from_filename(os.path.join(self.dir, fname))
 
 
 import lxml.etree as etree
@@ -208,32 +208,35 @@ def get_resource(path):
     return os.path.join(os.path.dirname(__file__), path)
 
 
-class OutputFile(object):
-    """Represents a file returned by one of the converters."""
-
+class IOFile(object):
+    """ Represents a file fed as input or returned as a result. """
     _string = None
     _filename = None
+    _filename_tmp = False
+
+    def __init__(self, attachments=None):
+        self.attachments = attachments or {}
 
     def __del__(self):
-        if self._filename:
+        if self._filename_tmp:
             os.unlink(self._filename)
 
     def __nonzero__(self):
         return self._string is not None or self._filename is not None
 
     @classmethod
-    def from_string(cls, string):
+    def from_string(cls, string, *args, **kwargs):
         """Converter returns contents of a file as a string."""
 
-        instance = cls()
+        instance = cls(*args, **kwargs)
         instance._string = string
         return instance
 
     @classmethod
-    def from_filename(cls, filename):
+    def from_filename(cls, filename, *args, **kwargs):
         """Converter returns contents of a file as a named file."""
 
-        instance = cls()
+        instance = cls(*args, **kwargs)
         instance._filename = filename
         return instance
 
@@ -266,6 +269,7 @@ class OutputFile(object):
             temp.write(self._string)
             temp.close()
             self._filename = temp.name
+            self._filename_tmp = True
             return self._filename
         else:
             return None
@@ -278,6 +282,23 @@ class OutputFile(object):
             os.makedirs(dirname)
         shutil.copy(self.get_filename(), path)
 
+    def dump_to(self, path, directory=None):
+        """ Path should be name for main file. """
+        self.save_as(path)
+        dirname = os.path.dirname(os.path.abspath(path))
+        for filename, attachment in self.attachments.items():
+            attachment.save_as(os.path.join(dirname, filename))
+
+
+class Format(object):
+    """ Generic format class. """
+    def __init__(self, wldoc, **kwargs):
+        self.wldoc = wldoc
+        self.customization = kwargs
+
+    def build(self):
+        raise NotImplementedError
+
 
 class URLOpener(urllib.FancyURLopener):
     version = 'FNP Librarian (http://github.com/fnp/librarian)'