diff --git a/src/renderer/pages/Index.vue b/src/renderer/pages/Index.vue index 50a5fba..90c1fc5 100644 --- a/src/renderer/pages/Index.vue +++ b/src/renderer/pages/Index.vue @@ -265,7 +265,9 @@ export default { async start(file){ // ps5 version - if( this.isPS5 ){ + if( this.isPS5 ){ + this.log(file.name + ' install request') + return await this.$ps5.install(file) .then( (data) => { // this.$message({ message: file.name + ' send to PS5', file, type: "info" }) diff --git a/src/renderer/plugins/fs.js b/src/renderer/plugins/fs.js index 06f4c49..2c339ed 100644 --- a/src/renderer/plugins/fs.js +++ b/src/renderer/plugins/fs.js @@ -190,6 +190,17 @@ let o = { // let filePath = item.file.replace('attachments/', 'attachments/stream/') let filePath = item.file ? item.file.replace('https', 'http') : item.file + // file url if we have missing ps4 default pacakage but file_ps5 given instead + // so fallback to file_ps5 if file is empty + if( !item.file && item.file_ps5){ + filePath = item.file_ps5 ? item.file_ps5.replace('https', 'http') : item.file_ps5 + } + + // if we have ps5 selected enforce ps5 file + if( store.getters['app/isPS5'] && item.file_ps5 ){ + filePath = item.file_ps5 ? item.file_ps5.replace('https', 'http') : item.file_ps5 + } + return { name: item.name, status: 'remote', diff --git a/src/renderer/plugins/ps4.js b/src/renderer/plugins/ps4.js index bfa9d5c..993e5c3 100644 --- a/src/renderer/plugins/ps4.js +++ b/src/renderer/plugins/ps4.js @@ -213,7 +213,8 @@ let ps4 = { install(file){ if(!file.url){ - return console.log("Cannot find path for file " + file.name ) + return new Promise( (resolve, reject) => reject("Can't find file URL for " + file.name) ) + // return console.log("Cannot find path for file " + file.name ) } return this.request(this.getURL() + '/api/install', { type : 'direct', packages: [file.url] }, { timeout: this.getTimeout() }) diff --git a/src/renderer/plugins/ps5.js b/src/renderer/plugins/ps5.js index f70e82d..f506880 100644 --- a/src/renderer/plugins/ps5.js +++ b/src/renderer/plugins/ps5.js @@ -21,6 +21,9 @@ let ps5 = { // #todo refactor to ps5 getURL(of='ps'){ + if(of == 'url'){ + return store.getters['app/getPS4IP'] + } if(of == 'ps'){ let url = store.getters['app/getPS4IP'] @@ -134,7 +137,7 @@ let ps5 = { console.error('Socket error:', error); if( error.code == 'ECONNREFUSED' ) - return reject("PS5 Connection failed at " + this.getURL('url') ) + return reject(`PS5 Connection failed at ${this.getURL('url')}`) reject(error); }); @@ -171,7 +174,7 @@ let ps5 = { install(file, cb=null){ if(!file.url){ - return console.log("Cannot find path for file " + file.name ) + return new Promise( (resolve, reject) => reject("Can't find file URL for " + file.name) ) } return this.send({ url: file.url })