Merge pull request #149 from StarGazer1258/beta

Merge 2.6.2-beta to stable

package.json

@@ -2,7 +2,7 @@
   "name": "beatdrop",
   "description": "A desktop app for downloading Beat Saber songs.",
   "author": "Nathaniel Johns (StarGazer1258)",
-  "version": "2.5.9",
+  "version": "2.6.2-beta",
   "private": false,
   "license": "CC-BY-NC-SA-4.0",
   "repository": {

public/electron.js

@@ -23,7 +23,8 @@ let launchEvents = {
     details: [],
     install: [],
     uninstall: []
-  }
+  },
+  files: []
 }
 
 ipcMain.on('launch-events', (_, event, message) => {
@@ -155,7 +156,7 @@ function handleArgs(argv, sendImmediately) {
   // handle files
   const args = argv.filter((_, i) => !(i < (isDev ? 2 : 1)))
   const { ext } = path.parse(args[0])
-  return handleFiles(args[0], ext);
+  launchEvents.files.push({ file: args[0], ext })
 }
 
 function handleBeatdrop(argv, sendImmediately){
@@ -220,10 +221,6 @@ function handleBeatdrop(argv, sendImmediately){
   }
 }
 
-function handleFiles(path, ext){
- mainWindow.webContents.send('file-open', path, ext);
-}
-
 function createWindow() {
   mainWindow = new BrowserWindow({
     width: 1080, 

src/actions/appActions.js

@@ -0,0 +1,7 @@
+import { RESET_APP } from "./types"
+
+export const resetApp = () => dispatch => {
+  dispatch({
+    type: RESET_APP
+  })
+}

src/actions/detailsActions.js

@@ -20,7 +20,7 @@ export const loadDetailsFromFile = file => (dispatch, getState) => {
     type: SET_DETAILS_LOADING,
     payload: true
   })
-  setView(SONG_DETAILS)(dispatch)
+  setView(SONG_DETAILS)(dispatch, getState)
   fs.readFile(file, 'UTF-8', (err, data) => {
     if(err) return
     let details = JSON.parse(data)
@@ -50,15 +50,15 @@ export const loadDetailsFromFile = file => (dispatch, getState) => {
  * Loads and presents the details page for a song from a key.
  * @param {string} key The key of the song
  */
-export const loadDetailsFromKey = key => dispatch => {
+export const loadDetailsFromKey = key => (dispatch, getState) => {
   dispatch({
     type: CLEAR_DETAILS
   })
   dispatch({
     type: SET_DETAILS_LOADING,
     payload: true
   })
-  setView(SONG_DETAILS)(dispatch)
+  setView(SONG_DETAILS)(dispatch, getState)
   if((/^[a-f0-9]+$/).test(key)) {
     fetch(`https://beatsaver.com/api/maps/detail/${key}`)
       .then(res => {