deleting files works now

diff --git a/README.rst b/README.rst
index af8b42e51c195cb919c7c6d893aa129e8d2c64fb..f5c7b789094989f46a78dfd770dd3236cda8905f 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -13,6 +13,9 @@ Features
 ========
 - every paste is a git repository
 - paste editing
+
+  - add new files
+  - delete existing files
 - multiple files in one paste
 - syntax highlighting with GeSHi
 - rST rendering

diff --git a/data/templates/edit-file.htm b/data/templates/edit-file.htm
index 37f92538486aa853925965460573a7ef86cd40c6..b0a4848659358d65647f01223cbd3ff4d52e29f1 100644 (file)
--- a/data/templates/edit-file.htm
+++ b/data/templates/edit-file.htm
@@ -14,5 +14,18 @@
    </div>
   </div>
   <textarea name="files[{{fileid}}][content]" id="content_{{fileid}}" cols="80" rows="15" class="content">{{file.getContent}}</textarea>
+  <div class="row-fluid">
+   <div class="span9">
+    &nbsp;
+    <!--
+    <label for="upload_{{fileid}}" class="inline">Replace with file upload:</label>
+    <input type="file" name="files[{{fileid}}][upload]" id="upload_{{fileid}}" class="btn"/>
+    -->
+   </div>
+   <div class="span3" style="text-align: right">
+    <input type="checkbox" name="files[{{fileid}}][delete]" value="1" id="delete_{{fileid}}"/>
+    <label for="delete_{{fileid}}" class="inline">delete file</label>
+   </div>
+  </div>
  </div>
 

diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index 828dbadb16e897c8c36833b4d9a82cd968cc7778..1b6075214e389b9d151a1669d44872baf6f19e22 100644 (file)
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -44,6 +44,7 @@ class Repository_Post
             }
 
             $bNew = false;
+            $bDelete = false;
             if (!isset($orignalName) || $orignalName == '') {
                 //new file
                 $bNew = true;
@@ -51,6 +52,8 @@ class Repository_Post
                 //unknown file
                 //FIXME: Show error message
                 continue;
+            } else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
+                $bDelete = true;
             } else if ($orignalName != $name) {
                 //FIXME: what to do with overwrites?
                 $vc->getCommand('mv')
@@ -61,7 +64,12 @@ class Repository_Post
             }
 
             $file = $this->repo->getFileByName($name, false);
-            if ($bNew || $file->getContent() != $arFile['content']) {
+            if ($bDelete) {
+                $command = $vc->getCommand('rm')
+                    ->addArgument($file->getFilename())
+                    ->execute();
+                $bChanged = true;
+            } else if ($bNew || $file->getContent() != $arFile['content']) {
                 file_put_contents($file->getPath(), $arFile['content']);
                 $command = $vc->getCommand('add')
                     ->addArgument($file->getFilename())

diff --git a/www/phorkie.css b/www/phorkie.css
index a09aef10001a061c7bef29ac1a21e1e87f056ad9..f9f3ad0e0b735b92ee9e7cca5b3f4772eca29b7d 100644 (file)
--- a/www/phorkie.css
+++ b/www/phorkie.css
@@ -62,4 +62,8 @@ form input#description {
     box-sizing: border-box;
     height: 2em;
     width: 100%;
+}
+
+form label.inline {
+    display: inline;
 }
\ No newline at end of file