--wip-- [skip ci]
This commit is contained in:
parent
ccf3981d8d
commit
7a8b904852
10 changed files with 282 additions and 191 deletions
|
|
@ -16,11 +16,11 @@ const (
|
|||
|
||||
// MergeOldState merges a given SpaceAPIResponse with the state saved at the time of last program exit and then deletes
|
||||
// the file containing the old state.
|
||||
func MergeOldState(response *types.SpaceAPIResponseV14) {
|
||||
func MergeOldState(response *types.SpaceAPIResponse) {
|
||||
var (
|
||||
err error
|
||||
oldState []byte
|
||||
persistedState types.PersistentStateV14
|
||||
persistedState types.PersistentSpaceState
|
||||
)
|
||||
|
||||
log.Println("Merging old state from", persistentStatePath, "...")
|
||||
|
|
@ -48,7 +48,7 @@ func MergeOldState(response *types.SpaceAPIResponseV14) {
|
|||
}
|
||||
|
||||
// Merge state
|
||||
response.State = persistedState.State
|
||||
response.State.FromPersistentSpaceState(persistedState)
|
||||
|
||||
// Merge sensors
|
||||
for key, environmentSensors := range persistedState.Sensors {
|
||||
|
|
@ -72,7 +72,7 @@ removeOld:
|
|||
}
|
||||
}
|
||||
|
||||
func SaveCurrentState(response types.SpaceAPIResponseV14) {
|
||||
func SaveCurrentState(response types.SpaceAPIResponse) {
|
||||
// Create state directory if not present
|
||||
err := os.MkdirAll(persistentStateDir, 0750)
|
||||
if err != nil {
|
||||
|
|
@ -87,7 +87,7 @@ func SaveCurrentState(response types.SpaceAPIResponseV14) {
|
|||
defer file.Close()
|
||||
|
||||
// Create persistent state
|
||||
persistentStateV14 := types.PersistentStateV14{
|
||||
persistentStateV14 := types.PersistentSpaceState{
|
||||
State: struct {
|
||||
Open bool `json:"open"`
|
||||
LastChange int64 `json:"lastchange"`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue