From b31b69f643feda1d52a20f0ccb26a3d17aaea10f Mon Sep 17 00:00:00 2001 From: rraymondgh Date: Mon, 27 Jan 2025 18:05:36 +0000 Subject: [PATCH 1/2] torznab permalinks --- internal/model/torrents.go | 11 ++++++++--- internal/torznab/adapter/search.go | 6 ++++++ internal/torznab/attributes.go | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/internal/model/torrents.go b/internal/model/torrents.go index 258626e2..615d33c6 100644 --- a/internal/model/torrents.go +++ b/internal/model/torrents.go @@ -1,14 +1,15 @@ package model import ( - "github.com/bitmagnet-io/bitmagnet/internal/lexer" - "github.com/facette/natsort" - "gorm.io/gorm" "net/url" "sort" "strconv" "strings" "time" + + "github.com/bitmagnet-io/bitmagnet/internal/lexer" + "github.com/facette/natsort" + "gorm.io/gorm" ) func (t *Torrent) AfterFind(tx *gorm.DB) error { @@ -76,6 +77,10 @@ func (t Torrent) MagnetUri() string { "&xl=" + strconv.FormatUint(uint64(t.Size), 10) } +func (t Torrent) PermaLink() string { + return "/webui/torrents/permalink/" + t.InfoHash.String() +} + // HasFilesInfo returns true if we know about the files in this torrent. func (t Torrent) HasFilesInfo() bool { return t.FilesStatus == FilesStatusSingle || t.FilesStatus == FilesStatusMulti || len(t.Files) > 0 diff --git a/internal/torznab/adapter/search.go b/internal/torznab/adapter/search.go index 896248e9..e865646b 100644 --- a/internal/torznab/adapter/search.go +++ b/internal/torznab/adapter/search.go @@ -220,6 +220,10 @@ func (a adapter) transformSearchResult(req torznab.SearchRequest, res search.Tor AttrName: torznab.AttrPublishDate, AttrValue: item.PublishedAt.Format(torznab.RssDateDefaultFormat), }, + { + AttrName: torznab.AttrCoverUrl, + AttrValue: item.Torrent.PermaLink(), + }, } seeders := item.Torrent.Seeders() leechers := item.Torrent.Leechers() @@ -297,6 +301,8 @@ func (a adapter) transformSearchResult(req torznab.SearchRequest, res search.Tor Category: category, GUID: item.InfoHash.String(), PubDate: torznab.RssDate(item.PublishedAt), + Comments: item.Torrent.PermaLink(), + Link: item.Torrent.PermaLink(), Enclosure: torznab.SearchResultItemEnclosure{ URL: item.Torrent.MagnetUri(), Type: "application/x-bittorrent;x-scheme-handler/magnet", diff --git a/internal/torznab/attributes.go b/internal/torznab/attributes.go index 43f42532..53de3180 100644 --- a/internal/torznab/attributes.go +++ b/internal/torznab/attributes.go @@ -20,4 +20,5 @@ const ( AttrResolution = "resolution" AttrTeam = "team" AttrImdb = "imdb" + AttrCoverUrl = "coverurl" ) From d375bbbcbf7e613277b45a1949641617bf737017 Mon Sep 17 00:00:00 2001 From: rraymondgh Date: Mon, 27 Jan 2025 18:05:36 +0000 Subject: [PATCH 2/2] torznab permalinks --- internal/model/torrents.go | 11 ++++++++--- internal/torznab/adapter/search.go | 6 ++++++ internal/torznab/attributes.go | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/internal/model/torrents.go b/internal/model/torrents.go index 258626e2..615d33c6 100644 --- a/internal/model/torrents.go +++ b/internal/model/torrents.go @@ -1,14 +1,15 @@ package model import ( - "github.com/bitmagnet-io/bitmagnet/internal/lexer" - "github.com/facette/natsort" - "gorm.io/gorm" "net/url" "sort" "strconv" "strings" "time" + + "github.com/bitmagnet-io/bitmagnet/internal/lexer" + "github.com/facette/natsort" + "gorm.io/gorm" ) func (t *Torrent) AfterFind(tx *gorm.DB) error { @@ -76,6 +77,10 @@ func (t Torrent) MagnetUri() string { "&xl=" + strconv.FormatUint(uint64(t.Size), 10) } +func (t Torrent) PermaLink() string { + return "/webui/torrents/permalink/" + t.InfoHash.String() +} + // HasFilesInfo returns true if we know about the files in this torrent. func (t Torrent) HasFilesInfo() bool { return t.FilesStatus == FilesStatusSingle || t.FilesStatus == FilesStatusMulti || len(t.Files) > 0 diff --git a/internal/torznab/adapter/search.go b/internal/torznab/adapter/search.go index 896248e9..e865646b 100644 --- a/internal/torznab/adapter/search.go +++ b/internal/torznab/adapter/search.go @@ -220,6 +220,10 @@ func (a adapter) transformSearchResult(req torznab.SearchRequest, res search.Tor AttrName: torznab.AttrPublishDate, AttrValue: item.PublishedAt.Format(torznab.RssDateDefaultFormat), }, + { + AttrName: torznab.AttrCoverUrl, + AttrValue: item.Torrent.PermaLink(), + }, } seeders := item.Torrent.Seeders() leechers := item.Torrent.Leechers() @@ -297,6 +301,8 @@ func (a adapter) transformSearchResult(req torznab.SearchRequest, res search.Tor Category: category, GUID: item.InfoHash.String(), PubDate: torznab.RssDate(item.PublishedAt), + Comments: item.Torrent.PermaLink(), + Link: item.Torrent.PermaLink(), Enclosure: torznab.SearchResultItemEnclosure{ URL: item.Torrent.MagnetUri(), Type: "application/x-bittorrent;x-scheme-handler/magnet", diff --git a/internal/torznab/attributes.go b/internal/torznab/attributes.go index 43f42532..53de3180 100644 --- a/internal/torznab/attributes.go +++ b/internal/torznab/attributes.go @@ -20,4 +20,5 @@ const ( AttrResolution = "resolution" AttrTeam = "team" AttrImdb = "imdb" + AttrCoverUrl = "coverurl" )