Links included in Drive exports #1695
Conversation
zuzanna-maria
commented
Oct 28, 2024
zuzanna-maria
commented
- Links are now part of Drive exports (fixes Links aren't parts of drive exports #942)
zuzanna-maria
added
the
Ready to Review
zuzanna-maria
added
Ready to Test
mathilde-cryptpad
added
the
Drive
zuzanna-maria
added
OK to Merge
yflory
added
Ready to Test
www/common/make-backup.js
Outdated
| Object.keys(links).forEach(function(key) { | ||
| filesData[key] = links[key]; | ||
| }); |
There was a problem hiding this comment.
You could avoid merge the data (and risking a conflict with ids) if you provide links as a 5th argument to makeFolder 5 lines below (line 369 when I'm writing this review).
www/common/make-backup.js
Outdated
| var fData = fd[el]; | ||
| var sData = sd ? sd[el] : undefined; | ||
| if (fData) { | ||
| addFile(ctx, zip, fData, existingNames); | ||
| return; | ||
| } else if (sData) { | ||
| addFile(ctx, zip, sData, existingNames); | ||
| return; |
There was a problem hiding this comment.
This is fine but you could simplify it with
var fData = fd[el] || (sd && sd[el]);
and remove the else if part
www/common/make-backup.js
Outdated
| } | ||
| if (ctx.data.sharedFolders[el]) { // if shared folder | ||
| staticData = ctx.sf[el].static; |
There was a problem hiding this comment.
staticData is only used inside this if. You could declare it here with let` directly.
www/common/make-backup.js
Outdated
| var linkRegex = new RegExp("^(http|https)://"); | ||
| if (fData.href && linkRegex.test(fData.href)) { |
There was a problem hiding this comment.
This should work but this isn't a very clean way to detect if this is a link. If someone created a pad at the very beginning of CryptPad and this pad's href wasn't properly migrated to the new format, it's possible that they still have a pad with an absolute URL in their drive https://cryptpad.fr/pad/#....
It's also possible that in the future we'll want to have absolute URL for pads stored at a different place.
Another way to detect if the item is a link is to simply check if channel exists:
if (!fData.channel) {
// this is a link
} else {
