mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make template remover more robust

Browse source 
marktraceur pointed out that my previous code will fail at
{{echo|{}} which is, unsurprisingly, valid wikitext
This commit is contained in:
YuviPanda 2013-04-11 00:19:09 +05:30
parent 125275548f
commit 91e0f8cff2
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
View file

@ -12,6 +12,10 @@ public class TemplateRemoveModifier extends PageModifier {
public static final String PARAM_TEMPLATE_NAME = "template"; public static final String PARAM_TEMPLATE_NAME = "template";
public static final Pattern PATTERN_TEMPLATE_OPEN = Pattern.compile("\\{\\{");
public static final Pattern PATTERN_TEMPLATE_CLOSE = Pattern.compile("\\}\\}");
public TemplateRemoveModifier(String templateName) { public TemplateRemoveModifier(String templateName) {
super(MODIFIER_NAME); super(MODIFIER_NAME);
try { try {
@ -39,13 +43,13 @@ public class TemplateRemoveModifier extends PageModifier {
Matcher matcher = templateStartPattern.matcher(pageContents); Matcher matcher = templateStartPattern.matcher(pageContents);
while(matcher.find()) { while(matcher.find()) {
int braceCount = 2; int braceCount = 1;
int startIndex = matcher.start(); int startIndex = matcher.start();
int curIndex = matcher.end(); int curIndex = matcher.end();
while(curIndex < pageContents.length()) { while(curIndex < pageContents.length()) {
if(pageContents.charAt(curIndex) == '{') { if(PATTERN_TEMPLATE_OPEN.matcher(pageContents).find(curIndex)) {
braceCount++; braceCount++;
} else if(pageContents.charAt(curIndex) == '}') { } else if(PATTERN_TEMPLATE_CLOSE.matcher(pageContents).find(curIndex)) {
braceCount--; braceCount--;
} }
curIndex++; curIndex++;