fujin/music-agregator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Share single torrent client across all services, eliminate triple qBittorrent login on startup

Browse Source
This commit is contained in:
Alexander
2026-05-09 21:42:53 +02:00
parent 758a4b909a
commit ef75b9bfba
5 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server.go
+3 -2
View File
@@ -11,6 +11,7 @@ import (
pb "homelab.lan/music-agregator/gen/music_agregator/v1"
"homelab.lan/music-agregator/internal/config"
"homelab.lan/music-agregator/internal/database"
"homelab.lan/music-agregator/internal/torrent"
)
type MusicAgregatorServer struct {
@@ -18,8 +19,8 @@ type MusicAgregatorServer struct {
pb.UnimplementedMusicAgregatorServiceServer
}
func NewMusicAgregatorServer(cfg config.Config, riverClient *river.Client[pgx.Tx], db *database.DB) (*MusicAgregatorServer, error) {
service, err := NewMusicAgregatorService(cfg, riverClient, db)
func NewMusicAgregatorServer(cfg config.Config, riverClient *river.Client[pgx.Tx], torrentClient torrent.TorrentClient, db *database.DB) (*MusicAgregatorServer, error) {
service, err := NewMusicAgregatorService(cfg, riverClient, torrentClient, db)
if err != nil {
log.Err(err).Msg("failed to create MusicAgregatorService")
return nil, err
internal/service.go
+1 -7
View File
@@ -44,7 +44,7 @@ type MusicAgregatorService struct {
downloadFiles *database.DownloadFileRepository
}
func NewMusicAgregatorService(cfg config.Config, riverClient *river.Client[pgx.Tx], db *database.DB) (*MusicAgregatorService, error) {
func NewMusicAgregatorService(cfg config.Config, riverClient *river.Client[pgx.Tx], torrentClient torrent.TorrentClient, db *database.DB) (*MusicAgregatorService, error) {
idx, err := indexer.NewIndexerService(cfg, riverClient, nil)
if err != nil {
log.Err(err).Msg("failed to create IndexerService")
@@ -63,12 +63,6 @@ func NewMusicAgregatorService(cfg config.Config, riverClient *river.Client[pgx.T
return nil, err
}
torrentClient, err := torrent.NewTorrentClient(cfg)
if err != nil {
log.Err(err).Msg("failed to create torrent client")
return nil, err
}
return &MusicAgregatorService{
config: cfg,
metadata: metadata.NewMetadataService(metadataClient, db),
internal/torrent/server.go
+2 -9
View File
@@ -7,7 +7,6 @@ import (
"google.golang.org/grpc"
pb "homelab.lan/music-agregator/gen/music_agregator/torrent/v1"
"homelab.lan/music-agregator/internal/config"
)
type TorrentServer struct {
@@ -15,14 +14,8 @@ type TorrentServer struct {
pb.UnimplementedTorrentServiceServer
}
func NewTorrentServer(cfg config.Config) (*TorrentServer, error) {
service, err := NewTorrentService(cfg)
if err != nil {
log.Err(err).Msg("failed to initialize TorrentService")
return nil, err
}
return &TorrentServer{service: service}, nil
func NewTorrentServer(client TorrentClient) *TorrentServer {
return &TorrentServer{service: NewTorrentService(client)}
}
func (server *TorrentServer) List(ctx context.Context, req *pb.ListRequest) (*pb.ListResponse, error) {
internal/torrent/service.go
+2 -20
View File
@@ -11,7 +11,6 @@ import (
"github.com/rs/zerolog/log"
pb "homelab.lan/music-agregator/gen/music_agregator/torrent/v1"
"homelab.lan/music-agregator/internal/config"
)
type TorrentService struct {
@@ -19,27 +18,10 @@ type TorrentService struct {
token string
}
func NewTorrentService(cfg config.Config) (*TorrentService, error) {
var client TorrentClient
switch cfg.Torrent.ClientType {
case config.TorrentClientQbittorrent:
client = NewQbittorrentClient(cfg.Torrent.Url)
default:
return nil, fmt.Errorf("unknown torrent client type: %s", cfg.Torrent.ClientType)
}
token, err := client.Login(cfg.Torrent.Username, cfg.Torrent.Password)
if err != nil {
return nil, fmt.Errorf("torrent client login failed: %w", err)
}
log.Info().Str("client", string(cfg.Torrent.ClientType)).Msg("torrent client connected")
func NewTorrentService(client TorrentClient) *TorrentService {
return &TorrentService{
client: client,
token: token,
}, nil
}
}
func (service *TorrentService) List(req *pb.ListRequest) (*pb.ListResponse, error) {