From fabe060d3a435f116128851f828e35c2af5fde67 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 10 Sep 2012 16:26:27 -0400
Subject: [PATCH] Strip folder name and .git from repo links in the project view
---
src/com/gitblit/wicket/pages/BlobPage.java | 173 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 104 insertions(+), 69 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index c425186..e2683ae 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -21,6 +21,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
@@ -29,7 +30,8 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.RepositoryPage;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.ExternalImage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.CommitHeaderPanel;
import com.gitblit.wicket.panels.PathBreadcrumbsPanel;
@@ -39,78 +41,111 @@
public BlobPage(PageParameters params) {
super(params);
- final String blobPath = WicketUtils.getPath(params);
-
- String extension = null;
- if (blobPath.lastIndexOf('.') > -1) {
- extension = blobPath.substring(blobPath.lastIndexOf('.') + 1).toLowerCase();
- }
-
- // see if we should redirect to the markdown page
- for (String ext : GitBlit.self().settings().getStrings(Keys.web.markdownExtensions)) {
- if (ext.equals(extension)) {
- setResponsePage(MarkdownPage.class, params);
- return;
- }
- }
-
- // standard blob view
Repository r = getRepository();
- RevCommit commit = getCommit();
+ final String blobPath = WicketUtils.getPath(params);
+ String [] encodings = GitBlit.getEncodings();
+
+ if (StringUtils.isEmpty(blobPath)) {
+ // blob by objectid
- // blob page links
- add(new Label("blameLink", getString("gb.blame")));
- add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
- add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
- add(new BookmarkablePageLink<Void>("headLink", BlobPage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));
-
- add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
-
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
-
- // Map the extensions to types
- Map<String, Integer> map = new HashMap<String, Integer>();
- for (String ext : GitBlit.self().settings().getStrings(Keys.web.prettyPrintExtensions)) {
- map.put(ext.toLowerCase(), 1);
- }
- for (String ext : GitBlit.self().settings().getStrings(Keys.web.imageExtensions)) {
- map.put(ext.toLowerCase(), 2);
- }
- for (String ext : GitBlit.self().settings().getStrings(Keys.web.binaryExtensions)) {
- map.put(ext.toLowerCase(), 3);
- }
-
- if (extension != null) {
- int type = 0;
- if (map.containsKey(extension)) {
- type = map.get(extension);
- }
- Component c = null;
- switch (type) {
- case 1:
- // PrettyPrint blob text
- c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));
- WicketUtils.setCssClass(c, "prettyprint linenums");
- break;
- case 2:
- // TODO image blobs
- c = new Label("blobText", "Image File");
- break;
- case 3:
- // TODO binary blobs
- c = new Label("blobText", "Binary File");
- break;
- default:
- // plain text
- c = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));
- WicketUtils.setCssClass(c, "plainprint");
- }
+ add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, blobPath))
+ .setEnabled(false));
+ add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));
+ add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
+ add(new BookmarkablePageLink<Void>("headLink", BlobPage.class).setEnabled(false));
+ add(new CommitHeaderPanel("commitHeader", objectId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
+ Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings));
+ WicketUtils.setCssClass(c, "plainprint");
add(c);
} else {
- // plain text
- Label blobLabel = new Label("blobText", JGitUtils.getRawContentAsString(r, commit, blobPath));
- WicketUtils.setCssClass(blobLabel, "plainprint");
- add(blobLabel);
+ // standard blob view
+ String extension = null;
+ if (blobPath.lastIndexOf('.') > -1) {
+ extension = blobPath.substring(blobPath.lastIndexOf('.') + 1).toLowerCase();
+ }
+
+ // see if we should redirect to the markdown page
+ for (String ext : GitBlit.getStrings(Keys.web.markdownExtensions)) {
+ if (ext.equals(extension)) {
+ setResponsePage(MarkdownPage.class, params);
+ return;
+ }
+ }
+
+ // manually get commit because it can be null
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
+
+ // blob page links
+ add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
+ add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
+ add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));
+ add(new BookmarkablePageLink<Void>("headLink", BlobPage.class,
+ WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));
+
+ add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
+
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
+
+ // Map the extensions to types
+ Map<String, Integer> map = new HashMap<String, Integer>();
+ for (String ext : GitBlit.getStrings(Keys.web.prettyPrintExtensions)) {
+ map.put(ext.toLowerCase(), 1);
+ }
+ for (String ext : GitBlit.getStrings(Keys.web.imageExtensions)) {
+ map.put(ext.toLowerCase(), 2);
+ }
+ for (String ext : GitBlit.getStrings(Keys.web.binaryExtensions)) {
+ map.put(ext.toLowerCase(), 3);
+ }
+
+ if (extension != null) {
+ int type = 0;
+ if (map.containsKey(extension)) {
+ type = map.get(extension);
+ }
+ Component c = null;
+ Component i = null;
+ switch (type) {
+ case 1:
+ // PrettyPrint blob text
+ c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(),
+ blobPath, encodings));
+ WicketUtils.setCssClass(c, "prettyprint linenums");
+ i = new Image("blobImage").setVisible(false);
+ break;
+ case 2:
+ // image blobs
+ c = new Label("blobText").setVisible(false);
+ i = new ExternalImage("blobImage", urlFor(RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)).toString());
+ break;
+ case 3:
+ // binary blobs
+ c = new Label("blobText", "Binary File");
+ i = new Image("blobImage").setVisible(false);
+ break;
+ default:
+ // plain text
+ c = new Label("blobText", JGitUtils.getStringContent(r, commit.getTree(),
+ blobPath, encodings));
+ WicketUtils.setCssClass(c, "plainprint");
+ i = new Image("blobImage").setVisible(false);
+ }
+ add(c);
+ add(i);
+ } else {
+ // plain text
+ Label blobLabel = new Label("blobText", JGitUtils.getStringContent(r,
+ commit.getTree(), blobPath, encodings));
+ WicketUtils.setCssClass(blobLabel, "plainprint");
+ add(blobLabel);
+ add(new Image("blobImage").setVisible(false));
+ }
}
}
--
Gitblit v1.9.1