use backup subdirectory #21

Author: aadrian

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

@@ -27,7 +27,7 @@ class H2BackupController extends ControllerBase with AdminAuthenticator {
   // private val defaultBackupFile:String = new File(GitBucketHome, "gitbucket-database-backup.zip").toString;
 
   def exportDatabase(exportFile: File): Unit = {
-    val destFile = if (exportFile.isAbsolute()) exportFile else new File(GitBucketHome, exportFile.toString)
+    val destFile = if (exportFile.isAbsolute()) exportFile else new File(GitBucketHome+"/backup", exportFile.toString)
 
     val session = Database.getSession(request)
     val conn = session.conn
@@ -64,13 +64,14 @@ class H2BackupController extends ControllerBase with AdminAuthenticator {
 
   post("/database/backup", backupForm) { form: BackupForm =>
     exportDatabase(new File(form.destFile))
-    flash += "info" -> "H2 Database has been exported."
+    val msg:String = "H2 Database has been exported to '"+form.destFile+"'."
+    flash += "info" -> msg
     flash += "dest" -> form.destFile
     redirect("/admin/h2backup")
   }
 
   private def defaultBackupFileName(): String = {
-    val format = new java.text.SimpleDateFormat("yyyy-MM-dd-HHmm")
-    "gitbucket-database-backup-" + format.format(new Date())+ ".zip"
+    val format = new java.text.SimpleDateFormat("yyyy-MM-dd_HH-mm")
+    "gitbucket-db-" + format.format(new Date())+ ".zip"
   }
 }

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

@@ -10,14 +10,14 @@
 @information(info)
 <form action="@path/database/backup" method="POST">
     <div class="panel panel-default">
-        <div class="panel-heading strong">Database backup</div>
+        <div class="panel-heading strong">H2 Database Backup</div>
         <div class="panel-body">
             <fieldset>
-                <label><span class="strong">Database backup file:</span></label>
+                <label><span class="strong">H2 Database Backup File:</span></label>
                 <p class="muted">
-                    Allows to export/backup the database content. The same action can be achieved via an HTTP GET call to @path/database/backup
+                    Allows to export/backup the H2 database content. The same action can be achieved via an HTTP GET call to @path/database/backup .
                 </p>
-                <input type="text" name="dest" value="@dest" style="width: 400px" />
+                backup/<input type="text" name="dest" value="@dest" style="width: 400px" />
             </fieldset>
         </div>
     </div>