From f4370d335fed59cd040ecbc23afbf538712b915f Mon Sep 17 00:00:00 2001 From: Nathan Rew Date: Sun, 16 Aug 2020 09:16:50 +0900 Subject: [PATCH 1/4] prevent error when `.` is in the name --- tests/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.js b/tests/test.js index 9d2ef63c..a62b01a7 100644 --- a/tests/test.js +++ b/tests/test.js @@ -83,7 +83,7 @@ function testDescription(text) { function testSrcDemCli(text) { let testC = text.search(/\(\[|\)\,|\)\)/); let testD = /(?<=\w. )(\(\[(Demo|Source Code|Clients)\]\([^)\]]*\)(, \[(Source Code|Clients)\]\([^)\]]*\))?(, \[(Source Code|Clients)\]\([^)\]]*\))*\))(?= \`?)/; - const testD1 = /(^- \W[a-zA-Z0-9-_ ]*\W{0,2}http[^\[]*)(?<= )/; + const testD1 = /(^- \W[a-zA-Z0-9-_ .]*\W{0,2}http[^\[]*)(?<= )/; const testD2 = /(\`.*\` \`.*\`$)/; if ((testC > -1) && (!testD.test(text))) { let d1 = testD1.exec(text)[1]; From 98e01c976929ed72377975f2a3207a554cfd9433 Mon Sep 17 00:00:00 2001 From: Nathan Rew Date: Sun, 16 Aug 2020 10:03:04 +0900 Subject: [PATCH 2/4] Update regex checks for Source Code, Demo, Clients --- tests/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.js b/tests/test.js index a62b01a7..5e44c29a 100644 --- a/tests/test.js +++ b/tests/test.js @@ -81,7 +81,7 @@ function testDescription(text) { //If present, tests '([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps))' function testSrcDemCli(text) { - let testC = text.search(/\(\[|\)\,|\)\)/); + let testC = text.search(/\.\ \(|\.\ \[|\ \(\[[sSdDcC]/); // /\(\[|\)\,|\)\)/); let testD = /(?<=\w. )(\(\[(Demo|Source Code|Clients)\]\([^)\]]*\)(, \[(Source Code|Clients)\]\([^)\]]*\))?(, \[(Source Code|Clients)\]\([^)\]]*\))*\))(?= \`?)/; const testD1 = /(^- \W[a-zA-Z0-9-_ .]*\W{0,2}http[^\[]*)(?<= )/; const testD2 = /(\`.*\` \`.*\`$)/; From b0cb23bd921d472be3d1091eab8abd1b88fb4ace Mon Sep 17 00:00:00 2001 From: Nathan Rew Date: Sun, 16 Aug 2020 11:12:27 +0900 Subject: [PATCH 3/4] Fix regex for mainlink. --- tests/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.js b/tests/test.js index 5e44c29a..36ee3e4e 100644 --- a/tests/test.js +++ b/tests/test.js @@ -57,7 +57,7 @@ function parseLicense(md) { //Test '- [Name](http://homepage/)' function testMainLink(text) { - let testA = /(^ {0,2}- \[.*?\]\(.*\))(?=.?-? ?\w)/; + let testA = /(^ {0,2}- \[.*?\]\([^)]*\.[^)]*?\))(?=\ ?\-?\ ?\w)/ // /(^ {0,2}- \[.*?\]\(.*\))(?=.?-? ?\w)/; const testA1 = /(- \W?\w*\W{0,2}.*?\)?)( .*$)/; if (!testA.test(text)) { let a1 = testA1.exec(text)[2]; From dd18570d0ea04dbe489f9ad22eb2d9c5fd05ccc3 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 5 Sep 2020 15:01:11 +0200 Subject: [PATCH 4/4] travis.yml: only run full awesome_bot tests on monthly-check branch fixes https://github.com/awesome-selfhosted/awesome-selfhosted/issues/2209 --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 828806b7..4ba0cd9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,8 @@ before_script: script: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then git diff origin/master -U0 README.md | grep -Pos "(?<=^\+).*" >> temp.md; fi || (exit 0)' - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then node tests/test.js -r README.md -d temp.md; else node tests/test.js -r README.md; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ -f temp.md ]; then awesome_bot temp.md --allow-redirect --skip-save-results --allow 202 --white-list airsonic.github.io/docs/apps; else (exit 0); fi else awesome_bot *.md --allow-redirect --skip-save-results --allow 202 --white-list airsonic.github.io/docs/apps; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then awesome_bot temp.md --allow-redirect --skip-save-results --allow 202 --white-list airsonic.github.io/docs/apps; else (exit 0); fi' + - 'if [ "$TRAVIS_BRANCH" == "monthly-check" ]; then awesome_bot *.md --allow-redirect --skip-save-results --allow 202 --white-list airsonic.github.io/docs/apps; fi' - notifications: email: false - -branches: - only: - - master - - travis_test -