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

Delete all temporary directories in repository deletion.

Browse Source
This commit is contained in:
takezoe
2013-06-20 02:51:49 +09:00
parent 1826b81e99
commit ff27135df6
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/SettingsController.scala
View File

@@ -122,7 +122,7 @@ trait SettingsControllerBase extends ControllerBase {
FileUtils.deleteDirectory(getRepositoryDir(owner, repository)) FileUtils.deleteDirectory(getRepositoryDir(owner, repository))
FileUtils.deleteDirectory(getWikiRepositoryDir(owner, repository)) FileUtils.deleteDirectory(getWikiRepositoryDir(owner, repository))
FileUtils.deleteDirectory(getWikiWorkDir(owner, repository)) FileUtils.deleteDirectory(getTemporaryDir(owner, repository))
redirect("/%s".format(owner)) redirect("/%s".format(owner))
}) })

12
src/main/scala/util/Directory.scala
View File

@@ -33,11 +33,17 @@ object Directory {
def getRepositoryDir(owner: String, repository: String): File = def getRepositoryDir(owner: String, repository: String): File =
new File("%s/%s/%s.git".format(RepositoryHome, owner, repository)) new File("%s/%s/%s.git".format(RepositoryHome, owner, repository))
/**
* Root of temporary directories for the specified repository.
*/
def getTemporaryDir(owner: String, repository: String): File =
new File("%s/tmp/%s/%s".format(GitBucketHome, owner, repository))
/** /**
* Temporary directory which is used to create an archive to download repository contents. * Temporary directory which is used to create an archive to download repository contents.
*/ */
def getDownloadWorkDir(owner: String, repository: String, sessionId: String): File = def getDownloadWorkDir(owner: String, repository: String, sessionId: String): File =
new File("%s/tmp/%s/%s/download/%s".format(GitBucketHome, owner, repository, sessionId)) new File(getTemporaryDir(owner, repository), "download/%s".format(sessionId))
/** /**
* Temporary directory which is used in the repository creation. * Temporary directory which is used in the repository creation.
@@ -45,7 +51,7 @@ object Directory {
* This directory is removed after the repository creation. * This directory is removed after the repository creation.
*/ */
def getInitRepositoryDir(owner: String, repository: String): File = def getInitRepositoryDir(owner: String, repository: String): File =
new File("%s/tmp/%s/init-%s".format(GitBucketHome, owner, repository)) new File(getTemporaryDir(owner, repository), "init")
/** /**
* Substance directory of the wiki repository. * Substance directory of the wiki repository.
@@ -57,6 +63,6 @@ object Directory {
* Wiki working directory which is cloned from the wiki repository. * Wiki working directory which is cloned from the wiki repository.
*/ */
def getWikiWorkDir(owner: String, repository: String): File = def getWikiWorkDir(owner: String, repository: String): File =
new File("%s/tmp/%s/%s.wiki".format(Directory.GitBucketHome, owner, repository)) new File(getTemporaryDir(owner, repository), "wiki")
} }