From 7010803e35facd8364ec1be05b6be067fe5a182c Mon Sep 17 00:00:00 2001 From: Ben Sarmiento Date: Fri, 20 Oct 2023 04:37:43 +0200 Subject: [PATCH] fix checksum issue --- internal/dav/aero.go | 6 +++--- internal/dav/propfind.go | 6 +++--- internal/torrent/manager.go | 11 ++++++----- pkg/realdebrid/api.go | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/internal/dav/aero.go b/internal/dav/aero.go index f423b0f..f89d400 100644 --- a/internal/dav/aero.go +++ b/internal/dav/aero.go @@ -50,7 +50,7 @@ func Setup(app *aero.Application, c config.ConfigInterface, t *torrent.TorrentMa torrentsInDirectory := t.GetByDirectory(directory) resp, err := createMultiTorrentResponse(fmt.Sprintf("/%s", directory), torrentsInDirectory) if err != nil { - log.Printf("Cannot read directory (%s): %v\n", directory, err.Error()) + log.Printf("Cannot read directory (%s): %v\n", directory, err) return ctx.Error(http.StatusInternalServerError, "Cannot read directory") } return xmlResponse(ctx, *resp) @@ -62,7 +62,7 @@ func Setup(app *aero.Application, c config.ConfigInterface, t *torrent.TorrentMa sameNameTorrents := findAllTorrentsWithName(t, directory, torrentName) resp, err := createSingleTorrentResponse(fmt.Sprintf("/%s", directory), sameNameTorrents, t) if err != nil { - log.Printf("Cannot read directory (%s): %v\n", directory, err.Error()) + log.Printf("Cannot read directory (%s): %v\n", directory, err) return ctx.Error(http.StatusInternalServerError, "Cannot read directory") } return xmlResponse(ctx, *resp) @@ -119,7 +119,7 @@ func Setup(app *aero.Application, c config.ConfigInterface, t *torrent.TorrentMa func xmlResponse(ctx aero.Context, resp dav.MultiStatus) error { output, err := xml.MarshalIndent(resp, "", " ") if err != nil { - log.Printf("Cannot marshal xml: %v\n", err.Error()) + log.Printf("Cannot marshal xml: %v\n", err) return ctx.Error(http.StatusInternalServerError, "Cannot read directory") } diff --git a/internal/dav/propfind.go b/internal/dav/propfind.go index 8381686..dd52b37 100644 --- a/internal/dav/propfind.go +++ b/internal/dav/propfind.go @@ -42,7 +42,7 @@ func HandlePropfindRequest(w http.ResponseWriter, r *http.Request, t *torrent.To return } if err != nil { - log.Printf("Cannot marshal xml: %v\n", err.Error()) + log.Printf("Cannot marshal xml: %v\n", err) http.Error(w, "Cannot read directory", http.StatusInternalServerError) return } @@ -87,7 +87,7 @@ func handleListOfTorrents(requestPath string, w http.ResponseWriter, r *http.Req torrents := t.GetByDirectory(basePath) resp, err := createMultiTorrentResponse(fmt.Sprintf("/%s", basePath), torrents) if err != nil { - log.Printf("Cannot read directory (%s): %v\n", basePath, err.Error()) + log.Printf("Cannot read directory (%s): %v\n", basePath, err) http.Error(w, "Cannot read directory", http.StatusInternalServerError) return nil, nil } @@ -108,7 +108,7 @@ func handleSingleTorrent(requestPath string, w http.ResponseWriter, r *http.Requ var resp *dav.MultiStatus resp, err := createSingleTorrentResponse(fmt.Sprintf("/%s", directory), sameNameTorrents, t) if err != nil { - log.Printf("Cannot read directory (%s): %v\n", requestPath, err.Error()) + log.Printf("Cannot read directory (%s): %v\n", requestPath, err) http.Error(w, "Cannot read directory", http.StatusInternalServerError) return nil, nil } diff --git a/internal/torrent/manager.go b/internal/torrent/manager.go index b8ca63a..f3d2f8b 100644 --- a/internal/torrent/manager.go +++ b/internal/torrent/manager.go @@ -73,10 +73,11 @@ func NewTorrentManager(config config.ConfigInterface) *TorrentManager { func (t *TorrentManager) getChecksum() string { torrents, totalCount, err := realdebrid.GetTorrents(t.token, 1) if err != nil { - log.Printf("Cannot get torrents: %v\n", err.Error()) + log.Printf("Cannot get torrents: %v\n", err) return t.checksum } if len(torrents) == 0 { + log.Println("Huh, no torrents returned") return t.checksum } return fmt.Sprintf("%d-%s", totalCount, torrents[0].ID) @@ -87,7 +88,7 @@ func (t *TorrentManager) getAll() []Torrent { torrents, totalCount, err := realdebrid.GetTorrents(t.token, 0) if err != nil { - log.Printf("Cannot get torrents: %v\n", err.Error()) + log.Printf("Cannot get torrents: %v\n", err) return nil } t.checksum = fmt.Sprintf("%d-%s", totalCount, torrents[0].ID) @@ -148,10 +149,10 @@ func (t *TorrentManager) RefreshInfo(torrentID string) { } err = os.Remove(filePath) if err != nil && !os.IsNotExist(err) { // File doesn't exist or other error - log.Printf("Cannot remove file: %v\n", err.Error()) + log.Printf("Cannot remove file: %v\n", err) } } else if !os.IsNotExist(err) { // Error other than file not existing - log.Printf("Error checking file info: %v\n", err.Error()) + log.Printf("Error checking file info: %v\n", err) return } info := t.getInfo(torrentID) @@ -170,7 +171,7 @@ func (t *TorrentManager) getInfo(torrentID string) *Torrent { log.Println("Getting info for", torrentID) info, err := realdebrid.GetTorrentInfo(t.token, torrentID) if err != nil { - log.Printf("Cannot get info: %v\n", err.Error()) + log.Printf("Cannot get info: %v\n", err) return nil } var selectedFiles []File diff --git a/pkg/realdebrid/api.go b/pkg/realdebrid/api.go index a002141..4150346 100644 --- a/pkg/realdebrid/api.go +++ b/pkg/realdebrid/api.go @@ -167,7 +167,7 @@ func GetTorrents(accessToken string, customLimit int) ([]Torrent, int, error) { allTorrents = append(allTorrents, torrents...) totalCountHeader := resp.Header.Get("x-total-count") - totalCount, err := strconv.Atoi(totalCountHeader) + totalCount, err = strconv.Atoi(totalCountHeader) if err != nil { break }