hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use full path of files

Browse Source
This commit is contained in:
Ben Sarmiento
2024-01-27 00:32:16 +01:00
parent 4bb0234d8f
commit 1c0ae6e27f
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/torrent/manager.go
View File

@@ -52,7 +52,7 @@ func NewTorrentManager(cfg config.ConfigInterface, api *realdebrid.RealDebrid, w
deleteOnceDone: mapset.NewSet[string](), deleteOnceDone: mapset.NewSet[string](),
allAccessKeys: mapset.NewSet[string](), allAccessKeys: mapset.NewSet[string](),
latestState: &LibraryState{}, latestState: &LibraryState{},
requiredVersion: "24.01.2024", requiredVersion: "27.01.2024",
workerPool: workerPool, workerPool: workerPool,
repairPool: repairPool, repairPool: repairPool,
log: log, log: log,

13
internal/torrent/refresh.go
View File

@@ -213,15 +213,18 @@ func (t *TorrentManager) getMoreInfo(rdTorrent realdebrid.Torrent) *Torrent {
} }
torrent.SelectedFiles = cmap.New[*File]() torrent.SelectedFiles = cmap.New[*File]()
for _, file := range selectedFiles { for _, file := range selectedFiles {
// remove forward slash in the beginning
filename := strings.TrimPrefix(file.Path, "/")
filename = strings.ReplaceAll(filename, "/", " - ")
// todo better handling of duplicate filenames // todo better handling of duplicate filenames
if torrent.SelectedFiles.Has(filepath.Base(file.Path)) { if torrent.SelectedFiles.Has(filename) {
oldName := filepath.Base(file.Path) oldName := filename
ext := filepath.Ext(oldName) ext := filepath.Ext(oldName)
filename := strings.TrimSuffix(oldName, ext) noExtension := strings.TrimSuffix(oldName, ext)
newName := fmt.Sprintf("%s (%d)%s", filename, file.ID, ext) newName := fmt.Sprintf("%s (%d)%s", noExtension, file.ID, ext)
torrent.SelectedFiles.Set(newName, file) torrent.SelectedFiles.Set(newName, file)
} else { } else {
torrent.SelectedFiles.Set(filepath.Base(file.Path), file) torrent.SelectedFiles.Set(filename, file)
} }
} }
torrent.DownloadedIDs = mapset.NewSet[string]() torrent.DownloadedIDs = mapset.NewSet[string]()

2
internal/torrent/uncached.go
View File

@@ -6,7 +6,7 @@ import (
mapset "github.com/deckarep/golang-set/v2" mapset "github.com/deckarep/golang-set/v2"
) )
func (t *TorrentManager) getUncachedTorrents() ([]*Torrent, error) { func (t *TorrentManager) GetUncachedTorrents() ([]*Torrent, error) {
t.log.Debug("Checking if torrents are still cached") t.log.Debug("Checking if torrents are still cached")
allTorrents, _ := t.DirectoryMap.Get(INT_ALL) allTorrents, _ := t.DirectoryMap.Get(INT_ALL)