Remove scheme

Author: avedor

src/config/config.go

@@ -67,7 +67,6 @@ type Lidarr struct {
 	LidarrDir        string        `env:"LIDARR_DIR" env-default:"/lidarr/"`
 	MigrateDL        bool          `env:"MIGRATE_DOWNLOADS" env-default:"false"` // Move downloads from LidarrDir to DownloadDir
 	Timeout          int           `env:"LIDARR_TIMEOUT" env-default:"20"`
-	Scheme           string        `env:"LIDARR_SCHEME" env-default:"http"`
 	URL              string        `env:"LIDARR_URL"`
 	Filters          Filters
 	MonitorConfig    LidarrMon

src/downloader/lidarr.go

@@ -207,7 +207,7 @@ func (c Lidarr) QueryTrack(track *models.Track) error {
 		return err
 	}
 
-	queryURL := fmt.Sprintf("%s://%s/api/v1/track?apiKey=%s&artistId=%v&albumId=%v", c.Cfg.Scheme, c.Cfg.URL, c.Cfg.APIKey, album.ArtistID, album.Releases[0].AlbumID)
+	queryURL := fmt.Sprintf("%s/api/v1/track?apiKey=%s&artistId=%v&albumId=%v", c.Cfg.URL, c.Cfg.APIKey, album.ArtistID, album.Releases[0].AlbumID)
 	body, err := c.HttpClient.MakeRequest("GET", queryURL, nil, nil)
 	if err != nil {
 		return fmt.Errorf("failed to check existing tracks: %w", err)
@@ -236,7 +236,7 @@ func (c Lidarr) GetTrack(track *models.Track) error {
 	}
 
 	// Get the defaults from the root dir
-	queryURL := fmt.Sprintf("%s://%s/api/v1/rootfolder?apiKey=%s", c.Cfg.Scheme, c.Cfg.URL, c.Cfg.APIKey)
+	queryURL := fmt.Sprintf("%s/api/v1/rootfolder?apiKey=%s", c.Cfg.URL, c.Cfg.APIKey)
 
 	body, err := c.HttpClient.MakeRequest("GET", queryURL, nil, nil)
 	if err != nil {
@@ -280,7 +280,7 @@ func (c Lidarr) GetTrack(track *models.Track) error {
 	if err != nil {
 		return fmt.Errorf("marshal error: %w", err)
 	}
-	queryURL = fmt.Sprintf("%s://%s/api/v1/album?apiKey=%s", c.Cfg.Scheme, c.Cfg.URL, c.Cfg.APIKey)
+	queryURL = fmt.Sprintf("%s/api/v1/album?apiKey=%s", c.Cfg.URL, c.Cfg.APIKey)
 	_, err = c.HttpClient.MakeRequest("POST", queryURL, bytes.NewReader(body), nil)
 	if err != nil {
 		return fmt.Errorf("failed to add album: %w", err)
@@ -290,7 +290,7 @@ func (c Lidarr) GetTrack(track *models.Track) error {
 
 func (c Lidarr) findBestAlbumMatch(track *models.Track) (*Album, error) {
 	escQuery := url.PathEscape(fmt.Sprintf("%s - %s", track.Album, track.MainArtist))
-	queryURL := fmt.Sprintf("%s://%s/api/v1/album/lookup?apiKey=%s&term=%s", c.Cfg.Scheme, c.Cfg.URL, c.Cfg.APIKey, escQuery)
+	queryURL := fmt.Sprintf("%s/api/v1/album/lookup?apiKey=%s&term=%s", c.Cfg.URL, c.Cfg.APIKey, escQuery)
 
 	body, err := c.HttpClient.MakeRequest("GET", queryURL, nil, nil)
 	if err != nil {
@@ -388,10 +388,10 @@ func (c Lidarr) deleteDownload(user, ID string) error {
 
 func (c *Lidarr) Cleanup(track models.Track, fileID string) error {
 	if err := c.deleteSearch(track.ID); err != nil {
-		slog.Debug(fmt.Sprintf("[slskd] failed to delete search request: %v", err))
+		slog.Debug(fmt.Sprintf("[lidarr] failed to delete search request: %v", err))
 	}
 	if err := c.deleteDownload(track.MainArtistID, fileID); err != nil {
-		slog.Debug(fmt.Sprintf("[slskd] failed to delete download: %v", err))
+		slog.Debug(fmt.Sprintf("[lidarr] failed to delete download: %v", err))
 	}
 	return nil
 }