From 6c1c339ae4efe0f457ba95f33253187bae724dd3 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Thu, 11 Sep 2014 14:18:59 +1000 Subject: [PATCH] Clean up magnet URI parsing errors in dirwatch --- util/dirwatch/dirwatch.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go index 1e857e1a..b01e5630 100644 --- a/util/dirwatch/dirwatch.go +++ b/util/dirwatch/dirwatch.go @@ -7,6 +7,7 @@ import ( "log" "os" "path/filepath" + "strings" "bitbucket.org/anacrolix/go.torrent/util" @@ -118,7 +119,7 @@ func scanDir(dirName string) (ee map[torrent.InfoHash]entity) { for _, uri := range uris { m, err := torrent.ParseMagnetURI(uri) if err != nil { - log.Print(err) + log.Printf("error parsing %q in file %q: %s", uri, fullName, err) continue } addEntity(entity{ @@ -140,6 +141,10 @@ func magnetFileURIs(name string) (uris []string, err error) { scanner := bufio.NewScanner(f) scanner.Split(bufio.ScanWords) for scanner.Scan() { + // Allow magnet URIs to be "commented" out. + if strings.HasPrefix(scanner.Text(), "#") { + continue + } uris = append(uris, scanner.Text()) } err = scanner.Err() -- 2.48.1