Changeset 38

Timestamp:

02/24/07 20:08:09 (2 years ago)

Author:

simon

Message:

Allow multiple uploads, look into ZIP and tar.gz files. Closes #8.

Files:

• trunk/Memories/Photo.pm (modified) (8 diffs)
• trunk/templates/custom/list (modified) (1 diff)
• trunk/templates/photo/upload (modified) (1 diff)

trunk/Memories/Photo.pm

@@ -2 +2 @@
-use File::Basename;
-use File::Copy;
+use Archive::Any;
+use File::Temp qw(tempdir);
+use File::Path qw(rmtree);
+use File::Find;
+use File::MMagic;
-use strict;
-use Carp qw(cluck confess);
@@ -48 +53 @@
-    my $upload = $r->{ar}->upload("photo");
-    # Check $self->type
-jpeg($upload->tempname, ($r->params->{title}||basename($upload->filename)), $r->params->{tags}, $r
+file($r, $upload->tempname, $upload->filename
-    my @quarantined = grep { !$_->tags } @photos;
-    warn "Quarantined these photos: ".join(",", map {$_->id} @quarantined);
-    # Set it up to go again
-    if (@quarantined) { 
-        $r->{session}{quarantined} = join ",", sort map { $_->id} @quarantined;
-        warn "Setting quarantineined to: ".( join ",", sort map { $_->id} @quarantined);
-        $r->objects(\@quarantined);
-        $r->template("quarantine");
@@ -60 +63 @@
-    }
-    $r->objects(\@photos);
+    if (@photos == 0) { $r->template("upload"); return  }
-    if (@photos > 1) { $r->template("list") } 
-    else { $r->template("view"); }
@@ -69 +73 @@
-    my @quarantined = split /,/, $r->{session}{quarantined};
-    my %q = map { $_ => 1 } @quarantined;
-    warn "Before we had these quarantined: @{[ keys %q ]}";
-    for (map /(\d+)/,grep /tags\d+/, keys %{$r->{params}}) {
-        my $tags = $r->{params}{"tags$_"};
-        warn "Got tags for $_: <$tags>";
-        next unless $tags;
-        if (my $photo = $self->retrieve($_)) {
@@ -80 +82 @@
-    }
-    $r->{session}{quarantined} = join ",", sort keys %q;
-    warn "After, we have these quarantined: @{[ keys %q ]}";
-    warn "And we set session to  $r->{session}{quarantined}";
-    if (!$r->{session}{quarantined}) {
-        $r->template("list");
@@ -90 +90 @@
-}
-
+sub upload_file {
+    my ($self, $r, $filename, $offered_name) = @_;
+    my $mm = File::MMagic->new;
+    my $res = $mm->checktype_filename($filename);
+    warn "$filename is a $res\n";
+    if ($res =~ m{/x-zip} or $offered_name =~ /t(ar\.)?gz/) {
+        return $self->upload_archive($r, $filename);
+    } elsif ($res =~ m{image/jpeg}) {
+        return $self->upload_jpeg($r, $filename, $offered_name);
+    } else {
+        $r->message(basename($offered_name).": I can't handle $res files yet");
+        return ();
+    }
+}
+
+sub upload_archive {
+    my ($self, $r, $filename, $tags) = @_;
+    $r->{params}{title} = ""; # Kill that dead.
+    my $archive = Archive::Any->new($filename);
+    my $dir = tempdir();
+    $archive->extract($dir);
+    my @results; 
+    find({ wanted   => sub { return unless -f $_; 
+                             push @results, $self->upload_file($r, $_, $_) }, 
+           no_chdir => 1}, $dir);
+    rmtree($dir);
+    return @results;
+}
+
-sub upload_jpeg {
-filename, $title, $tags, $r
+r, $filename, $offered_name
-    my $photo = $self->create({
-        uploader => $r->user,
-        uploaded => Time::Piece->new(),
-$title
+($r->{params}{title} || basename($offered_name))
-        hit_count => 0,
-        rating => 0,
@@ -113 +142 @@
-
-    $photo->make_thumb;
-$tags ||= 
+my $tags = $r->{params}{tags}.
-    $photo->add_tags($tags);
-    $photo->add_to_imageseek_library;
@@ -293 +322 @@
-    if (!$resized) { cluck "Asked for crazy size $size"; return; }
-    if ($resized eq "full") { return $self->path("url") }
+    warn "Looking for path ".$self->path(file => $resized);
-    $self->scale($resized) 
-        unless -e $self->path( file => $resized );

trunk/templates/custom/list

@@ -8 +8 @@
-    [% FOR object = minilist %]
-        <td>
-object
+[%object.moniker%]
-        <img src="[% object.photos.last.thumb_url |uri%]"></a><br/>
-        <span class="info">

trunk/templates/photo/upload

@@ -2 +2 @@
-<h1> Upload a photo </h1>
-<p>
-At the moment, you must
-
-upload a Zip file containing several photo
+You can upload
+
+picture
-</p>
-<p>