diff --git a/models/sql/torrent.js b/models/sql/torrent.js index 8c238e1..40480d6 100644 --- a/models/sql/torrent.js +++ b/models/sql/torrent.js @@ -89,6 +89,9 @@ module.exports = (sequelize, DataTypes, Model) => { async getTorrentData(noUpdate){ try{ + + if(this.percentDone === 1) return this.dataValues + let res = ( await tr_client.get(this.hashString, [ "eta", "percentDone", "status", "rateDownload", "errorString", "hashString", 'name', @@ -103,9 +106,9 @@ module.exports = (sequelize, DataTypes, Model) => { 'sizeWhenDone', ]) ).torrents[0]; - if(this.percentDone === 1) return this.dataValues await this.update(res); if(noUpdate) await this.save(); + return {...res, ...this.dataValues}; }catch(error){ if(error.code === 'ECONNREFUSED'){ diff --git a/public/partial/header.html b/public/partial/header.html index a58aa63..4a2a810 100644 --- a/public/partial/header.html +++ b/public/partial/header.html @@ -537,7 +537,7 @@ } }); } - localStorage.clear('torrents'); + localStorage.removeItem('torrents',); } }