commit 2644b7c7562a812d5c4073f639da4ee18871f336
parent 748ab40552cc79f9bd1f7bdd4da79900a1664f54
Author: Peter Kosyh <p.kosyh@gmail.com>
Date: Wed, 2 Sep 2020 20:08:51 +0300
fix in refresh index
Diffstat:
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ii/db.go b/ii/db.go
@@ -193,7 +193,7 @@ func (db *DB) LoadIndex() error {
if db.Idx.Hash != nil { // already loaded
if fsize > db.Idx.FileSize {
Trace.Printf("Refreshing index file...%d>%d", fsize, db.Idx.FileSize)
- if _, err := file.Seek(0, 2); err != nil {
+ if _, err := file.Seek(db.Idx.FileSize, 0); err != nil {
Error.Printf("Can not seek index: %s", err)
return err
}
@@ -233,6 +233,7 @@ func (db *DB) LoadIndex() error {
Idx.List = append(Idx.List, mi.Id)
}
Idx.Hash[mi.Id] = mi
+ Trace.Printf("Adding %s to index", mi.Id)
return true
})
if err != nil {
diff --git a/ii/db_test.go b/ii/db_test.go
@@ -8,6 +8,7 @@ import (
func TestOpenDB(t *testing.T) {
var db *DB
+ InitLog()
dir, err := ioutil.TempDir(os.TempDir(), "ii.test.*")
if err != nil {
t.Error("Can not create temp dir")
@@ -34,7 +35,6 @@ func TestOpenDB(t *testing.T) {
t.Error("Can not lookup msg")
return
}
-
os.Remove(db.IndexPath())
db = OpenDB(path) // reopen
diff --git a/ii/log.go b/ii/log.go
@@ -3,6 +3,7 @@ package ii
import (
"io"
"log"
+ "os"
)
var (
@@ -10,7 +11,11 @@ var (
Info *log.Logger
Error *log.Logger
)
-
+func InitLog() {
+ Trace = log.New(os.Stdout, "=== ", log.Ldate|log.Ltime)
+ Info = log.New(os.Stdout, "INFO: ", log.Ldate|log.Ltime)
+ Error = log.New(os.Stderr, "ERR: ", log.Ldate|log.Ltime)
+}
func OpenLog(trace io.Writer, info io.Writer, error io.Writer) {
Trace = log.New(trace, "=== ", log.Ldate|log.Ltime)
Info = log.New(info, "INFO: ", log.Ldate|log.Ltime)
diff --git a/ii/msg_test.go b/ii/msg_test.go
@@ -34,7 +34,7 @@ func TestParse(t *testing.T) {
func TestMsgline(t *testing.T) {
var m *Msg
- m = DecodeMsgline(`test.area
+ m, _ = DecodeMsgline(`test.area
All
hello world!