mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-21 05:16:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

#301: functional tests for api-method "editqueue"

Browse Source 
And a small fix in edit-commands GroupMoveAfter and GroupMoveBefore.
This commit is contained in:
Andrey Prygunkov
2016-11-08 21:02:36 +01:00
parent e49d4c59af
commit df11d1acb4
2 changed files with 99 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/queue/QueueEditor.cpp
View File

@@ -518,15 +518,15 @@ void QueueEditor::PrepareList(ItemList* itemList, IdList* idList,
}
}
}
else if ((offset != 0) &&
(action == DownloadQueue::eaGroupMoveOffset || action == DownloadQueue::eaGroupMoveTop || action == DownloadQueue::eaGroupMoveBottom))
else if (((offset != 0) &&
(action == DownloadQueue::eaGroupMoveOffset || action == DownloadQueue::eaGroupMoveTop || action == DownloadQueue::eaGroupMoveBottom)) ||
action == DownloadQueue::eaGroupMoveBefore || action == DownloadQueue::eaGroupMoveAfter)
{
// add IDs to list in order they currently have in download queue
// per group only one FileInfo is added to the list
int nrEntries = (int)m_downloadQueue->GetQueue()->size();
int lastDestPos = -1;
int start, end, step;
if (offset < 0)
if (offset <= 0)
{
start = 0;
end = nrEntries;
@@ -1138,7 +1138,7 @@ bool QueueEditor::MoveGroupsTo(ItemList* itemList, IdList* idList, bool before,
if (offset == 0)
{
// calculate offset between first moving item and target
int moveId = idList->at(0);
int moveId = itemList->at(0).m_nzbInfo->GetId();
bool progress = false;
int step = 0;
for (NzbInfo* nzbInfo : m_downloadQueue->GetQueue())