diff --git a/tableaudocumentapi/xfile.py b/tableaudocumentapi/xfile.py
index 3067781..cac6c09 100644
--- a/tableaudocumentapi/xfile.py
+++ b/tableaudocumentapi/xfile.py
@@ -52,7 +52,15 @@ def temporary_directory(*args, **kwargs):
def find_file_in_zip(zip_file):
- for filename in zip_file.namelist():
+ '''Returns the twb/tds file from a Tableau packaged file format. Packaged
+ files can contain cache entries which are also valid XML, so only look for
+ files with a .tds or .twb extension.
+ '''
+
+ candidate_files = filter(lambda x: x.split('.')[-1] in ('twb', 'tds'),
+ zip_file.namelist())
+
+ for filename in candidate_files:
with zip_file.open(filename) as xml_candidate:
try:
ET.parse(xml_candidate)
@@ -81,10 +89,10 @@ def build_archive_file(archive_contents, zip_file):
def save_into_archive(xml_tree, filename, new_filename=None):
- # Saving a archive means extracting the contents into a temp folder,
+ # Saving an archive means extracting the contents into a temp folder,
# saving the changes over the twb/tds in that folder, and then
- # packaging it back up into a specifically formatted zip with the correct
- # relative file paths
+ # packaging it back up into a zip with a very specific format
+ # e.g. no empty files for directories, which Windows and Mac do by default
if new_filename is None:
new_filename = filename
diff --git a/test/assets/Cache.twbx b/test/assets/Cache.twbx
new file mode 100644
index 0000000..b1df6b7
Binary files /dev/null and b/test/assets/Cache.twbx differ
diff --git a/test/test_xfile.py b/test/test_xfile.py
index 6cbe67f..259c98b 100644
--- a/test/test_xfile.py
+++ b/test/test_xfile.py
@@ -12,8 +12,17 @@
'BadZip.zip'
)
+TWBX_WITH_CACHE_FILES = os.path.join(
+ TEST_ASSET_DIR,
+ 'Cache.twbx'
+)
+
class XFileEdgeTests(unittest.TestCase):
def test_find_file_in_zip_no_xml_file(self):
badzip = zipfile.ZipFile(BAD_ZIP_FILE)
self.assertIsNone(find_file_in_zip(badzip))
+
+ def test_only_find_twbs(self):
+ twb_from_twbx_with_cache = zipfile.ZipFile(TWBX_WITH_CACHE_FILES)
+ self.assertEqual(find_file_in_zip(twb_from_twbx_with_cache), 'Superstore.twb')
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy