Mirrors/bt2qbt
1
0
Fork 0
mirror of https://github.com/rumanzo/bt2qbt.git synced 2024-11-24 19:33:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from rumanzo/issue-27

Browse Source 
Issue 27
This commit is contained in:
Alexey Kostin 2021-05-07 17:55:59 +03:00 committed by GitHub
commit af6ab6bc59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bt2qbt.go
View File

@ -22,6 +22,7 @@ import (
"strings"
"sync"
"time"
"unicode/utf8"
)
type Flags struct {
@ -72,13 +73,14 @@ func ASCIIconvert(s string) string {
return buffer.String()
}
func checknotexists(s string, tags []string) (bool, string) {
for _, value := range tags {
// return true and string if string exists in array, else false and string
func checkexists(s string, arr []string) (bool, string) {
for _, value := range arr {
if value == s {
return false, s
return true, s
}
}
return true, s
return false, s
}
func decodetorrentfile(path string) (map[string]interface{}, error) {
@ -203,11 +205,16 @@ func logic(key string, value map[string]interface{}, flags *Flags, chans *Channe
} else {
newstructure.HasFiles = false
}
if value["path"].(string)[len(value["path"].(string))-1] == os.PathSeparator {
newstructure.Path = value["path"].(string)[:len(value["path"].(string))-1]
// remove separator from end
lastRune, lastRuneSize := utf8.DecodeLastRuneInString(value["path"].(string))
separatorRunes := []rune("/\\")
if lastRune == separatorRunes[0] || lastRune == separatorRunes[1] {
newstructure.Path = value["path"].(string)[:len(value["path"].(string))-lastRuneSize]
} else {
newstructure.Path = value["path"].(string)
}
// if torrent name was renamed, add modified name
if value["caption"] != nil {
newstructure.QbtName = value["caption"].(string)
@ -381,7 +388,7 @@ func transfertorrents(chans Channels, flags Flags, resumefile map[string]interfa
if labels, ok := value.(map[string]interface{})["labels"]; ok {
for _, label := range labels.([]interface{}) {
if len(label.(string)) > 0 {
if ok, tag := checknotexists(ASCIIconvert(label.(string)), newtags); ok {
if exists, tag := checkexists(ASCIIconvert(label.(string)), newtags); !exists {
newtags = append(newtags, tag)
}
}
@ -434,7 +441,7 @@ func transfertorrents(chans Channels, flags Flags, resumefile map[string]interfa
if cfg.Section("BitTorrent").HasKey("Session\\Tags") {
oldtags = cfg.Section("BitTorrent").Key("Session\\Tags").String()
for _, tag := range strings.Split(oldtags, ", ") {
if ok, t := checknotexists(tag, newtags); ok {
if exists, t := checkexists(tag, newtags); !exists {
newtags = append(newtags, t)
}
}

7
libtorrent/torrent.go
View File

@ -253,7 +253,12 @@ func (newstructure *NewTorrentStructure) FillSavePaths() {
torrentname = newstructure.TorrentFile["info"].(map[string]interface{})["name"].(string)
}
origpath := newstructure.Path
dirpaths := strings.Split(origpath, "\\")
var dirpaths []string
if contains := strings.Contains(origpath, "\\"); contains {
dirpaths = strings.Split(origpath, "\\")
} else {
dirpaths = strings.Split(origpath, "/")
}
lastdirname := dirpaths[len(dirpaths)-1]
if newstructure.HasFiles {
if lastdirname == torrentname {