d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-28 23:44:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14210 from glassez/fix-webui

Browse Source 
WebUI: Correctly represent torrent content structure
This commit is contained in:
Vladimir Golovnev 2021-01-13 20:37:25 +03:00 committed by GitHub
commit 08b3d6bbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/webui/www/private/scripts/prop-files.js
View File

@ -422,38 +422,40 @@ window.qBittorrent.PropFiles = (function() {
const rootNode = new window.qBittorrent.FileTree.FolderNode(); const rootNode = new window.qBittorrent.FileTree.FolderNode();
rows.forEach(function(row) { rows.forEach(function(row) {
const pathItems = row.fileName.split(window.qBittorrent.Filesystem.PathSeparator);
pathItems.pop(); // remove last item (i.e. file name)
let parent = rootNode; let parent = rootNode;
let folderPath = window.qBittorrent.Filesystem.folderName(row.fileName); pathItems.forEach(function(folderName) {
while (folderPath) {
const folderName = window.qBittorrent.Filesystem.fileName(folderPath);
if (folderName === '.unwanted') if (folderName === '.unwanted')
return; return;
let parentNode = null; let folderNode = null;
if (parent.children !== null) { if (parent.children !== null) {
for (let i = 0; i < parent.children.length; ++i) { for (let i = 0; i < parent.children.length; ++i) {
const childFolder = parent.children[i]; const childFolder = parent.children[i];
if (childFolder.name === folderName) { if (childFolder.name === folderName) {
parentNode = childFolder; folderNode = childFolder;
break; break;
} }
} }
} }
if (parentNode === null) { if (folderNode === null) {
parentNode = new window.qBittorrent.FileTree.FolderNode(); folderNode = new window.qBittorrent.FileTree.FolderNode();
parentNode.path = folderPath; folderNode.path = (parent.path === "")
parentNode.name = folderName; ? folderName
parentNode.rowId = rowId; : [parent.path, folderName].join(window.qBittorrent.Filesystem.PathSeparator);
parentNode.root = parent; folderNode.name = folderName;
parent.addChild(parentNode); folderNode.rowId = rowId;
folderNode.root = parent;
parent.addChild(folderNode);
++rowId; ++rowId;
} }
parent = parentNode; parent = folderNode;
folderPath = window.qBittorrent.Filesystem.folderName(folderPath); });
}
const isChecked = row.checked ? TriState.Checked : TriState.Unchecked; const isChecked = row.checked ? TriState.Checked : TriState.Unchecked;
const remaining = (row.priority === FilePriority.Ignored) ? 0 : row.remaining; const remaining = (row.priority === FilePriority.Ignored) ? 0 : row.remaining;