Re-Organisation of the arborescence

7 files changed, 20 insertions, 3 deletions

diff --git a/lib/hachoir_editor/__init__.py b/lib/hachoir_editor/__init__.py
new file mode 100644
index 0000000..1835676
--- /dev/null
+++ b/lib/hachoir_editor/__init__.py
@@ -0,0 +1,8 @@
+from field import (
+    EditorError, FakeField)
+from typed_field import (
+    EditableField, EditableBits, EditableBytes,
+    EditableInteger, EditableString,
+    createEditableField)
+from fieldset import EditableFieldSet, NewFieldSet, createEditor
+
diff --git a/hachoir_editor/field.py b/lib/hachoir_editor/field.py
index 6b1efe3..6b1efe3 100644
--- a/hachoir_editor/field.py
+++ b/lib/hachoir_editor/field.py
diff --git a/hachoir_editor/fieldset.py b/lib/hachoir_editor/fieldset.py
index 1669b5a..cbc12f9 100644
--- a/hachoir_editor/fieldset.py
+++ b/lib/hachoir_editor/fieldset.py
@@ -2,7 +2,8 @@ from hachoir_core.dict import UniqKeyError
 from hachoir_core.field import MissingField, Float32, Float64, FakeArray
 from hachoir_core.compatibility import any
 from hachoir_core.i18n import _
-from hachoir_editor import createEditableField, EditorError
+from typed_field import createEditableField
+from field import EditorError
 from collections import deque # Python 2.4
 import weakref # Python 2.1
 import struct
diff --git a/hachoir_editor/typed_field.py b/lib/hachoir_editor/typed_field.py
index 4abc989..0f0427b 100644
--- a/hachoir_editor/typed_field.py
+++ b/lib/hachoir_editor/typed_field.py
@@ -3,7 +3,7 @@ from hachoir_core.field import (
     RawBytes, Bytes, PaddingBytes,
     GenericString, Character,
     isInteger, isString)
-from hachoir_editor import FakeField
+from field import FakeField
 
 class EditableField(FakeField):
     """
diff --git a/lib/mat.py b/lib/mat.py
index 64bec10..12df06d 100644
--- a/lib/mat.py
+++ b/lib/mat.py
@@ -20,7 +20,9 @@ import archive
 __version__ = "0.1"
 __author__ = "jvoisin"
 
-logging.basicConfig(level = logging.DEBUG)
+LOGGING_LEVEL = logging.DEBUG
+
+logging.basicConfig(level = LOGGING_LEVEL)
 
 strippers = {
     hachoir_parser.image.JpegFile: images.JpegStripper,
diff --git a/lib/misc.py b/lib/misc.py
index cfe5684..a0e4a5b 100644
--- a/lib/misc.py
+++ b/lib/misc.py
@@ -1,6 +1,7 @@
 import parser
 import pdfrw
 import os
+import mimetypes
 import mat
 import subprocess
 import tempfile
@@ -14,6 +15,8 @@ class PdfStripper(parser.Generic_parser):
         self.filename = filename
         self.backup = backup
         self.realname = realname
+        self.shortname = os.path.basename(filename)
+        self.mime = mimetypes.guess_type(filename)[0]
         self.trailer = pdfrw.PdfReader(self.filename)
         self.writer = pdfrw.PdfWriter()
         self.convert = 'gm convert -antialias -enhance %s %s'
diff --git a/lib/parser.py b/lib/parser.py
index 6b899f3..2b7b52e 100644
--- a/lib/parser.py
+++ b/lib/parser.py
@@ -8,6 +8,7 @@ import hachoir_editor
 import sys
 import os
 import subprocess
+import mimetypes
 import mat
 
 POSTFIX = ".cleaned"
@@ -16,6 +17,8 @@ class Generic_parser(object):
     def __init__(self, realname, filename, parser, editor, backup):
         self.filename = filename
         self.realname = realname
+        self.shortname = os.path.basename(filename)
+        self.mime = mimetypes.guess_type(filename)[0]
         self.parser = parser
         self.editor = editor
         self.backup = backup