pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue of not removing the corresponding database entry when removing a item from Aria

Browse Source
This commit is contained in:
huangjx
2021-10-24 11:08:48 +08:00
parent 44b0976cf8
commit 41fa31ae7b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Controller/Aria2Controller.php
View File

@@ -2,8 +2,8 @@
namespace OCA\NCDownloader\Controller; namespace OCA\NCDownloader\Controller;
use OCA\NCDownloader\Tools\Aria2; use OCA\NCDownloader\Tools\Aria2;
use OCA\NCDownloader\Tools\DBConn;
use OCA\NCDownloader\Tools\Counters; use OCA\NCDownloader\Tools\Counters;
use OCA\NCDownloader\Tools\DBConn;
use OCA\NCDownloader\Tools\folderScan; use OCA\NCDownloader\Tools\folderScan;
use OCA\NCDownloader\Tools\Helper; use OCA\NCDownloader\Tools\Helper;
use OCA\NCDownloader\Tools\Settings; use OCA\NCDownloader\Tools\Settings;
@@ -39,7 +39,7 @@ class Aria2Controller extends Controller
$this->aria2 = $aria2; $this->aria2 = $aria2;
$this->aria2->init(); $this->aria2->init();
$this->dbconn = new DBConn(); $this->dbconn = new DBConn();
$this->counters = new Counters($aria2, $this->dbconn,$UserId); $this->counters = new Counters($aria2, $this->dbconn, $UserId);
} }
/** /**
@@ -65,6 +65,9 @@ class Aria2Controller extends Controller
case "remove": case "remove":
case "pause": case "pause":
$resp = $this->doAction($path, $gid); $resp = $this->doAction($path, $gid);
if ($path === "remove" && isset($resp['status']) && $resp['status']) {
$this->dbconn->deleteByGid($gid);
}
break; break;
case "get": case "get":
$resp = $this->doAction('tellStatus', $gid); $resp = $this->doAction('tellStatus', $gid);
@@ -236,11 +239,10 @@ class Aria2Controller extends Controller
if ($this->aria2->methodName === "tellStopped") { if ($this->aria2->methodName === "tellStopped") {
$actions[] = $this->createActionItem('purge', 'purge'); $actions[] = $this->createActionItem('purge', 'purge');
} else {
$actions[] = $this->createActionItem('delete', 'remove');
} }
if ($this->aria2->methodName === "tellWaiting") { if ($this->aria2->methodName === "tellWaiting") {
$actions[] = $this->createActionItem('unpause', 'unpause'); $actions[] = $this->createActionItem('unpause', 'unpause');
$actions[] = $this->createActionItem('delete', 'remove');
} }
if ($this->aria2->methodName === "tellActive") { if ($this->aria2->methodName === "tellActive") {
$speed = [Helper::formatBytes($value['downloadSpeed']), $left]; $speed = [Helper::formatBytes($value['downloadSpeed']), $left];