From 7323ed9675b57dbff528a54dad93271099bda14d Mon Sep 17 00:00:00 2001
From: Olzzon <github@olzzon.dk>
Date: Wed, 18 Dec 2019 17:49:44 +0100
Subject: [PATCH] Fix: move storage to "storage" folder, to avoid docker
 conflicts

---
 README.md                       | 3 ++-
 server/MainApp.ts               | 4 ++--
 server/MainThreadHandler.ts     | 4 ++--
 server/utils/SettingsStorage.ts | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7b3a64b2..450443bb 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ Routing setups can be stored in STORAGE. So it´s possible to have different Rou
 ### Run as Docker: (On linux)
 ```
 docker pull olzzon/sisyfos-audio-controller:develop
-sudo docker run --mount source=sisyfos-vol,target=/opt/sisyfos-audio-controller  --network="host" --restart unless-stopped olzzon/sisyfos-audio-controller:develop
+docker volume create sisyfos-vol
+sudo docker run --mount source=sisyfos-vol,target=/opt/sisyfos-audio-controller/storage  --network="host" --restart unless-stopped olzzon/sisyfos-audio-controller:develop
 ```
 
 ### Install Local node host:
diff --git a/server/MainApp.ts b/server/MainApp.ts
index 0aec06ee..6edd7c03 100644
--- a/server/MainApp.ts
+++ b/server/MainApp.ts
@@ -31,7 +31,7 @@ export class MainApp {
         global.mixerProtocol.channelTypes.forEach((item: any, index: number) => {
             this.numberOfChannels.push(this.store.settings[0].numberOfChannelsInType[index]);
         });
-        this.loadSnapshotSettings(path.resolve('default.shot'), true)
+        this.loadSnapshotSettings(path.resolve('storage', 'default.shot'), true)
 
         // ** UNCOMMENT TO DUMP A FULL STORE:
         //const fs = require('fs')
@@ -45,7 +45,7 @@ export class MainApp {
                     faderState: this.store.faders[0],
                     channelState: this.store.channels[0]
                 }
-                saveSnapshotState(snapshot, path.resolve(this.settingsPath, 'default.shot'))
+                saveSnapshotState(snapshot, path.resolve(this.settingsPath, 'storage', 'default.shot'))
             },
             2000);
     }
diff --git a/server/MainThreadHandler.ts b/server/MainThreadHandler.ts
index f332fdbd..e6e2457c 100644
--- a/server/MainThreadHandler.ts
+++ b/server/MainThreadHandler.ts
@@ -107,14 +107,14 @@ export class MainThreadHandlers {
         .on(SOCKET_LOAD_SNAPSHOT, (
             (payload: string) => { 
                 console.log('Load Snapshot')
-                global.mainApp.loadSnapshotSettings(path.resolve(payload), false)
+                global.mainApp.loadSnapshotSettings(path.resolve('storage', payload), false)
                 global.socketServer.emit('set-store', global.storeRedux.getState())
             })
         )
         .on(SOCKET_SAVE_SNAPSHOT, (
             (payload: string) => { 
                 console.log('Save Snapshot')
-                global.mainApp.saveSnapshotSettings(path.resolve(payload))
+                global.mainApp.saveSnapshotSettings(path.resolve('storage', payload))
 
                 global.socketServer.emit(
                     SOCKET_RETURN_SNAPSHOT_LIST, 
diff --git a/server/utils/SettingsStorage.ts b/server/utils/SettingsStorage.ts
index 9ab37d79..fe113840 100644
--- a/server/utils/SettingsStorage.ts
+++ b/server/utils/SettingsStorage.ts
@@ -11,7 +11,7 @@ export const loadSettings = (storeRedux: any) => {
     // console.log('SETTINGS IS LOADING')
     let settingsInterface = storeRedux.settings[0];
     try {
-        return (JSON.parse(fs.readFileSync(path.resolve("settings.json"))))
+        return (JSON.parse(fs.readFileSync(path.resolve('storage', 'settings.json'))))
     }
     catch (error) {
         saveSettings(settingsInterface);
@@ -21,7 +21,7 @@ export const loadSettings = (storeRedux: any) => {
 
 export const saveSettings = (settings: any) => {
     let json = JSON.stringify(settings);
-    fs.writeFile(path.resolve("settings.json"), json, 'utf8', (error: any)=>{
+    fs.writeFile(path.resolve('storage', 'settings.json'), json, 'utf8', (error: any)=>{
         console.log(error);
     });
 };
@@ -85,7 +85,7 @@ export const saveSnapshotState = (stateSnapshot: any, fileName: string) => {
 }
 
 export const getSnapShotList = () => {
-    const files = fs.readdirSync(path.resolve()).filter((file: string) => { 
+    const files = fs.readdirSync(path.resolve('storage')).filter((file: string) => { 
         if (file.includes('.shot') && file !== 'default.shot') {
             return true
         }