From 8e3549fdbee4148663224ccc324df115a645082a Mon Sep 17 00:00:00 2001
From: marcelveldt <marcelvanderveldt@MacBook-Silvia.local>
Date: Wed, 16 Oct 2019 00:34:03 +0200
Subject: [PATCH] fix dockerfile

---
 Dockerfile                              |  2 +-
 music_assistant/config.py               |  7 ++++--
 music_assistant/web/pages/config.vue.js | 33 ++++++++++++++-----------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0b9aea1..b042502b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN pip install -r requirements.txt
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY music_assistant /usr/src/app/music_assistant
-COPY mass.py /usr/src/app/main.py
+COPY mass.py /usr/src/app/mass.py
 RUN chmod a+x /usr/src/app/mass.py
 
 VOLUME ["/data"]
diff --git a/music_assistant/config.py b/music_assistant/config.py
index 8de4febd..ed49bac3 100755
--- a/music_assistant/config.py
+++ b/music_assistant/config.py
@@ -57,11 +57,14 @@ class MassConfig(dict):
 
     def __setitem__(self, key, new_value):
         # optional processing here
-        if self[key] != new_value:
+        if key not in self:
+            super().__setitem__(key, new_value)
+        elif self[key] != new_value:
             # value changed
+            super().__setitem__(key, new_value)
             self[key] = new_value
             self.mass.event_loop.create_task(
-                    self.mass.signal_event(EVENT_CONFIG_CHANGED, self.__dict__))
+                    self.mass.signal_event(EVENT_CONFIG_CHANGED, self))
             self.__save()
 
     def __save(self):
diff --git a/music_assistant/web/pages/config.vue.js b/music_assistant/web/pages/config.vue.js
index c4164db2..0bc9ff1d 100755
--- a/music_assistant/web/pages/config.vue.js
+++ b/music_assistant/web/pages/config.vue.js
@@ -21,10 +21,10 @@ var Config = Vue.component('Config', {
                               </template>
                               <div v-for="conf_item_key in conf[conf_key][conf_subkey].__desc__">
                                     <v-list-tile>
-                                          <v-switch v-if="typeof(conf_item_key[1]) == 'boolean'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])"></v-switch>
-                                          <v-text-field v-else-if="conf_item_key[1] == '<password>'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" box type="password"></v-text-field>
-                                          <v-select v-else-if="conf_item_key[1] == '<player>'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" box type="password"></v-select>
-                                          <v-text-field v-else v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" box></v-text-field>
+                                          <v-switch v-if="typeof(conf_item_key[1]) == 'boolean'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" @change="confChanged(conf_key, conf_subkey, conf[conf_key][conf_subkey])"></v-switch>
+                                          <v-text-field v-else-if="conf_item_key[1] == '<password>'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" box type="password" @change="confChanged(conf_key, conf_subkey, conf[conf_key][conf_subkey])"></v-text-field>
+                                          <v-select v-else-if="conf_item_key[1] == '<player>'" v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" box type="password" @change="confChanged(conf_key, conf_subkey, conf[conf_key][conf_subkey])"></v-select>
+                                          <v-text-field v-else v-model="conf[conf_key][conf_subkey][conf_item_key[0]]" :label="$t('conf.'+conf_item_key[2])" @change="confChanged(conf_key, conf_subkey, conf[conf_key][conf_subkey])" box></v-text-field>
                                     </v-list-tile>
                                 </div>
                                 <v-divider></v-divider>
@@ -97,16 +97,16 @@ var Config = Vue.component('Config', {
     }
   },
   watch: {
-    'conf': {
-        handler: _.debounce(function (val, oldVal) {
-          if (oldVal.base) {
-            console.log("save config needed!");
-            this.saveConfig();
-            this.$toasted.show(this.$t('conf.conf_saved'))
-          }
-        }, 5000),
-        deep: true
-    }
+    // 'conf': {
+    //     handler: _.debounce(function (val, oldVal) {
+    //       if (oldVal.base) {
+    //         console.log("save config needed!");
+    //         this.saveConfig();
+    //         this.$toasted.show(this.$t('conf.conf_saved'))
+    //       }
+    //     }, 5000),
+    //     deep: true
+    // }
   },
   created() {
     this.$globals.windowtitle = this.$t('settings');
@@ -135,6 +135,11 @@ var Config = Vue.component('Config', {
           console.log("error", error);
         });
     },
+    confChanged(key, subkey, newvalue) {
+      console.log(key + "/" + subkey + " changed!");
+      console.log(newvalue);
+
+    },
     getPlayers () {
       const api_url = '/api/players';
       axios
-- 
2.34.1