Changeset 752

Timestamp:

11/16/06 16:42:32 (2 years ago)

Author:

bchoate

Message:

Refactored asset classes to have a first-class table. Merged selected vfix updates.

Files:

• branches/wheeljack/build/mt-dists/MT.mk (modified) (1 diff)
• branches/wheeljack/lib/MT.pm.pre (modified) (2 diffs)
• branches/wheeljack/lib/MT/App/CMS.pm (modified) (27 diffs)
• branches/wheeljack/lib/MT/App/Comments.pm (modified) (2 diffs)
• branches/wheeljack/lib/MT/Asset.pm (modified) (6 diffs)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (2 diffs)
• branches/wheeljack/lib/MT/Entry.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/FileInfo.pm (modified) (3 diffs)
• branches/wheeljack/lib/MT/Image.pm (modified) (2 diffs)
• branches/wheeljack/lib/MT/Object.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/ObjectDriver/DBM.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/Template/Context.pm (modified) (2 diffs)
• branches/wheeljack/lib/MT/Template/ContextHandlers.pm (modified) (17 diffs)
• branches/wheeljack/lib/MT/Upgrade.pm (modified) (1 diff)
• branches/wheeljack/mt-static/styles.css (modified) (2 diffs)
• branches/wheeljack/php/lib/MTUtil.php (modified) (6 diffs)
• branches/wheeljack/php/lib/block.MTCategories.php (modified) (2 diffs)
• branches/wheeljack/php/lib/block.MTEntries.php (modified) (1 diff)
• branches/wheeljack/php/lib/block.MTTags.php (modified) (2 diffs)
• branches/wheeljack/php/lib/function.MTBlogArchiveURL.php (modified) (1 diff)
• branches/wheeljack/php/lib/function.MTCategoryTrackbackCount.php (modified) (1 diff)
• branches/wheeljack/php/lib/function.MTCommentBody.php (modified) (1 diff)
• branches/wheeljack/php/lib/mtdb_base.php (modified) (7 diffs)
• branches/wheeljack/php/lib/mtdb_mysql.php (modified) (2 diffs)
• branches/wheeljack/plugins/WidgetManager/lib/WidgetManager/App.pm (modified) (2 diffs)
• branches/wheeljack/search_templates/default.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_admin_permissions.tmpl (deleted)
• branches/wheeljack/tmpl/cms/edit_author.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_permissions.tmpl (deleted)
• branches/wheeljack/tmpl/cms/edit_profile.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_role.tmpl (modified) (2 diffs)
• branches/wheeljack/tmpl/cms/list_asset.tmpl (modified) (8 diffs)
• branches/wheeljack/tmpl/cms/list_association.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_blog.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_role.tmpl (modified) (1 diff)
• branches/wheeljack/tools/convert-db (modified) (1 diff)

branches/wheeljack/build/mt-dists/MT.mk

@@ -2 +2 @@
-PRODUCT_CODE = MT
-PRODUCT_VERSION = 3.3
-3
+5
-API_VERSION = 3.33

branches/wheeljack/lib/MT.pm.pre

@@ -1816 +1816 @@
-
-Movable Type has a variety of hook points at which a plugin can attach
-
-
+
-
-In each case, the first parameter is an L<MT::Callback> object which
@@ -1823 +1822 @@
-
-The app-level callbacks related to rebuilding are documented
- which
-
+
+which 
-
-=head1 LICENSE

branches/wheeljack/lib/MT/App/CMS.pm

@@ -887 +887 @@
-    my %args = ( sort => 'created_on', direction => 'descend' );
-
-type
+class
-    my $filter = ($app->param('filter') || '');
-archive_type
-type
+class
+class
-    }
-
@@ -906 +906 @@
-    my %blogs;
-    require File::Basename;
+    require JSON;
-    my $auth_prefs = $app->user->entry_prefs;
-    my $tag_delim = chr($auth_prefs->{tag_delim});
@@ -919 +920 @@
-        $row->{blog_name} = $blog ? $blog->name : '-';
-        $row->{file_name} = File::Basename::basename($row->{file_path});
+        my $meta = $obj->metadata;
-        if (-f $row->{file_path}) {
-            my @stat = stat($row->{file_path});
-            my $size = $stat[7];
-
+
+
+
-            $row->{file_size} = $size;
-            $row->{tags} = MT::Tag->join($tag_delim, $obj->tags);
-            if ($size < 1024) {
-            } elsif ($size < 1024000) {
@@ -935 +938 @@
-                $ts = $stat[10];
-                $ts = epoch2ts($blog, $ts);
+            }
+            if (my $by = $obj->created_by) {
+                my $user = MT::Author->load($by, { cached_ok => 1 });
+                $row->{created_by} = $user ? $user->name : '';
-            }
-            if ($ts) {
@@ -947 +954 @@
-            $row->{file_is_missing} = 1;
-        }
+        $row->{metadata_json} = JSON::objToJson($meta);
-    };
-
-type
-type_class($type
-archive_type} = $asset_pkg->typ
+class
+class_handler($class
+class} = $asset_pkg->class
-    } else {
-archive_type} = MT::Asset->typ
+class} = MT::Asset->class
-    }
-
-    # identifier => name
-types = MT::Asset->type_name
-type
-type (keys %$typ
-type
-type_id => $type
-type_name => $types->{$type
+classes = MT::Asset->class_label
+class
+class (keys %$class
+class
+class_id => $class
+class_label => $classes->{$class
-        };
-    }
-    # Now, sort it
-type_loop = sort { $a->{type_name} cmp $b->{type_name} } @type
+class_loop = sort { $a->{class_label} cmp $b->{class_label} } @class
-
-    $app->listing({
@@ -979 +987 @@
-                edit_blog_id => $blog_id,
-            ) : ()),
-type_loop => \@type
+class_loop => \@class
-            can_delete_files => $app->user->is_superuser,
-            nav_assets => 1,
+            has_expanded_mode => 1,
-        },
-    });
@@ -2266 +2275 @@
-        push @class_loop, {
-            class_name => $_,
-app->translate($MT::Log::Classes{$_}->class_label)
+MT::Log::Classes{$_}->class_label
-        };
-    }
@@ -2726 +2735 @@
-                $q->param($col) : $obj->$col();
-        }
+        # Make certain any blog-specific element matches the blog we're
+        # dealing with. If not, call shenanigans.
+        if (defined($blog_id) && (exists $param{blog_id}) && ($blog_id != $obj->blog_id)) {
+            return $app->error($app->translate("Invalid parameter"));
+        }
+
-        # Set type-specific display parameters
-        if ($type eq 'entry') {
@@ -3110 +3125 @@
-            $param{core_itemset_action_loop} = $core_actions || [];
-            $param{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-
-            # since MT::App::build_page clobbers it:
@@ -3177 +3192 @@
-            $param{core_itemset_action_loop} = $core_actions || [];
-            $param{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-        } elsif ($type eq 'author') {
-            # TODO: Populate permissions / blogs for this user
@@ -5213 +5228 @@
-    $param{core_itemset_action_loop} = $core_actions || [];
-    $param{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-
-    $param{saved} = $q->param('saved');
@@ -5502 +5517 @@
-
-        require MT::Asset;
-type_class('asset:
+class_handler('
-        my $asset = new $img_pkg;
-        $asset->blog_id($blog_id);
-
+#
-        $asset->file_path($t_file);
-        $asset->file_name($basename);
@@ -5513 +5528 @@
-        $asset->image_width($thumb_width);
-        $asset->image_height($thumb_height);
+        $asset->created_by($app->user->id);
-        $asset->save;
-
@@ -5575 +5591 @@
-            $url .= $rel_url_ext;
-
-type_class('asset:
+class_handler('
-            my $asset = new $img_pkg;
-            $asset->blog_id($blog_id);
@@ -5582 +5598 @@
-            $asset->file_name($basename);
-            $asset->file_ext($blog->file_extension);
+            $asset->created_by($app->user->id);
-            $asset->save;
-
@@ -6056 +6073 @@
-    $param->{commenter_table}[0]{core_itemset_action_loop} = $core_actions || [];
-    $param->{commenter_table}[0]{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    $param->{commenter_table}[0]{plugin_action_loop} = $app->plugin_actions('list_commenters') || [];
-    \@data;
@@ -6304 +6321 @@
-    $param->{template_table}[0]{core_itemset_action_loop} = $core_actions || [];
-    $param->{template_table}[0]{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    \@data;
-}
@@ -6411 +6428 @@
-    $param->{comment_table}[0]{core_itemset_action_loop} = $core_actions || [];
-    $param->{comment_table}[0]{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    \@data;
-}
@@ -6900 +6917 @@
-    $param->{ping_table}[0]{core_itemset_action_loop} = $core_actions || [];
-    $param->{ping_table}[0]{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    \@data;
-}
@@ -7252 +7269 @@
-    $param->{entry_table}[0]{core_itemset_action_loop} = $core_actions || [];
-    $param->{entry_table}[0]{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    \@data;
-}
@@ -7364 +7381 @@
-        $obj = MT::Entry->load($id)
-            || return $app->error($app->translate("No such entry."));
+        return $app->error($app->translate("Invalid parameter"))
+            unless $obj->blog_id == $blog_id;
-        return $app->error($app->translate("Permission denied."))
-            unless $perms->can_edit_entry($obj, $author);
@@ -7807 +7826 @@
-    $param{core_itemset_action_loop} = $core_actions || [];
-    $param{has_itemset_actions} =
-$plugin_actions || $core_actions
+scalar(@$plugin_actions) || scalar(@$core_actions)
-    $param{nav_categories} = 1;
-    $app->add_breadcrumb($app->translate('Categories'));
@@ -9273 +9292 @@
-    $param{is_image} = defined($w) && defined($h);
-    require File::Basename;
-$
+my $local_
-    my $ext = '';
-    if ($local_file =~ m/\.([A-Za-z]+)$/) {
@@ -9280 +9299 @@
-
-    require MT::Asset;
-type_class($param{is_image} ? 'asset:image' : 'asset
+class_handler($param{is_image} ? 'image' : 'file
-    my $asset = new $img_pkg;
-    $asset->blog_id($blog_id);
-    $asset->url($url);
-    $asset->file_path($local_file);
-
+local_
-    $asset->file_ext($ext);
-    if ($param{is_image}) {
@@ -9291 +9310 @@
-        $asset->image_height($h);
-    }
+    $asset->created_by($app->user->id);
-    $asset->save;
-
@@ -9520 +9540 @@
-    ## on it if it's there.
-    if (defined $search) {
+        my $enc = MT::ConfigMgr->instance->PublishCharset;
+        $search = MT::I18N::encode_text($search, 'utf-8', $enc) if ($enc !~ m/utf-?8/i) && ('dialog_grant_role' eq $app->param('__mode'));
-        $search = quotemeta($search) unless $is_regex;
-        $search = '(?i)' . $search unless $case;
@@ -9535 +9557 @@
-            $terms{'type'} = MT::Author::AUTHOR();
-            if ('dialog_grant_role' eq $app->param('__mode')) {
-) 
+ nickname email url)
-            } elsif ($blog_id) {
-                $args{'join'} = MT::Permission->join_on('author_id', { blog_id => $blog_id } );

branches/wheeljack/lib/MT/App/Comments.pm

@@ -633 +633 @@
-    my %params = @_;
-    require MT::Author;
-ickn
+
-                                   type => MT::Author::COMMENTER });
-    if (!$cmntr) {
@@ -647 +647 @@
-    } else {
-        $cmntr->set_values({email => $params{email},
-
+ickn
-                            password => "(none)",
-                            type => MT::Author::COMMENTER,

branches/wheeljack/lib/MT/Asset.pm

@@ -9 +9 @@
-use strict;
-use MT::Tag;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# A registry of mappings between asset identifiers and packages.
-our %Classes = (
-
+
+
-);
-our %Types = (
-
+
+
-);
+
+sub set_defaults {
+    my $obj = shift;
+    my $pkg = ref $obj;
+    $obj->class($pkg->class);
+}
+
+sub class {
+    my $pkg = shift;
+    return $pkg->SUPER::class(@_) if ref $pkg;
+    $Types{ref $pkg || $pkg} || 'file';
+}
-
-# Returns the list of registered asset identifiers for this class
-# and those that derive from it. Also includes the type of the package
-# invoked.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
-# Allows registration (or replacement) of an asset type.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -48 +117 @@
-# available, this will at least offer the generic package to access the
-# asset.)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    __PACKAGE__;
@@ -61 +133 @@
-
-# Returns a hashref of asset identifiers mapped to the localized string
-asset:
-type_name
-
- = ($pkg->type => $pkg->type_name)
-Typ
-type_class
-type} = $class->type_name
+
+class_label
+
+
+Class
+class_handler
+class} = $class->class_label
-    }
-    \%names;
-}
-
-# Initializes the MT::Asset object (which is actually a MT::FileInfo object),
-# assigning a generic asset_type to it.
-sub init {
-    my $asset = shift;
-    $asset->SUPER::init(@_);
-    my $type = $asset->type;
-    $asset->archive_type($asset->type);
-    $asset;
-}
-
-# Returns the asset type identifier; for generic MT::Asset, this is just
-# 'asset'
-sub type {
-    'asset';
-}
-
-# Returns a localized name for the asset type. For MT::Asset, this is simply
-# 'File'.
-type_name
+class_label
-    MT->translate('File');
-}
@@ -99 +155 @@
-    my $obj = shift;
-    $obj->SUPER::set_values(@_);
-at = $obj->archive_type
-type_class($a
+t = $obj->class
+class_handler($
-        bless $obj, $pkg;
-    }
-    $obj;
-}
-
-# Calls the standard MT::Object::load routine, but sets the
-# archive_type, if unset. This restricts the load to include only
-# the assets that match the package requested. Note that this will
-# exclude by default all other asset types, even if you use
-# MT::Asset->load. To include all asset types, the archive_type
-# load term should be set to the value of MT::Asset->types.
-sub load {
-    my $pkg = shift;
-    my ($terms, $args) = @_;
-    if ($terms && (!ref($terms))) {
-        $terms = { id => $terms };
-    } else {
-        $terms ||= {};
-    }
-    $terms->{archive_type} ||= $pkg->type;
-    $pkg->SUPER::load(@_);
-}
-
-# See notes for the load method.
-sub load_iter {
-    my $pkg = shift;
-    my ($terms, $args) = @_;
-    if ($terms && (!ref($terms))) {
-        $terms = { id => $terms };
-    } else {
-        $terms ||= {};
-    }
-    $terms->{archive_type} ||= $pkg->type;
-    $pkg->SUPER::load_iter(@_);
-}
-
@@ -147 +172 @@
-
-# Removes the asset, associated tags and related file.
+# TBD: Should we track and remove any generated thumbnail files here too?
-sub remove {
-    my $asset = shift;
@@ -160 +186 @@
-}
-
+sub blog {
+    my $asset = shift;
+    $asset->cache_property(sub {
+        my $blog_id = $asset->blog_id or return undef;
+        require MT::Blog;
+        MT::Blog->load($blog_id, { cached_ok => 1 });
+    });
+}
+
+# Returns a true/false response based on whether the active package
+# has extensions registered that match the requested filename.
+sub can_handle {
+    my $pkg = shift;
+    my ($filename) = @_;
+    my $ext = lc $filename;
+    $ext =~ s/.*\.//;
+    my $extensions = $pkg->extensions or return 0;
+    foreach my $this_ext (@$extensions) {
+        if (ref $this_ext eq 'Regexp') {
+            return 1 if $ext =~ m/$this_ext/;
+        } elsif ($this_ext eq $ext) {
+            return 1;
+        }
+    }
+    0;
+}
+
+# Given a filename, returns an appropriate MT::Asset class to associate
+# with it. This lookup is based purely on file extension! If none can
+# be found, it returns MT::Asset.
+sub handler_for_file {
+    my $pkg = shift;
+    my ($filename) = @_;
+    my $classes = $pkg->classes || [];
+    foreach my $class (@$classes) {
+        my $this_pkg = $pkg->class_handler($class);
+        if ($this_pkg->can_handle($filename)) {
+            return $this_pkg;
+        }
+    }
+    __PACKAGE__;
+}
+
+sub metadata {
+    my $asset = shift;
+    return {
+        MT->translate("Tags") => MT::Tag->join(',', $asset->tags),
+        url => $asset->url,
+        file => $asset->file_path,
+        name => $asset->file_name,
+        'class' => $asset->class,
+        ext => $asset->file_ext,
+        mime_type => $asset->mime_type,
+        duration => $asset->duration,
+    };
+}
+
+sub thumbnail_file {
+    undef;
+}
+
+sub stock_icon_url {
+    undef;
+}
+
+sub thumbnail_url {
+    my $asset = shift;
+    my $file_path = $asset->thumbnail_file(@_);
+    if ((defined $file_path) && (-f $file_path)) {
+        require File::Basename;
+        my ($base) = File::Basename::basename($file_path);
+        my $url = $asset->url;
+        my $file = $asset->file_name;
+        $url =~ s/%([A-F0-9]{2})/chr(hex($1))/gei;
+        $url =~ s!\Q$file\E$!$base!;
+        return $url;
+    }
+    # Use a stock icon
+    return $asset->stock_icon_url(@_);
+}
+
-1;
+
+__END__
+
+=head1 NAME
+
+MT::Asset
+
+=head1 SYNOPSIS
+
+    use MT::Asset;
+
+    # Example
+
+=head1 DESCRIPTION
+
+This module provides an object definition for a file that is placed under
+MT's control for publishing.
+
+=head1 METHODS
+
+=head2 MT::Asset->new
+
+Constructs a new asset object. The base class is the generic asset object,
+which represents a generic file.
+
+=head2 MT::Asset->handler_for_file($filename)
+
+Returns a I<MT::Asset> package suitable for the filename given. This
+determination is typically made based on the file's extension.
+
+=head1 AUTHORS & COPYRIGHT
+
+Please see the I<MT> manpage for author, copyright, and license information.
+
+=cut

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

@@ -9 +9 @@
-use base 'MT::Asset';
-
-
-
+
+
+
-}
-
-type_name
+class_label
-    MT->translate('Image');
-}
@@ -19 +20 @@
-sub metadata {
-    my $obj = shift;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-1;
+
+__END__
+
+=head1 NAME
+
+MT::Asset::Image
+
+=head1 SYNOPSIS
+
+    use MT::Asset::Image;
+
+    # Example
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 MT::Asset::Image->class
+
+Returns 'image', the identifier for this particular class of asset.
+
+=head2 MT::Asset::Image->class_label
+
+Returns the localized descriptive name for this type of asset.
+
+=head2 MT::Asset::Image->extensions
+
+Returns an arrayref of file extensions that are supported by this
+package.
+
+=head2 $asset->metadata
+
+Returns a hashref of metadata values for this asset.
+
+=head2 $asset->thumbnail_file(%param)
+
+Creates or retrieves the file path to a thumbnail image appropriate for
+the asset. If a thumbnail cannot be created, this routine will return
+undef.
+
+=head1 AUTHORS & COPYRIGHT
+
+Please see the I<MT> manpage for author, copyright, and license information.
+
+=cut

branches/wheeljack/lib/MT/Entry.pm

@@ -178 +178 @@
-    my $entry = shift;
-    $entry->cache_property('trackback', sub {
-
+
+
+
-    });
-}

branches/wheeljack/lib/MT/FileInfo.pm

@@ -14 +14 @@
-        'id' => 'integer not null auto_increment',
-        'blog_id' => 'integer not null',
+        'entry_id' => 'integer',
-        'url' => 'string(255)',
-
-
-
-
+
-        'templatemap_id' => 'integer',
-        'template_id' => 'integer',
@@ -25 +23 @@
-        'startdate' => 'string(80)',
-        'virtual' => 'boolean',
-        'image_width' => 'integer',
-        'image_height' => 'integer',
-    },
-    indexes => {
@@ -34 +30 @@
-        templatemap_id => 1,
-        url => 1,
-        file_path => 1,
-        archive_type => 1,
-    },
-    audit => 1,
-    datasource => 'fileinfo',
-    primary_key => 'id',

branches/wheeljack/lib/MT/Image.pm

@@ -53 +53 @@
-    my $image = shift;
-    eval { require Image::Magick };
-
-
+
+
+
-    1;
-}
@@ -102 +103 @@
-    my $image = shift;
-    eval { require IPC::Run };
-
-
+
+
+
-    my $pbm = $image->_find_pbm or return;
-    1;

branches/wheeljack/lib/MT/Object.pm

@@ -342 +342 @@
-sub cache_property {
-    my $obj = shift;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/wheeljack/lib/MT/ObjectDriver/DBM.pm

@@ -657 +657 @@
-        $driver->run_callbacks($class . "::pre_update", $obj, $original);
-    }
-    my $class = ref $obj;
-    delete $object_cache{$class}->{$id} if $id && exists $object_cache{$class}->{$id}; # invalidate the cache
-    $original->id($id);

branches/wheeljack/lib/MT/Template/Context.pm

@@ -160 +160 @@
-
-    if ($cat_expr) {
+        my @cols = $cat_expr =~ m!/! ? qw(category_label_path label) : qw(label);
-        my %cats_used;
-# sort in descending order by length
-if ($cat_expr =~ m!/!) {
-# add extra 'path' expression categories
-
+foreach my $col (@cols) {
+    my %cats_replaced;
+@$cats = sort {length($b->$col) <=> length($a->$col)} @$cats;
+
-            foreach my $cat (@$cats) {
-
-
-
-
-
-
-