Skip to content

The Unified and Autonomous Development Platform

Adapt to generic SymbolExtractor interface as well as improving path query

robin shinee4bd3534afa4
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java b/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
index cebed4b9a4..9c093ff29b 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
@@ -2,8 +2,12 @@ package com.gitplex.commons.util;
import java.util.Collection;
+import javax.annotation.Nullable;
+
import org.apache.commons.io.FilenameUtils;
+import com.gitplex.symbolextractor.Range;
+
public class PathUtils {
/**
@@ -79,4 +83,17 @@ public class PathUtils {
return matchedBasePath;
}
+ public @Nullable static Range matchSegments(String path, String match, boolean ignoreExt) {
+ int beginIndex = path.indexOf(match);
+ while (beginIndex != -1) {
+ int endIndex = beginIndex+match.length();
+ char leftCh = beginIndex==0?'/':path.charAt(beginIndex-1);
+ char rightCh = endIndex==path.length()?'/':path.charAt(endIndex);
+ if (leftCh == '/' && (rightCh=='/' || ignoreExt&&rightCh=='.'))
+ return new Range(beginIndex, endIndex);
+ beginIndex = path.indexOf(match, beginIndex+1);
+ }
+ return null;
+ }
+
}
diff --git a/commons.util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java b/commons.util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java
index dfcee8a65b..ce30aeab20 100644
--- a/commons.util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java
+++ b/commons.util/src/test/java/com/gitplex/commons/util/PathUtilsTest.java
@@ -2,6 +2,8 @@ package com.gitplex.commons.util;
import static com.gitplex.commons.util.PathUtils.matchLongest;
import static com.gitplex.commons.util.PathUtils.parseRelative;
+import static com.gitplex.commons.util.PathUtils.matchSegments;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -37,4 +39,12 @@ public class PathUtilsTest {
assertEquals(matchLongest(basePaths, "/asset1/asset2/test.html"), "/asset1/asset2");
}
+ @Test
+ public void shouldMatchSegments() {
+ assertEquals("0-5", matchSegments("hello/world", "hello", true).toString());
+ assertEquals("5-16", matchSegments("just/hello/world/do", "hello/world", true).toString());
+ assertEquals("13-18", matchSegments("hello0/world/hello.gif", "hello", true).toString());
+ assertNull(matchSegments("mayhello/worldtwo", "hello/world", true));
+ assertNull(matchSegments("hello0/world/hello.gif", "hello", false));
+ }
}
diff --git a/server.product/src/test/java/com/gitplex/server/product/Test.java b/server.product/src/test/java/com/gitplex/server/product/Test.java
index 5b8e28b072..2290b4c83c 100644
--- a/server.product/src/test/java/com/gitplex/server/product/Test.java
+++ b/server.product/src/test/java/com/gitplex/server/product/Test.java
@@ -12,15 +12,15 @@ public class Test {
try {
graphics = image.getGraphics();
- graphics.setColor(Color.decode("0x7F55FF"));
+ graphics.setColor(Color.decode("0x208507"));
graphics.fillOval(0, 0, 16, 16);
int fontSize = new Double(16).intValue();
Font font = new Font(Font.MONOSPACED, Font.BOLD, fontSize);
graphics.setFont(font);
graphics.setColor(Color.WHITE);
- graphics.drawString("p", 4, 13);
- ImageIO.write(image, "PNG", new File("w:\\temp\\icons\\property.png"));
+ graphics.drawString("P", 4, 13);
+ ImageIO.write(image, "PNG", new File("w:\\temp\\exported_property.png"));
} finally {
if (graphics != null)
graphics.dispose();
diff --git a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
index 451cafdd44..d100cbcb49 100644
--- a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
+++ b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
@@ -202,7 +202,7 @@ public class DefaultIndexManager implements IndexManager {
checked++;
}
- SymbolExtractor extractor = SymbolExtractorRegistry.getExtractor(blobPath);
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobPath);
String currentBlobIndexVersion = getCurrentBlobIndexVersion(extractor);
String blobIndexVersion = blobIndexVersionRef.get();
if (blobIndexVersion != null) {
@@ -240,7 +240,7 @@ public class DefaultIndexManager implements IndexManager {
}
private void indexBlob(IndexWriter writer, Repository repository,
- SymbolExtractor extractor, ObjectId blobId, String blobPath) throws IOException {
+ SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {
Document document = new Document();
document.add(new StoredField(BLOB_INDEX_VERSION.name(), getCurrentBlobIndexVersion(extractor)));
@@ -276,7 +276,7 @@ public class DefaultIndexManager implements IndexManager {
}
}
} catch (Exception e) {
- logger.error("Error extracting symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
+ logger.debug("Error extracting symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
}
}
} else {
@@ -369,7 +369,7 @@ public class DefaultIndexManager implements IndexManager {
return INDEX_VERSION + ";" + SymbolExtractorRegistry.getVersion();
}
- private String getCurrentBlobIndexVersion(SymbolExtractor extractor) {
+ private String getCurrentBlobIndexVersion(SymbolExtractor<Symbol> extractor) {
if (extractor != null)
return INDEX_VERSION + ";" + extractor.getVersion();
else
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
index cce932b93b..26a40cdeff 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
@@ -12,32 +12,32 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
+import com.gitplex.commons.util.PathUtils;
import com.gitplex.server.search.hit.PathHit;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.symbolextractor.Range;
public class PathQuery extends BlobQuery {
- private final String subPath;
+ private final String match;
- public PathQuery(@Nullable String directory, String subPath, int count) {
+ public PathQuery(@Nullable String directory, String match, int count) {
super(directory, count);
- this.subPath = subPath;
+ this.match = match;
}
@Override
public void collect(TreeWalk treeWalk, List<QueryHit> hits) {
String blobPath = treeWalk.getPathString();
- int index = blobPath.indexOf(subPath);
- if (index != -1) {
- Range matchRange = new Range(index, index+subPath.length());
- hits.add(new PathHit(blobPath, matchRange));
+ Range range = PathUtils.matchSegments(blobPath, match, true);
+ if (range != null) {
+ hits.add(new PathHit(blobPath, range));
}
}
@Override
protected void applyConstraints(BooleanQuery query) {
- query.add(new WildcardQuery(new Term(BLOB_PATH.name(), "*"+subPath+"*")), Occur.MUST);
+ query.add(new WildcardQuery(new Term(BLOB_PATH.name(), "*"+match+"*")), Occur.MUST);
}
}
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
index e74e103c19..7fcf3e1c95 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
@@ -60,7 +60,7 @@ public class SymbolQuery extends BlobQuery {
public void collect(TreeWalk treeWalk, List<QueryHit> hits) {
String blobPath = treeWalk.getPathString();
- SymbolExtractor extractor = SymbolExtractorRegistry.getExtractor(blobPath);
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobPath);
if (extractor != null) {
ObjectLoader objectLoader;
try {
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
index 9ae12ce3aa..a6db1cda18 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
@@ -82,7 +82,6 @@ import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.server.web.util.DateUtils;
-import com.gitplex.symbolextractor.ExtractException;
import com.gitplex.symbolextractor.Range;
import com.gitplex.symbolextractor.Symbol;
import com.gitplex.symbolextractor.SymbolExtractor;
@@ -137,11 +136,11 @@ public class SourceViewPanel extends BlobViewPanel {
Blob blob = context.getDepot().getBlob(context.getBlobIdent());
Preconditions.checkArgument(blob.getText() != null);
- SymbolExtractor extractor = SymbolExtractorRegistry.getExtractor(context.getBlobIdent().path);
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(context.getBlobIdent().path);
if (extractor != null) {
try {
symbols.addAll(extractor.extract(blob.getText().getContent()));
- } catch (ExtractException e) {
+ } catch (Exception e) {
logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);
}
}
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js
index 5a35f68870..845e0930c0 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js
@@ -148,7 +148,7 @@ gitplex.server.sourceview = {
var node = e.target || e.srcElement, $node = $(node);
if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")
|| $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")
- || $node.hasClass("cm-string")) {
+ || $node.hasClass("cm-string") || $node.hasClass("cm-tag") || $node.hasClass("cm-attribute")) {
document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);
}
});
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
index f74fcbdab0..115265a9d5 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
@@ -1,5 +1,5 @@
gitplex.server.textdiff = {
- symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string",
+ symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute",
init: function(containerId, symbolTooltipId, oldRev, newRev, scroll, callback, blameMessageCallback,
markSupport, mark, openComment, oldComments, newComments, dirtyContainerId, doclink) {
var $container = $("#" + containerId);