Browse Source

WebUI: Implement 'Force Start' feature.

adaptive-webui-19844
Gabriele 10 years ago
parent
commit
b5b40abb56
  1. 3
      src/webui/btjson.cpp
  2. 14
      src/webui/webapplication.cpp
  3. 1
      src/webui/webapplication.h
  4. 1
      src/webui/www/private/index.html
  5. 6
      src/webui/www/public/scripts/contextmenu.js
  6. 15
      src/webui/www/public/scripts/mocha-init.js
  7. 3
      src/webui/www/public/transferlist.html

3
src/webui/btjson.cpp

@ -103,6 +103,7 @@ static const char KEY_TORRENT_SEQUENTIAL_DOWNLOAD[] = "seq_dl"; @@ -103,6 +103,7 @@ static const char KEY_TORRENT_SEQUENTIAL_DOWNLOAD[] = "seq_dl";
static const char KEY_TORRENT_FIRST_LAST_PIECE_PRIO[] = "f_l_piece_prio";
static const char KEY_TORRENT_LABEL[] = "label";
static const char KEY_TORRENT_SUPER_SEEDING[] = "super_seeding";
static const char KEY_TORRENT_FORCE_START[] = "force_start";
// Tracker keys
static const char KEY_TRACKER_URL[] = "url";
@ -234,6 +235,7 @@ private: @@ -234,6 +235,7 @@ private:
* - "state": Torrent state
* - "seq_dl": Torrent sequential download state
* - "f_l_piece_prio": Torrent first last piece priority state
* - "force_start": Torrent force start state
*/
QByteArray btjson::getTorrents(QString filter, QString label,
QString sortedColumn, bool reverse, int limit, int offset)
@ -582,6 +584,7 @@ QVariantMap toMap(const QTorrentHandle& h) @@ -582,6 +584,7 @@ QVariantMap toMap(const QTorrentHandle& h)
ret[KEY_TORRENT_FIRST_LAST_PIECE_PRIO] = h.first_last_piece_first();
ret[KEY_TORRENT_LABEL] = TorrentPersistentData::instance()->getLabel(h.hash());
ret[KEY_TORRENT_SUPER_SEEDING] = status.super_seeding;
ret[KEY_TORRENT_FORCE_START] = h.is_forced(status);
return ret;
}

14
src/webui/webapplication.cpp

@ -103,6 +103,7 @@ QMap<QString, QMap<QString, WebApplication::Action> > WebApplication::initialize @@ -103,6 +103,7 @@ QMap<QString, QMap<QString, WebApplication::Action> > WebApplication::initialize
ADD_ACTION(command, toggleSequentialDownload);
ADD_ACTION(command, toggleFirstLastPiecePrio);
ADD_ACTION(command, setSuperSeeding);
ADD_ACTION(command, setForceStart);
ADD_ACTION(command, delete);
ADD_ACTION(command, deletePerm);
ADD_ACTION(command, increasePrio);
@ -551,6 +552,19 @@ void WebApplication::action_command_setSuperSeeding() @@ -551,6 +552,19 @@ void WebApplication::action_command_setSuperSeeding()
}
}
void WebApplication::action_command_setForceStart()
{
CHECK_URI(0);
CHECK_PARAMETERS("hashes" << "value");
bool value = request().posts["value"] == "true";
QStringList hashes = request().posts["hashes"].split("|");
foreach (const QString &hash, hashes) {
QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
if (h.is_valid())
QBtSession::instance()->resumeTorrent(hash, value);
}
}
void WebApplication::action_command_delete()
{
CHECK_URI(0);

1
src/webui/webapplication.h

@ -77,6 +77,7 @@ private: @@ -77,6 +77,7 @@ private:
void action_command_toggleSequentialDownload();
void action_command_toggleFirstLastPiecePrio();
void action_command_setSuperSeeding();
void action_command_setForceStart();
void action_command_delete();
void action_command_deletePerm();
void action_command_increasePrio();

1
src/webui/www/private/index.html

@ -96,6 +96,7 @@ @@ -96,6 +96,7 @@
</div>
<ul id="contextmenu">
<li><a href="#Start"><img src="theme/media-playback-start" alt="QBT_TR(Resume)QBT_TR"/> QBT_TR(Resume)QBT_TR</a></li>
<li><a href="#ForceStart"><img src="theme/checked" alt="QBT_TR(Force Resume)QBT_TR"/> QBT_TR(Force Resume)QBT_TR</a></li>
<li><a href="#Pause"><img src="theme/media-playback-pause" alt="QBT_TR(Pause)QBT_TR"/> QBT_TR(Pause)QBT_TR</a></li>
<li class="separator"><a href="#Delete"><img src="theme/list-remove" alt="QBT_TR(Delete)QBT_TR"/> QBT_TR(Delete)QBT_TR</a></li>
<li id="queueingMenuItems" class="separator">

6
src/webui/www/public/scripts/contextmenu.js

@ -137,6 +137,7 @@ var ContextMenu = new Class({ @@ -137,6 +137,7 @@ var ContextMenu = new Class({
all_are_paused = true;
there_are_paused = false;
all_are_super_seeding = true;
all_are_force_start = true;
var h = myTable.selectedIds();
h.each(function(item, index){
@ -152,6 +153,9 @@ var ContextMenu = new Class({ @@ -152,6 +153,9 @@ var ContextMenu = new Class({
else
there_are_f_l_piece_prio = true;
if (data['force_start'] != true)
all_are_force_start = false;
if (data['progress'] != 1.0) // not downloaded
all_are_downloaded = false;
else if (data['super_seeding'] != true)
@ -174,6 +178,8 @@ var ContextMenu = new Class({ @@ -174,6 +178,8 @@ var ContextMenu = new Class({
if (!all_are_f_l_piece_prio && there_are_f_l_piece_prio)
show_f_l_piece_prio = false;
this.setItemChecked('ForceStart', all_are_force_start);
if (all_are_downloaded) {
this.hideItem('SequentialDownload');
this.hideItem('FirstLastPiecePrio');

15
src/webui/www/public/scripts/mocha-init.js

@ -181,6 +181,21 @@ initializeWindows = function() { @@ -181,6 +181,21 @@ initializeWindows = function() {
}
};
setForceStartFN = function(val) {
var h = myTable.selectedIds();
if (h.length) {
new Request({
url: 'command/setForceStart',
method: 'post',
data: {
value: val,
hashes: h.join("|")
}
}).send();
updateMainData();
}
};
globalDownloadLimitFN = function() {
new MochaUI.Window({
id: 'downloadLimitPage',

3
src/webui/www/public/transferlist.html

@ -54,6 +54,9 @@ @@ -54,6 +54,9 @@
},
SuperSeeding : function (element, ref) {
setSuperSeedingFN(!ref.getItemChecked('SuperSeeding'));
},
ForceStart : function (element, ref) {
setForceStartFN(!ref.getItemChecked('ForceStart'));
}
},
offsets : {

Loading…
Cancel
Save