From 5bfbeafea577e4927f00c3a3f456d78346d33183 Mon Sep 17 00:00:00 2001
From: huangjx <freefallbenson@gmail.com>
Date: Wed, 23 Feb 2022 15:49:40 +0800
Subject: [PATCH] cleaning up;bump version to 0.7.5

---
 appinfo/info.xml        |  2 +-
 js/settings/admin.js    | 16 ----------------
 js/settings/personal.js | 20 --------------------
 lib/Tools/Aria2.php     | 40 +---------------------------------------
 src/index.js            | 10 ----------
 5 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 js/settings/admin.js
 delete mode 100644 js/settings/personal.js

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2eb5387..7ef389b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -8,7 +8,7 @@ Search for torrents within the app from mutiple BT sites;
 Control Aria2 and manage download tasks from the web;
 download videos from 700+ video sites(youtube,youku,vimo,dailymotion,twitter,facebook and the likes
 </description>
-    <version>0.7.4</version>
+    <version>0.7.5</version>
     <licence>agpl</licence>
     <author mail="freefallbenson@gmail.com" homepage="https://github.com/shiningw">jiaxinhuang</author>
     <namespace>NCDownloader</namespace>
diff --git a/js/settings/admin.js b/js/settings/admin.js
deleted file mode 100644
index 96985ea..0000000
--- a/js/settings/admin.js
+++ /dev/null
@@ -1,16 +0,0 @@
-window.addEventListener('DOMContentLoaded', function () {
-	$('.ncdownloader-admin-settings').on('click', 'input[type="button"]', function (event) {
-		OC.msg.startSaving('#ncdownloader-message');
-		const target = $(this).attr("data-rel");
-		const http = $.ncdownloader.http;
-		let inputData = http.getData(target);
-		http.setData(inputData.data);
-		const path = inputData.url || "/apps/ncdownloader/admin/save";
-		let url = OC.generateUrl(path);
-		http.setUrl(url);
-		http.setHandler(function () {
-			OC.msg.finishedSuccess('#ncdownloader-message', "OK");
-		});
-		http.send();
-	});
-});
diff --git a/js/settings/personal.js b/js/settings/personal.js
deleted file mode 100644
index 4f15b1b..0000000
--- a/js/settings/personal.js
+++ /dev/null
@@ -1,20 +0,0 @@
-+(function ($) {
-
-	window.addEventListener("DOMContentLoaded", function () {
-		$('.ncdownloader-personal-settings').on('click', 'input[type="button"]', function (event) {
-			OC.msg.startSaving('#ncdownloader-message');
-			const target = $(this).attr("data-rel");
-			const http = $.ncdownloader.http;
-			let inputData = http.getData(target);
-			http.setData(inputData.data);
-			const path = inputData.url || "/apps/ncdownloader/personal/save";
-			let url = OC.generateUrl(path);
-			http.setUrl(url);
-			http.setHandler(function (data) {
-				OC.msg.finishedSuccess('#ncdownloader-message', "OK");
-			});
-			http.send();
-		});
-	});
-}
-)(jQuery)
\ No newline at end of file
diff --git a/lib/Tools/Aria2.php b/lib/Tools/Aria2.php
index 1860e32..84720c2 100644
--- a/lib/Tools/Aria2.php
+++ b/lib/Tools/Aria2.php
@@ -61,7 +61,7 @@ class Aria2
         $this->setToken($this->tokenString);
         $this->confDir = $conf_dir;
         $this->sessionFile = $this->confDir . "/aria2.session";
-        $this->confFile = $this->confDir . "/aria2.conf";
+        //$this->confFile = $this->confDir . "/aria2.conf";
         $this->logFile = $this->confDir . "/aria2.log";
     }
     public function init()
@@ -96,9 +96,6 @@ class Aria2
         if (!is_dir($this->confDir)) {
             mkdir($this->confDir, 0755, true);
         }
-        if (!file_exists($this->confDir . "/aria2.conf")) {
-            file_put_contents($this->confDir . "/aria2.conf", $this->confTemplate());
-        }
         if (!is_dir($dir = $this->getDownloadDir())) {
             mkdir($dir, 0755, true);
         }
@@ -405,39 +402,4 @@ class Aria2
         sleep(3);
         return $resp ?? null;
     }
-    private function confTemplate()
-    {
-        return <<<EOF
-continue
-daemon=true
-#dir=/home/aria2/Downloads
-#file-allocation=falloc
-log-level=info
-max-connection-per-server=4
-max-concurrent-downloads=5
-max-overall-download-limit=0
-min-split-size=5M
-enable-http-pipelining=true
-#interface=127.0.0.1
-enable-rpc=true
-rpc-secret=$this->tokenString
-rpc-listen-all=true
-rpc-listen-port=6800
-follow-torrent=true
-listen-port=51413
-enable-dht=true
-enable-peer-exchange=true
-peer-id-prefix=-TR2770-
-user-agent=Transmission/2.77
-seed-ratio=0.1
-bt-seed-unverified=true
-max-overall-upload-limit=1M
-#on-download-complete=
-#on-download-error=
-#on-download-start=
-save-session=$this->sessionFile
-input-file=$this->sessionFile
-log=$this->logFile
-EOF;
-    }
 }
diff --git a/src/index.js b/src/index.js
index c26ce79..1963886 100644
--- a/src/index.js
+++ b/src/index.js
@@ -76,16 +76,6 @@ window.addEventListener('DOMContentLoaded', function () {
         }).send();
     })
     eventHandler.add("click", "#app-navigation", "#search-download", helper.showDownload);
-    eventHandler.add("change", "#app-navigation", "#ncd-hide-errors", e => {
-        let data = {};
-        data["ncd_hide_errors"] = e.target.checked;
-        const url = helper.generateUrl(basePath + "/personal/save");
-        Http.getInstance(url).setData(data).setHandler(resp => {
-            if (resp['message']) {
-                helper.message(t("ncdownloader", resp['message']), 1000);
-            }
-        }).send();
-    })
     delegate('#app-ncdownloader-wrapper',
         { target: '[data-tippy-content]' }
     );