|
@@ -107,17 +107,23 @@ function toArray (list) {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * Takes a fileName and turns it into fileID, by converting to lowercase,
|
|
|
|
- * removing extra characters and adding unix timestamp
|
|
|
|
|
|
+ * Takes a file object and turns it into fileID, by converting file.name to lowercase,
|
|
|
|
+ * removing extra characters and adding type, size and lastModified
|
|
*
|
|
*
|
|
- * @param {String} fileName
|
|
|
|
|
|
+ * @param {Object} file
|
|
|
|
+ * @return {String} the fileID
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
function generateFileID (file) {
|
|
function generateFileID (file) {
|
|
- let fileID = file.name.toLowerCase()
|
|
|
|
- fileID = fileID.replace(/[^A-Z0-9]/ig, '')
|
|
|
|
- fileID = fileID + file.data.lastModified
|
|
|
|
- return fileID
|
|
|
|
|
|
+ // filter is needed to not join empty values with `-`
|
|
|
|
+ return [
|
|
|
|
+ 'uppy',
|
|
|
|
+ file.name ? file.name.toLowerCase().replace(/[^A-Z0-9]/ig, '') : '',
|
|
|
|
+ file.type,
|
|
|
|
+ file.hui,
|
|
|
|
+ file.data.size,
|
|
|
|
+ file.data.lastModified
|
|
|
|
+ ].filter(val => val).join('-')
|
|
}
|
|
}
|
|
|
|
|
|
function extend (...objs) {
|
|
function extend (...objs) {
|