From 5bb79fbb553a11e6582392f658233cf58a4ceb11 Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Wed, 06 Apr 2016 14:31:41 -0400 Subject: [PATCH] Fix for #1042 - Filestore items now shown as icons --- src/main/java/com/gitblit/wicket/pages/CommitPage.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 145 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java index c5a24c8..3998204 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java @@ -15,6 +15,7 @@ */ package com.gitblit.wicket.pages; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -23,28 +24,38 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.ExternalLink; +import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.StringResourceModel; +import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget; +import org.apache.wicket.util.resource.AbstractResourceStreamWriter; +import org.apache.wicket.util.resource.IResourceStream; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.models.GitNote; import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.models.SubmoduleModel; +import com.gitblit.models.UserModel; +import com.gitblit.servlet.RawServlet; import com.gitblit.utils.JGitUtils; +import com.gitblit.wicket.CacheControl; +import com.gitblit.wicket.GitBlitWebSession; +import com.gitblit.wicket.CacheControl.LastModified; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.CommitLegendPanel; import com.gitblit.wicket.panels.CompressedDownloadsPanel; -import com.gitblit.wicket.panels.GravatarImage; +import com.gitblit.wicket.panels.DiffStatPanel; +import com.gitblit.wicket.panels.AvatarImage; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.RefsPanel; +@CacheControl(LastModified.BOOT) public class CommitPage extends RepositoryPage { public CommitPage(PageParameters params) { @@ -52,7 +63,7 @@ Repository r = getRepository(); RevCommit c = getCommit(); - + List<String> parents = new ArrayList<String>(); if (c.getParentCount() > 0) { for (RevCommit parent : c.getParents()) { @@ -82,7 +93,7 @@ add(createPersonPanel("commitAuthor", c.getAuthorIdent(), Constants.SearchType.AUTHOR)); add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils())); - + // committer add(createPersonPanel("commitCommitter", c.getCommitterIdent(), Constants.SearchType.COMMITTER)); add(WicketUtils.createTimestampLabel("commitCommitterDate", @@ -94,7 +105,7 @@ newCommitParameter())); add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter())); final String baseUrl = WicketUtils.getGitblitURL(getRequest()); - + add(new CompressedDownloadsPanel("compressedLinks", baseUrl, repositoryName, objectId, null)); // Parent Commits @@ -102,6 +113,7 @@ DataView<String> parentsView = new DataView<String>("commitParents", parentsDp) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<String> item) { String entry = item.getModelObject(); item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class, @@ -114,7 +126,7 @@ }; add(parentsView); - addFullText("fullMessage", c.getFullMessage(), true); + addFullText("fullMessage", c.getFullMessage()); // git notes List<GitNote> notes = JGitUtils.getNotesOnCommit(r, c); @@ -122,35 +134,51 @@ DataView<GitNote> notesView = new DataView<GitNote>("notes", notesDp) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<GitNote> item) { GitNote entry = item.getModelObject(); item.add(new RefsPanel("refName", repositoryName, Arrays.asList(entry.notesRef))); item.add(createPersonPanel("authorName", entry.notesRef.getAuthorIdent(), Constants.SearchType.AUTHOR)); - item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent())); + item.add(new AvatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent())); item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef .getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils())); - item.add(new Label("noteContent", GitBlit.self().processCommitMessage( - repositoryName, entry.content)).setEscapeModelStrings(false)); + item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, + entry.content)).setEscapeModelStrings(false)); } }; add(notesView.setVisible(notes.size() > 0)); // changed paths list List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c); + + // add commit diffstat + int insertions = 0; + int deletions = 0; + for (PathChangeModel pcm : paths) { + insertions += pcm.insertions; + deletions += pcm.deletions; + } + add(new DiffStatPanel("diffStat", insertions, deletions)); + add(new CommitLegendPanel("commitLegend", paths)); ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths); DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) { private static final long serialVersionUID = 1L; int counter; + @Override public void populateItem(final Item<PathChangeModel> item) { final PathChangeModel entry = item.getModelObject(); + Label changeType = new Label("changeType", ""); WicketUtils.setChangeTypeCssClass(changeType, entry.changeType); setChangeTypeTooltip(changeType, entry.changeType); item.add(changeType); - + item.add(new DiffStatPanel("diffStat", entry.insertions, entry.deletions, true)); + item.add(WicketUtils.setHtmlTooltip(new Label("filestore", ""), getString("gb.filestore")) + .setVisible(entry.isFilestoreItem())); + boolean hasSubmodule = false; String submodulePath = null; if (entry.isTree()) { @@ -164,7 +192,7 @@ SubmoduleModel submodule = getSubmodule(entry.path); submodulePath = submodule.gitblitPath; hasSubmodule = submodule.hasSubmodule; - + item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), TreePage.class, WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule)); @@ -176,14 +204,45 @@ path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path); displayPath = entry.path + " -> " + path; } - item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class, - WicketUtils - .newPathParameter(repositoryName, entry.commitId, path))); + + if (entry.isFilestoreItem()) { + item.add(new LinkPanel("pathName", "list", entry.path, new Link<Object>("link", null) { + + private static final long serialVersionUID = 1L; + + @Override + public void onClick() { + + IResourceStream resourceStream = new AbstractResourceStreamWriter() { + + private static final long serialVersionUID = 1L; + + @Override + public void write(OutputStream output) { + UserModel user = GitBlitWebSession.get().getUser(); + user = user == null ? UserModel.ANONYMOUS : user; + + app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); + } + }; + + + getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); + }})); + + + } else { + item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class, + WicketUtils.newPathParameter(repositoryName, entry.commitId, path))); + } } - + + // quick links if (entry.isSubmodule()) { - // submodule + item.add(new ExternalLink("raw", "").setEnabled(false)); + + // submodule item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.ADD))); @@ -199,11 +258,68 @@ .newPathParameter(repositoryName, entry.commitId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.ADD) && !entry.changeType.equals(ChangeType.DELETE))); - item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils - .newPathParameter(repositoryName, entry.commitId, entry.path))); + + if (entry.isFilestoreItem()) { + item.add(new Link<Object>("view", null) { + + private static final long serialVersionUID = 1L; + + @Override + public void onClick() { + + IResourceStream resourceStream = new AbstractResourceStreamWriter() { + + private static final long serialVersionUID = 1L; + + @Override + public void write(OutputStream output) { + UserModel user = GitBlitWebSession.get().getUser(); + user = user == null ? UserModel.ANONYMOUS : user; + + app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); + } + }; + + + getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); + }}); + + item.add(new Link<Object>("raw", null) { + + private static final long serialVersionUID = 1L; + + @Override + public void onClick() { + + IResourceStream resourceStream = new AbstractResourceStreamWriter() { + + private static final long serialVersionUID = 1L; + + @Override + public void write(OutputStream output) { + UserModel user = GitBlitWebSession.get().getUser(); + user = user == null ? UserModel.ANONYMOUS : user; + + app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output); + } + }; + + + getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path)); + }}); + + } else { + item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path)) + .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); + String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, entry.commitId, entry.path); + item.add(new ExternalLink("raw", rawUrl) + .setEnabled(!entry.changeType.equals(ChangeType.DELETE))); + } item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) - .setEnabled(!entry.changeType.equals(ChangeType.ADD))); + .setEnabled(!entry.changeType.equals(ChangeType.ADD) + && !entry.changeType.equals(ChangeType.DELETE))); item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils .newPathParameter(repositoryName, entry.commitId, entry.path)) .setEnabled(!entry.changeType.equals(ChangeType.ADD))); @@ -220,4 +336,14 @@ protected String getPageName() { return getString("gb.commit"); } + + @Override + protected boolean isCommitPage() { + return true; + } + + @Override + protected Class<? extends BasePage> getRepoNavPageClass() { + return LogPage.class; + } } -- Gitblit v1.9.1