Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 05:55:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add FileUtil#getContentType().

Browse Source
This commit is contained in:
takezoe
2013-10-04 04:17:30 +09:00
parent f4f2bf34fc
commit 380cdbcf75
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -94,17 +94,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
if(raw){
// Download
val mimeType = FileUtil.getMimeType(path)
val bytes = JGitUtil.getContent(git, objectId, false).get
contentType = if(mimeType == "application/octet-stream" && FileUtil.isText(bytes)){
"text/plain"
} else {
mimeType
defining(JGitUtil.getContent(git, objectId, false).get){ bytes =>
contentType = FileUtil.getContentType(path, bytes)
bytes
}
//response.setHeader("Content-Disposition", s"inline; filename=${FileUtil.getFileName(path)}")
bytes
} else {
// Viewer
val large = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)