From 01a9c73428ebc7ee13647368c3214f20b7d97130 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Thu, 28 Aug 2014 08:05:06 +1000 Subject: [PATCH] Some fixes and improvements to dirwatch --- util/dirwatch/dirwatch.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go index afc7653d..1e857e1a 100644 --- a/util/dirwatch/dirwatch.go +++ b/util/dirwatch/dirwatch.go @@ -90,7 +90,7 @@ func scanDir(dirName string) (ee map[torrent.InfoHash]entity) { addEntity := func(e entity) { e0, ok := ee[e.InfoHash] if ok { - if e0.MagnetURI != "" && len(e.MagnetURI) < len(e0.MagnetURI) { + if e0.MagnetURI == "" || len(e.MagnetURI) < len(e0.MagnetURI) { return } } @@ -107,7 +107,7 @@ func scanDir(dirName string) (ee map[torrent.InfoHash]entity) { e := entity{ TorrentFilePath: fullName, } - util.CopyExact(e.InfoHash, ih) + util.CopyExact(&e.InfoHash, ih) addEntity(e) case ".magnet": uris, err := magnetFileURIs(fullName) @@ -138,6 +138,7 @@ func magnetFileURIs(name string) (uris []string, err error) { } defer f.Close() scanner := bufio.NewScanner(f) + scanner.Split(bufio.ScanWords) for scanner.Scan() { uris = append(uris, scanner.Text()) } -- 2.44.0