Mercurial > kallithea
diff rhodecode/controllers/files.py @ 2318:058e2743e7b7 beta
fixes issue #455 Creating an archive generates an exception on Windows
- reverted the FileIter implementation as it had the same issue on windows and
probably on unix as ref #448
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 20 May 2012 14:41:03 +0200 |
parents | 3c1d991755df |
children | 530bd12fc18a |
line wrap: on
line diff
--- a/rhodecode/controllers/files.py Sun May 20 14:34:45 2012 +0200 +++ b/rhodecode/controllers/files.py Sun May 20 14:41:03 2012 +0200 @@ -361,26 +361,26 @@ except (ImproperArchiveTypeError, KeyError): return _('Unknown archive type') - fd, _archive_name = tempfile.mkstemp(suffix='rcarchive') - with open(_archive_name, 'wb') as f: - cs.fill_archive(stream=f, kind=fileformat, subrepos=subrepos) - - content_disposition = 'attachment; filename=%s-%s%s' \ - % (repo_name, revision[:12], ext) - content_length = os.path.getsize(_archive_name) + fd, archive = tempfile.mkstemp() + t = open(archive, 'wb') + cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos) + t.close() - headers = [('Content-Disposition', str(content_disposition)), - ('Content-Type', str(content_type)), - ('Content-Length', str(content_length))] + def get_chunked_archive(archive): + stream = open(archive, 'rb') + while True: + data = stream.read(16 * 1024) + if not data: + stream.close() + os.close(fd) + os.remove(archive) + break + yield data - class _DestroyingFileWrapper(_FileIter): - def close(self): - self.file.close - os.remove(self.file.name) - - request.environ['wsgi.file_wrapper'] = _DestroyingFileWrapper - fapp = FileApp(_archive_name, headers=headers) - return fapp(request.environ, self.start_response) + response.content_disposition = str('attachment; filename=%s-%s%s' \ + % (repo_name, revision[:12], ext)) + response.content_type = str(content_type) + return get_chunked_archive(archive) @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', 'repository.admin')