From 226b3702de57e278e7f1961a9d6431d25a046d7b Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Fri, 16 Feb 2018 16:36:38 +0100
Subject: [PATCH] Remove unused functions and delete scr.utils.js

---
 src/renderer/scr.exec.js     | 21 ++++++++++++---
 src/renderer/scr.savefile.js |  8 ------
 src/renderer/scr.state.js    |  6 +----
 src/renderer/scr.utils.js    | 51 ------------------------------------
 4 files changed, 19 insertions(+), 67 deletions(-)
 delete mode 100644 src/renderer/scr.utils.js

diff --git a/src/renderer/scr.exec.js b/src/renderer/scr.exec.js
index a2eb858..4774cd9 100644
--- a/src/renderer/scr.exec.js
+++ b/src/renderer/scr.exec.js
@@ -4,14 +4,29 @@ document.addEventListener("DOMContentLoaded", () => {
   
   GUI.onFileUploaded(files => {
     if (files.length === 1){
-      UTILS.readJsonFile(files[0], (obj, file) => {
+      var file = files[0];
+      var reader = new FileReader();
+
+      reader.onload = function(){
+        var obj;
+        
+        try{
+          obj = JSON.parse(reader.result);
+        }catch(e){
+          console.error(e);
+          alert("Could not parse '"+file.name+"', see console for details.");
+          return;
+        }
+        
         if (SAVEFILE.isValid(obj)){
           STATE.uploadFile(new SAVEFILE(obj));
         }
         else{
-          alert((obj ? "File '{}' has an invalid format." : "Could not parse '{}', see console for details.").replace("{}", file.name));
+          alert("File '"+file.name+"' has an invalid format.");
         }
-      });
+      };
+
+      reader.readAsText(file, "UTF-8");
     }
     else{
       alert("Please, select only one file.");
diff --git a/src/renderer/scr.savefile.js b/src/renderer/scr.savefile.js
index 9165d0b..f8ce660 100644
--- a/src/renderer/scr.savefile.js
+++ b/src/renderer/scr.savefile.js
@@ -38,14 +38,6 @@ SAVEFILE.prototype.getUserById = function(user){
   return this.meta.users[user] || { "name": user };
 };
 
-SAVEFILE.prototype.getAllMessages = function(){
-  var messages = {};
-  
-  UTILS.forEachValue(this.data, messageObject => {
-    UTILS.combineObjects(messages, messageObject);
-  });
-  
-  return messages;
 SAVEFILE.prototype.getUserIndex = function(user){
   return this.meta.userindex.indexOf(user);
 };
diff --git a/src/renderer/scr.state.js b/src/renderer/scr.state.js
index 523fbe3..af7bf48 100644
--- a/src/renderer/scr.state.js
+++ b/src/renderer/scr.state.js
@@ -8,10 +8,10 @@ var STATE = (function(){
   var FILE;
   var MSGS;
   
+  var filterFunction;
   var selectedChannel;
   var currentPage;
   var messagesPerPage;
-  var filterFunction;
   
   // ----------------------------------
   // Channel and message refresh events
@@ -66,10 +66,6 @@ var STATE = (function(){
   ROOT.getUserName = function(user){
     return FILE.getUserById(user).name;
   };
-
-  ROOT.getRawMessages = function(channel){
-    return channel ? FILE.getMessages(channel) : FILE.getAllMessages();
-  };
   
   // --------------------------
   // Channel list and selection
diff --git a/src/renderer/scr.utils.js b/src/renderer/scr.utils.js
deleted file mode 100644
index 2aba9d2..0000000
--- a/src/renderer/scr.utils.js
+++ /dev/null
@@ -1,51 +0,0 @@
-var UTILS = {
-  /*
-   * Reads a file object and converts the JSON-formatted contents to a JS object. The callback accepts the parsed object (or null on failure), and the original file object.
-   */
-  readJsonFile: function(file, callback){
-    var reader = new FileReader();
-
-    reader.onload = function(){
-      var obj;
-
-      try{
-        obj = JSON.parse(reader.result);
-      }catch(e){
-        console.error(e);
-        callback(null, file);
-        return;
-      }
-
-      callback(obj, file);
-    };
-
-    reader.readAsText(file, "UTF-8");
-  },
-
-  /*
-   * Runs the callback with a key and value for each entry in an object.
-   */
-  forEachEntry: function(object, callback){
-    for(var key of Object.keys(object)){
-      callback(key, object[key]);
-    }
-  },
-
-  /*
-   * Runs the callback for each value in an object.
-   */
-  forEachValue: function(object, callback){
-    for(var key of Object.keys(object)){
-      callback(object[key]);
-    }
-  },
-
-  /*
-   * Adds all entries from the source object to the target object.
-   */
-  combineObjects: function(target, source){
-    for(var key of Object.keys(source)){
-      target[key] = source[key];
-    }
-  }
-};