From c3ce1dd99ec1671d50a7cf89dc1b287fbbdf96aa Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 26 Jul 2011 21:12:58 +0200
Subject: Simplification of the __init__() method

---
 lib/parser.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'lib/parser.py')

diff --git a/lib/parser.py b/lib/parser.py
index ae647fe..385dd78 100644
--- a/lib/parser.py
+++ b/lib/parser.py
@@ -3,6 +3,7 @@
 '''
 
 import hachoir_core
+import hachoir_editor
 
 import os
 import mimetypes
@@ -13,17 +14,22 @@ NOMETA = ('.bmp', 'html', '.py', '.rdf', '.txt', '.xml')
 
 
 class GenericParser(object):
-    def __init__(self, realname, filename, parser, editor, backup,
-        add2archive):
+    def __init__(self, filename, parser, mime, backup, add2archive):
+        self.filename = ''
+        self.parser = parser
+        self.mime = mime
+        self.backup = backup
+        self.editor = hachoir_editor.createEditor(parser)
+        self.realname = filename
+        try:
+            self.filename = hachoir_core.cmd_line.unicodeFilename(filename)
+        except TypeError:  # get rid of "decoding Unicode is not supported"
+            self.filename = filename
         basename, ext = os.path.splitext(filename)
         self.output = basename + '.cleaned' + ext
-        self.filename = filename  # path + filename
-        self.realname = realname  # path + filename
         self.basename = os.path.basename(filename)  # only filename
-        self.mime = mimetypes.guess_type(filename)[0]  # mimetype
-        self.parser = parser
-        self.editor = editor
-        self.backup = backup
+
+
 
     def is_clean(self):
         '''
-- 
cgit v1.3