From 89f5402923963237549edcd3e141780a7e044cea Mon Sep 17 00:00:00 2001 From: Mathias Markl Date: Wed, 25 Jul 2018 01:46:31 +0200 Subject: [PATCH] update --- muk_converter/data/autovacuum.xml | 1 - muk_converter/service/unoconv.py | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/muk_converter/data/autovacuum.xml b/muk_converter/data/autovacuum.xml index 297b5da..a1eb590 100644 --- a/muk_converter/data/autovacuum.xml +++ b/muk_converter/data/autovacuum.xml @@ -26,7 +26,6 @@ parameter used_date desc - \ No newline at end of file diff --git a/muk_converter/service/unoconv.py b/muk_converter/service/unoconv.py index db5a6bf..66d755b 100644 --- a/muk_converter/service/unoconv.py +++ b/muk_converter/service/unoconv.py @@ -35,6 +35,8 @@ from contextlib import closing from odoo.tools import config from odoo.tools.mimetypes import guess_mimetype +from odoo.addons.muk_utils.tools import utils_os + _logger = logging.getLogger(__name__) FORMATS = [ @@ -123,17 +125,7 @@ def convert_binary(binary, mimetype=None, filename=None, export="binary", doctyp :return: Returns the output depending on the given format. :raises ValueError: The file extension could not be determined or the format is invalid. """ - def get_extension(filename, mimetype): - if not filename and mimetype: - return mimetypes.guess_extension(mimetype)[1:].strip().lower() - elif filename: - return os.path.splitext(filename)[1][1:].strip().lower() - return None - if not mimetype and not filename: - mimetype = guess_mimetype(binary, default=False) - if not mimetype and filename: - mimetype = mimetypes.guess_type(urllib.request.pathname2url(filename))[0] - extension = get_extension(filename, mimetype) + extension = utils_os.get_extension(filename, mimetype) if not extension: raise ValueError("The file extension could not be determined.") if format not in FORMATS: