mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2025-04-20 07:05:05 -04:00
Merge pull request #381 from schlagmichdoch/fix-filename-wo-suffix
WIP:Fix chromium file extension if mime type is not set
This commit is contained in:
commit
b7c1893ac0
3 changed files with 8 additions and 6 deletions
|
@ -1082,7 +1082,7 @@ class PeersManager {
|
|||
}
|
||||
|
||||
async _onFilesSelected(message) {
|
||||
let files = mime.addMissingMimeTypesToFiles(message.files);
|
||||
let files = mime.addMissingMimeTypesToFiles([...message.files]);
|
||||
await this.peers[message.to].requestFileTransfer(files);
|
||||
}
|
||||
|
||||
|
@ -1306,9 +1306,8 @@ class FileDigester {
|
|||
const blob = new Blob(this._buffer)
|
||||
this._buffer = null;
|
||||
this._callback(new File([blob], this._name, {
|
||||
type: this._mime,
|
||||
type: this._mime || "application/octet-stream",
|
||||
lastModified: new Date().getTime()
|
||||
}));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -873,7 +873,9 @@ class ReceiveDialog extends Dialog {
|
|||
|
||||
const fileName = files[0].name;
|
||||
const fileNameSplit = fileName.split('.');
|
||||
const fileExtension = '.' + fileNameSplit[fileNameSplit.length - 1];
|
||||
const fileExtension = fileNameSplit.length > 1
|
||||
? '.' + fileNameSplit[fileNameSplit.length - 1]
|
||||
: '';
|
||||
this.$fileStem.innerText = fileName.substring(0, fileName.length - fileExtension.length);
|
||||
this.$fileExtension.innerText = fileExtension;
|
||||
this.$fileSize.innerText = this._formatFileSize(totalSize);
|
||||
|
|
|
@ -392,7 +392,8 @@ const mime = (() => {
|
|||
"vob": "video/x-ms-vob",
|
||||
"wmv": "video/x-ms-wmv",
|
||||
"avi": "video/x-msvideo",
|
||||
"*": "video/x-sgi-movie"
|
||||
"*": "video/x-sgi-movie",
|
||||
"kdbx": "application/x-keepass2"
|
||||
}
|
||||
|
||||
return {
|
||||
|
@ -409,7 +410,7 @@ const mime = (() => {
|
|||
// if filetype is empty guess via suffix otherwise leave unchanged
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
if (!files[i].type) {
|
||||
files[i] = new File([files[i]], files[i].name, {type: mime.guessMimeByFilename(files[i].name) || ""});
|
||||
files[i] = new File([files[i]], files[i].name, {type: mime.guessMimeByFilename(files[i].name) || "application/octet-stream"});
|
||||
}
|
||||
}
|
||||
return files;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue