mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Export: Limit attachment filename length, + convo date, + tests (#1439)

Browse source 
* Export: limit attachment names to 30 chars, tests for helper fns

Also, reintroduce last contact date in conversation dir name

FREEBIE

* MessageView tests: Fix failures during blanket coverage run

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-06 18:20:42 -07:00 • committed by GitHub
parent 4009a0119e
commit cc6dcf67b7
4 changed files with 185 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
js/backup.js
View file

@ -267,8 +267,35 @@
});
}
function trimFileName(filename) {
var components = filename.split('.');
if (components.length <= 1) {
return filename.slice(0, 30);
}
var extension = components[components.length - 1];
var name = components.slice(0, components.length - 1);
if (extension.length > 5) {
return filename.slice(0, 30);
}
return name.join('.').slice(0, 24) + '.' + extension;
}
function getAttachmentFileName(attachment) {
return attachment.fileName || (attachment.id + '.' + attachment.contentType.split('/')[1]);
if (attachment.fileName) {
return trimFileName(attachment.fileName);
}
var name = attachment.id;
if (attachment.contentType) {
var components = attachment.contentType.split('/');
name += '.' + (components.length > 1 ? components[1] : attachment.contentType);
}
return name;
}
function readAttachment(parent, message, attachment) {
@ -407,11 +434,10 @@
function getConversationDirName(conversation) {
var name = conversation.active_at || 'never';
if (conversation.name) {
return ' (' + conversation.name.slice(0, 30) + ' ' + conversation.id + ')';
return name + ' (' + conversation.name.slice(0, 30) + ' ' + conversation.id + ')';
} else {
return ' (' + conversation.id + ')';
return name + ' (' + conversation.id + ')';
}
return name;
}
// Goals for logging names:
@ -673,7 +699,13 @@
);
return Promise.reject(error);
});
}
},
// for testing
sanitizeFileName: sanitizeFileName,
trimFileName: trimFileName,
getAttachmentFileName: getAttachmentFileName,
getConversationDirName: getConversationDirName,
getConversationLoggingName: getConversationLoggingName
};
}());