# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+import logging
import os
import tempfile
-
-# A quick hack: if netsvc is not there, emulate it. Thus, work offline, too
-try:
- import netsvc
- def log(lvl, msg):
- netsvc.Logger().notifyChannel("index", lvl, msg)
-except:
- class netsvc:
- LOG_NOTSET = 'notset'
- LOG_DEBUG_RPC = 'debug_rpc'
- LOG_DEBUG = 'debug'
- LOG_DEBUG2 = 'debug2'
- LOG_INFO = 'info'
- LOG_WARNING = 'warn'
- LOG_ERROR = 'error'
- LOG_CRITICAL = 'critical'
-
- def log(lvl, msg):
- print msg
-
-
+from subprocess import Popen, PIPE
+_logger = logging.getLogger(__name__)
class NhException(Exception):
pass
-from subprocess import Popen, PIPE
-class indexer():
+class indexer(object):
""" An indexer knows how to parse the content of some file.
-
+
Typically, one indexer should be instantiated per file
type.
Override this class to add more functionality. Note that
return mts[0]
return None
- def indexContent(self, content, filename=None, realfile=None):
+ def indexContent(self, content, filename=None, realfile = None):
""" Use either content or the real file, to index.
Some parsers will work better with the actual
content, others parse a file easier. Try the
except NhException:
pass
- fp = open(realfile, 'rb')
- content2 = fp.read()
- fp.close()
+ fp = open(realfile,'rb')
+ try:
+ content2 = fp.read()
+ finally:
+ fp.close()
# The not-handled exception may be raised here
return self._doIndexContent(content2)
# last try, with a tmp file
if content:
try:
- fname, ext = filename and os.path.splitext(filename) or ('', '')
+ fname,ext = filename and os.path.splitext(filename) or ('','')
fd, rfname = tempfile.mkstemp(suffix=ext)
os.write(fd, content)
os.close(fd)
raise NhException('No appropriate method to index file')
- def _doIndexContent(self, content):
+ def _doIndexContent(self,content):
raise NhException("Content not handled here")
- def _doIndexFile(self, fpath):
+ def _doIndexFile(self,fpath):
raise NhException("Content not handled here")
+ def __repr__(self):
+ return "<indexer %s.%s>" %(self.__module__, self.__class__.__name__)
def mime_match(mime, mdict):
if mdict.has_key(mime):
return (mime, mdict[mime])
if '/' in mime:
- mpat = mime.split('/')[0] + '/*'
+ mpat = mime.split('/')[0]+'/*'
if mdict.has_key(mpat):
return (mime, mdict[mpat])
return (None, None)
-class contentIndex() :
+class contentIndex(object):
+
def __init__(self):
self.mimes = {}
self.exts = {}
f = True
if f:
- log(netsvc.LOG_DEBUG, "Register content indexer: %r" % obj)
+ _logger.debug('Register content indexer: %r', obj)
if not f:
raise Exception("Your indexer should at least suport a mimetype or extension")
- def doIndex(self, content, filename=None, content_type=None, realfname=None, debug=False):
+ def doIndex(self, content, filename=None, content_type=None, realfname = None, debug=False):
fobj = None
fname = None
mime = None
mime = content_type
fobj = self.mimes[content_type]
elif filename:
- bname, ext = os.path.splitext(filename)
+ bname,ext = os.path.splitext(filename)
if self.exts.has_key(ext):
fobj = self.exts[ext]
mime = fobj._getDefMime(ext)
if content_type and not fobj:
- mime, fobj = mime_match(content_type, self.mimes)
+ mime,fobj = mime_match(content_type, self.mimes)
if not fobj:
try:
if realfname :
fname = realfname
else:
- bname, ext = os.path.splitext(filename)
+ try:
+ bname,ext = os.path.splitext(filename or 'test.tmp')
+ except Exception:
+ bname, ext = filename, 'tmp'
fd, fname = tempfile.mkstemp(suffix=ext)
os.write(fd, content)
os.close(fd)
- fp = Popen(['file', '-b', '--mime-type', fname], shell=False, stdout=PIPE).stdout
- result = fp.read()
- fp.close()
- mime2 = result.strip()
- log(netsvc.LOG_DEBUG, "File gave us: %s" % mime2)
+ pop = Popen(['file','-b','--mime',fname], shell=False, stdout=PIPE)
+ (result, _) = pop.communicate()
+
+ mime2 = result.split(';')[0]
+ _logger.debug('File gave us: %s', mime2)
# Note that the temporary file still exists now.
- mime, fobj = mime_match(mime2, self.mimes)
+ mime,fobj = mime_match(mime2, self.mimes)
if not mime:
mime = mime2
- except Exception, e:
- log(netsvc.LOG_WARNING, "Cannot determine mime type: %s" % str(e))
+ except Exception:
+ _logger.exception('Cannot determine mime type')
try:
if fobj:
- res = (mime, fobj.indexContent(content, filename, fname or realfname))
+ res = (mime, fobj.indexContent(content,filename,fname or realfname) )
else:
- log(netsvc.LOG_DEBUG, "Have no object, return (%s, None)" % mime)
- res = (mime, None)
- except Exception, e:
- log(netsvc.LOG_WARNING, "Could not index file, %s" % e)
+ _logger.debug("Have no object, return (%s, None)", mime)
+ res = (mime, None )
+ except Exception:
+ _logger.exception("Could not index file %s (%s)",
+ filename, fname or realfname)
res = None
# If we created a tmp file, unlink it now
if not realfname and fname:
try:
os.unlink(fname)
- except Exception, e:
- log(netsvc.LOG_WARNING, "Could not unlink %s, %s" % (fname, e))
-
+ except Exception:
+ _logger.exception("Could not unlink %s", fname)
return res
cntIndex = contentIndex()
projects / odoo / odoo.git / blobdiff