From 716745e2dd9b3925b1229433e7072580206f731e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 08 Jun 2011 17:38:11 -0400
Subject: [PATCH] Stubbed out Blame. Added Github banner to site. Documentation.
---
src/com/gitblit/wicket/pages/SummaryPage.java | 251 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 166 insertions(+), 85 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 273de57..37b0bcf 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -1,26 +1,57 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.pages;
+import java.awt.Color;
import java.awt.Dimension;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.ContextImage;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.protocol.http.WebRequest;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.wicketstuff.googlecharts.Chart;
+import org.wicketstuff.googlecharts.ChartAxis;
+import org.wicketstuff.googlecharts.ChartAxisType;
+import org.wicketstuff.googlecharts.ChartProvider;
+import org.wicketstuff.googlecharts.ChartType;
+import org.wicketstuff.googlecharts.IChartData;
+import org.wicketstuff.googlecharts.LineStyle;
+import org.wicketstuff.googlecharts.MarkerType;
+import org.wicketstuff.googlecharts.ShapeMarker;
-import com.codecommit.wicket.AbstractChartData;
-import com.codecommit.wicket.Chart;
-import com.codecommit.wicket.ChartAxis;
-import com.codecommit.wicket.ChartAxisType;
-import com.codecommit.wicket.ChartProvider;
-import com.codecommit.wicket.ChartType;
-import com.codecommit.wicket.IChartData;
-import com.gitblit.StoredSettings;
+import com.gitblit.Constants;
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
+import com.gitblit.models.Metric;
+import com.gitblit.models.PathModel;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebApp;
-import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.RepositoryPage;
-import com.gitblit.wicket.models.Metric;
+import com.gitblit.utils.MarkdownUtils;
+import com.gitblit.utils.MetricUtils;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
+import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LogPanel;
import com.gitblit.wicket.panels.TagsPanel;
@@ -29,109 +60,159 @@
public SummaryPage(PageParameters params) {
super(params);
-
+
int numCommitsDef = 20;
int numRefsDef = 5;
-
- int numberCommits = StoredSettings.getInteger("summaryCommitCount", numCommitsDef);
+
+ int numberCommits = GitBlit.getInteger(Keys.web.summaryCommitCount, numCommitsDef);
if (numberCommits <= 0) {
numberCommits = numCommitsDef;
}
- int numberRefs = StoredSettings.getInteger("summaryRefsCount", numRefsDef);
+ int numberRefs = GitBlit.getInteger(Keys.web.summaryRefsCount, numRefsDef);
if (numberRefs <= 0) {
numberRefs = numRefsDef;
}
-
- Repository r = getRepository();
- List<Metric> metrics = JGitUtils.getDateMetrics(r);
-
- long numberOfCommits = 0;
- for (Metric m : metrics) {
- numberOfCommits += m.count;
+
+ Repository r = getRepository();
+ List<Metric> metrics = null;
+ Metric metricsTotal = null;
+ if (GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {
+ metrics = MetricUtils.getDateMetrics(r, null, true, null);
+ metricsTotal = metrics.remove(0);
}
- String owner = JGitUtils.getRepositoryOwner(r);
- GitBlitWebSession session = GitBlitWebSession.get();
- String lastchange = session.formatDateTimeLong(JGitUtils.getLastChange(r));
- String cloneurl = GitBlitWebApp.get().getCloneUrl(repositoryName);
-
// repository description
- add(new Label("repositoryDescription", description));
- add(new Label("repositoryOwner", owner));
- add(new Label("repositoryLastChange", lastchange));
- add(new Label("repositoryCloneUrl", cloneurl));
+ add(new Label("repositoryDescription", getRepositoryModel().description));
+ add(new Label("repositoryOwner", getRepositoryModel().owner));
+
+ add(WicketUtils.createTimestampLabel("repositoryLastChange", JGitUtils.getLastChange(r),
+ getTimeZone()));
+ if (metricsTotal == null) {
+ add(new Label("branchStats", ""));
+ } else {
+ add(new Label("branchStats", MessageFormat.format(
+ "{0} commits and {1} tags in {2}", metricsTotal.count, metricsTotal.tag,
+ TimeUtils.duration(metricsTotal.duration))));
+ }
+ add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
+
+ List<String> repositoryUrls = new ArrayList<String>();
+
+ if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) {
+ AccessRestrictionType accessRestriction = getRepositoryModel().accessRestriction;
+ switch (accessRestriction) {
+ case NONE:
+ add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
+ break;
+ case PUSH:
+ add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",
+ getAccessRestrictions().get(accessRestriction)));
+ break;
+ case CLONE:
+ add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",
+ getAccessRestrictions().get(accessRestriction)));
+ break;
+ case VIEW:
+ add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",
+ getAccessRestrictions().get(accessRestriction)));
+ break;
+ default:
+ add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
+ }
+
+ HttpServletRequest req = ((WebRequest) getRequestCycle().getRequest())
+ .getHttpServletRequest();
+ StringBuilder sb = new StringBuilder();
+ sb.append(req.getScheme());
+ sb.append("://");
+ sb.append(req.getServerName());
+ if ((req.getScheme().equals("http") && req.getServerPort() != 80)
+ || (req.getScheme().equals("https") && req.getServerPort() != 443)) {
+ sb.append(":" + req.getServerPort());
+ }
+ sb.append(Constants.GIT_SERVLET_PATH);
+ sb.append(repositoryName);
+ repositoryUrls.add(sb.toString());
+ } else {
+ add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
+ }
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName));
+
+ add(new Label("repositoryCloneUrl", StringUtils.flattenStrings(repositoryUrls, "<br/>"))
+ .setEscapeModelStrings(false));
add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));
- add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs));
- add(new BranchesPanel("branchesPanel", repositoryName, r, numberRefs));
-
+ add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty());
+ add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs).hideIfEmpty());
+
+ if (getRepositoryModel().showReadme) {
+ String htmlText = null;
+ try {
+ RevCommit head = JGitUtils.getCommit(r, null);
+ List<String> markdownExtensions = GitBlit.getStrings(Keys.web.markdownExtensions);
+ List<PathModel> paths = JGitUtils.getFilesInPath(r, null, head);
+ String readme = null;
+ for (PathModel path : paths) {
+ if (!path.isTree()) {
+ String name = path.name.toLowerCase();
+
+ if (name.startsWith("readme")) {
+ if (name.indexOf('.') > -1) {
+ String ext = name.substring(name.lastIndexOf('.') + 1);
+ if (markdownExtensions.contains(ext)) {
+ readme = path.name;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!StringUtils.isEmpty(readme)) {
+ String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme);
+ htmlText = MarkdownUtils.transformMarkdown(markdownText);
+ }
+ } catch (ParseException p) {
+ error(p.getMessage());
+ }
+ // Add the html to the page
+ add(new Label("readme", htmlText).setEscapeModelStrings(false).setVisible(
+ !StringUtils.isEmpty(htmlText)));
+ } else {
+ add(new Label("readme").setVisible(false));
+ }
+
// Display an activity line graph
insertActivityGraph(metrics);
}
-
+
@Override
protected String getPageName() {
return getString("gb.summary");
}
private void insertActivityGraph(List<Metric> metrics) {
- if (StoredSettings.getBoolean("generateActivityGraph", true)) {
- IChartData data = getChartData(metrics);
+ if ((metrics != null) && (metrics.size() > 0)
+ && GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {
+ IChartData data = WicketUtils.getChartData(metrics);
- ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);
+ ChartProvider provider = new ChartProvider(new Dimension(400, 100), ChartType.LINE,
+ data);
ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
- dateAxis.setLabels(new String[] { metrics.get(0).name, metrics.get(metrics.size() / 2).name, metrics.get(metrics.size() - 1).name });
+ dateAxis.setLabels(new String[] { metrics.get(0).name,
+ metrics.get(metrics.size() / 2).name, metrics.get(metrics.size() - 1).name });
provider.addAxis(dateAxis);
- ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
- commitAxis.setLabels(new String[] { "", String.valueOf((int) maxValue(metrics)) });
+ ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
+ commitAxis.setLabels(new String[] { "",
+ String.valueOf((int) WicketUtils.maxValue(metrics)) });
provider.addAxis(commitAxis);
+ provider.setLineStyles(new LineStyle[] { new LineStyle(2, 4, 0), new LineStyle(0, 4, 1) });
+ provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.BLUE, 1, -1, 5));
add(new Chart("commitsChart", provider));
} else {
- add(new ContextImage("commitsChart", "blank.png"));
+ add(WicketUtils.newBlankImage("commitsChart"));
}
- }
-
- protected IChartData getChartData(List<Metric> metrics) {
- final double[] counts = new double[metrics.size()];
- int i = 0;
- double max = 0;
- for (Metric m : metrics) {
- counts[i++] = m.count;
- max = Math.max(max, m.count);
- }
- final double dmax = max;
- IChartData data = new AbstractChartData() {
- private static final long serialVersionUID = 1L;
-
- public double[][] getData() {
- return new double[][] { counts };
- }
-
- public double getMax() {
- return dmax;
- }
- };
- return data;
- }
-
- protected String[] getNames(List<Metric> results) {
- String[] names = new String[results.size()];
- for (int i = 0; i < results.size(); i++) {
- names[i] = results.get(i).name;
- }
- return names;
- }
-
- protected double maxValue(List<Metric> metrics) {
- double max = Double.MIN_VALUE;
- for (Metric m : metrics) {
- if (m.count > max) {
- max = m.count;
- }
- }
- return max;
}
}
--
Gitblit v1.9.1