split /pigs/ after all...
|
@ -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"
|
||||
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|
|
||||
small_img = img.gsub /^(.+)\.(\w+)$/, '\1_small.\2'
|
||||
sites_arg(options[:sites]).each do |site|
|
||||
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|
|
||||
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}..."
|
||||
system "convert -resize '400' #{img} #{small_img}"
|
||||
puts "resizing #{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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 %>
|
||||
|
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 157 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 148 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 284 KiB |
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 111 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 589 B |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 200 KiB After Width: | Height: | Size: 200 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 113 KiB |
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 135 KiB |
Before Width: | Height: | Size: 91 KiB After Width: | Height: | Size: 91 KiB |
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 169 KiB |
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 272 KiB After Width: | Height: | Size: 272 KiB |
Before Width: | Height: | Size: 162 KiB After Width: | Height: | Size: 162 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 123 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
@ -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?
|
||||
|
|