Fix for #1042 - Filestore items now shown as icons

Paul Martin

2016-04-06 5bb79fbb553a11e6582392f658233cf58a4ceb11

 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,34 @@
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.DiffStatPanel;

import com.gitblit.wicket.panels.GravatarImage;

import com.gitblit.wicket.panels.AvatarImage;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.RefsPanel;



@@ -133,10 +140,10 @@
            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().processPlainCommitMessage(repositoryName,

            item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,

                  entry.content)).setEscapeModelStrings(false));

         }

      };

@@ -163,11 +170,14 @@
         @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;

@@ -194,13 +204,44 @@
                  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()) {

               item.add(new ExternalLink("raw", "").setEnabled(false));



               // submodule

               item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

@@ -217,12 +258,64 @@
                     .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))

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

               item.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils

                     .newPathParameter(repositoryName, entry.commitId, entry.path))

                     .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));

					
               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)

@@ -245,6 +338,11 @@
   }



   @Override

   protected boolean isCommitPage() {

      return true;

   }



   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return LogPage.class;

   }