fixed for cache.len

shingetsu-gou · Sep 2, 2017 · 6a751fc · 6a751fc
1 parent 49c2732
commit 6a751fc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-- 1.8
+- 1.9
 
 env:
   global:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/shingetsu-gou/shingetsu-gou.svg?branch=master)](https://travis-ci.org/shingetsu-gou/shingetsu-gou)
 [![GoDoc](https://godoc.org/github.com/shingetsu-gou/shingetsu-gou?status.svg)](https://godoc.org/github.com/shingetsu-gou/shingetsu-gou)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/shingetsu-gou/shingetsu-gou/master/LICENSE)
+[![GitHub license](https://img.shields.io/badge/license-BSD-blue.svg)](https://raw.githubusercontent.com/shingetsu-gou/shingetsu-gou/master/LICENSE)
 
 
 # Gou(合) 
@@ -107,7 +107,7 @@ This is for easy to use Gou; just get a binary, and run it.
 
 ## License
 
-MIT License
+3-clause BSD
 
 Original program comes from [saku](https://github.com/shingetsu/saku), which is under [2-clause BSD license](https://github.com/shingetsu/saku/blob/master/LICENSE)
 Copyrighted by 2005-2015 shinGETsu Project.

diff --git a/cgi/message.go b/cgi/message.go
@@ -113,6 +113,6 @@ func SearchMessage(acceptLanguage, filedir string) Message {
 			}
 		}
 	}
-	log.Fatalf("no messages are found.")
+	log.Printf("no messages are found.")
 	return nil
 }
diff --git a/gou_template/remove_file_form.txt b/gou_template/remove_file_form.txt
@@ -12,7 +12,7 @@
   <p id="status">
 {{ end }}
 {{ $mb:=toInt .CacheSize | toMB}}
-{{printf "(%s/%d/%.1f%s)" .Title .Cache.Len $mb .Message.mb}}
+{{printf "(%s/%d/%.1f%s)" .Title (.Cache.Len 0) $mb .Message.mb}}
 {{ if .IsAdmin }}
   </p></form>
 {{ else }}

diff --git a/gou_template/thread_bottom.txt b/gou_template/thread_bottom.txt
@@ -2,7 +2,7 @@
  Copyright (c) 2005-2014 shinGETsu Project.
  */}}
 {{define "thread_bottom"}}
-{{ if .Cache.Len }}
+{{ if .Cache.Len 1 }}
   <p><a href="#top"
   onclick="window.scroll(0,0); return false;"
   onkeypress="window.scroll(0,0); return false;">{{.Message.top_of_page}}</a>

diff --git a/gou_template/thread_top.txt b/gou_template/thread_top.txt
@@ -2,7 +2,7 @@
  Copyright (c) 2005-2014 shinGETsu Project.
  */}}
 {{define "thread_top"}}
-{{ if and (or .IsFriend .IsAdmin) (le .Cache.Len 0) }}
+{{ if and (or .IsFriend .IsAdmin) (le (.Cache.Len 0) 0) }}
   <form method="get" action="{{.ThreadCGI}}/{{strEncode .Path}}"><p>
     <input type="hidden" name="search_new_file" value="yes" />
     <input type="submit" value="{{.Message.sync_from_network}}" class="btn" />

diff --git a/tag/user/user.go b/tag/user/user.go
@@ -51,7 +51,6 @@ func Len(thread string) int {
 		return errr
 	})
 	if err != nil {
-		log.Print(err)
 		return 0
 	}
 	return len(r)
@@ -84,7 +83,6 @@ func Get() tag.Slice {
 		return err
 	})
 	if err != nil {
-		log.Print(err)
 		return nil
 	}
 	return tag.NewSlice(r)
@@ -99,7 +97,6 @@ func GetStrings(thread string) []string {
 		return err
 	})
 	if err != nil {
-		log.Print(err, thread)
 		return nil
 	}
 	return r

diff --git a/thread/download/download.go b/thread/download/download.go
@@ -247,7 +247,7 @@ func getWithRange(n *node.Node, c *thread.Cache, dm *Manager) bool {
 //GetCache checks  nodes in lookuptable have the cache.
 //if found gets records.
 func GetCache(background bool, c *thread.Cache) bool {
-	const searchDepth = 5 // Search node size
+	const searchDepth = 100 // Search node size
 	ns := manager.NodesForGet(c.Datfile, searchDepth)
 	found := false
 	var wg sync.WaitGroup