allow to optionally specify backup file. closes #2, closes #3

Author: McFoggy

src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala

@@ -8,31 +8,43 @@ import gitbucket.core.util.Directory._
 import fr.brouillard.gitbucket.h2._
 import org.scalatra.Ok
 import org.slf4j.LoggerFactory
+import jp.sf.amateras.scalatra.forms._
 
 class H2BackupController extends ControllerBase {
   private val logger = LoggerFactory.getLogger(classOf[H2BackupController])
 
-  def exportDatabase: Unit = {
+  case class BackupForm(destFile: String)
+
+  private val backupForm = mapping(
+    "dest" -> trim(label("Destination", text(required)))
+  )(BackupForm.apply)
+
+  def exportDatabase(exportFile: File): Unit = {
     val session = Database.getSession(request)
     val conn = session.conn
-    val exportFile = new File(GitBucketHome, "gitbucket-database-backup.zip")
 
     logger.info("exporting database to {}", exportFile)
 
     conn.prepareStatement("BACKUP TO '" + exportFile + "'").execute();
   }
 
+  def exportDatabase: Unit = {
+    val exportFile = new File(GitBucketHome, "gitbucket-database-backup.zip")
+    exportDatabase(exportFile);
+  }
+
   get("/admin/h2backup") {
     html.export(flash.get("info"));
   }
 
   get("/database/backup") {
-    exportDatabase
+    val filePath:String = params.getOrElse("dest", new File(GitBucketHome, "gitbucket-database-backup.zip").toString)
+    exportDatabase(new File(filePath))
     Ok("done")
   }
 
-  post("/database/backup") {
-    exportDatabase
+  post("/database/backup", backupForm) { form: BackupForm =>
+    exportDatabase(new File(form.destFile))
     flash += "info" -> "H2 Database has been exported."
     redirect("/admin/h2backup")
   }

src/main/twirl/fr/brouillard/gitbucket/h2/export.scala.html

@@ -12,16 +12,19 @@
     <div class="box">
         <div class="box-header">Database export</div>
         <div class="box-content">
-            <label><span class="strong">Database export file:</span>@GitBucketHome/gitbucket-database-backup.zip</label>
-            <p class="muted">
-                Allows to export the database content. The same action can be achieved via an HTTP GET call to @path/database/backup
-            </p>
-
             <fieldset>
-                <input type="submit" class="btn btn-primary" value="Export database"/>
+                <label><span class="strong">Database export file:</span></label>
+                <p class="muted">
+                    Allows to export the database content. The same action can be achieved via an HTTP GET call to @path/database/backup
+                </p>
+                <input type="text" name="dest" value="@GitBucketHome/gitbucket-database-backup.zip" style="width: 400px" />
             </fieldset>
+
         </div>
     </div>
+    <div class="align-right" style="margin-top: 20px;">
+        <input type="submit" class="btn btn-success" value="Export database"/>
+    </div>
 </form>
 }
 }