zip() implemented

tkrajina · tkrajina · commit 8f68ef998790 · 2013-06-08T22:37:29.000+02:00
diff --git a/srtm/data.py b/srtm/data.py
@@ -120,20 +120,19 @@ def retrieve_or_load_file_data(self, file_name):
             return None
 
         # data is zipped:
-        mod_logging.info('Unzipping {0}'.format(url))
-        mod_logging.info('Unzipped {0}'.format(url))
 
         if self.reduce_big_files:
             data = mod_utils.unzip(data)
             data = self._reduce_file(data, file_name)
-            data = mod_utils.zip(data)
+            data = mod_utils.zip(data, file_name)
 
         with open(data_file_name, 'w') as f:
             if self.leave_zipped:
                 f = open(data_file_name + '.zip', 'w')
             else:
                 data = mod_utils.unzip(data)
                 f = open(data_file_name, 'w')
+            f.write(data)
 
         return data
 
diff --git a/srtm/utils.py b/srtm/utils.py
@@ -16,6 +16,7 @@
 
 import pdb
 
+import logging as mod_logging
 import math as mod_math
 import zipfile as mod_zipfile
 import cStringIO as mod_cstringio
@@ -43,16 +44,21 @@ def get_color_between(color1, color2, i):
             int(color1[1] + (color2[1] - color1[1]) * i),
             int(color1[2] + (color2[2] - color1[2]) * i))
 
-def zip(contents):
-    pdb.set_trace()
+def zip(contents, file_name):
+    mod_logging.debug('Zipping %s bytes' % len(contents))
     result = mod_cstringio.StringIO()
     zip_file = mod_zipfile.ZipFile(result, 'w', mod_zipfile.ZIP_DEFLATED, False)
-    zip_file.writestr('archive.zip', contents)
+    zip_file.writestr(file_name, contents)
+    zip_file.close()
     result.seek(0)
+    mod_logging.debug('Zipped')
     return result.read()
 
 def unzip(contents):
+    mod_logging.debug('Unzipping %s bytes' % len(contents))
     zip_file = mod_zipfile.ZipFile(mod_cstringio.StringIO(contents))
     zip_info_list = zip_file.infolist()
     zip_info = zip_info_list[0]
-    return zip_file.open(zip_info).read()
+    result = zip_file.open(zip_info).read()
+    mod_logging.debug('Unzipped')
+    return result
