Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for #1018 and #1025 browser LFS links #1027

Merged
merged 1 commit into from
Mar 23, 2016
Merged

Fix for #1018 and #1025 browser LFS links #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
86 changes: 82 additions & 4 deletions src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,9 +24,13 @@
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.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;
Expand All @@ -35,13 +40,15 @@
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.DiffUtils;
import com.gitblit.utils.DiffUtils.DiffComparator;
import com.gitblit.utils.DiffUtils.DiffOutput;
import com.gitblit.utils.DiffUtils.DiffOutputType;
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;
Expand Down Expand Up @@ -135,7 +142,6 @@ public void populateItem(final Item<GitNote> item) {
@Override
public void populateItem(final Item<PathChangeModel> item) {
final PathChangeModel entry = item.getModelObject();
final String filestoreItemUrl = entry.isFilestoreItem() ? JGitUtils.getLfsRepositoryUrl(getContextUrl(), repositoryName, entry.getFilestoreOid()) : null;

Label changeType = new Label("changeType", "");
WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);
Expand All @@ -162,7 +168,34 @@ public void populateItem(final Item<PathChangeModel> item) {
item.add(new LinkPanel("pathName", "list", entry.path + " @ " + getShortObjectId(submoduleId), "#n" + entry.objectId));
} else {
// add relative link
item.add(new LinkPanel("pathName", "list", entry.path, entry.isFilestoreItem() ? filestoreItemUrl : "#n" + entry.objectId));
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", entry.path, "#n" + entry.objectId));
}
}

// quick links
Expand All @@ -188,8 +221,53 @@ public void populateItem(final Item<PathChangeModel> item) {
if (entry.isFilestoreItem()) {
item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));

item.add(new ExternalLink("view", filestoreItemUrl));
item.add(new ExternalLink("raw", filestoreItemUrl));
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 Label("filestore", getString("gb.filestore")).setVisible(false));
Expand Down
100 changes: 97 additions & 3 deletions src/main/java/com/gitblit/wicket/pages/CommitPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,51 @@
*/
package com.gitblit.wicket.pages;

import java.io.OutputStream;
import java.sql.Blob;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;

import org.apache.wicket.PageParameters;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.DownloadLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.link.ResourceLink;
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.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.target.basic.RedirectRequestTarget;
import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
import org.apache.wicket.util.resource.AbstractResourceStream;
import org.apache.wicket.util.resource.AbstractResourceStreamWriter;
import org.apache.wicket.util.resource.IResourceStream;
import org.bouncycastle.jcajce.provider.symmetric.Threefish;
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.manager.FilestoreManager;
import com.gitblit.manager.GitblitManager;
import com.gitblit.models.FilestoreModel;
import com.gitblit.models.GitNote;
import com.gitblit.models.RepositoryModel;
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;
Expand Down Expand Up @@ -198,7 +220,31 @@ public void populateItem(final Item<PathChangeModel> item) {
}

if (entry.isFilestoreItem()) {
item.add(new LinkPanel("pathName", "list", entry.path, filestoreItemUrl));
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)));
Expand Down Expand Up @@ -232,8 +278,56 @@ public void populateItem(final Item<PathChangeModel> item) {
if (entry.isFilestoreItem()) {
item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));

item.add(new ExternalLink("view", filestoreItemUrl));
item.add(new ExternalLink("raw", filestoreItemUrl));


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 Label("filestore", getString("gb.filestore")).setVisible(false));

Expand Down