Updated

Author: thecoder75

index.js

@@ -15,9 +15,10 @@ const concat = require('concat-files')
 const async = require('async')
 const pjson = require('./package.json')
 
-let op = ''
+let op = process.platform == 'win32' ? process.env.APPDATA : process.env.HOME + (process.platform == 'darwin' ? '/Library/Preferences' : '/.config')
 let download_list = []
 let mainWindow = null
+let appSettings = JSON.parse(fs.readFileSync(path.join(op, 'liveme-pro-tools/Settings')))
 
 function createWindow() {
     mainWindow = new BrowserWindow({
@@ -61,19 +62,6 @@ function createWindow() {
 
         })
 
-    op = ''
-    if (process.platform == 'win32')
-        op = process.env.APPDATA
-    else if (process.platform == 'darwin')
-        op = process.env.HOME + '/Library/Preferences'
-    else
-        op = process.env.HOME + '/.config'
-
-    op += '/liveme-pro-tools'
-
-    if (fs.existsSync(path.join(op, 'Settings'))) {
-        appSettings = JSON.parse(fs.readFileSync(path.join(op, 'Settings')))
-    }
     appSettings.path = op
 
     global.appSettings = appSettings

package.json

@@ -27,7 +27,6 @@
     "request-promise-native": "^1.0.5"
   },
   "devDependencies": {
-    "electron-builder": "^20.38.5",
     "electron": "^3.1.1"
   },
   "build": {

src/css/main.css

@@ -5,6 +5,7 @@ body {
     color: rgb(224,224,224);
     font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
     font-size: 10pt;
+    overflow: hidden;
 }
 
 h1,h2,h3,h4,h5,h6 {
@@ -18,6 +19,11 @@ h1,h2,h3,h4,h5,h6 {
     height: calc(100%-25px);
     overflow-x: hidden;
     overflow-y: auto;
+    position: absolute;
+    top: 0;
+    bottom: 25px;
+    left: 0;
+    right: 0;
 }
 
 

src/js/index.js

@@ -8,12 +8,14 @@ let bookmarks = []
 let bookmark_index = 0
 let bookmarks_loading = false
 
-let minuteTicks = 29
-let secondTicks = 45
+let minuteTicks = appSettings.lamd.cycletime - 1
+let secondTicks = 55
 
 let isOnline = false
 let scan_active = false
 
+let appPath = (process.platform == 'win32' ? process.env.APPDATA : process.env.HOME + (process.platform == 'darwin' ? '/Library/Preferences' : '/.config')) + '/liveme-pro-tools/'
+
 
 $(function(){
 
@@ -81,9 +83,9 @@ $(function(){
         `)
     })
 
-    if (fs.existsSync(path.join(appSettings.path, 'bookmarks.json'))) {
+    if (fs.existsSync(appPath + 'bookmarks.json')) {
         loadBookmarks()
-        fs.watch(path.join(appSettings.path, 'bookmarks.json'), () => {
+        fs.watch(appPath + 'bookmarks.json', () => {
             if (bookmarks_loading) return;
             bookmarks_loading = true;
             loadBookmarks()
@@ -104,27 +106,28 @@ $(function(){
 
         secondTicks++
 
-        let t1 = 29 - minuteTicks
+        let t1 = (appSettings.lamd.cycletime - 1) - minuteTicks
         let t2 = 60 - secondTicks
         if (t1 < 10) t1 = '0' + t1
         if (t2 < 10) t2 = '0' + t2
 
-        if (!scan_active && (minuteTicks > 20)) {
+        if (!scan_active) {
             $('#statusbar h1').html(`Next scan in ${t1}:${t2}`)
         }
 
-        secondTicks = 0
-        minuteTicks++
+        if (secondTicks > 59) {
+            secondTicks = 0
+            minuteTicks++
 
-        if (minuteTicks > (appSettings.lamd.cycletime)) {
-            minuteTicks = 0;
+            if (minuteTicks == appSettings.lamd.cycletime) {
+                minuteTicks = 0;
 
-            if (isOnline) {
-                scan_active = true
-                beginBookmarkScan()
+                if (isOnline) {
+                    scan_active = true
+                    beginBookmarkScan()
+                }
             }
         }
-
     }, 1000)
 
 })
@@ -138,9 +141,9 @@ function cancelDownload(i) {
 
 
 function loadBookmarks() {
-    if (fs.existsSync(path.join(appSettings.path, 'bookmarks.json'))) {
+    if (fs.existsSync(appPath + 'bookmarks.json')) {
         $('#statusbar h1').html('Loading bookmarks...')
-        fs.readFile(path.join(appSettings.path, 'bookmarks.json'), 'utf8', function(err, data) {
+        fs.readFile(appPath + 'bookmarks.json', 'utf8', function(err, data) {
             if (err) {
                 bookmarks = []
             } else {
@@ -164,6 +167,8 @@ function beginBookmarkScan() {
     if (bookmarks[bookmark_index] != undefined) {
         if (bookmarks[bookmark_index].lamd != undefined) {
             if (bookmarks[bookmark_index].lamd.monitor == true) {
+                console.log(`${bookmark_index} - Checking ${bookmarks[bookmark_index].nickname}`)
+
                 let t = Math.round((bookmark_index / bookmarks.length) * 100) + '%'
                 $('#statusbar h1').html(`Scanning ${bookmarks[bookmark_index].nickname} (${bookmarks[bookmark_index].uid}) ${t}`)
                 scanForNewReplays(bookmark_index)
@@ -177,8 +182,10 @@ function beginBookmarkScan() {
     } else {
         $('statusbar h1').html(`Bookmark scan complete.`)
 
+        scan_active = false
+
         fs.writeFile(
-            path.join(op, 'bookmarks.json'),
+            appPath + 'bookmarks.json',
             JSON.stringify(bookmarks), 
             () => {