better loggin + fixed empty mods loading

Author: wurunduk

CHANGELOG.md

@@ -8,7 +8,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 ### Fixed
 
-## [1.7.1, 1.7.2] 2020-09-23
+## [1.7.4] 2020-10-01
+### Added
+- Added a notification when CD path is saved.
+- Added some better console logging for better debugging.
+### Fixed
+- Empty mod folders are not loaded from workshop folder now (thanks OutBlast).
+
+## [1.7.1, 1.7.2, 1.7.3] 2020-09-23
 Fixed build errors?
 
 ## [1.7.0] 2020-09-23

app/img/icon.png

@@ -53,6 +53,9 @@ $('#cd-file-path').on('change', function() {
   else collectionConfig['CrashdayPath'] = p
 
   SaveConfig()
+
+  $.toast({title: 'CD Path saved!',
+           type: 'success', delay: 5000, container: $('#toaster')})
 })
 
 LoadWorkshop()
@@ -133,10 +136,18 @@ function PrepareMissingModsModal(){
   Http.open('GET', url)
   Http.send()
 
+  console.groupCollapsed('Sent a request to Steam')
+  console.log(url)
+  console.groupEnd()
+
   Http.onreadystatechange=function(){
     if(this.readyState==4 && this.status==200){
       var answer = JSON.parse(Http.responseText)['response']
 
+      console.groupCollapsed('Steam answer')
+      console.log(answer)
+      console.groupEnd()
+
       $('#missing-mods-modal-list').html('')
       for(i in answer['publishedfiledetails']){
         $('#missing-mods-modal-list').append(
@@ -189,12 +200,18 @@ function LoadWorkshop(){
   Http.open('GET', url)
   Http.send()
 
+  console.groupCollapsed('Sent a request to Steam')
   console.log(url)
+  console.groupEnd()
 
   Http.onreadystatechange=function(){
     if(this.readyState==4 && this.status==200){
       steamAnswer = JSON.parse(Http.responseText)['response']
 
+      console.groupCollapsed('Steam answer')
+      console.log(steamAnswer)
+      console.groupEnd()
+
       const table = {}
       table['search'] = true
       table['clickToSelect'] = true
@@ -493,10 +510,18 @@ function GetCollectionFromLink(){
   Http.open('GET', url)
   Http.send()
 
+  console.groupCollapsed('Sent a request to Steam')
+  console.log(url)
+  console.groupEnd()
+
   Http.onreadystatechange=function(){
     if(this.readyState==4 && this.status==200){
       var response = JSON.parse(Http.responseText)['response']
 
+      console.groupCollapsed('Steam answer')
+      console.log(response)
+      console.groupEnd()
+
       if(response['publishedfiledetails'][0]['result'] != 1){
       	$.toast({title: 'Collection import error',
              content: 'Steam could not find collection with id ' + collectionUrl,
@@ -767,31 +792,52 @@ function LoadConfig(){
 
   //check for new mods in the workshop folder
   var p = path.join(colls['CrashdayPath'], '../../workshop/content/508980')
-  var foundNewMods = 0
+  var unlistedMods = 0
+  var listedMods = 0
+  var emptyFolders = 0
+  var otherFiles = 0
   if(fs.existsSync(p)){
     fs.readdirSync(p).forEach(file => {
       var foundFile = false
       var name = parseInt(file, 10)
-      //skip not numbered .cpk's
-      if(name == NaN) return
+      //skip not numbered folder names
+      if(name == NaN) {
+        otherFiles++
+        return
+      }
+      
+      folder = fs.statSync(path.join(p, file))
+      if(!folder.isDirectory()) {
+        otherFiles++
+        return
+      }
+      //check there is a mod file in mod folder
+      files = fs.readdirSync(path.join(p, file))
+      if(files.length == 0) {
+        emptyFolders++
+        return
+      }
 
       for(n in cfg['WorkshopItems'])
       {
         if(cfg['WorkshopItems'][n][0] == name)
         {
+          listedMods++
           foundFile = true
         }
       }
       if(!foundFile){
         cfg['WorkshopItems'].push([name, false])
-        foundNewMods += 1
+        unlistedMods++
       }
     })
   }
 
-  if(foundNewMods > 0){
+  console.log(`Found ${listedMods} listed mods, ${unlistedMods} unlisted mods, ${emptyFolders} empty folders and ${otherFiles} other files in Workshop folder`)
+
+  if(unlistedMods > 0){
     $.toast({title: 'New mods found',
-             content: 'Launcher found and added ' + foundNewMods + ' new mods.',
+             content: 'Launcher found and added ' + unlistedMods + ' new mods.',
              type: 'info', delay: 5000, container: $('#toaster')})
   }
 

app/js/renderer.js

@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const {app, BrowserWindow, ipcMain } = require('electron')
+const {nativeImage, app, BrowserWindow, ipcMain } = require('electron')
 const {autoUpdater} = require('electron-updater')
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -10,7 +10,8 @@ function createWindow () {
   // Create the browser window.
   mainWindow = new BrowserWindow({width: 1280, height: 720, webPreferences: {
       nodeIntegration: true,
-    }})
+    }, icon: nativeImage.createFromPath(__dirname + '/img/icon.png')
+  })
 
   // and load the index.html of the app.
   mainWindow.loadFile('app/index.html')

main.js

@@ -20,7 +20,7 @@
     ]
   },
   "name": "crashday-smart-launcher",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "A better launcher for Crashday:Redline edition",
   "author": "Wurunduk",
   "license": "MIT",