Changeset 41

Timestamp:

02/24/07 22:45:16 (2 years ago)

Author:

simon

Message:

Allow RAW files. I can't believe that just worked. Closes #10.

Files:

• trunk/Memories/Photo.pm (modified) (6 diffs)
• trunk/memories.sql (modified) (1 diff)

trunk/Memories/Photo.pm

@@ -3 +3 @@
-use File::Copy;
-use Archive::Any;
-
+ tmpnam
-use File::Path qw(rmtree);
-use File::Find;
@@ -14 +14 @@
-use Image::Seek;
-use constant PAGER_SYNTAX => "LimitXY";
-
+ format
-__PACKAGE__->untaint_columns(printable => [qw/title/]);
-__PACKAGE__->columns(TEMP => qw/exif_object/);
@@ -95 +95 @@
-    my $res = $mm->checktype_filename($filename);
-    warn "$filename is a $res\n";
-
+$
-        return $self->upload_archive($r, $filename);
+    } elsif ($offered_name =~ /\.(raw|nef)/i) {
+        return $self->upload_raw($r, $filename, $offered_name);
-    } elsif ($res =~ m{image/jpeg}) {
-        return $self->upload_jpeg($r, $filename, $offered_name);
@@ -117 +119 @@
-    rmtree($dir);
-    return @results;
+}
+
+sub upload_raw {
+    my ($self, $r, $filename, $offered_name) = @_;
+    my $jpg = tmpnam().".jpg";
+    system("dcraw -c $filename | convert - $jpg");
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
+    $filename =~ /\.(.*)$/;
+    my $format = $1;
+    $photo->format($format);
+    # Put the file in place
+    copy($filename, 
+         Memories->config->{data_store}."/".$photo->id.".".$format);
+    return $photo;
-}
-
@@ -223 +239 @@
-}
-
-sub format { 
-    "jpg" # For now
-} 
-
-use Cache::MemoryCache;
-use Image::Info qw(dim image_info);
@@ -336 +348 @@
-    use File::Path;
-    if ($is_url ne "url") {mkpath($path);}
-
+
+
+
+
+
-    return $path;
-}

trunk/memories.sql

@@ -8 +8 @@
-    hit_count integer,
-    rating integer,
-
+
+
-);
-