[WIP] Fix mozilla/thimble.mozilla.org#889: Remove root folder thimble-project if exists #724
Conversation
There was a problem hiding this comment.
Looks pretty good, but I haven't tested it yet. Can you fix the things I mention here?
Also, two more things:
- We should probably change the name of the
.zipfile we produce tothimble-project.zipvs.project.zipif it isn't already (can't remember). - Can you file a bug to make this string configurable on startup? Bramble might get used outside of Thimble, so it's not ideal to hard-code that string in here. We'd probably want to add this to
src/bramble/client/main.jssuch that you can override what it uses in the constructor forBramble.
| isDirectory: isDir, | ||
| data: isDir ? null : new Buffer(file.asArrayBuffer()) | ||
| }); | ||
| }); | ||
|
|
||
| function removeProjectFolder(path){ | ||
| // Nuke root folder thimble-project/ if exists | ||
| var regex = /^thimble\-project\//g; |
There was a problem hiding this comment.
Let's combine these two lines:
return path.replace(/^thimble\-project\//, "");Also, I don't think you want to include the g in your regex, since you're only wanting to deal with the case of this string starting at the beginning.
| isDirectory: isDir, | ||
| data: isDir ? null : new Buffer(file.asArrayBuffer()) | ||
| }); | ||
| }); | ||
|
|
||
| function removeProjectFolder(path){ |
There was a problem hiding this comment.
removeThimbleProjectFolder is probably more accurate a name.
| isDirectory: isDir, | ||
| data: isDir ? null : new Buffer(file.asArrayBuffer()) | ||
| }); | ||
| }); | ||
|
|
||
| function removeProjectFolder(path){ | ||
| // Nuke root folder thimble-project/ if exists |
There was a problem hiding this comment.
Expand this comment slightly:
// Nuke root folder `thimble-project/` if exists so that project zip files
// can be re-imported without adding an unnecessary folder.
|
I did a rebase on my code and I've added the changes you asked for. Going to file a new Just to recap, you want the string "thimble-project.zip" and "thimble-project" to be reconfigurable right? |
|
@Simon66 you still finishing this? |
|
I'm finishing this in #789 |
The user is now able to export and import a zipped project without creating redundant folders (As first described here: mozilla/thimble.mozilla.org#889).
Because
ArchiveUtils.jsis being changed by @humphd, I've added the[WIP]in the title. Once his PR lands, I'll make the necessary changes 馃憤