mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-22 15:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #381 from schlagmichdoch/fix-filename-wo-suffix

Browse source 
WIP:Fix chromium file extension if mime type is not set
This commit is contained in:
schlagmichdoch 2025-02-19 12:17:55 +01:00 • committed by GitHub
commit b7c1893ac0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/scripts/network.js
View file

@ -1082,7 +1082,7 @@ class PeersManager {
} }
async _onFilesSelected(message) { async _onFilesSelected(message) {
let files = mime.addMissingMimeTypesToFiles(message.files); let files = mime.addMissingMimeTypesToFiles([...message.files]);
await this.peers[message.to].requestFileTransfer(files); await this.peers[message.to].requestFileTransfer(files);
} }
@ -1306,9 +1306,8 @@ class FileDigester {
const blob = new Blob(this._buffer) const blob = new Blob(this._buffer)
this._buffer = null; this._buffer = null;
this._callback(new File([blob], this._name, { this._callback(new File([blob], this._name, {
type: this._mime, type: this._mime || "application/octet-stream",
lastModified: new Date().getTime() lastModified: new Date().getTime()
})); }));
} }
} }

4
public/scripts/ui.js
View file

@ -873,7 +873,9 @@ class ReceiveDialog extends Dialog {
const fileName = files[0].name; const fileName = files[0].name;
const fileNameSplit = fileName.split('.'); 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.$fileStem.innerText = fileName.substring(0, fileName.length - fileExtension.length);
this.$fileExtension.innerText = fileExtension; this.$fileExtension.innerText = fileExtension;
this.$fileSize.innerText = this._formatFileSize(totalSize); this.$fileSize.innerText = this._formatFileSize(totalSize);

5
public/scripts/util.js
View file

@ -392,7 +392,8 @@ const mime = (() => {
"vob": "video/x-ms-vob", "vob": "video/x-ms-vob",
"wmv": "video/x-ms-wmv", "wmv": "video/x-ms-wmv",
"avi": "video/x-msvideo", "avi": "video/x-msvideo",
"*": "video/x-sgi-movie" "*": "video/x-sgi-movie",
"kdbx": "application/x-keepass2"
} }
return { return {
@ -409,7 +410,7 @@ const mime = (() => {
// if filetype is empty guess via suffix otherwise leave unchanged // if filetype is empty guess via suffix otherwise leave unchanged
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
if (!files[i].type) { 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; return files;