Allow to remember torrent content files deletion in WebUI #20150

solarfl4re · 2023-12-19T17:58:34Z

Add a 'remember choice' button to the WebUI Torrent deletion dialog that sets the default file deletion setting. The setting is shared with Qt UI, so if you set it in WebUI and open the Qt app, the delete files checkbox will match WebUI (checked or unchecked).

Button is disabled until user checks or unchecks the delete files checkbox:

When the checkbox is clicked, the user can click the lock button to remember their choice:

This setting was used in the Qt GUI but not in WebUI; I named it delete_torrent_files_as_default to match other WebUI setting names.

Qt UI has a 'Remember choice' button in the confirm torrent deletion dialog; this adds a button to the WebUI that matches the Qt dialog in looks and functionality. - Button's title text (not visible, but needed for accessibility) matches Qt UI, so existing translations for 'Remember choice' can be used. Do I just need to update all the .ts files and use the QBT_TR() helper? - The button's script GETs api/v2/app/preferences each time the confirm deletion dialog opens; should we cache the deletion setting locally? Closes qbittorrent#20073.

src/webui/www/private/confirmdeletion.html

Also reordered things for better clarity and rewrote/added comments.

Chocobo1 · 2024-01-06T06:18:44Z

@solarfl4re
I have tested this PR and found some issues. I would like to correct them myself. I hope you don't mind that push some commits directly onto your git branch. Afterwards we will review/approve and squash merge it. If you agree, please leave the PR and git branch as is and I'll handle the rest.

solarfl4re · 2024-01-06T09:50:12Z

@solarfl4re I have tested this PR and found some issues. I would like to correct them myself. I hope you don't mind that push some commits directly onto your git branch. Afterwards we will review/approve and squash merge it. If you agree, please leave the PR and git branch as is and I'll handle the rest.

Sure, that sounds good.

glassez · 2024-01-06T12:25:29Z

Allow setting torrent-file deletion default in WebUI

Looks confusing... is it about deletion of torrent file?

src/webui/api/appcontroller.cpp

glassez · 2024-01-06T12:45:36Z

@Chocobo1, @qbittorrent/bug-handlers
Shouldn't we use some terminology that allows someone to clearly distinguish which files we are talking about, the torrent metadata files (.torrent files), or the torrent content files?

P.S. this especially refers to user-visible strings.

* Fix wrong initialization logic for the "Delete files" checkbox. * Revert back to use XHR to load svg icon. This is better than embedding svg icons. * Revise CSS selector. * Make the dialog resizeable and a bit larger.

thalieht · 2024-01-06T17:29:10Z

Shouldn't we use some terminology that allows someone to clearly distinguish which files we are talking about, the torrent metadata files (.torrent files), or the torrent content files?

Current string looks good enough to me but i don't know if utorrent has trained its users to consider the .torrent file as part of the torrent's files.

glassez · 2024-01-06T18:48:29Z

Shouldn't we use some terminology that allows someone to clearly distinguish which files we are talking about, the torrent metadata files (.torrent files), or the torrent content files?

Current string looks good enough to me but i don't know if utorrent has trained its users to consider the .torrent file as part of the torrent's files.

It's not even about uTorrent. "torrent files" is just ambiguous in itself, isn't it?

thalieht · 2024-01-06T23:33:42Z

It's not even about uTorrent. "torrent files" is just ambiguous in itself, isn't it?

I was talking about the single torrent deletion string. I just saw OP pics and multi torrent deletion string can definitely be confusing.

glassez

Didn't test.

Chocobo1 · 2024-01-08T06:40:01Z

@solarfl4re
Thank you!

Chocobo1 · 2024-01-08T06:45:32Z

I was talking about the single torrent deletion string. I just saw OP pics and multi torrent deletion string can definitely be confusing.

The dialog currently does not make use of the number of torrents being deleted. It can be counted from:

qBittorrent/src/webui/www/private/confirmdeletion.html

Line 74 in e69f857

const hashes = new URI().getData('hashes').split('|');

And modify the message string accordingly:

qBittorrent/src/webui/www/private/confirmdeletion.html

Line 104 in e69f857

    
           <p>&nbsp;&nbsp;QBT_TR(Are you sure you want to remove the selected torrents from the transfer list?)QBT_TR[CONTEXT=HttpServer]</p>

Ideally it should match GUI behavior. PR welcome.

thalieht · 2024-01-08T12:46:36Z

The dialog currently does not make use of the number of torrents being deleted

I don't see how that helps. I meant ...remove the selected torrents... Also permanently delete the files
"delete the files" could mistakenly be interpreted as "delete the .torrent files".
I don't have a good suggestion.

glassez · 2024-01-08T15:47:26Z

The dialog currently does not make use of the number of torrents being deleted

I don't see how that helps. I meant ...remove the selected torrents... Also permanently delete the files "delete the files" could mistakenly be interpreted as "delete the .torrent files". I don't have a good suggestion.

IMO, we should use "torrent content files" (or some other suitable alternative) in all such cases to dusambiguate it.

solarfl4re · 2024-01-28T02:56:57Z

The dialog currently does not make use of the number of torrents being deleted

I don't see how that helps. I meant ...remove the selected torrents... Also permanently delete the files "delete the files" could mistakenly be interpreted as "delete the .torrent files". I don't have a good suggestion.

IMO, we should use "torrent content files" (or some other suitable alternative) in all such cases to dusambiguate it.

What about 'downloaded'? E.g. 'delete downloaded files' - that's clear to me as meaning the files I've downloaded.

glassez · 2024-01-28T06:45:42Z

What about 'downloaded'? E.g. 'delete downloaded files' - that's clear to me as meaning the files I've downloaded.

It removes the content referenced by torrent independently from whether it was downloaded by torrent or they are previously existing files that you share via that torrent.

solarfl4re added 3 commits December 19, 2023 07:58

Expose torrent file deletion setting to WebUI

2425a1f

This setting was used in the Qt GUI but not in WebUI; I named it delete_torrent_files_as_default to match other WebUI setting names.

Add Lock icon SVG to WebUI

50598ea

Chocobo1 reviewed Dec 22, 2023

View reviewed changes

Chocobo1 added the WebUI WebUI-related issues/changes label Dec 22, 2023

solarfl4re added 2 commits December 30, 2023 18:41

Declare lock icon and its height and width in html

ad6593d

Update for dark mode, implement review suggestions

1b80df8

Also reordered things for better clarity and rewrote/added comments.

Chocobo1 force-pushed the webuiPermDeleteBox branch 2 times, most recently from 30bdbcc to 8a3404b Compare January 6, 2024 11:15

Chocobo1 previously approved these changes Jan 6, 2024

View reviewed changes

Chocobo1 requested a review from a team January 6, 2024 11:16

Chocobo1 dismissed their stale review via 5c6df12 January 6, 2024 11:20

Chocobo1 force-pushed the webuiPermDeleteBox branch from 8a3404b to 5c6df12 Compare January 6, 2024 11:20

Chocobo1 previously approved these changes Jan 6, 2024

View reviewed changes

Chocobo1 added this to the 5.0 milestone Jan 6, 2024

glassez reviewed Jan 6, 2024

View reviewed changes

src/webui/api/appcontroller.cpp Outdated Show resolved Hide resolved

glassez requested a review from a team January 6, 2024 12:50

Chocobo1 changed the title ~~Allow setting torrent-file deletion default in WebUI~~ Allow to remember torrent content deletion in WebUI Jan 6, 2024

Chocobo1 changed the title ~~Allow to remember torrent content deletion in WebUI~~ Allow to remember torrent content files deletion in WebUI Jan 6, 2024

Revise WebUI confirm deletion dialog

9a244d5

* Fix wrong initialization logic for the "Delete files" checkbox. * Revert back to use XHR to load svg icon. This is better than embedding svg icons. * Revise CSS selector. * Make the dialog resizeable and a bit larger.

Chocobo1 dismissed their stale review via 9a244d5 January 6, 2024 13:44

Chocobo1 force-pushed the webuiPermDeleteBox branch from 5c6df12 to 9a244d5 Compare January 6, 2024 13:44

thalieht approved these changes Jan 6, 2024

View reviewed changes

glassez approved these changes Jan 7, 2024

View reviewed changes

Chocobo1 merged commit e69f857 into qbittorrent:master Jan 8, 2024
13 checks passed

Larsluph mentioned this pull request Oct 4, 2024

[Bug]: Having the same behaviour as qbitorrent / Add an option to keep or not the last "deleting files" setting VueTorrent/VueTorrent#1907

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to remember torrent content files deletion in WebUI #20150

Allow to remember torrent content files deletion in WebUI #20150

solarfl4re commented Dec 19, 2023

Chocobo1 commented Jan 6, 2024

solarfl4re commented Jan 6, 2024

glassez commented Jan 6, 2024

glassez commented Jan 6, 2024 •

edited

Loading

thalieht commented Jan 6, 2024

glassez commented Jan 6, 2024

thalieht commented Jan 6, 2024

glassez left a comment

Chocobo1 commented Jan 8, 2024

Chocobo1 commented Jan 8, 2024

thalieht commented Jan 8, 2024

glassez commented Jan 8, 2024

solarfl4re commented Jan 28, 2024

glassez commented Jan 28, 2024

Allow to remember torrent content files deletion in WebUI #20150

Allow to remember torrent content files deletion in WebUI #20150

Conversation

solarfl4re commented Dec 19, 2023

Chocobo1 commented Jan 6, 2024

solarfl4re commented Jan 6, 2024

glassez commented Jan 6, 2024

glassez commented Jan 6, 2024 • edited Loading

thalieht commented Jan 6, 2024

glassez commented Jan 6, 2024

thalieht commented Jan 6, 2024

glassez left a comment

Choose a reason for hiding this comment

Chocobo1 commented Jan 8, 2024

Chocobo1 commented Jan 8, 2024

thalieht commented Jan 8, 2024

glassez commented Jan 8, 2024

solarfl4re commented Jan 28, 2024

glassez commented Jan 28, 2024

glassez commented Jan 6, 2024 •

edited

Loading