From ff27135df60e43c94d1ee71936b99736a312e446 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Thu, 20 Jun 2013 02:51:49 +0900
Subject: [PATCH] Delete all temporary directories in repository deletion.

---
 src/main/scala/app/SettingsController.scala |  2 +-
 src/main/scala/util/Directory.scala         | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala
index 44c2acce0..f06d4ecbd 100644
--- a/src/main/scala/app/SettingsController.scala
+++ b/src/main/scala/app/SettingsController.scala
@@ -122,7 +122,7 @@ trait SettingsControllerBase extends ControllerBase {
 
     FileUtils.deleteDirectory(getRepositoryDir(owner, repository))
     FileUtils.deleteDirectory(getWikiRepositoryDir(owner, repository))
-    FileUtils.deleteDirectory(getWikiWorkDir(owner, repository))
+    FileUtils.deleteDirectory(getTemporaryDir(owner, repository))
 
     redirect("/%s".format(owner))
   })
diff --git a/src/main/scala/util/Directory.scala b/src/main/scala/util/Directory.scala
index 96dcddb7b..f6329a816 100644
--- a/src/main/scala/util/Directory.scala
+++ b/src/main/scala/util/Directory.scala
@@ -32,12 +32,18 @@ object Directory {
    */
   def getRepositoryDir(owner: String, repository: String): File =
     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.
    */
   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.
@@ -45,7 +51,7 @@ object Directory {
    * This directory is removed after the repository creation.
    */
   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.
@@ -56,7 +62,7 @@ object Directory {
   /**
    * Wiki working directory which is cloned from the wiki repository.
    */
-  def getWikiWorkDir(owner: String, repository: String): File = 
-    new File("%s/tmp/%s/%s.wiki".format(Directory.GitBucketHome, owner, repository))
-  
+  def getWikiWorkDir(owner: String, repository: String): File =
+    new File(getTemporaryDir(owner, repository), "wiki")
+
 }
\ No newline at end of file