Skip to content

Small bugfix in xfile opening #60

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

Closed
wants to merge 2 commits into from
Closed

Small bugfix in xfile opening #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c4b3b
We weren't truly checking for a workbook or datasource root tag, now …
t8y8 Jul 23, 2016
ea49e2f
More robust approach for opening the right file
t8y8 Jul 23, 2016
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
16 changes: 13 additions & 3 deletions tableaudocumentapi/xfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,22 @@ def temporary_directory(*args, **kwargs):


def find_file_in_zip(zip):
_VALID_ROOTS_AND_EXTS = {
'workbook': ('.twb', '.twbx'),
'datasource': ('.tds', '.tdsx')
}

for filename in zip.namelist():
_, file_extension = os.path.splitext(filename)

try:
with zip.open(filename) as xml_candidate:
ET.parse(xml_candidate).getroot().tag in (
'workbook', 'datasource')
return filename
root_tag = ET.parse(xml_candidate).getroot().tag
if root_tag in _VALID_ROOTS_AND_EXTS.keys() and \
file_extension in _VALID_ROOTS_AND_EXTS.get(root_tag, None):
return filename
else:
raise Exception # TableauInvalidFileException or something should go here
except ET.ParseError:
# That's not an XML file by gosh
pass
Expand Down