Merge pull request #988 from gitblit/976-raw-download-filestore-item

Fix for #976 - Filestore links via browser

2 files changed, 107 insertions, 16 deletions

diff --git a/src/main/java/com/gitblit/models/FilestoreModel.java b/src/main/java/com/gitblit/models/FilestoreModel.java
index 4144df6b..2ed1ede9 100644
--- a/src/main/java/com/gitblit/models/FilestoreModel.java
+++ b/src/main/java/com/gitblit/models/FilestoreModel.java
@@ -20,6 +20,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.gitblit.Constants;
 
 /**
  * A FilestoreModel represents a file stored outside a repository but referenced by the repository using a unique objectID
@@ -31,6 +35,18 @@ public class FilestoreModel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	private static final String metaRegexText = new StringBuilder()
+			.append("version\\shttps://git-lfs.github.com/spec/v1\\s+")
+			.append("oid\\ssha256:(" + Constants.REGEX_SHA256 + ")\\s+")
+			.append("size\\s([0-9]+)")
+			.toString();
+	
+	private static final Pattern metaRegex = Pattern.compile(metaRegexText);
+	
+	private static final int metaRegexIndexSHA = 1;
+	
+	private static final int metaRegexIndexSize = 2;
+	
 	public final String oid;
 	
 	private Long size;
@@ -43,6 +59,12 @@ public class FilestoreModel implements Serializable {
 	//Access Control
 	private List<String> repositories;
 	
+	public FilestoreModel(String id, long definedSize) {
+		oid = id;
+		size = definedSize;
+		status = Status.ReferenceOnly;
+	}
+	
 	public FilestoreModel(String id, long expectedSize, UserModel user, String repo) {
 		oid = id;
 		size = expectedSize;
@@ -53,6 +75,29 @@ public class FilestoreModel implements Serializable {
 		repositories.add(repo);
 	}
 	
+	/*
+	 * Attempts to create a FilestoreModel from the given meta string
+	 * 
+	 * @return A valid FilestoreModel if successful, otherwise null
+	 */
+	public static FilestoreModel fromMetaString(String meta) {
+		
+		Matcher m = metaRegex.matcher(meta);
+		
+		if (m.find()) {
+			try
+			{
+				final Long size = Long.parseLong(m.group(metaRegexIndexSize));
+				final String sha = m.group(metaRegexIndexSHA);
+				return new FilestoreModel(sha, size);			
+			} catch (Exception e) {
+				//Fail silent - it is not a valid filestore item
+			}
+		}
+
+		return null;
+	}
+	
 	public synchronized long getSize() {
 		return size;
 	}
@@ -102,19 +147,25 @@ public class FilestoreModel implements Serializable {
 	}
 	
 	public synchronized void addRepository(String repo) {
-		if (!repositories.contains(repo)) {
-			repositories.add(repo);
-		}	
+		if (status != Status.ReferenceOnly) {
+			if (!repositories.contains(repo)) {
+				repositories.add(repo);
+			}
+		}
 	}
 	
 	public synchronized void removeRepository(String repo) {
-		repositories.remove(repo);
+		if (status != Status.ReferenceOnly) {
+			repositories.remove(repo);
+		}
 	}
 	
 	public synchronized boolean isInRepositoryList(List<String> repoList) {
-		for (String name : repositories) {
-			if (repoList.contains(name)) {
-				return true;
+		if (status != Status.ReferenceOnly) {
+			for (String name : repositories) {
+				if (repoList.contains(name)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -122,6 +173,8 @@ public class FilestoreModel implements Serializable {
 	
 	public static enum Status {
 
+		ReferenceOnly(-42),
+		
 		Deleted(-30),
 		AuthenticationRequired(-20),
 		
diff --git a/src/main/java/com/gitblit/models/PathModel.java b/src/main/java/com/gitblit/models/PathModel.java
index bf585425..3c280eb4 100644
--- a/src/main/java/com/gitblit/models/PathModel.java
+++ b/src/main/java/com/gitblit/models/PathModel.java
@@ -15,11 +15,20 @@
  */

 package com.gitblit.models;

 

+import java.io.IOException;

 import java.io.Serializable;

 

 import org.eclipse.jgit.diff.DiffEntry;

 import org.eclipse.jgit.diff.DiffEntry.ChangeType;

+import org.eclipse.jgit.errors.IncorrectObjectTypeException;

+import org.eclipse.jgit.errors.MissingObjectException;

+import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.FileMode;

+import org.eclipse.jgit.lib.Repository;

+import org.eclipse.jgit.revwalk.RevWalk;

+

+import com.gitblit.manager.FilestoreManager;

+import com.gitblit.utils.JGitUtils;

 

 /**

  * PathModel is a serializable model class that represents a file or a folder,

@@ -34,16 +43,18 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 

 	public final String name;

 	public final String path;

+	private final FilestoreModel filestoreItem;

 	public final long size;

 	public final int mode;

 	public final String objectId;

 	public final String commitId;

 	public boolean isParentPath;

-

-	public PathModel(String name, String path, long size, int mode, String objectId, String commitId) {

+	

+	public PathModel(String name, String path, FilestoreModel filestoreItem, long size, int mode, String objectId, String commitId) {

 		this.name = name;

 		this.path = path;

-		this.size = size;

+		this.filestoreItem = filestoreItem;

+		this.size = (filestoreItem == null) ? size : filestoreItem.getSize();

 		this.mode = mode;

 		this.objectId = objectId;

 		this.commitId = commitId;

@@ -66,6 +77,18 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 				|| FileMode.EXECUTABLE_FILE.equals(mode)

 				|| (FileMode.MISSING.equals(mode) && !isSymlink() && !isSubmodule() && !isTree());

 	}

+	

+	public boolean isFilestoreItem() {

+		return filestoreItem != null;

+	}

+	

+	public String getFilestoreOid() {

+		if (filestoreItem != null) {

+			return filestoreItem.oid;

+		}

+		

+		return null;

+	}

 

 	@Override

 	public int hashCode() {

@@ -119,9 +142,9 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 

 		public int deletions;

 

-		public PathChangeModel(String name, String path, long size, int mode, String objectId,

+		public PathChangeModel(String name, String path, FilestoreModel filestoreItem, long size, int mode, String objectId,

 				String commitId, ChangeType type) {

-			super(name, path, size, mode, objectId, commitId);

+			super(name, path, filestoreItem, size, mode, objectId, commitId);

 			this.changeType = type;

 		}

 

@@ -148,18 +171,33 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 			return super.equals(o);

 		}

 

-		public static PathChangeModel from(DiffEntry diff, String commitId) {

+		public static PathChangeModel from(DiffEntry diff, String commitId, Repository repository) {

 			PathChangeModel pcm;

+			FilestoreModel filestoreItem = null;

+			long size = 0;

+

+			if (repository != null) {

+				try (RevWalk revWalk = new RevWalk(repository)) {

+					size = revWalk.getObjectReader().getObjectSize(diff.getNewId().toObjectId(), Constants.OBJ_BLOB);

+	

+					if (JGitUtils.isPossibleFilestoreItem(size)) {

+						filestoreItem = JGitUtils.getFilestoreItem(revWalk.getObjectReader().open(diff.getNewId().toObjectId()));

+					}

+				} catch (Exception e) {

+						e.printStackTrace();

+				}

+			}

+			

 			if (diff.getChangeType().equals(ChangeType.DELETE)) {

-				pcm = new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff

+				pcm = new PathChangeModel(diff.getOldPath(), diff.getOldPath(), filestoreItem, size, diff

 						.getNewMode().getBits(), diff.getOldId().name(), commitId, diff

 						.getChangeType());

 			} else if (diff.getChangeType().equals(ChangeType.RENAME)) {

-				pcm = new PathChangeModel(diff.getOldPath(), diff.getNewPath(), 0, diff

+				pcm = new PathChangeModel(diff.getOldPath(), diff.getNewPath(), filestoreItem, size, diff

 						.getNewMode().getBits(), diff.getNewId().name(), commitId, diff

 						.getChangeType());

 			} else {

-				pcm = new PathChangeModel(diff.getNewPath(), diff.getNewPath(), 0, diff

+				pcm = new PathChangeModel(diff.getNewPath(), diff.getNewPath(), filestoreItem, size, diff

 						.getNewMode().getBits(), diff.getNewId().name(), commitId, diff

 						.getChangeType());

 			}