Skip to content

22 - Reenable support for Flat XML OpenDocumentFormat files #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonadem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

22 - Reenable support for Flat XML OpenDocumentFormat files #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ezodf/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@

MIMETYPES = {
'odt': "application/vnd.oasis.opendocument.text",
'fodt': "application/xml",
'ott': "application/vnd.oasis.opendocument.text-template",
'odg': "application/vnd.oasis.opendocument.graphics",
'otg': "application/vnd.oasis.opendocument.graphics-template",
'odp': "application/vnd.oasis.opendocument.presentation",
'otp': "application/vnd.oasis.opendocument.presentation-template",
'ods': "application/vnd.oasis.opendocument.spreadsheet",
'fods': "application/xml",
'ots': "application/vnd.oasis.opendocument.spreadsheet-template",
'odc': "application/vnd.oasis.opendocument.chart",
'otc': "application/vnd.oasis.opendocument.chart-template",
Expand Down
14 changes: 7 additions & 7 deletions ezodf/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ def is_valid_stream(buffer):
def opendoc(filename):
if is_stream(filename):
fm = ByteStreamManager(filename)
elif filename is not None:
fm = FileManager(filename)
else:
fm = FileManager(filename)

mime_type = __detect_mime_type(fm)
if (mime_type == "application/xml"):
try:
xmlnode = etree.parse(filename).getroot()
return FlatXMLDocument(filename=filename, xmlnode=xmlnode)
except etree.ParseError:
raise IOError("File '%s' is neither a zip-package nor a flat "
"XML OpenDocumentFormat file." % filename)

mime_type = __detect_mime_type(fm)
raise IOError("File '%s' is detected as a flat "
"XML OpenDocumentFormat file but failed to be parsed." % filename)
return PackagedDocument(filemanager=fm, mimetype=mime_type)


Expand All @@ -64,7 +64,7 @@ def __detect_mime_type(file_manager):
else:
# use file ext name
ext = os.path.splitext(file_manager.zipname)[1]
mime_type = MIMETYPES[ext]
mime_type = MIMETYPES[ext[1:]]
return mime_type


Expand Down