show a little indicator depending on whether the file has been found …

…or not
niuage · Nov 18, 2015 · a5968e8 · a5968e8
1 parent 7709d4b
commit a5968e8
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 24 deletions.
diff --git a/app/app.html b/app/app.html
@@ -40,7 +40,14 @@ <h2>Log monitoring</h2>
       <p class="hint">Only the commands sent from these characters will be sent to pathofmaps.com.</p>
       <textarea placeholder="Enter your character names, one on each line"><%= characters %></textarea>
 
-      <label>Path to PoE logs (Client.txt)</label>
+      <label>
+        Path to PoE logs (Client.txt)
+        <% if (validLogPath) { %>
+          <span class="check valid"></span>
+        <% } else { %>
+          <span class="check invalid"></span>
+        <% } %>
+      </label>
       <p class="hint">
         Full path of the Client.txt log file.
       </p>

diff --git a/app/lib/log_watcher.js b/app/lib/log_watcher.js
@@ -14,7 +14,6 @@ import { Log } from "./log"
 class LogWatcher {
   constructor() {
     radio.channel("settings").on("change:logs_path", _.bind(function(logsPath) {
-      console.log(logsPath)
       try {
         fs.lstatSync(logsPath);
         this.start(logsPath);
@@ -28,6 +27,8 @@ class LogWatcher {
   start(logsPath) {
     this.stop();
 
+    radio.channel("logs").trigger("watch:start");
+
     this.setLogsFile(logsPath);
 
     this.refreshLogsPeriodically();
@@ -47,6 +48,8 @@ class LogWatcher {
   stop() {
     if (!this.started) return;
 
+    radio.channel("logs").trigger("watch:stop");
+
     this.stopRefreshing();
     this.stopWatching();
     this.logFile = null;

diff --git a/app/lib/map.js b/app/lib/map.js
@@ -3,7 +3,6 @@
 class Map {
   constructor(mapData) {
     this.mapData = mapData;
-    console.log(this.mapData);
   }
 
   isValid() {

diff --git a/app/lib/models/setting.js b/app/lib/models/setting.js
@@ -12,14 +12,9 @@ var Setting = Backbone.Model.extend({
   },
 
   initialize: function() {
-    this.set("token", window.storage.get("token"));
-    this.set("characters", window.storage.get("characters"));
-    this.set("logs_path", window.storage.get("logs_path"));
-
     _.each(["token", "characters", "logs_path"], _.bind(function(attr) {
       var changeEvent = "change:" + attr
       this.on(changeEvent, function() {
-        console.log(attr + " changed")
         radio.channel("settings").trigger(changeEvent, this.get(attr))
         storage.set(attr, this.get(attr))
       })

diff --git a/app/lib/popom.js b/app/lib/popom.js
@@ -21,21 +21,6 @@ class Popom {
 
     this.renderSettingsForm();
 
-    // radio.channel("settings").on({
-    //   "change:token": function(token) {
-    //     console.log("token changed:", token)
-    //     storage.set("token", token);
-    //   },
-    //   "change:characters": function(characters) {
-    //     console.log("characters changed:", characters)
-    //     storage.set("characters", characters);
-    //   },
-    //   "change:logs_path": function(logs_path) {
-    //     console.log("logs_path changed:", logs_path)
-    //     ;
-    //   },
-    // })
-
     app.on('window-all-closed', _.bind(this.stop, this));
   }
 

diff --git a/app/lib/views/settings_form.js b/app/lib/views/settings_form.js
@@ -17,8 +17,25 @@ var SettingsForm = Backbone.View.extend({
     "paste [data-logs-path-input]": "logsPathChanged"
   },
 
+  validLogPath: false,
+
   initialize: function(options) {
     this.render();
+
+    radio.channel("logs").on({
+      "watch:start": _.bind(this.validLogs, this),
+      "watch:stop": _.bind(this.invalidLogs, this)
+    });
+
+    this.model.set("token", window.storage.get("token"));
+    this.model.set("characters", window.storage.get("characters"));
+    this.model.set("logs_path", window.storage.get("logs_path"));
+  },
+
+  serializeData: function() {
+    return _.extend(this.model.toJSON(), {
+      validLogPath: this.validLogPath
+    })
   },
 
   tokenChanged: function() {
@@ -53,8 +70,18 @@ var SettingsForm = Backbone.View.extend({
     return(this._template = _.template($("#settings-form-template").html()));
   },
 
+  validLogs: function() {
+    this.validLogPath = true;
+    this.render();
+  },
+
+  invalidLogs: function() {
+    this.validLogPath = false;
+    this.render();
+  },
+
   render: function() {
-    this.$el.html(this.template()(this.model.toJSON()));
+    this.$el.html(this.template()(this.serializeData()));
   }
 })
 

diff --git a/app/stylesheets/main.less b/app/stylesheets/main.less
@@ -102,3 +102,18 @@ textarea {
 .right {
   float: right !important;
 }
+
+.check {
+  border-radius: 50%;
+  height: 15px;
+  width: 15px;
+  display: inline-block;
+}
+
+.check.invalid {
+  background: red;
+}
+
+.check.valid {
+  background: green;
+}