|
@@ -22,6 +22,7 @@ import (
|
|
"errors"
|
|
"errors"
|
|
"os"
|
|
"os"
|
|
|
|
|
|
|
|
+ "github.com/88250/gulu"
|
|
"github.com/siyuan-note/dejavu"
|
|
"github.com/siyuan-note/dejavu"
|
|
"github.com/siyuan-note/dejavu/entity"
|
|
"github.com/siyuan-note/dejavu/entity"
|
|
"github.com/siyuan-note/encryption"
|
|
"github.com/siyuan-note/encryption"
|
|
@@ -148,12 +149,18 @@ var indexCallbacks = map[string]dejavu.Callback{
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
|
|
-func IndexRepo(message string) (err error) {
|
|
|
|
|
|
+func IndexRepo(memo string) (err error) {
|
|
if 1 > len(Conf.Repo.Key) {
|
|
if 1 > len(Conf.Repo.Key) {
|
|
err = errors.New("repo key is nil")
|
|
err = errors.New("repo key is nil")
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ memo = gulu.Str.RemoveInvisible(memo)
|
|
|
|
+ if "" == memo {
|
|
|
|
+ err = errors.New(Conf.Language(142))
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+
|
|
repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key)
|
|
repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key)
|
|
if nil != err {
|
|
if nil != err {
|
|
util.LogErrorf("init repo failed: %s", err)
|
|
util.LogErrorf("init repo failed: %s", err)
|
|
@@ -164,7 +171,7 @@ func IndexRepo(message string) (err error) {
|
|
syncLock.Lock()
|
|
syncLock.Lock()
|
|
defer syncLock.Unlock()
|
|
defer syncLock.Unlock()
|
|
filesys.ReleaseAllFileLocks()
|
|
filesys.ReleaseAllFileLocks()
|
|
- _, err = repo.Index(message, util.PushEndlessProgress, indexCallbacks)
|
|
|
|
|
|
+ _, err = repo.Index(memo, util.PushEndlessProgress, indexCallbacks)
|
|
util.PushClearProgress()
|
|
util.PushClearProgress()
|
|
return
|
|
return
|
|
}
|
|
}
|