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

Activate NoSleep on file transfers instead of on click and deactivate when transfer is finished

Browse source
This commit is contained in:
schlagmichdoch 2024-02-06 14:42:09 +01:00
parent 6d95f3f4e2
commit ef3c338dad
1 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

61
public/scripts/ui.js
View file

@ -446,11 +446,17 @@ class PeerUI {
this.html(); this.html();
this.$icon = this.$el.querySelector('svg use');
this.$displayName = this.$el.querySelector('.name');
this.$deviceName = this.$el.querySelector('.device-name');
this.$label = this.$el.querySelector('label'); this.$label = this.$el.querySelector('label');
this.$input = this.$el.querySelector('input'); this.$input = this.$el.querySelector('input');
this.$displayName = this.$el.querySelector('.name');
this.$progress = this.$el.querySelector('.progress'); this.$progress = this.$el.querySelector('.progress');
this.$icon.setAttribute('xlink:href', this._icon());
this.$displayName.textContent = this._displayName();
this.$deviceName.textContent = this._deviceName();
this.updateTypesClassList(); this.updateTypesClassList();
this.setStatus("connect"); this.setStatus("connect");
@ -489,10 +495,6 @@ class PeerUI {
<div class="status font-body2"></div> <div class="status font-body2"></div>
</div> </div>
</label>`; </label>`;
this.$el.querySelector('svg use').setAttribute('xlink:href', this._icon());
this.$el.querySelector('.name').textContent = this._displayName();
this.$el.querySelector('.device-name').textContent = this._deviceName();
} }
updateTypesClassList() { updateTypesClassList() {
@ -544,8 +546,6 @@ class PeerUI {
_createCallbacks() { _createCallbacks() {
this._callbackInput = e => this._onFilesSelected(e); this._callbackInput = e => this._onFilesSelected(e);
this._callbackClickSleep = _ => NoSleepUI.enable();
this._callbackTouchStartSleep = _ => NoSleepUI.enable();
this._callbackDrop = e => this._onDrop(e); this._callbackDrop = e => this._onDrop(e);
this._callbackDragEnd = e => this._onDragEnd(e); this._callbackDragEnd = e => this._onDragEnd(e);
this._callbackDragLeave = e => this._onDragEnd(e); this._callbackDragLeave = e => this._onDragEnd(e);
@ -562,9 +562,7 @@ class PeerUI {
this.$el.removeEventListener('pointerdown', this._callbackPointerDown); this.$el.removeEventListener('pointerdown', this._callbackPointerDown);
// Add Events Normal Mode // Add Events Normal Mode
this.$el.querySelector('input').addEventListener('change', this._callbackInput); this.$input.addEventListener('change', this._callbackInput);
this.$el.addEventListener('click', this._callbackClickSleep);
this.$el.addEventListener('touchstart', this._callbackTouchStartSleep);
this.$el.addEventListener('drop', this._callbackDrop); this.$el.addEventListener('drop', this._callbackDrop);
this.$el.addEventListener('dragend', this._callbackDragEnd); this.$el.addEventListener('dragend', this._callbackDragEnd);
this.$el.addEventListener('dragleave', this._callbackDragLeave); this.$el.addEventListener('dragleave', this._callbackDragLeave);
@ -575,8 +573,7 @@ class PeerUI {
} }
else { else {
// Remove Events Normal Mode // Remove Events Normal Mode
this.$el.removeEventListener('click', this._callbackClickSleep); this.$input.removeEventListener('change', this._callbackInput);
this.$el.removeEventListener('touchstart', this._callbackTouchStartSleep);
this.$el.removeEventListener('drop', this._callbackDrop); this.$el.removeEventListener('drop', this._callbackDrop);
this.$el.removeEventListener('dragend', this._callbackDragEnd); this.$el.removeEventListener('dragend', this._callbackDragEnd);
this.$el.removeEventListener('dragleave', this._callbackDragLeave); this.$el.removeEventListener('dragleave', this._callbackDragLeave);
@ -677,6 +674,13 @@ class PeerUI {
if (files.length === 0) return; if (files.length === 0) return;
let totalSize = 0;
for (let i = 0; i < files.length; i++) {
totalSize += files[i].size;
}
// Prevent device from sleeping
NoSleepUI.enable();
Events.fire('files-selected', { Events.fire('files-selected', {
files: files, files: files,
to: this._peer.id to: this._peer.id
@ -724,7 +728,7 @@ class PeerUI {
this.$el.removeAttribute('status'); this.$el.removeAttribute('status');
this.$el.querySelector('.status').innerHTML = ''; this.$el.querySelector('.status').innerHTML = '';
this._currentStatus = null; this._currentStatus = null;
NoSleepUI.disableIfPeersIdle(); NoSleepUI.disableIfIdle();
return; return;
} }
@ -1346,9 +1350,11 @@ class ReceiveRequestDialog extends ReceiveDialog {
this.$acceptRequestBtn.addEventListener('click', _ => this._respondToFileTransferRequest(true)); this.$acceptRequestBtn.addEventListener('click', _ => this._respondToFileTransferRequest(true));
this.$declineRequestBtn.addEventListener('click', _ => this._respondToFileTransferRequest(false)); this.$declineRequestBtn.addEventListener('click', _ => this._respondToFileTransferRequest(false));
this._filesTransferRequestQueue = [];
this._currentRequest = null;
Events.on('files-transfer-request', e => this._onRequestFileTransfer(e.detail.request, e.detail.peerId)) Events.on('files-transfer-request', e => this._onRequestFileTransfer(e.detail.request, e.detail.peerId))
Events.on('keydown', e => this._onKeyDown(e)); Events.on('keydown', e => this._onKeyDown(e));
this._filesTransferRequestQueue = [];
} }
_onKeyDown(e) { _onKeyDown(e) {
@ -1366,9 +1372,13 @@ class ReceiveRequestDialog extends ReceiveDialog {
} }
_dequeueRequests() { _dequeueRequests() {
if (!this._filesTransferRequestQueue.length) return; if (!this._filesTransferRequestQueue.length) {
this._currentRequest = null;
return;
}
let {request, peerId} = this._filesTransferRequestQueue.shift(); let {request, peerId} = this._filesTransferRequestQueue.shift();
this._showRequestDialog(request, peerId) this._currentRequest = request;
this._showRequestDialog(request, peerId);
} }
_addThumbnailToPreviewBox(thumbnailData) { _addThumbnailToPreviewBox(thumbnailData) {
@ -1409,7 +1419,8 @@ class ReceiveRequestDialog extends ReceiveDialog {
}) })
if (accepted) { if (accepted) {
Events.fire('set-progress', {peerId: this.correspondingPeerId, progress: 0, status: 'wait'}); Events.fire('set-progress', {peerId: this.correspondingPeerId, progress: 0, status: 'wait'});
// Todo: only on big files?
// Prevent device from sleeping
NoSleepUI.enable(); NoSleepUI.enable();
} }
this.hide(); this.hide();
@ -2856,20 +2867,20 @@ class WebFileHandlersUI {
class NoSleepUI { class NoSleepUI {
constructor() { constructor() {
NoSleepUI._nosleep = new NoSleep(); NoSleepUI._nosleep = new NoSleep();
NoSleepUI._active = false;
} }
static enable() { static enable() {
if (!NoSleepUI._interval) { if (NoSleepUI._active) return;
NoSleepUI._nosleep.enable(); NoSleepUI._nosleep.enable();
// Disable after 10s if all peers are idle NoSleepUI._active = true;
NoSleepUI._interval = setInterval(() => NoSleepUI.disableIfPeersIdle(), 10000);
}
} }
static disableIfPeersIdle() { static disableIfIdle() {
if ($$('x-peer[status]') === null) { if ($$('x-peer[status]')) return;
clearInterval(NoSleepUI._interval);
NoSleepUI._nosleep.disable(); NoSleepUI._nosleep.disable();
} NoSleepUI._active = false;
} }
} }