dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some fixes and improvements to dirwatch

This commit is contained in:
Matt Joiner 2014-08-28 08:05:06 +10:00
parent 8f89d030cc
commit 01a9c73428
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/dirwatch/dirwatch.go
View File

@ -90,7 +90,7 @@ func scanDir(dirName string) (ee map[torrent.InfoHash]entity) {
addEntity := func(e entity) { addEntity := func(e entity) {
e0, ok := ee[e.InfoHash] e0, ok := ee[e.InfoHash]
if ok { if ok {
if e0.MagnetURI != "" && len(e.MagnetURI) < len(e0.MagnetURI) { if e0.MagnetURI == "" || len(e.MagnetURI) < len(e0.MagnetURI) {
return return
} }
} }
@ -107,7 +107,7 @@ func scanDir(dirName string) (ee map[torrent.InfoHash]entity) {
e := entity{ e := entity{
TorrentFilePath: fullName, TorrentFilePath: fullName,
} }
util.CopyExact(e.InfoHash, ih) util.CopyExact(&e.InfoHash, ih)
addEntity(e) addEntity(e)
case ".magnet": case ".magnet":
uris, err := magnetFileURIs(fullName) uris, err := magnetFileURIs(fullName)
@ -138,6 +138,7 @@ func magnetFileURIs(name string) (uris []string, err error) {
} }
defer f.Close() defer f.Close()
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
scanner.Split(bufio.ScanWords)
for scanner.Scan() { for scanner.Scan() {
uris = append(uris, scanner.Text()) uris = append(uris, scanner.Text())
} }