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

Add link for image file

Browse Source 
* Render image tag with link tag on issue and wiki
* Correct response content-type of attached image on issue
This commit is contained in:
Tomofumi Tanaka
2014-05-03 00:56:36 +09:00
parent dc21e8388e
commit 619f72d929
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/app/IssuesController.scala
View File

@@ -275,7 +275,10 @@ trait IssuesControllerBase extends ControllerBase {
get("/:owner/:repository/_attached/:file")(referrersOnly { repository => get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
defining(new java.io.File(Directory.getAttachedDir(repository.owner, repository.name), params("file"))){ file => defining(new java.io.File(Directory.getAttachedDir(repository.owner, repository.name), params("file"))){ file =>
if(file.exists) file else NotFound if(file.exists) {
contentType = FileUtil.getMimeType(file)
file
} else NotFound
} }
}) })

14
src/main/scala/util/FileUtil.scala
View File

@@ -5,9 +5,13 @@ import java.net.URLConnection
import java.io.File import java.io.File
import util.ControlUtil._ import util.ControlUtil._
import scala.util.Random import scala.util.Random
import eu.medsea.mimeutil.{MimeUtil2, MimeType}
object FileUtil { object FileUtil {
private val mimeUtil = new MimeUtil2()
mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
def getMimeType(name: String): String = def getMimeType(name: String): String =
defining(URLConnection.getFileNameMap()){ fileNameMap => defining(URLConnection.getFileNameMap()){ fileNameMap =>
fileNameMap.getContentTypeFor(name) match { fileNameMap.getContentTypeFor(name) match {
@@ -16,6 +20,16 @@ object FileUtil {
} }
} }
/**
* Returns mime type detected by file content.
*
* @param file File object
* @return mime type String
*/
def getMimeType(file: File): String = {
MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
}
def getContentType(name: String, bytes: Array[Byte]): String = { def getContentType(name: String, bytes: Array[Byte]): String = {
defining(getMimeType(name)){ mimeType => defining(getMimeType(name)){ mimeType =>
if(mimeType == "application/octet-stream" && isText(bytes)){ if(mimeType == "application/octet-stream" && isText(bytes)){

3
src/main/scala/view/Markdown.scala
View File

@@ -89,7 +89,8 @@ class GitBucketHtmlSerializer(
) with LinkConverter with RequestCache { ) with LinkConverter with RequestCache {
override protected def printImageTag(imageNode: SuperNode, url: String): Unit = override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
printer.print("<img src=\"").print(fixUrl(url)).print("\" alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>") printer.print("<a target=\"_blank\" href=\"").print(fixUrl(url)).print("\">")
.print("<img src=\"").print(fixUrl(url)).print("\" alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/></a>")
override protected def printLink(rendering: LinkRenderer.Rendering): Unit = { override protected def printLink(rendering: LinkRenderer.Rendering): Unit = {
printer.print('<').print('a') printer.print('<').print('a')