From 2863f008fd2ab27355898bffd776ed0a5db9bc60 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sat, 3 Oct 2015 22:55:55 +0200
Subject: [PATCH] Add some checks and error messages

---
 lib/Lufi/Controller/Files.pm | 98 ++++++++++++++++++++++--------------
 templates/render.html.ep     |  8 +--
 2 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/lib/Lufi/Controller/Files.pm b/lib/Lufi/Controller/Files.pm
index d51fdea..9d0551a 100644
--- a/lib/Lufi/Controller/Files.pm
+++ b/lib/Lufi/Controller/Files.pm
@@ -81,36 +81,62 @@ sub download {
     $c->debug('Client connected');
 
     my @records = LufiDB::Files->select('WHERE short = ?', $short);
-    my $f       = Lufi::File->new(record => $records[0]);
 
-    $c->on(
-        message => sub {
-            my ($ws, $json) = @_;
-            $json = decode_json $json;
-            if (defined($json->{part})) {
-                # Make $num an integer instead of a string
-                my $num = $json->{part} + 0;
-
-                my $e    = $f->slices->[$num];
-                my $text = slurp $e->path;
-                $c->send($text);
-            } elsif (defined($json->{ended}) && $json->{ended}) {
-                $f->counter($f->counter + 1);
-                $f->last_access_at(time);
-
-                if ($f->delete_at_first_view) {
-                    $f->delete;
-                } else {
-                    $f->write;
+    # Do we have a file?
+    if (scalar @records) {
+        # Is the file fully uploaded?
+        if ($records[0]->deleted) {
+            $c->on(
+                message => sub {
+                    my ($ws, $json) = @_;
+                    $c->send('{"success": false, "msg": "'.$c->l('Error: the file existed but has been deleted.').'"}');
                 }
-            }
+            );
+        } elsif ($records[0]->complete) {
+            my $f       = Lufi::File->new(record => $records[0]);
+
+            $c->on(
+                message => sub {
+                    my ($ws, $json) = @_;
+                    $json = decode_json $json;
+                    if (defined($json->{part})) {
+                        # Make $num an integer instead of a string
+                        my $num = $json->{part} + 0;
+
+                        # Get the slice
+                        my $e    = $f->slices->[$num];
+                        my $text = slurp $e->path;
+
+                        # Send the slice
+                        $c->send($text);
+                    } elsif (defined($json->{ended}) && $json->{ended}) {
+                        $f->counter($f->counter + 1);
+                        $f->last_access_at(time);
+
+                        if ($f->delete_at_first_view) {
+                            $f->delete;
+                        } else {
+                            $f->write;
+                        }
+                    }
+                }
+            );
+            $c->on(
+                finish => sub {
+                    $c->debug('Client disconnected');
+                }
+            );
+        } else {
+            $c->on(
+                message => sub {
+                    my ($ws, $json) = @_;
+                    $c->send('{"success": false, "msg": "'.$c->l('Error: the file has not been send entirely.').'"}');
+                }
+            );
         }
-    );
-    $c->on(
-        finish => sub {
-            $c->debug('Client disconnected');
-        }
-    );
+    } else {
+        $c->send('{"success": false, "msg": "'.$c->l('Error: unable to find the file. Are you sure of your URL?').'"}');
+    }
 }
 
 sub r {
@@ -120,16 +146,13 @@ sub r {
     my @records = LufiDB::Files->select('WHERE short = ?', $short);
     if (scalar @records) {
         my $f   = Lufi::File->new(record => $records[0]);
-        my $msg = $c->l('The file has been deleted and is no more available.') if $f->deleted;
         return $c->render(
             template => 'render',
-            f        => $f,
-            msg      => $msg
+            f        => $f
         );
     } else {
         return $c->render(
             template => 'render',
-            f        => undef,
             msg      => $c->l('Could not find the file. Are you sure of the URL?')
         );
     }
@@ -148,13 +171,14 @@ sub get_counter {
                 counter => $records[0]->counter
             }
         );
+    } else {
+        return $c->render(
+            json => {
+                success => false,
+                msg     => $c->l('Unable to get counter for %1. The file does not exists.', $short)
+            }
+        );
     }
-    return $c->render(
-        json => {
-            success => false,
-            msg     => $c->l('Unable to get counter')
-        }
-    );
 }
 
 sub delete {
diff --git a/templates/render.html.ep b/templates/render.html.ep
index e553135..f832fa8 100644
--- a/templates/render.html.ep
+++ b/templates/render.html.ep
@@ -1,11 +1,11 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
 <div class="inner cover render">
-% if (!defined($f) && defined($msg)) {
-    <div class="alert alert-danger"><%= $msg %></div>
+% if (!defined(stash('f')) && defined(stash('msg'))) {
+    <div class="alert alert-danger"><%= stash('msg') %></div>
 % } else {
     <h2><%= stash('f')->filename %></h2>
-    % if (defined($msg)) {
-    <div class="alert alert-danger"><%= $msg %></div>
+    % if (defined(stash('msg'))) {
+    <div class="alert alert-danger"><%= stash('msg') %></div>
     % } else {
     <p id="please-wait"><%= l('Please wait while we are getting your file') %></p>
     <div class="progress" id="pbd">