Mirrors/bt2qbt
1
0
Fork 0
mirror of https://github.com/rumanzo/bt2qbt.git synced 2024-11-22 02:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #47

Browse Source 
respect force state of torrents (automanaged 0)
This commit is contained in:
rumanzo 2024-03-20 23:29:52 +03:00
parent e41bda56fe
commit db4705403c
No known key found for this signature in database
2 changed files with 226 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/transfer/transfer.go
View File

@ -85,28 +85,31 @@ func (transfer *TransferStructure) HandleCaption() {
// HandleState transfer torrents state. // HandleState transfer torrents state.
// if torrent has several files, and it doesn't complete downloaded (priority), it will be stopped // if torrent has several files, and it doesn't complete downloaded (priority), it will be stopped
func (transfer *TransferStructure) HandleState() { func (transfer *TransferStructure) HandleState() {
if transfer.ResumeItem.Started == 0 { var parted bool = false
transfer.Fastresume.Paused = 1
transfer.Fastresume.AutoManaged = 0
} else {
if !transfer.TorrentFile.IsSingle() { if !transfer.TorrentFile.IsSingle() {
var parted bool
for _, prio := range transfer.Fastresume.FilePriority { for _, prio := range transfer.Fastresume.FilePriority {
if prio == 0 { if prio == 0 {
parted = true parted = true
break break
} }
} }
if parted {
transfer.Fastresume.Paused = 1
transfer.Fastresume.AutoManaged = 0
return
}
}
transfer.Fastresume.Paused = 0
transfer.Fastresume.AutoManaged = 1
} }
if transfer.ResumeItem.Started == 0 || parted {
transfer.Fastresume.Paused = 1
} else {
transfer.Fastresume.Paused = 0
}
if parted {
transfer.Fastresume.AutoManaged = 0 // incomplete torrents always should be stopped
} else {
if transfer.ResumeItem.Started == 0 || transfer.ResumeItem.Started == 2 { // just stoped or started completed torrents
transfer.Fastresume.AutoManaged = 1
} else { // should be 1 - forced
transfer.Fastresume.AutoManaged = 0
}
}
} }
func (transfer *TransferStructure) HandleTotalDownloaded() { func (transfer *TransferStructure) HandleTotalDownloaded() {

248
internal/transfer/transfer_test.go
View File

@ -2126,11 +2126,11 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
expected: &TransferStructure{ expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 1, AutoManaged: 0}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 1, AutoManaged: 1},
}, },
}, },
{ {
name: "003 started resume", name: "003 forced started resume",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{},
ResumeItem: &utorrentStructs.ResumeItem{Started: 1}, ResumeItem: &utorrentStructs.ResumeItem{Started: 1},
@ -2138,16 +2138,178 @@ func TestTransferStructure_HandleState(t *testing.T) {
Info: &torrentStructures.TorrentInfo{}, Info: &torrentStructures.TorrentInfo{},
}, },
}, },
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 0, AutoManaged: 0},
},
},
{
name: "004 force started resume with full downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 0, AutoManaged: 0},
},
},
{
name: "005 force started resume with parted downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 1,
AutoManaged: 0,
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
},
},
{
name: "006 force started resume with prioritized parted downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 1,
AutoManaged: 0,
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
},
},
{
name: "007 force started resume with prioritized complete downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 1, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 0,
AutoManaged: 0,
FilePriority: []int64{1, 1, 1, 1, 1, 6, 6},
},
},
},
{
name: "008 force started resume with parted prioritized downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 1,
AutoManaged: 0,
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
},
},
{
name: "009 started resume",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{},
ResumeItem: &utorrentStructs.ResumeItem{Started: 2},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{},
},
},
expected: &TransferStructure{ expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 0, AutoManaged: 1}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 0, AutoManaged: 1},
}, },
}, },
{ {
name: "004 started resume with full downloaded files", name: "010 started resume with fully downloaded files",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{},
ResumeItem: &utorrentStructs.ResumeItem{ ResumeItem: &utorrentStructs.ResumeItem{
Started: 1, Started: 2,
}, },
TorrentFile: &torrentStructures.Torrent{ TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{ Info: &torrentStructures.TorrentInfo{
@ -2168,13 +2330,13 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
{ {
name: "005 started resume with parted downloaded files", name: "011 started resume with parted downloaded files",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{ Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6}, FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
}, },
ResumeItem: &utorrentStructs.ResumeItem{ ResumeItem: &utorrentStructs.ResumeItem{
Started: 1, Started: 2,
}, },
TorrentFile: &torrentStructures.Torrent{ TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{ Info: &torrentStructures.TorrentInfo{
@ -2199,13 +2361,13 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
{ {
name: "006 started resume with parted downloaded files", name: "012 started resume with prioritized parted downloaded files",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{ Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6}, FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
}, },
ResumeItem: &utorrentStructs.ResumeItem{ ResumeItem: &utorrentStructs.ResumeItem{
Started: 1, Started: 2,
}, },
TorrentFile: &torrentStructures.Torrent{ TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{ Info: &torrentStructures.TorrentInfo{
@ -2230,13 +2392,44 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
{ {
name: "007 started resume with full downloaded files", name: "013 started resume with prioritized complete downloaded files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 1, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 2,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 0,
AutoManaged: 1,
FilePriority: []int64{1, 1, 1, 1, 1, 6, 6},
},
},
},
{
name: "014 started resume with prioritized parted downloaded files",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{ Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6}, FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
}, },
ResumeItem: &utorrentStructs.ResumeItem{ ResumeItem: &utorrentStructs.ResumeItem{
Started: 1, Started: 2,
}, },
TorrentFile: &torrentStructures.Torrent{ TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{ Info: &torrentStructures.TorrentInfo{
@ -2261,38 +2454,7 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
{ {
name: "008 started resume with parted downloaded files", name: "015 started resume without files",
newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
ResumeItem: &utorrentStructs.ResumeItem{
Started: 1,
},
TorrentFile: &torrentStructures.Torrent{
Info: &torrentStructures.TorrentInfo{
Files: []*torrentStructures.TorrentFile{
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
&torrentStructures.TorrentFile{Path: []string{`/`}},
},
},
},
},
expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{
Paused: 1,
AutoManaged: 0,
FilePriority: []int64{1, 0, 1, 1, 1, 6, 6},
},
},
},
{
name: "009 started resume without files",
newTransferStructure: &TransferStructure{ newTransferStructure: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{},
ResumeItem: &utorrentStructs.ResumeItem{ ResumeItem: &utorrentStructs.ResumeItem{
@ -2303,7 +2465,7 @@ func TestTransferStructure_HandleState(t *testing.T) {
}, },
}, },
expected: &TransferStructure{ expected: &TransferStructure{
Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 1, AutoManaged: 0}, Fastresume: &qBittorrentStructures.QBittorrentFastresume{Paused: 1, AutoManaged: 1},
}, },
}, },
} }