Ticket Reference handling #1048

Paul Martin

2016-04-27 c2188a840bc4153ae92112b04b2e06a90d3944aa

 src/main/java/com/gitblit/servlet/DownloadZipServlet.java

@@ -20,8 +20,9 @@
import java.text.ParseException;

import java.util.Date;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;



import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletResponse;

@@ -34,9 +35,8 @@
import com.gitblit.Constants;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.Keys.web;

import com.gitblit.manager.IFilestoreManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.utils.CompressionUtils;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.MarkdownUtils;

@@ -56,9 +56,11 @@


   private transient Logger logger = LoggerFactory.getLogger(DownloadZipServlet.class);



   private final IStoredSettings settings;

   private IStoredSettings settings;



   private final IRepositoryManager repositoryManager;

   private IRepositoryManager repositoryManager;

	
   private IFilestoreManager filestoreManager;



   public static enum Format {

      zip(".zip"), tar(".tar"), gz(".tar.gz"), xz(".tar.xz"), bzip2(".tar.bzip2");

@@ -80,13 +82,10 @@
   }



   @Inject

   public DownloadZipServlet(

         IRuntimeManager runtimeManager,

         IRepositoryManager repositoryManager) {



      super();

      this.settings = runtimeManager.getSettings();

   public DownloadZipServlet(IStoredSettings settings, IRepositoryManager repositoryManager, IFilestoreManager filestoreManager) {

      this.settings = settings;

      this.repositoryManager = repositoryManager;

      this.filestoreManager = filestoreManager;

   }



   /**

@@ -175,22 +174,23 @@
         response.setHeader("Pragma", "no-cache");

         response.setDateHeader("Expires", 0);



			
         try {

            switch (format) {

            case zip:

               CompressionUtils.zip(r, basePath, objectId, response.getOutputStream());

               CompressionUtils.zip(r, filestoreManager, basePath, objectId, response.getOutputStream());

               break;

            case tar:

               CompressionUtils.tar(r, basePath, objectId, response.getOutputStream());

               CompressionUtils.tar(r, filestoreManager, basePath, objectId, response.getOutputStream());

               break;

            case gz:

               CompressionUtils.gz(r, basePath, objectId, response.getOutputStream());

               CompressionUtils.gz(r, filestoreManager, basePath, objectId, response.getOutputStream());

               break;

            case xz:

               CompressionUtils.xz(r, basePath, objectId, response.getOutputStream());

               CompressionUtils.xz(r, filestoreManager, basePath, objectId, response.getOutputStream());

               break;

            case bzip2:

               CompressionUtils.bzip2(r, basePath, objectId, response.getOutputStream());

               CompressionUtils.bzip2(r, filestoreManager, basePath, objectId, response.getOutputStream());

               break;

            }