diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 3000c3464..2e3a8bfe6 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -669,19 +669,19 @@ void WebApplication::action_command_recheck() void WebApplication::action_command_setLabel() { CHECK_URI(0); - CHECK_PARAMETERS("hash" << "label_obj"); + CHECK_PARAMETERS("hashes" << "label"); - QString hash = request().posts["hash"]; - QString label_obj = request().posts["label_obj"]; + QStringList hashes = request().posts["hashes"].split("|"); + QString label = request().posts["label"].trimmed(); + if (!Utils::Fs::isValidFileSystemName(label)) { + status(400, "Labels must not contain special characters"); + return; + } - const QVariantMap m = json::fromJson(label_obj).toMap(); - if( m.contains("value") ) { - QString label = m["value"].toString(); - if (!hash.isEmpty()) { - BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); - if (torrent) - torrent->setLabel(label); - } + foreach (const QString &hash, hashes) { + BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); + if (torrent) + torrent->setLabel(label); } } diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index a0ee74397..d3a320afd 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -106,9 +106,8 @@
  • QBT_TR(Force Resume)QBT_TR QBT_TR(Force Resume)QBT_TR
  • QBT_TR(Delete)QBT_TR QBT_TR(Delete)QBT_TR
  • - QBT_TR(Label >)QBT_TR - + QBT_TR(Label)QBT_TR QBT_TR(Label)QBT_TR +
  • QBT_TR(Priority)QBT_TR diff --git a/src/webui/www/public/filters.html b/src/webui/www/public/filters.html index ba1b1ce7f..48cce7baf 100644 --- a/src/webui/www/public/filters.html +++ b/src/webui/www/public/filters.html @@ -1,15 +1,15 @@ - QBT_TR(Torrents)QBT_TR - -
    - QBT_TR(Labels)QBT_TR - +QBT_TR(Torrents)QBT_TR + +
    +QBT_TR(Labels)QBT_TR + diff --git a/src/webui/www/public/newlabel.html b/src/webui/www/public/newlabel.html index 2b6ff512e..ccf226bc2 100644 --- a/src/webui/www/public/newlabel.html +++ b/src/webui/www/public/newlabel.html @@ -7,58 +7,41 @@ -
    -

    QBT_TR(Label)QBT_TR: - -

    -
    diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js index 72610e33d..49374be4d 100644 --- a/src/webui/www/public/scripts/client.js +++ b/src/webui/www/public/scripts/client.js @@ -95,10 +95,10 @@ window.addEvent('load', function () { resizeLimit : [100, 300] }); - setLabelFilter = function( hash ) { + setLabelFilter = function(hash) { selected_label = hash; localStorage.setItem('selected_label', selected_label); - updateLabelList(); + highlightSelectedLabel(); if (typeof myTable.table != 'undefined') updateMainData(); }; @@ -161,35 +161,33 @@ window.addEvent('load', function () { var syncMainDataLastResponseId = 0; var serverState = {}; - var removeTorrentFromLabelList = function( hash ) - { - if( hash == null || hash == "" ) return false; - + var removeTorrentFromLabelList = function(hash) { + if (hash == null || hash == "") + return false; var removed = false; - Object.each( label_list, function( label ) { - if( Object.contains( label.torrents, hash ) ) { + Object.each(label_list, function(label) { + if (Object.contains(label.torrents, hash)) { removed = true; - label.torrents.splice( label.torrents.indexOf( hash ), 1 ); + label.torrents.splice(label.torrents.indexOf(hash), 1); } }); return removed; }; - var addTorrentToLabelList = function( torrent ) { + var addTorrentToLabelList = function(torrent) { var label = torrent['label']; - if( label == null || label.length === 0 ) { - removeTorrentFromLabelList( torrent['hash'] ); + if (label == null) return false; + if (label.length === 0) { // Empty label + removeTorrentFromLabelList(torrent['hash']); + return true; } - - var labelHash = genHash( label ); - if( label_list[labelHash] == null ) { - console.log( "addTorrentToLabelList: warning, label not found. label=", label, " label_list=", label_list ); - label_list[labelHash] = { name: label, torrents: [] }; - } - if( !Object.contains(label_list[labelHash].torrents, torrent['hash'] ) ) { - removeTorrentFromLabelList( torrent['hash'] ); - label_list[labelHash].torrents = label_list[labelHash].torrents.combine( [ torrent['hash'] ] ); + var labelHash = genHash(label); + if (label_list[labelHash] == null) // This should not happen + label_list[labelHash] = {name: label, torrents: []}; + if (!Object.contains(label_list[labelHash].torrents, torrent['hash'])) { + removeTorrentFromLabelList(torrent['hash']); + label_list[labelHash].torrents = label_list[labelHash].torrents.combine([torrent['hash']]); return true; } return false; @@ -198,15 +196,20 @@ window.addEvent('load', function () { var updateContextMenu = function () { var labelList = $('contextLabelList'); labelList.empty(); - labelList.appendChild(new Element('li', {html: 'QBT_TR(New...)QBT_TR'})); - labelList.appendChild(new Element('li', {html: 'QBT_TR(Reset)QBT_TR'})); + labelList.appendChild(new Element('li', {html: 'QBT_TR(New...)QBT_TR QBT_TR(New...)QBT_TR'})); + labelList.appendChild(new Element('li', {html: 'QBT_TR(Reset)QBT_TR QBT_TR(Reset)QBT_TR'})); + + var sortedLabels = [] + Object.each(label_list, function(label) { + sortedLabels.push(label.name); + }); + sortedLabels.sort(); var first = true; - Object.each(label_list, function (label) { - var labelHash = genHash( label.name ); - var el = new Element('li', {html: '' + label.name + ''}); + Object.each(sortedLabels, function(labelName) { + var labelHash = genHash(labelName); + var el = new Element('li', {html: ' ' + labelName + ''}); if (first) { - el.removeClass(); el.addClass('separator'); first = false; } @@ -215,42 +218,54 @@ window.addEvent('load', function () { }; var updateLabelList = function() { - var labelList = $( 'filterLabelList' ); - if( !labelList ) { + var labelList = $('filterLabelList'); + if (!labelList) return; - } labelList.empty(); - var create_link = function( hash, text, count ) - { + var create_link = function(hash, text, count) { var html = '' + - '' + - text + '(' + count + ')' + ''; - - return new Element( 'li', { id: hash, html: html } ); + '' + + text + ' (' + count + ')' + ''; + return new Element('li', {id: hash, html: html}); }; - var allLabels = 0; - Object.each( label_list, function( label ) { - allLabels += label.torrents.length; + var all = myTable.getRowIds().length; + var unlabelled = 0; + Object.each(myTable.rows, function(row) { + if (row['full_data'].label.length === 0) + unlabelled += 1; + }); + labelList.appendChild(create_link(LABELS_ALL, 'QBT_TR(All)QBT_TR', all)); + labelList.appendChild(create_link(LABELS_UNLABELLED, 'QBT_TR(Unlabeled)QBT_TR', unlabelled)); + + var sortedLabels = [] + Object.each(label_list, function(label) { + sortedLabels.push(label.name); + }); + sortedLabels.sort(); + + Object.each(sortedLabels, function(labelName) { + var labelHash = genHash(labelName); + var labelCount = label_list[labelHash].torrents.length; + labelList.appendChild(create_link(labelHash, labelName, labelCount)); }); - var unlabelled = myTable.getRowIds().length - allLabels; - labelList.appendChild( create_link( LABELS_ALL, 'QBT_TR(All Labels)QBT_TR', allLabels ) ); - labelList.appendChild( create_link( LABELS_UNLABELLED, 'QBT_TR(Unlabeled)QBT_TR', unlabelled ) ); - - Object.each( label_list, function( label ) { - var labelHash = genHash( label.name ); - labelList.appendChild( create_link( labelHash, label.name, label.torrents.length ) ); - } ); + highlightSelectedLabel(); + }; + var highlightSelectedLabel = function() { + var labelList = $('filterLabelList'); + if (!labelList) + return; var childrens = labelList.childNodes; for (var i in childrens) { - if( childrens[i].id == selected_label ) { + if (childrens[i].id == selected_label) childrens[i].className = "selectedFilter"; - } + else + childrens[i].className = ""; } - }; + } var syncMainDataTimer; var syncMainData = function () { @@ -268,30 +283,42 @@ window.addEvent('load', function () { onSuccess : function (response) { $('error_div').set('html', ''); if (response) { + var update_labels = false; var full_update = (response['full_update'] == true); if (full_update) { myTable.rows.erase(); label_list = {}; - Object.each( response['labels'], function( label ) { - var labelHash = genHash( label ); - label_list[ labelHash ] = { name: label, torrents: [] }; - } ); } if (response['rid']) { syncMainDataLastResponseId = response['rid']; } + if (response['labels']) { + response['labels'].each(function(label) { + var labelHash = genHash(label); + label_list[labelHash] = {name: label, torrents: []}; + }); + update_labels = true; + } + if (response['labels_removed']) { + response['labels_removed'].each(function(label) { + var labelHash = genHash(label); + delete label_list[labelHash]; + }); + update_labels = true; + } if (response['torrents']) { for (var key in response['torrents']) { response['torrents'][key]['hash'] = key; - myTable.updateRowData( response['torrents'][key] ); - addTorrentToLabelList( response['torrents'][key] ); + myTable.updateRowData(response['torrents'][key]); + if (addTorrentToLabelList(response['torrents'][key])) + update_labels = true; } - updateLabelList(); - updateContextMenu(); } if (response['torrents_removed']) response['torrents_removed'].each(function (hash) { myTable.removeRow(hash); + removeTorrentFromLabelList(hash); + update_labels = true; // Allways to update All label }); myTable.updateTable(full_update); myTable.altRow(); @@ -301,6 +328,10 @@ window.addEvent('load', function () { serverState[key] = tmp[key]; processServerState(); } + if (update_labels) { + updateLabelList(); + updateContextMenu(); + } } clearTimeout(syncMainDataTimer); syncMainDataTimer = syncMainData.delay(syncMainDataTimerPeriod); diff --git a/src/webui/www/public/scripts/dynamicTable.js b/src/webui/www/public/scripts/dynamicTable.js index c49de75c7..8b23bf29a 100644 --- a/src/webui/www/public/scripts/dynamicTable.js +++ b/src/webui/www/public/scripts/dynamicTable.js @@ -280,7 +280,7 @@ var dynamicTable = new Class({ break; } - if (labelName == LABELS_ALL && row['full_data'].label.length > 0) + if (labelName == LABELS_ALL) return true; if (labelName == LABELS_UNLABELLED && row['full_data'].label.length === 0) diff --git a/src/webui/www/public/scripts/mocha-init.js b/src/webui/www/public/scripts/mocha-init.js index 9ff9c36f5..35af44816 100644 --- a/src/webui/www/public/scripts/mocha-init.js +++ b/src/webui/www/public/scripts/mocha-init.js @@ -314,52 +314,34 @@ initializeWindows = function() { if (h.length) { new MochaUI.Window({ id: 'newLabelPage', - title: "QBT_TR(Torrent Label)QBT_TR", + title: "QBT_TR(New Label)QBT_TR", loadMethod: 'iframe', - contentURL: 'newlabel.html?hashes=' + h.join(','), + contentURL: 'newlabel.html?hashes=' + h.join('|'), scrollbars: false, resizable: false, maximizable: false, paddingVertical: 0, paddingHorizontal: 0, - width: 424, - height: 150 + width: 250, + height: 100 }); } }; - resetLabelFN = function () { - var h = myTable.selectedIds(); - var label_json = JSON.stringify({value: ''}); - if (h.length) { - h.each(function (hash, index) { - new Request({ - url: 'command/setLabel', - method: 'post', - data: { - hash: hash, - label_obj: label_json - } - }).send(); - }); - } - }; - - updateLabelFN = function (label_hash) { - var label = label_list[label_hash].name; - var label_json = JSON.stringify({value: label}); + updateLabelFN = function (labelHash) { + var labelName = ''; + if (labelHash != 0) + var labelName = label_list[labelHash].name; var h = myTable.selectedIds(); if (h.length) { - h.each(function (hash, index) { - new Request({ - url: 'command/setLabel', - method: 'post', - data: { - hash: hash, - label_obj: label_json - } - }).send(); - }); + new Request({ + url: 'command/setLabel', + method: 'post', + data: { + hashes: h.join("|"), + label: labelName + } + }).send(); } };