diff --git a/src/app/admin-page.js b/src/app/admin-page.js
index 7ea44cb..9ae2518 100644
--- a/src/app/admin-page.js
+++ b/src/app/admin-page.js
@@ -134,24 +134,6 @@ export default class AdminPage extends Page {
}} />
-
-
CPU usage limitation
-
{
- if(value === 100)
- value = 0
-
- this.options.spider.cpuLimit = value
- this.forceUpdate()
- }}
- />
-
-
Download torrents directory
+ Torrent network scanner settings:
+
+
+
Scanner walk speed (current: {this.options.spider && this.options.spider.walkInterval}) [affected after program reload]
+
{
+ this.options.spider.walkInterval = value
+ this.forceUpdate()
+ }}
+ />
+
+
* Low value - fast initial scanning and high cpu usage. High Value - low cpu usage but very slow scanning.
+ Good value between 3-60. Defaul value: 5
+
+
+
+
Nodes usage (current: {this.options.spider && this.options.spider.nodesUsage})
+
{
+ this.options.spider.nodesUsage = value
+ this.forceUpdate()
+ }}
+ />
+
+
* Low Value - very low usage of nodes, low network traffic, slow torrent scanning. High value - high traffic, fast scanning, high routers usage.
+ Recomended value between 10-1000. Defaul value: 100. 0 - Ignore this option (no limit).
+
+
+
+
+
Reduce network packages (current: {this.options.spider && this.options.spider.packagesLimit})
+
{
+ this.options.spider.packagesLimit = value
+ this.forceUpdate()
+ }}
+ />
+
+
* Low Value - ignore more usless network packages, lower traffic and routers usage. High Value - high traffic and router usage in prospectю
+ Recomended value between 300-2000. Defaul value: 500. 0 - Ignore this option (no limit).
+
+
+
{
this.settingsSavedMessage
&&
diff --git a/src/background/config.js b/src/background/config.js
index 6eeb9fb..cca922c 100644
--- a/src/background/config.js
+++ b/src/background/config.js
@@ -76,7 +76,18 @@ config.load = () => {
const obj = JSON.parse(data);
for(let prop in obj)
{
- config[prop] = obj[prop]
+ // объединяем объекты
+ if(typeof config[prop] === 'object' && typeof obj[prop] === 'object')
+ {
+ for(const subProp in obj[prop])
+ {
+ config[prop][subProp] = obj[prop][subProp]
+ }
+ }
+ else
+ {
+ config[prop] = obj[prop]
+ }
debug('rats.json:', prop, '=', obj[prop])
}
}