[PATCH] Empty folders excluded from Zip Downloads in Browse Source

[trustmaster@…]

The "Download in other formats: Zip Archive" feature ignores folders which have no files inside. It results in missing folders in the Zip.

In our project it breaks such downloads completely because we use empty folders for example to store cache files which are not yet present in initial download but are generated later on in such folders.

[Remy Blank]

PatchWelcome.

[Thijs Triemstra]

against 0.12-stable r10514

[Thijs Triemstra]

Attached patch creates empty directories in zip files. Also attaching the svn repo i used for testing.

[Christian Boos]

Looks good, except for the zipfile.write(mkdtemp(), filename) part:

• directories created like that won't get deleted automatically; you'd have to do some housekeeping (try/finally and delete it there)
• you could created only one empty directory and reuse it (and possibly only create it when actually needed?)

[Remy Blank]

Replying to cboos:

Looks good, except for the zipfile.write(mkdtemp(), filename) part:

You can also add a directory by appending a / to the filename, and setting .external_attr to 040755 << 16 (octal):

elif new_node.isdir:
    zipinfo = ZipInfo()
    zipinfo.filename = filename + '/'
    zipinfo.date_time = new_node.last_modified.utctimetuple()[:6]
    zipinfo.external_attr = 040755 << 16L # needed since Python 2.5
    zipinfo.compress_type = compression
    zipfile.writestr(zipinfo, '')

[Remy Blank]

… and this will even work with Python 2.4 and 2.5, contrary to the "temporary directory" approach.

[Thijs Triemstra]

Replying to rblank:

You can also add a directory by appending a / to the filename, and setting .external_attr to 040755 << 16 (octal):

omg, you dont want to know how many combinations I tried before finally switching from ZipFile.writestr to ZipFile.write. Anyway, your suggestion works perfectly (tested on py2.7.1), I'll attach an updated patch.

[Remy Blank]

Replying to thijstriemstra:

omg, you dont want to know how many combinations I tried before finally switching from ZipFile.writestr to ZipFile.write.

Heh, I cheated. I read the implementation of ZipFile.write() in the zipfile module for Python 2.6 :)

[Thijs Triemstra]

Is this patch ok like this?

[Remy Blank]

Yes, it's fine. Putting on my todo list to apply.

[Remy Blank]

Applied in [10665].