Add a very simple HTML5 uploader.

diff --git a/perl/Sesse/pr0n/Upload.pm b/perl/Sesse/pr0n/Upload.pm
new file mode 100644 (file)
index 0000000..a9d1023
--- /dev/null
+++ b/perl/Sesse/pr0n/Upload.pm
@@ -0,0 +1,40 @@
+# Shows the upload dialog.
+
+package Sesse::pr0n::Upload;
+use strict;
+use warnings;
+
+use Sesse::pr0n::Common qw(error dberror);
+
+sub handler {
+       my $r = shift;
+       my $dbh = Sesse::pr0n::Common::get_dbh();
+
+       # Fix common error: pr0n.sesse.net/upload/event -> pr0n.sesse.net/upload/event/
+       if ($r->path_info !~ /\/$/) {
+               my $res = Plack::Response->new(301);
+               $res->header('Location' => $r->path_info . "/");
+               return $res;
+       }
+       $r->path_info =~ /^\/upload\/([a-zA-Z0-9-]+)\/?$/
+               or return error($r, "Could not extract event");
+       my $event = $1;
+
+       my $res = Plack::Response->new(200);
+       $res->content_type("text/html; charset=utf-8");
+       my $io = IO::String->new;
+
+       chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'upload-title'));
+       Sesse::pr0n::Common::header($r, $io, $title);
+       Sesse::pr0n::Templates::print_template($r, $io, 'upload', {
+               event => $event
+       });
+       Sesse::pr0n::Common::footer($r, $io);
+
+       $io->setpos(0);
+       $res->body($io);
+       return $res;
+}
+       
+1;
+

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index f5715f53b7077b9f7d5b30831f7915ff75aecb79..ff4ae8e4be52b3472fd34c8f717ab3ff1e8211a9 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -6,6 +6,7 @@ use Sesse::pr0n::Rotate;
 use Sesse::pr0n::Select;
 use Sesse::pr0n::WebDAV;
 use Sesse::pr0n::NewEvent;
+use Sesse::pr0n::Upload;
 use IO::File::WithPath;
 
 package Sesse::pr0n::pr0n;
@@ -63,6 +64,8 @@ sub handler {
                return Sesse::pr0n::Select::handler($r);
        } elsif ($uri =~ m#^/newevent$#) {
                return Sesse::pr0n::NewEvent::handler($r);
+       } elsif ($uri =~ /^\/upload\/[a-zA-Z0-9-]+\/?$/) {
+               return Sesse::pr0n::Upload::handler($r);
        } elsif ($uri =~ /^\/[a-zA-Z0-9-]+\/?$/ ||
                 $uri =~ /^\/\+all\/?$/) {
                return Sesse::pr0n::Index::handler($r);

diff --git a/templates/default/upload b/templates/default/upload
new file mode 100644 (file)
index 0000000..5d4b375
--- /dev/null
+++ b/templates/default/upload
@@ -0,0 +1,77 @@
+    <p><label><input type="checkbox" id="autorename" /> Automatically rename bad or duplicate filenames</p>
+    <p>
+      <input type="file" id="fileinput" multiple="multiple" accept="image/*" />
+      <button id="upload">Upload</button>
+    </p>
+
+    <table style="margin-top: 1em">
+      <thead>
+        <tr><th>Filename</th><th>Size</th><th>Status</th></tr>
+      </thead>
+      <tbody id="files">
+      </tbody>
+    </table>
+
+<script>
+//<![CDATA[
+document.getElementById('upload').addEventListener('click', function() {
+       var files = document.getElementById('fileinput').files;
+       var tbody = document.getElementById('files');
+       tbody.innerHTML = '';
+       for (var i = 0; i < files.length; ++i) {
+               var tr = document.createElement('tr');
+
+               var td_filename = document.createElement('td');
+               td_filename.appendChild(document.createTextNode(files[i].name));
+               tr.appendChild(td_filename);
+
+               var td_size = document.createElement('td');
+               td_size.appendChild(document.createTextNode(files[i].size));
+               tr.appendChild(td_size);
+
+               var td_status = document.createElement('td');
+               tr.appendChild(td_status);
+
+               tbody.appendChild(tr);
+       }
+       upload(files, 0);
+}, false);
+
+var upload = function(files, file_index) {
+       var file = files[file_index];
+       var url = window.location.origin + '/webdav/upload/%EVENT%/';
+       if (document.getElementById('autorename').checked) {
+               url += 'autorename/';
+       }
+       url += file.name;
+       var xhr = new XMLHttpRequest();
+       var tr = document.getElementById('files').getElementsByTagName('tr')[file_index];
+       var td_status = tr.getElementsByTagName('td')[2];
+       //var fd = new FormData();
+       console.log("uploading: " + url);
+       if (xhr.upload) {
+               xhr.upload.addEventListener("progress", function(evt) {
+                       var kb = Math.floor(evt.loaded / 1024);
+                       var pct = (100.0 * evt.loaded / evt.total);
+                       td_status.innerHTML = kb + ' kB (' + pct.toFixed(1) + ' %)';
+               });
+       }
+       xhr.open("PUT", url, true);
+       xhr.onreadystatechange = function() {
+               if (xhr.readyState != 4) {
+                       return;
+               }
+               td_status.innerHTML = '';
+               td_status.appendChild(document.createTextNode(xhr.status + ' (' + xhr.responseText + ')'));
+               if (xhr.status != 201) {
+                       td_status.style.color = 'red';
+                       td_status.style.fontWeight = 'bold';
+               }
+               if (file_index + 1 < files.length) {
+                       upload(files, file_index + 1);
+               }
+       };
+       xhr.send(file);
+}
+//]]>
+</script>

diff --git a/templates/default/upload-title b/templates/default/upload-title
new file mode 100644 (file)
index 0000000..2b0edc3
--- /dev/null
+++ b/templates/default/upload-title
@@ -0,0 +1 @@
+Upload files