zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2025-12-19 13:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

When moving files, remember start/stopped status

Browse Source
This commit is contained in:
John Furrow
2017-09-11 19:54:41 -04:00
parent 83b6f1973a
commit fc41449385
3 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/models/ClientRequest.js
View File

@@ -12,7 +12,8 @@ let util = require('util');
let clientSettingsMap = require('../../shared/constants/clientSettingsMap');
let rTorrentPropMap = require('../util/rTorrentPropMap');
let scgi = require('../util/scgi');
let stringUtil = require('../../shared/util/stringUtil');
const torrentService = require('../services/torrentService');
const torrentStatusMap = require('../../shared/constants/torrentStatusMap');
class ClientRequest {
constructor(options) {
@@ -183,11 +184,16 @@ class ClientRequest {
}
checkHash(options) {
let hashes = this.getEnsuredArray(options.hashes);
const hashes = this.getEnsuredArray(options.hashes);
const hashesToStop = hashes.filter(hash => {
return torrentService.getTorrent(hash).status.includes(torrentStatusMap.stopped);
});
hashes.forEach((hash) => {
hashes.forEach(hash => {
this.requests.push(this.getMethodCall('d.check_hash', [hash]));
});
this.stopTorrents({hashes: hashesToStop});
}
createDirectory(options) {
@@ -247,15 +253,14 @@ class ClientRequest {
}
moveTorrents(options) {
let hashes = this.getEnsuredArray(options.hashes);
let destinationPath = options.destinationPath;
let filenames = this.getEnsuredArray(options.filenames);
let sourcePaths = this.getEnsuredArray(options.sourcePaths);
const destinationPath = options.destinationPath;
const filenames = this.getEnsuredArray(options.filenames);
const sourcePaths = this.getEnsuredArray(options.sourcePaths);
sourcePaths.forEach((source, index) => {
let callback = () => {};
let destination = `${destinationPath}${path.sep}${filenames[index]}`;
let isLastRequest = index + 1 === sourcePaths.length;
const destination = `${destinationPath}${path.sep}${filenames[index]}`;
const isLastRequest = index + 1 === sourcePaths.length;
if (isLastRequest) {
callback = this.handleSuccess.bind(this);