logauth
/
schastsp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[client:client] adapted 'update' to {client:config} + renamed lowercase to privatise

This commit is contained in:
xdrm-brackets 2018-04-22 00:59:23 +02:00
parent 507c29398d
commit 3246c88e0d
1 changed files with 24 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/git.xdrm.io/schastsp/client/client.go
View File

@ -33,7 +33,6 @@ func New(ctx *context.T, saveDir string) (*T, error) {
/* (1) Store context */ /* (1) Store context */
inst.ctx = ctx; inst.ctx = ctx;
/* (2) Get file management for KEY */ /* (2) Get file management for KEY */
inst.fkey, err = Config(saveDir, "key"); inst.fkey, err = Config(saveDir, "key");
if err != nil { return nil, err } if err != nil { return nil, err }
@ -42,14 +41,8 @@ func New(ctx *context.T, saveDir string) (*T, error) {
inst.fsync, err = Config(saveDir, "sync"); inst.fsync, err = Config(saveDir, "sync");
if err != nil { return nil, err } if err != nil { return nil, err }
/* (4) Init KEY */ /* (4) Restore from config */
inst.key = nil inst.update();
/* (5) Init SYNC */
inst.sync = nil
/* (6) Restore from config */
inst.Update();
return inst, nil; return inst, nil;
@ -60,39 +53,33 @@ func New(ctx *context.T, saveDir string) (*T, error) {
/* (1) Updates 'key' and 'sync' with files (reads or write) /* (1) Updates 'key' and 'sync' with files (reads or write)
* *
---------------------------------------------------------*/ ---------------------------------------------------------*/
func (c T) Update(){ func (c T) update(){
/* (1) Restore (both are NIL) var err error;
/* (1) Restore if both are NIL
---------------------------------------------------------*/ ---------------------------------------------------------*/
if c.key == nil && c.sync == nil { if c.key == nil && c.sync == nil {
/* (1) Fetch key */ /* (1) Create default key */
keyReader := c.fkey.Reader(); c.key, err = keyset.Create(c.ctx);
if keyReader != nil { /* (2) Fetch key */
err = c.fkey.Fetch(c.key)
defer keyReader.Close(); /* (3) On error -> set key to NIL */
if err != nil { c.key = nil }
c.key, _ = keyset.Create(c.ctx); /* (4) Create default sync */
c.sync, err = keyset.Create(c.ctx);
c.key.Fetch(keyReader); /* (5) Fetch sync */
err = c.fsync.Fetch(c.sync)
} /* (6) On error -> set sync to NIL */
if err != nil { c.sync = nil }
/* (2) Fetch sync */ /* (7) Exit if all keysets have been fetched */
syncReader := c.fsync.Reader();
if syncReader != nil {
defer syncReader.Close();
c.sync, _ = keyset.Create(c.ctx);
c.sync.Fetch(syncReader);
}
/* (3) Exit if no error */
if c.key != nil && c.sync != nil { if c.key != nil && c.sync != nil {
return; return;
} }
@ -101,7 +88,7 @@ func (c T) Update(){
/* (2) Manage if no config /* (2) If cannot fetch -> create new keysets
---------------------------------------------------------*/ ---------------------------------------------------------*/
if c.key == nil{ if c.key == nil{
c.key, _ = keyset.Create(c.ctx); c.key, _ = keyset.Create(c.ctx);
@ -116,31 +103,11 @@ func (c T) Update(){
/* (3) Store current value /* (3) Store current value
---------------------------------------------------------*/ ---------------------------------------------------------*/
/* (1) Store key */ /* (1) Store key */
c.key, _ = keyset.Create(c.ctx); err = c.fkey.Store(c.key)
if err != nil { panic("Cannot store key") }
keyWriter := c.fkey.Writer();
if keyWriter != nil {
defer keyWriter.Close();
c.key, _ = keyset.Create(c.ctx);
c.key.Store(keyWriter);
}
/* (2) Store sync */ /* (2) Store sync */
c.sync, _ = keyset.Create(c.ctx); err = c.fsync.Store(c.sync)
if err != nil { panic("Cannot store sync") }
syncWriter := c.fsync.Writer();
if syncWriter != nil {
defer syncWriter.Close();
c.sync, _ = keyset.Create(c.ctx);
c.sync.Store(syncWriter);
}
} }