Changeset 100:33521906fedb

Timestamp:

01/22/09 09:00:37 (14 months ago)

Author:

Ga?tan de Menten <ged@…>

Children:

102:91c56813903c, 103:6153a53efa40

Branch:

default

Message:

- enable compression in the resulting OO document
- preserve file permissions of files inside the OO document

Files:

• relatorio/templates/opendocument.py (modified) (4 diffs)

relatorio/templates/opendocument.py

@@ -23 +23 @@
 import re
 import md5
+import time
 import urllib
 import zipfile
@@ -401 +402 @@
         # find the position in the row of the cells holding the
         # <for> and </for> instructions
-        #XXX: count cells only instead of * ?
+        # We use "*" so as to count both normal cells and covered/hidden cells
         position_xpath_expr = 'count(preceding-sibling::*)'
         opening_pos = \
@@ -621 +622 @@
             files.setdefault(stream_for, []).append((kind, data, pos))
 
+        now = time.localtime()[:6]
         for f_info in self.inzip.infolist():
             if f_info.filename.startswith('ObjectReplacements'):
@@ -626 +628 @@
             elif f_info.filename in files:
                 stream = files[f_info.filename]
-                self.outzip.writestr(f_info.filename,
-                                     output_encode(self.xml_serializer(stream)))
+                # create a new file descriptor, copying some attributes from
+                # the original file
+                new_info = zipfile.ZipInfo(f_info.filename, now)
+                for attr in ('compress_type', 'flag_bits', 'create_system'):
+                    setattr(new_info, attr, getattr(f_info, attr))
+                serialized_stream = output_encode(self.xml_serializer(stream))
+                self.outzip.writestr(new_info, serialized_stream)
             else:
                 self.outzip.writestr(f_info, self.inzip.read(f_info.filename))