split /pigs/ after all...

commands/images.rb

@@ -4,24 +4,28 @@ usage       'images'
 summary     'prepares images'
 description 'Prepares images for uploads, i.e. strips them of metadata, compresses them and so on.'
 
+required :s, :sites, 'sites'
+
 module Nanoc::CLI::Commands
   class Images < ::Nanoc::CLI::CommandRunner
     def run
-      img_dir = "content/pigs"
+      sites_arg(options[:sites]).each do |site|
-      exts = "{" + %w{jpg png gif}.join(",") + "}"
+        img_dir = "content_#{site}/pigs"
-      
+        exts = "{" + %w{jpg png gif}.join(",") + "}"
-      # resize all large images
+        
-      Dir["#{img_dir}/*.#{exts}"].select {|f| ImageSize.new(IO.read(f)).width > 400}.map do |img|
+        # resize all large images
-        small_img = img.gsub /^(.+)\.(\w+)$/, '\1_small.\2'
+        Dir["#{img_dir}/*.#{exts}"].select {|f| ImageSize.new(IO.read(f)).width > 400}.map do |img|
+          small_img = img.gsub /^(.+)\.(\w+)$/, '\1_small.\2'
 
-        next if File.exists? small_img and File.mtime(small_img) >= File.mtime(img)
+          next if File.exists? small_img and File.mtime(small_img) >= File.mtime(img)
 
-        puts "resizing #{img}..."
+          puts "resizing #{img}..."
-        system "convert -resize '400' #{img} #{small_img}"
+          system "convert -resize '400' #{img} #{small_img}"
+        end
+
+        # strip exif
+        system "exiftool -all= -overwrite_original #{img_dir}/*.#{exts}"
       end
-
-      # strip exif
-      system "exiftool -all= -overwrite_original #{img_dir}/*.#{exts}"
     end
   end
 end

commands/sites.rb

@@ -44,11 +44,6 @@ module ::Nanoc
         }
       }
 
-      # only upload pigs for main site
-      unless $site == "muflax"
-        @config[:deploy][:default][:options] << "--exclude=pigs/"
-      end
-
       @config[:watcher][:dirs_to_watch] << "content_#{site}"
 
       @config[:base_url] = self.url

content/htaccess.erb

@@ -12,11 +12,6 @@ RewriteEngine on
 # don't alienate people who use the old feed
 RewriteRule ^feed/? /rss.xml
 
-<% unless @site.main_site? %>
-# store pigs in central site
-RewriteRule ^pigs/(.+)$ http://muflax.com/pigs/$1 [L]
-<% end %>
-
 # redirect old wordpress links
 <% @site.slug_items.each do |item| %>RewriteRule ^<%= item[:slug].chop %> <%= item.identifier%>
 <% end %>

lib/embed.rb

@@ -1,17 +1,18 @@
 require 'image_size'
+require 'set'
 
 def image(name, title="", link=nil)
   # all images are stored at content/pigs and only the main site routes them
   ret = ""
 
   # read image size
-  img = ImageSize.new IO.read("content/pigs/#{name}")
+  img = ImageSize.new IO.read("content_#{$site}/pigs/#{name}")
-
+  
   # if it's too large, redirect to smaller version (which is generated with 'nanoc images')
   if img.width > 400 and not name.end_with? ".gif"
     link = "/pigs/#{name}" if link.nil? # link to big version
     name.gsub! /^(.+)\.(\w+)$/, '\1_small.\2'
-    img = ImageSize.new IO.read("content/pigs/#{name}") # re-read image
+    img = ImageSize.new IO.read("content_#{$site}/pigs/#{name}") # re-read image
   end
 
   ret += "<a href='#{link}'>" unless link.nil?