Changeset 966

Timestamp:

12/21/06 00:40:52 (2 years ago)

Author:

bchoate

Message:

Updates to better handle storage/removal of asset cache files.

Files:

• branches/wheeljack/lib/MT/Asset.pm (modified) (6 diffs)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (10 diffs)

branches/wheeljack/lib/MT/Asset.pm

@@ -119 +119 @@
-    my ($class) = @_;
-    my $package = $Classes{$class};
-
+ 
-        if (defined *{$package.'::new'}) {
-            return $package;
@@ -181 +181 @@
-        }
-    }
+    $asset->remove_cached_files;
-    $asset->SUPER::remove(@_);
+}
+
+sub remove_cached_files {
+    my $asset = shift;
+
+    # remove any asset cache files that exist for this asset
+    my $blog = $asset->blog;
+    if ($asset->id && $blog) {
+        my $path = $blog->site_path;
+        my $cache_dir = MT->config('AssetCacheDir');
+        if ($path && $cache_dir) {
+            my $fmgr = $blog->file_mgr;
+            if ($fmgr) {
+                my $cache_glob = File::Spec->catfile($path, $cache_dir,
+                    $asset->id . '.*');
+                my @files = glob($cache_glob);
+                foreach my $file (@files) {
+                    $fmgr->delete($file);
+                }
+            }
+        }
+    }
+    1;
-}
-
@@ -210 +234 @@
-    my $pkg = shift;
-    my ($filename) = @_;
-
+
+
+
+
+
+
+
-    foreach my $class (@$classes) {
-        my $this_pkg = $pkg->class_handler($class);
@@ -239 +269 @@
-}
-
+sub thumbnail_filename {
+    undef;
+}
+
-sub stock_icon_url {
-    undef;
@@ -245 +279 @@
-sub thumbnail_url {
-    my $asset = shift;
-
-
+
-        require File::Basename;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    # Use a stock icon
@@ -281 +316 @@
-    my $asset = shift;
-    my ($param) = @_;
+    $asset->remove_cached_files;
-    1;
-}

branches/wheeljack/lib/MT/Asset/Image.pm

@@ -34 +34 @@
-    return undef unless @imginfo;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    my @thumbinfo = stat($thumbnail);
-
@@ -49 +56 @@
-
-    # stale or non-existent thumbnail. let's create one!
-
-
-
+
-    return undef unless $fmgr;
+
+    return undef unless $fmgr->can_write($asset_cache_path);
-
-    # create a thumbnail for this file
@@ -65 +72 @@
-    # 100000px wide/tall => 164x164
-    #     scale the horizontal to fit
+
+    my $h = $param{Height};
+    my $w = $param{Width};
-
-    # find the longest dimension of the image:
@@ -104 +114 @@
-        or return $asset->error(MT->translate("Error creating thumbnail file: [_1]", $fmgr->errstr));
-    return $thumbnail;
+}
+
+sub thumbnail_filename {
+    my $asset = shift;
+    my (%param) = @_;
+
+    require MT::Util;
+    my $signature = sprintf 'height:%d;width:%d',
+        $param{Height}, $param{Width};
+    my $suffix = MT::Util::perl_sha1_digest_hex($signature);
+    return $asset->id . '.' . $suffix . '.' . $asset->file_ext;
-}
-
@@ -206 +227 @@
-    my ($param) = @_;
-
+    $asset->SUPER::on_upload(@_);
+
-    my $app = MT->instance;
-    require MT::Util;
@@ -284 +307 @@
-        $thumb = $url . MT::Util::encode_url($base . '-thumb' . $ext);
-
-class_handler('image'
+handler_for_file($t_file
-        my $asset_thumb = new $img_pkg;
-        my $original = $asset_thumb->clone;
@@ -297 +320 @@
-        $asset_thumb->image_height($thumb_height);
-        $asset_thumb->created_by($app->user->id);
+        $asset_thumb->parent($asset->id);
-        $asset_thumb->save;
-        MT->run_callbacks('CMSPostSave.asset', $app, $asset_thumb, $original);
@@ -302 +326 @@
-        $param->{thumb_asset_id} = $asset_thumb->id;
-
-thumbnail'
+' . $asset_thumb->class
-                          File => $t_file, Url => $thumb, Size => length($blob),
-                          Asset => $asset_thumb,
@@ -308 +332 @@
-                          Blog => $blog);
-
-.thumbnail
+
-                          File => $t_file, Url => $thumb,
-                          Asset => $asset_thumb,
@@ -375 +399 @@
-            $asset_html->file_ext($blog->file_extension);
-            $asset_html->created_by($app->user->id);
+            $asset_html->parent($asset->id);
-            $asset_html->save;
-            MT->run_callbacks('CMSPostSave.asset', $app, $asset_html, $original);
-
-popup'
+' . $asset_html->class
-                          File => $abs_file_path, Url => $url,
-                          Asset => $asset_html,