X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/cdc273354769f4add5f2a6e01d5526a6130a517d..5bc29f19f308610c944d63597962fb3b0f468c54:/librarian/__init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 8a69d00..3b811d3 100644
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -8,15 +8,22 @@ from __future__ import with_statement
 import os
 import re
 import shutil
+import urllib
+
 
 class UnicodeException(Exception):
     def __str__(self):
         """ Dirty workaround for Python Unicode handling problems. """
-        return self.message
+        return unicode(self).encode('utf-8')
 
     def __unicode__(self):
         """ Dirty workaround for Python Unicode handling problems. """
-        return self.message
+        args = self.args[0] if len(self.args) == 1 else self.args
+        try:
+            message = unicode(args)
+        except UnicodeDecodeError:
+            message = unicode(args, encoding='utf-8', errors='ignore')
+        return message
 
 class ParseError(UnicodeException):
     pass
@@ -198,32 +205,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
 
@@ -256,6 +266,7 @@ class OutputFile(object):
             temp.write(self._string)
             temp.close()
             self._filename = temp.name
+            self._filename_tmp = True
             return self._filename
         else:
             return None
@@ -267,3 +278,25 @@ class OutputFile(object):
         if not os.path.isdir(dirname):
             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)'
+urllib._urlopener = URLOpener()