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

Dispose ObjectLoader certainty

Browse Source
This commit is contained in:
Naoki Takezoe
2015-05-06 10:30:53 +09:00
parent 8853264808
commit 4e78f01a09
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -290,16 +290,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
val lastModifiedCommit = JGitUtil.getLastModifiedCommit(git, revCommit, path)
getPathObjectId(git, path, revCommit).map { objectId => getPathObjectId(git, path, revCommit).map { objectId =>
if(raw){ if(raw){
// Download // Download
JGitUtil.getContentFromId(git, objectId, true).map {bytes => JGitUtil.getContentFromId(git, objectId, true).map { bytes =>
RawData(FileUtil.getContentType(path, bytes), bytes) RawData(FileUtil.getContentType(path, bytes), bytes)
} getOrElse NotFound } getOrElse NotFound
} else { } else {
html.blob(id, repository, path.split("/").toList, JGitUtil.getContentInfo(git, path, objectId), html.blob(id, repository, path.split("/").toList,
new JGitUtil.CommitInfo(lastModifiedCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount)) JGitUtil.getContentInfo(git, path, objectId),
new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
hasWritePermission(repository.owner, repository.name, context.loginAccount)
)
} }
} getOrElse NotFound } getOrElse NotFound
} }

39
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -639,21 +639,24 @@ object JGitUtil {
def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = { def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
// Viewer // Viewer
val large = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize) using(git.getRepository.getObjectDatabase){ db =>
val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other" val loader = db.open(objectId)
val bytes = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None val large = FileUtil.isLarge(loader.getSize)
val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
val bytes = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
if(viewer == "other"){ if(viewer == "other"){
if(bytes.isDefined && FileUtil.isText(bytes.get)){ if(bytes.isDefined && FileUtil.isText(bytes.get)){
// text // text
ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get))) ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
} else {
// binary
ContentInfo("binary", None, None)
}
} else { } else {
// binary // image or large
ContentInfo("binary", None, None) ContentInfo(viewer, None, None)
} }
} else {
// image or large
ContentInfo(viewer, None, None)
} }
} }
@@ -666,12 +669,12 @@ object JGitUtil {
* @return the byte array of content or None if object does not exist * @return the byte array of content or None if object does not exist
*/ */
def getContentFromId(git: Git, id: ObjectId, fetchLargeFile: Boolean): Option[Array[Byte]] = try { def getContentFromId(git: Git, id: ObjectId, fetchLargeFile: Boolean): Option[Array[Byte]] = try {
val loader = git.getRepository.getObjectDatabase.open(id) using(git.getRepository.getObjectDatabase){ db =>
if(fetchLargeFile == false && FileUtil.isLarge(loader.getSize)){ val loader = db.open(id)
None if(fetchLargeFile == false && FileUtil.isLarge(loader.getSize)){
} else { None
using(git.getRepository.getObjectDatabase){ db => } else {
Some(db.open(id).getBytes) Some(loader.getBytes)
} }
} }
} catch { } catch {