Browse Source

update

pull/6/head
Mathias Markl 6 years ago
parent
commit
89f5402923
  1. 1
      muk_converter/data/autovacuum.xml
  2. 14
      muk_converter/service/unoconv.py

1
muk_converter/data/autovacuum.xml

@ -26,7 +26,6 @@
<field name="size_type">parameter</field> <field name="size_type">parameter</field>
<field name="size_parameter" ref="muk_converter.muk_converter_max_store"/> <field name="size_parameter" ref="muk_converter.muk_converter_max_store"/>
<field name="size_order">used_date desc</field> <field name="size_order">used_date desc</field>
<field name="protect_starred" eval="False"/>
</record> </record>
</odoo> </odoo>

14
muk_converter/service/unoconv.py

@ -35,6 +35,8 @@ from contextlib import closing
from odoo.tools import config from odoo.tools import config
from odoo.tools.mimetypes import guess_mimetype from odoo.tools.mimetypes import guess_mimetype
from odoo.addons.muk_utils.tools import utils_os
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
FORMATS = [ 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. :return: Returns the output depending on the given format.
:raises ValueError: The file extension could not be determined or the format is invalid. :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: if not extension:
raise ValueError("The file extension could not be determined.") raise ValueError("The file extension could not be determined.")
if format not in FORMATS: if format not in FORMATS:

Loading…
Cancel
Save