Changeset 1122

Timestamp:

09/22/08 20:24:17 (18 months ago)

Author:

mpaschal

Message:

Merge changes to 2.1 for Sandbox plugin
Used:

svn merge -r 820:1061 http://code.sixapart.com/svn/mtplugins/branches/StyleCatcher-2.1-dev/ .

Location:

trunk/StyleCatcher

Files:

• README-StyleCatcher.txt (copied) (copied from branches/StyleCatcher-2.1-dev/README-StyleCatcher.txt)
• README.txt (deleted)
• mt-static/plugins/StyleCatcher/images/thumbnail-large.gif (copied) (copied from branches/StyleCatcher-2.1-dev/mt-static/plugins/StyleCatcher/images/thumbnail-large.gif)
• mt-static/plugins/StyleCatcher/images/thumbnail.gif (copied) (copied from branches/StyleCatcher-2.1-dev/mt-static/plugins/StyleCatcher/images/thumbnail.gif)
• plugins/StyleCatcher/lib/StyleCatcher/CMS.pm (modified) (13 diffs)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/de.pm (modified) (1 prop)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/es.pm (modified) (1 prop)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/fr.pm (modified) (1 prop)
• plugins/StyleCatcher/lib/StyleCatcher/L10N/nl.pm (modified) (1 prop)
• plugins/StyleCatcher/tmpl/view.tmpl (modified) (4 diffs)

trunk/StyleCatcher/plugins/StyleCatcher/lib/StyleCatcher/CMS.pm

@@ -9 +9 @@
 use strict;
 use File::Basename qw(basename);
+
+use MT::Util qw( remove_html decode_html );
 
 our $DEFAULT_STYLE_LIBRARY;
@@ -142 +144 @@
 }
 
+sub files_from_response {
+    my ($res, %param) = @_;
+
+    my $extensions = $param{css} ? qr{ (?:gif|jpe?g|png|css) }xms
+                   :               qr{ (?:gif|jpe?g|png)     }xms
+                   ;
+
+    my $stylesheet = $res->content;
+    $stylesheet =~ s!/\*.*?\*/!!gs;    # strip all comments first
+    my @images = $stylesheet =~ m{
+        \b url\( \s*                          # opening url() reference
+        ['"]?
+        ( [\w\.\-/]+\.$extensions )  # a filename ending in an image extension
+        ['"]?
+        \s* \)                                # close of url() reference
+    }xmsgi;
+
+    return @images;
+}
+
+sub download_theme {
+    my $app = shift;
+    my ($url) = @_;
+
+    my $static_path = $app->static_file_path;
+    my $themeroot   = File::Spec->catdir($static_path, 'support', 'themes');
+    my $ua          = $app->new_ua();
+    my $filemgr     = file_mgr()
+        or return;
+
+    my @url = split( /\//, $url );
+    my $stylesheet_filename = pop @url;
+    my $theme_url = join(q{/}, @url) . '/';
+
+    my ($basename, $extension) = split /\./, $stylesheet_filename;
+    if ($basename eq 'screen' || $basename eq 'style') {
+        $basename = $url[-1];
+    }
+
+    # Pick up the stylesheet
+    my $stylesheet_res = $ua->get($url);
+
+    my @images = files_from_response($stylesheet_res, css => 1);
+
+    my $theme_path = File::Spec->catdir($themeroot, $basename);
+    if (!$filemgr->mkpath($theme_path)) {
+        my $error = $app->translate("Could not create [_1] folder - Check that your 'themes' folder is webserver-writable.",
+            $basename);
+        return $app->json_error($error);
+    }
+
+    $filemgr->put_data( $stylesheet_res->content,
+        File::Spec->catfile($theme_path, $basename . '.css') );
+
+    # Pick up the images we parsed earlier and write them to the theme folder
+    my %got_files;
+    my @files = ('thumbnail.gif', 'thumbnail-large.gif', @images);
+    FILE: while (my $rel_url = shift @files) {
+        # Is this safe to get?
+        my $full_url = URI->new_abs($rel_url, $theme_url);
+        next FILE if !$full_url;
+        my $url = $full_url->as_string();
+        next FILE if $url !~ m{ \A \Q$theme_url\E }xms;
+
+        next FILE if $got_files{$url};
+        $got_files{$url} = 1;
+        my $res = $ua->get($url);
+
+        # Skip files that don't download; we were accidentally doing so already.
+        next FILE if !$res->is_success();
+
+        my $canon_rel_url = URI->new($rel_url)->rel($theme_url);
+        my @image_path = split /\//, $canon_rel_url->as_string();
+        my $image_filename = pop @image_path;
+
+        my $image_path = File::Spec->catdir($theme_path, @image_path);
+        if (!$filemgr->exists($image_path) && !$filemgr->mkpath($image_path)) {
+            my $error = $app->translate("Could not create [_1] folder - Check that your 'themes' folder is webserver-writable.",
+                $basename);
+            return $app->json_error($error);
+        }
+
+        my $image_full_path = File::Spec->catfile($image_path, $image_filename);
+        $filemgr->put_data($res->content, $image_full_path, 'upload')
+          or return $app->json_error( $filemgr->errstr );
+
+        if ($image_filename =~ m{ \.css \z }xmsi) {
+            my @new_files = files_from_response($res, css => 0);
+            # Schedule these as full URLs so relative references aren't
+            # misabsolved relative to the theme directory.
+            @new_files = map {
+                my $uri = URI->new_abs($_, $url);
+                $uri ? $uri->as_string() : ();
+            } @new_files;
+            push @files, @new_files;
+        }
+    }
+
+    return $basename;
+}
+
 # does the work after user selects a particular theme to apply to a blog
 sub apply {
     my $app = shift;
 
-    my $blog_id = $app->param('blog_id');
-    my $url     = $app->param('url');
-    my $layout  = $app->param('layout');
-    my $name    = $app->param('name');
+    my ($blog_id, $url, $layout, $name, $template_set)
+        = map { $app->param($_) || q{} } (qw( blog_id url layout name template_set ));
 
     # Load the default stylesheet for this blog
@@ -163 +264 @@
     }
 
-    my $themeroot =
-      File::Spec->catdir( $static_path, 'support', 'themes' );
-    my $webthemeroot = $app->static_path . 'support/themes/';
-    my $mtthemeroot  = $app->static_path . 'themes/';
-    my $mtthemebase  = $app->static_path . 'themes-base/';
-
-    # Break up the css url in to a couple useful pieces
-    my @url = split( /\//, $url );
-
     # if this isn't a local url, then we have to grab some files from
     # yonder...
-    my $filemgr = file_mgr()
-      or return $app->json_error( MT::FileMgr->errstr );
-
-    if ( $url !~ m/^(\Q$webthemeroot\E|\Q$mtthemeroot\E)/ ) {
-        my $new_url = '';
-
-        for (0..(scalar(@url)-2)) {
-            $new_url .= $url[$_] . '/';
-        }
-        my ( $basename, $extension ) = split( /\./, $url[-1] );
-        if ($basename eq 'screen') {
-            $basename = $url[-2];
-        }
-
-        # Pick up the stylesheet
-        my $user_agent  = $app->new_ua;
-        my $css_request = HTTP::Request->new( GET => $url );
-        my $response    = $user_agent->request($css_request);
-
-        # Pick up the thumbnail and thumbnail-large
-        my $thumbnail_request =
-          HTTP::Request->new( GET => $new_url . "thumbnail.gif" );
-        my $thumbnail_response = $user_agent->request($thumbnail_request);
-        my $thumbnail_large_request =
-          HTTP::Request->new( GET => $new_url . "thumbnail-large.gif" );
-        my $thumbnail_large_response =
-          $user_agent->request($thumbnail_large_request);
-
-        # Parse out image filenames in the css and then write out the css file
-        # and thumbnails to our theme folder
-        my $content = $response->content;
-        $content =~ s!/\*.*?\*/!!gs;    # strip all comments first
-        my @images = $content =~
-          m/\b(?:url\(\s*)([a-zA-Z0-9_.-]+\.(?:gif|jpe?g|png))(?:\s*?\))/gi;
-        $filemgr->mkpath( File::Spec->catdir( $themeroot, $basename ) )
-          or return $app->json_error(
-            $app->translate(
-"Could not create [_1] folder - Check that your 'themes' folder is webserver-writable.",
-                $basename
-            )
-          );
-        $filemgr->put_data( $response->content,
-            File::Spec->catfile( $themeroot, $basename, $basename . '.css' ) );
-        if (($thumbnail_response->code >= 200) && ($thumbnail_response->code < 400)) {
-        $filemgr->put_data( $thumbnail_response->content,
-            File::Spec->catfile( $themeroot, $basename, "thumbnail.gif" ),
-            'upload' );
-        } else {
-            return $app->json_error($app->translate("Error downloading image: [_1]", $new_url . 'thumbnail.gif'))
-        }
-        if (($thumbnail_large_response->code >= 200) && ($thumbnail_large_response->code < 400)) {
-            $filemgr->put_data(
-                $thumbnail_large_response->content,
-                File::Spec->catfile( $themeroot, $basename, "thumbnail-large.gif" ),
-                'upload'
-            );
-        } else {
-            return $app->json_error($app->translate("Error downloading image: [_1]", $new_url . 'thumbnail-large.gif'))
-        }
-
-       # Pick up the images we parsed earlier and write them to the theme folder
-        for my $image_url (@images) {
-            my $image_request =
-              HTTP::Request->new( GET => $new_url . $image_url );
-            my $image_response = $user_agent->request($image_request);
-
-            my @image_url = split( /\//, $image_url );
-            my $image_filename = $image_url[-1];
-
-            if (($response->code >= 200) && ($response->code < 400)) {
-                $filemgr->put_data( $image_response->content,
-                    File::Spec->catfile( $themeroot, $basename, $image_filename ),
-                    'upload' )
-                  or return $app->json_error( $filemgr->errstr );
-            } else {
-                return $app->json_error($app->translate("Error downloading image: [_1]", $new_url . $image_url));
-            }
-        }
-        $url = "$webthemeroot$basename/$basename.css";
-    }
-    
+    my $static_url = $app->static_path;
+    if ( $url !~ m{ \A \Q$static_url\E (?:support/)? themes/ }xms ) {
+        my $basename = download_theme($app, $url)
+            or return;
+        $url = "${static_url}support/themes/$basename/$basename.css";
+    }
+
+    my $blog = MT->model('blog')->load($blog_id)
+      or return $app->json_error( $app->translate('No such blog [_1]', $blog_id) );
+    my $blog_tset = $blog->template_set;
+    my $base_css_url = MT->registry('template_sets')->{$blog_tset}->{base_css};
+
+    my $base_css = q{};
+    if ($base_css_url) {
+        my $uri = URI->new_abs($base_css_url, $app->static_path);
+        $base_css = '@import url(' . $uri->as_string() . ');'
+            if $uri;
+    }
     my $blog = MT->model('blog')->load($blog_id)    
       or return $app->json_error( $app->translate('No such blog [_1]', $blog_id) );
-
-    my $r = MT->registry;
-    my $base_css = $r->{"template_sets"}{$blog->template_set}{"base_css"};
 
     # Replacing the theme import or adding a new one at the beginning
     my $template_text  = $tmpl->text();
     my $replaced       = 0;
-    my $header =
-'/* This is the StyleCatcher theme addition. Do not remove this block. */';
+    my $header = '/* This is the StyleCatcher theme addition. Do not remove this block. */';
     my $footer = '/* end StyleCatcher imports */';
-    my $styles = $header . "\n";
-    $styles .= "\@import url(".MT::Util::caturl($app->static_path, $base_css).");\n" if $base_css;
-    $styles .= "\@import url($url);\n";
-    $styles .= $footer;
-    print STDERR "styles=$styles\n";
-
+    my $styles = <<"EOT";
+$header
+$base_css
+\@import url($url);
+$footer
+EOT
     if ($template_text =~ s/\Q$header\E.*\Q$footer\E/$styles/s) {
         $tmpl->text( $template_text );
@@ -406 +431 @@
         $tmpl = new MT::Template;
         $tmpl->blog_id($blog_id);
+        $tmpl->name('Stylesheet');
+        $tmpl->type('index');
         $tmpl->identifier('styles');
         $tmpl->outfile("styles.css");
@@ -439 +466 @@
     if ( $type =~ m!^text/css! ) {
         $data->{auto}{url} = $url;
-        my $theme = fetch_theme( $url, ['collection:auto'] );
+        my $theme = fetch_theme(
+            url  => $url,
+            tags => ['collection:auto'],
+        );
         $data->{themes} = [$theme];
     }
@@ -475 +505 @@
         my $themes = [];
         for my $repo_theme (@repo_themes) {
-            my $theme = fetch_theme( $repo_theme, [] );
+            my $theme = fetch_theme(
+                url => $repo_theme,
+            );
             push @$themes, $theme if $theme;
         }
@@ -547 +579 @@
         next unless -d $theme;
         $theme =~ s/.*[\\\/]//;
-        $themes->{$theme} =
-          fetch_theme( $theme_dir, ['collection:mt-designs'], $theme_url,
-            $theme_dir );
+        $themes->{$theme} = fetch_theme(
+            url      => $theme_dir,
+            tags     => ['collection:mt-designs'],
+            baseurl  => $theme_url,
+            basepath => $theme_dir,
+        );
         $themes->{$theme}{name} = $themes->{$theme}{name};
         $themes->{$theme}{prefix} = 'default';
@@ -564 +599 @@
         next unless -d $theme;
         $theme =~ s/.*[\\\/]//;
-        $themes->{$theme} =
-          fetch_theme( $theme_dir, ['collection:my-designs'] );
+        $themes->{$theme} = fetch_theme(
+            url  => $theme_dir,
+            tags => ['collection:my-designs'],
+        );
         $themes->{$theme}{prefix} = 'local';
     }
@@ -579 +616 @@
 sub fetch_theme {
     my $app = MT->app;
-    my ( $url, $tags, $baseurl, $basepath ) = @_;
+    my %param = @_;
+    my ($url, $tags, $baseurl, $basepath, $default_metadata)
+        = @param{qw( url tags baseurl basepath metadata )};
+    $tags ||= [];
 
     my $theme;
@@ -585 +625 @@
     my $new_url;
     my $themeroot;
-    if ( $url =~ m/^https?:/i ) {
-
+    my $url_is_web = $url =~ m{ \A https?: }xms ? 1 : 0;
+    if ($url_is_web) {
         # Pick up the css file
         my $user_agent  = $app->new_ua;
@@ -597 +637 @@
         $theme = $url;
         # discard any generic 'screen.css' filename
-        $theme =~ s!/screen.css$!!;
+        $theme =~ s{ / (?:screen|style) \.css \z }{}xms;
         $theme =~ s/.*[\\\/]//;
         my @url = split( /\//, $url );
@@ -618 +658 @@
         }
         else {
-            $file = File::Spec->catfile( $url, "screen.css" );
+            $file = File::Spec->catfile( $url, $theme, "screen.css" );
             if ( -e $file ) {
                 $stylesheet = file_mgr()->get_data($file);
@@ -664 +704 @@
     }
 
-    my $thumbnail_link;
-    $thumbnail_link = $new_url . 'thumbnail.gif';
-    my $thumbnail_large_link;
-    $thumbnail_large_link = $new_url . 'thumbnail-large.gif';
+    my %thumbnails;
+    THUMB: for my $thumb (qw( thumbnail thumbnail_large )) {
+        $thumbnails{$thumb} = $metadata{$thumb};
+        next THUMB if $thumbnails{$thumb};
+
+        my $thumb_filename = $thumb;
+        $thumb_filename =~ tr/_/-/;
+        $thumb_filename .= '.gif';
+
+        if ($url_is_web) {
+            my $thumb_url = $new_url . $thumb_filename;
+
+            my $user_agent  = $app->new_ua;
+            my $css_request = HTTP::Request->new( HEAD => $thumb_url );
+            my $response    = $user_agent->request($css_request);
+            if ($response->is_success()) {
+                $thumbnails{$thumb} = $thumb_url;
+            }
+        }
+        else {
+            my $thumb_path = File::Spec->catfile($themeroot, $theme,
+                $thumb_filename);
+            if (-e $thumb_path) {
+                $thumbnails{$thumb} = $new_url . $thumb_filename;
+            }
+        }
+
+        $thumbnails{$thumb} ||= $app->static_path . 'plugins/StyleCatcher/'
+            . 'images/' . $thumb_filename;
+    }
+
+    my %field_map = (
+        title        => [ 'name',         'theme name' ],
+        author       => [ 'designer',     'author' ],
+        author_url   => [ 'designer_url', 'author_url', 'author uri' ],
+        template_set => [ 'template_set', 'template' ],
+        description  => [ 'description' ],
+    );
+    while (my ($best_name, $possible_names) = each %field_map) {
+        ($metadata{$best_name}) = grep { defined }
+            delete @metadata{ @$possible_names }, q{};
+        $metadata{$best_name} = decode_html(remove_html($metadata{$best_name}));
+    }
 
     require MT::Util;
     my $data = {
-        name        => $theme,
-        description => $metadata{description} || '',
-        title       => $metadata{name} || '(Untitled)',
-        url         => $url,
-        imageSmall  => $thumbnail_link,
-        imageBig    => $thumbnail_large_link,
-        author      => $metadata{designer} || $metadata{author} || '',
-        author_url  => $metadata{designer_url} || $metadata{author_url} || '',
-        author_affiliation => $metadata{author_affiliation} || '',
-        layouts            => $metadata{layouts} || '',
-        'sort'             => $metadata{name} || '',
-        tags               => $tags,
-        blogs              => [],
+        name         => $theme,
+        description  => $metadata{description} || q{},
+        title        => $metadata{title} || '(Untitled)',
+        url          => $url,
+        imageSmall   => $thumbnails{thumbnail},
+        imageBig     => $thumbnails{thumbnail_large},
+        layouts      => $metadata{layouts} || q{},
+        sort         => $metadata{name} || $theme || q{},
+        tags         => $tags,
+        blogs        => [],
+        author       => $metadata{author},
+        author_url   => $metadata{author_url},
+        template_set => $metadata{template_set},
+        author_affiliation => $metadata{author_affiliation} || q{},
     };
     $data;

trunk/StyleCatcher/plugins/StyleCatcher/tmpl/view.tmpl

@@ -29 +29 @@
         "layout-wtt": "<__trans phrase="3-Columns, Wide, Thin, Thin" escape="js">",
         "layout-twt": "<__trans phrase="3-Columns, Thin, Wide, Thin" escape="js">",
+        "layout-ttw": "<__trans phrase="3-Columns, Thin, Thin, Wide" escape="js">",
         "layout-tw": "<__trans phrase="2-Columns, Thin, Wide" escape="js">",
         "layout-wt": "<__trans phrase="2-Columns, Wide, Thin" escape="js">",
         "layout-wm": "<__trans phrase="2-Columns, Wide, Medium" escape="js">",
-        "layout-mw": "<__trans phrase="2-Columns, Medium, Wide" escape="js">"
+        "layout-mw": "<__trans phrase="2-Columns, Medium, Wide" escape="js">",
+        "layout-w-b": "<__trans phrase="1-Column, Wide, Bottom" escape="js">"
     };
 
@@ -76 +78 @@
         mixer = new TC.Mixer();
         // initialize mixer object
-        mixer.addSelectedDisplay( "display-details-content" );
+        var display = mixer.addSelectedDisplay( "display-details-content" );
+        display.entryProperties['template_set'] = 'Template Set';
         mixer.onselect = selectDesign;
     }
@@ -225 +228 @@
         selected = mixer.name;
         var url = mixer.entries[mixer.name].url;
+        var tset = mixer.entries[mixer.name].template_set;
 
         TC.addClassName(btn, "disabled-button");
@@ -235 +239 @@
             'magic_token': '<mt:var name="magic_token">',
             'blog_id': blog_id,
-            'name': mixer.name
+            'name': mixer.name,
+            'template_set': tset
         };
         if (layout)