github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-30 11:38:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

WebUI: add linting for regular expressions

Browse source 
And applies to following suggestions:
* Use case-insensitive flag `i`
* Use `\w` for matching characters
* Sort the regex flags
This commit is contained in:
Chocobo1 2024-04-30 01:10:00 +08:00
parent e2d6cd31b2
commit 6231208ddf
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/webui/www/eslint.config.mjs
View file

@ -2,9 +2,11 @@ import Globals from 'globals';
import Html from 'eslint-plugin-html'; import Html from 'eslint-plugin-html';
import Js from '@eslint/js'; import Js from '@eslint/js';
import Stylistic from '@stylistic/eslint-plugin'; import Stylistic from '@stylistic/eslint-plugin';
import * as RegexpPlugin from 'eslint-plugin-regexp';
export default [ export default [
Js.configs.recommended, Js.configs.recommended,
RegexpPlugin.configs["flat/recommended"],
Stylistic.configs["disable-legacy"], Stylistic.configs["disable-legacy"],
{ {
files: [ files: [
@ -20,6 +22,7 @@ export default [
}, },
plugins: { plugins: {
Html, Html,
RegexpPlugin,
Stylistic Stylistic
}, },
rules: { rules: {

1
src/webui/www/package.json
View file

@ -14,6 +14,7 @@
"@stylistic/eslint-plugin": "*", "@stylistic/eslint-plugin": "*",
"eslint": "*", "eslint": "*",
"eslint-plugin-html": "*", "eslint-plugin-html": "*",
"eslint-plugin-regexp": "*",
"html-validate": "*", "html-validate": "*",
"i18next-parser": "*", "i18next-parser": "*",
"js-beautify": "*", "js-beautify": "*",

4
src/webui/www/private/scripts/client.js
View file

@ -1527,8 +1527,8 @@ window.addEventListener("DOMContentLoaded", function() {
return lowercaseStr.startsWith("http:") return lowercaseStr.startsWith("http:")
|| lowercaseStr.startsWith("https:") || lowercaseStr.startsWith("https:")
|| lowercaseStr.startsWith("magnet:") || lowercaseStr.startsWith("magnet:")
|| ((str.length === 40) && !(/[^0-9A-Fa-f]/.test(str))) // v1 hex-encoded SHA-1 info-hash || ((str.length === 40) && !(/[^0-9A-F]/i.test(str))) // v1 hex-encoded SHA-1 info-hash
|| ((str.length === 32) && !(/[^2-7A-Za-z]/.test(str))); // v1 Base32 encoded SHA-1 info-hash || ((str.length === 32) && !(/[^2-7A-Z]/i.test(str))); // v1 Base32 encoded SHA-1 info-hash
}); });
if (urls.length <= 0) if (urls.length <= 0)

2
src/webui/www/private/scripts/misc.js
View file

@ -143,7 +143,7 @@ window.qBittorrent.Misc = (function() {
* JS counterpart of the function in src/misc.cpp * JS counterpart of the function in src/misc.cpp
*/ */
const parseHtmlLinks = function(text) { const parseHtmlLinks = function(text) {
const exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#/%?=~_|!:,.;]*[-A-Z0-9+&@#/%=~_|])/ig; const exp = /(\b(https?|ftp|file):\/\/[-\w+&@#/%?=~|!:,.;]*[-\w+&@#/%=~|])/gi;
return text.replace(exp, "<a target='_blank' rel='noopener noreferrer' href='$1'>$1</a>"); return text.replace(exp, "<a target='_blank' rel='noopener noreferrer' href='$1'>$1</a>");
}; };