Merge pull request #1044 from gitblit/1042-IntrusiveFilestoreLozenge

Paul Martin

2016-04-06 b00f45e9492d1cc17bc214daab9988c640741621

 src/main/java/com/gitblit/wicket/pages/CommitDiffPage.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,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;
@@ -35,6 +40,7 @@
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;
@@ -42,6 +48,7 @@
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;
@@ -135,13 +142,14 @@
         @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);
            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;
@@ -162,13 +170,38 @@
               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
            if (entry.isSubmodule()) {
               item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
					
               item.add(new ExternalLink("raw", "").setEnabled(false));
               // submodule
               item.add(new ExternalLink("patch", "").setEnabled(false));
@@ -186,14 +219,54 @@
                           && !entry.changeType.equals(ChangeType.DELETE)));
               
               if (entry.isFilestoreItem()) {
                  item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));
                  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 ExternalLink("view", filestoreItemUrl));
                  item.add(new ExternalLink("raw", filestoreItemUrl));
                  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));
						
                  item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
                        .newPathParameter(repositoryName, entry.commitId, entry.path))
                        .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));