simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix null pointer bug

Browse source
This commit is contained in:
MaysWind 2017-03-19 23:17:56 +08:00
parent abe74c4ac1
commit b4faa50dca
2 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripts/services/ariaNgTitleService.js
View file

@ -129,11 +129,11 @@
}, },
getFinalTitleByGlobalStat: function (globalStat) { getFinalTitleByGlobalStat: function (globalStat) {
var context = { var context = {
downloadingCount: globalStat.numActive, downloadingCount: (globalStat ? globalStat.numActive : 0),
waitingCount: globalStat.numWaiting, waitingCount: (globalStat ? globalStat.numWaiting : 0),
stoppedCount: globalStat.numStopped, stoppedCount: (globalStat ? globalStat.numStopped : 0),
downloadSpeed: globalStat.downloadSpeed, downloadSpeed: (globalStat ? globalStat.downloadSpeed : 0),
uploadSpeed: globalStat.uploadSpeed uploadSpeed: (globalStat ? globalStat.uploadSpeed : 0)
}; };
return this.getFinalTitle(context); return this.getFinalTitle(context);

58
src/views/settings-ariang.html
View file

@ -1,15 +1,20 @@
<section class="content no-padding"> <section class="content no-padding">
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li ng-class="{'active': context.currentTab == 'global'}"> <li ng-class="{'active': isCurrentGlobalTab()}">
<a class="pointer-cursor" ng-click="changeTab('global')" translate>Global</a> <a class="pointer-cursor" ng-click="changeGlobalTab()" translate>Global</a>
</li> </li>
<li ng-class="{'active': context.currentTab == 'rpc'}"> <li ng-repeat="setting in context.rpcSettings" ng-class="{'active': isCurrentRpcTab($index)}">
<a class="pointer-cursor" ng-click="changeTab('rpc')" translate>RPC</a> <a class="pointer-cursor" ng-click="changeRpcTab($index)" ng-bind="'RPC' + (setting.rpcAlias || setting.rpcHost ? '-' + (setting.rpcAlias ? setting.rpcAlias : setting.rpcHost + ':' + setting.rpcPort) : '')">RPC</a>
</li>
<li class="slim">
<a class="pointer-cursor" ng-click="addNewRpcSetting()" title="{{'Add New RPC Setting' | translate}}">
<i class="fa fa-plus"></i>
</a>
</li> </li>
</ul> </ul>
<div class="tab-content no-padding"> <div class="tab-content no-padding">
<div class="tab-pane" ng-class="{'active': context.currentTab == 'global'}"> <div class="tab-pane" ng-class="{'active': isCurrentGlobalTab()}">
<div class="settings-table striped hoverable"> <div class="settings-table striped hoverable">
<div class="row"> <div class="row">
<div class="setting-key setting-key-without-desc col-sm-4"> <div class="setting-key setting-key-without-desc col-sm-4">
@ -111,8 +116,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tab-pane" ng-class="{'active': context.currentTab == 'rpc'}"> <div class="tab-pane" ng-repeat="setting in context.rpcSettings" ng-class="{'active': isCurrentRpcTab($index)}">
<div class="settings-table striped hoverable"> <div class="settings-table striped hoverable">
<div class="row">
<div class="setting-key setting-key-without-desc col-sm-4">
<span translate>Aria2 RPC Alias</span>
<span class="asterisk">*</span>
</div>
<div class="setting-value col-sm-8">
<input class="form-control" type="text" ng-placeholder="(setting.rpcHost ? setting.rpcHost + ':' + setting.rpcPort : '')" ng-model="setting.rpcAlias" ng-change="updateRpcSetting(setting, 'rpcAlias')"/>
</div>
</div>
<div class="row"> <div class="row">
<div class="setting-key setting-key-without-desc col-sm-4"> <div class="setting-key setting-key-without-desc col-sm-4">
<span translate>Aria2 RPC Host</span> <span translate>Aria2 RPC Host</span>
@ -120,13 +134,12 @@
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon" ng-bind="context.settings.protocol + '://'"></span> <span class="input-group-addon" ng-bind="setting.protocol + '://'"></span>
<input class="form-control" type="text" ng-model="context.settings.rpcHost" <input class="form-control" type="text" ng-model="setting.rpcHost" ng-change="updateRpcSetting(setting, 'rpcHost')"/>
ng-change="settingService.setRpcHost(context.settings.rpcHost)"/>
<span class="input-group-addon" style="border-left: 0">:</span> <span class="input-group-addon" style="border-left: 0">:</span>
<span class="input-group-addon" ng-bind="context.settings.rpcPort" style="border-left: 0"></span> <span class="input-group-addon" ng-bind="setting.rpcPort" style="border-left: 0"></span>
<span class="input-group-addon" style="border-left: 0">/</span> <span class="input-group-addon" style="border-left: 0">/</span>
<span class="input-group-addon" ng-if="context.settings.rpcInterface" ng-bind="context.settings.rpcInterface"></span> <span class="input-group-addon" ng-if="setting.rpcInterface" ng-bind="setting.rpcInterface"></span>
</div> </div>
</div> </div>
</div> </div>
@ -136,8 +149,7 @@
<span class="asterisk">*</span> <span class="asterisk">*</span>
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<input class="form-control" type="text" ng-model="context.settings.rpcPort" <input class="form-control" type="text" ng-model="setting.rpcPort" ng-change="updateRpcSetting(setting, 'rpcPort')"/>
ng-change="settingService.setRpcPort(context.settings.rpcPort)"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -146,8 +158,7 @@
<span class="asterisk">*</span> <span class="asterisk">*</span>
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<input class="form-control" type="text" ng-model="context.settings.rpcInterface" <input class="form-control" type="text" ng-model="setting.rpcInterface" ng-change="updateRpcSetting(setting, 'rpcInterface')"/>
ng-change="settingService.setRpcInterface(context.settings.rpcInterface)"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -156,8 +167,7 @@
<span class="asterisk">*</span> <span class="asterisk">*</span>
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<select class="form-control" style="width: 100%;" ng-model="context.settings.protocol" <select class="form-control" style="width: 100%;" ng-model="setting.protocol" ng-change="updateRpcSetting(setting, 'protocol')">
ng-change="settingService.setProtocol(context.settings.protocol)">
<option value="http" translate>Http</option> <option value="http" translate>Http</option>
<option value="https" translate>Https</option> <option value="https" translate>Https</option>
<option value="ws" translate>WebSocket</option> <option value="ws" translate>WebSocket</option>
@ -165,7 +175,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="row" ng-if="context.settings.protocol === 'http' || context.settings.protocol === 'https'"> <div class="row" ng-if="setting.protocol === 'http' || setting.protocol === 'https'">
<div class="setting-key setting-key-without-desc col-sm-4"> <div class="setting-key setting-key-without-desc col-sm-4">
<span translate>Aria2 RPC Http Request Method</span> <span translate>Aria2 RPC Http Request Method</span>
<span class="asterisk">*</span> <span class="asterisk">*</span>
@ -173,8 +183,7 @@
ng-tooltip="{{'POST method only supports aria2 v1.15.2 and above.' | translate}}"></i> ng-tooltip="{{'POST method only supports aria2 v1.15.2 and above.' | translate}}"></i>
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<select class="form-control" style="width: 100%;" ng-model="context.settings.httpMethod" <select class="form-control" style="width: 100%;" ng-model="setting.httpMethod" ng-change="updateRpcSetting(setting, 'httpMethod')">
ng-change="settingService.setHttpMethod(context.settings.httpMethod)">
<option value="POST" translate>POST</option> <option value="POST" translate>POST</option>
<option value="GET" translate>GET</option> <option value="GET" translate>GET</option>
</select> </select>
@ -187,8 +196,7 @@
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" type="{{context.showRpcSecret ? 'text' : 'password'}}" ng-model="context.settings.secret" <input class="form-control" type="{{context.showRpcSecret ? 'text' : 'password'}}" ng-model="setting.secret" ng-change="updateRpcSetting(setting, 'secret')"/>
ng-change="settingService.setSecret(context.settings.secret)"/>
<span class="input-group-addon input-group-addon-compact no-vertical-padding"> <span class="input-group-addon input-group-addon-compact no-vertical-padding">
<button class="btn btn-xs btn-default" title="{{context.showRpcSecret ? 'Hide Secret' : 'Show Secret' | translate}}" <button class="btn btn-xs btn-default" title="{{context.showRpcSecret ? 'Hide Secret' : 'Show Secret' | translate}}"
ng-class="{'active': context.showRpcSecret}" ng-click="context.showRpcSecret = !context.showRpcSecret"> ng-class="{'active': context.showRpcSecret}" ng-click="context.showRpcSecret = !context.showRpcSecret">
@ -201,6 +209,12 @@
<div class="row tip no-background no-hover"> <div class="row tip no-background no-hover">
<span class="asterisk">*</span> <span class="asterisk">*</span>
<span translate>Changes to the settings take effect after refreshing page.</span> <span translate>Changes to the settings take effect after refreshing page.</span>
<button class="btn btn-xs btn-default" ng-disabled="setting.isDefault" ng-click="setDefaultRpcSetting(setting)">
<span translate>Set Default</span>
</button>
<button class="btn btn-xs btn-danger" ng-if="!setting.isDefault" ng-disabled="setting.isDefault" ng-click="removeRpcSetting(setting)">
<span translate>Delete RPC Setting</span>
</button>
</div> </div>
</div> </div>
</div> </div>