feat: Add host proxy pattern for global proxy configuration #752
Conversation
| @@ -83,6 +83,18 @@ | |||
| <em>[<span translate>Preview</span>] <span ng-bind="context.titlePreview"></span></em> | |||
| </div> | |||
| </div> | |||
| <div class="row"> | |||
| <div class="setting-key setting-key-without-desc col-sm-4"> | |||
| <span>{{ 'hostProxyPatternName' | translate }}</span> | |||
There was a problem hiding this comment.
Please use the actual displayed content in English instead of placeholders to avoid unfriendly content that may be displayed when the language resources are not loaded.
| </div> | ||
| <div class="setting-value col-sm-8"> | ||
| <textarea class="form-control" rows="4" ng-model="context.settings.hostProxyPattern" | ||
| ng-change="setHostProxyPattern(context.settings.hostProxyPattern)" ng-keyup="inputKeyUp($event, true)"></textarea> |
There was a problem hiding this comment.
AriaNgSettingsController does not have a function called "inputKeyUp", you can remove the ng-keyup attribute.
| @@ -318,6 +318,21 @@ | |||
| addUri: function (context, returnContextOnly) { | |||
| var urls = context.task ? context.task.urls : null; | |||
| var options = buildRequestOptions(context.task ? context.task.options : {}, context); | |||
| var proxyRegex= ariaNgSettingService.getHostProxyPattern().trim(); | |||
There was a problem hiding this comment.
Please format your code (a space should be appended to the left side of the equal symbol)
There was a problem hiding this comment.
I think it's better to check ariaNgSettingService.getHostProxyPattern() is defined and is not null. I think you can just use the following code to replace Line 321-Line 322
if (ariaNgSettingService.getHostProxyPattern() && ariaNgSettingService.getHostProxyPattern().trim()) {
// ...
}
| if (proxyRegex) { | ||
| var patterns = proxyRegex.split('\n'); | ||
| for (var i = 0; i < patterns.length; i++) { | ||
| patterns[i] = patterns[i].trim() |
There was a problem hiding this comment.
Please add a semicolon at the end of the line
| patterns[i] = patterns[i].trim() | ||
| if (patterns[i]) { | ||
| var lastIndex = patterns[i].lastIndexOf('|'); | ||
| if (lastIndex === -1) continue |
There was a problem hiding this comment.
Please do not write the if condition and the actual execution code on the same line. You can just write like the following code
if (lastIndex < 0) {
continue;
}
| if (lastIndex === -1) continue | ||
| var hostRegex = patterns[i].slice(0, lastIndex).trim(); | ||
| var httpProxy = patterns[i].slice(lastIndex + 1).trim(); | ||
| if (urls[0].match(hostRegex)) options['all-proxy'] = httpProxy |
There was a problem hiding this comment.
Check if the all-proxy is not set? Should the priority of the parameter in tasks be higher than the priority of the global one?
There was a problem hiding this comment.
The urls may be null in Line 319, please check if it is null first.
| @@ -310,6 +310,8 @@ | |||
| 'Cannot connect to aria2!': 'Cannot connect to aria2!', | |||
| 'Access Denied!': 'Access Denied!', | |||
| 'You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.': 'You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.', | |||
| 'hostProxyPatternName': 'Host Proxy Pattern', | |||
| 'hostProxyPatternDescription': 'Specify host regex pattern for proxy per line. If the host matches the pattern, the proxy will be used. Example: .*\\.example\\.com|proxy.com:8080 .*\\.example\\.org|proxy.org:8080', | |||
There was a problem hiding this comment.
I suggest you just write one example since you already mentioned one item per line
| @@ -169,6 +169,11 @@ | |||
| $rootScope.setTheme(value); | |||
| }; | |||
|
|
|||
| $scope.setHostProxyPattern = function (value) { | |||
| ariaNgSettingService.setHostProxyPattern(value); | |||
| $rootScope.setProxyHostPattern(value); | |||
There was a problem hiding this comment.
Don't need to call $rootScope.setProxyHostPattern(value), because there is no function called setProxyHostPattern in root scope.
| @@ -306,7 +306,8 @@ Cannot initialize WebSocket!=Impossibile inizializzare WebSocket! | |||
| Cannot connect to aria2!=Impossibile connettersi a aria2! | |||
| Access Denied!=Accesso negato! | |||
| You cannot use AriaNg because this browser does not meet the minimum requirements for data storage.=Non puoi utilizzare AriaNg perché questo browser non soddisfa i requisiti minimi di archiviazione dati. | |||
|
|
|||
| hostProxyPatternName=Modello proxy host | |||
| hostProxyPatternDescription=Specificare il modello regex host per il proxy per riga. Se l'host corrisponde al modello, verrà utilizzato il proxy. Esempio: .*\.example\.com|proxy.com:8080 .*\.example\.org|proxy.org:8080 | |||
There was a problem hiding this comment.
Please leave a blank line before the header of a new group
@mayswind PR related to discussion on #751