lib/picolena/config/thumbnails.yml lib/picolena/templates/config/initializers/009_load_thumbnail_config.rb @@ -14,6 +14,7 @@ lib/picolena/config/environment.rb lib/picolena/config/icons_and_filetypes.yml lib/picolena/config/indexed_directories.yml lib/picolena/config/indexing_performance.yml +lib/picolena/config/thumbnails.yml lib/picolena/config/title_and_names_and_links.yml lib/picolena/config/white_list_ip.yml lib/picolena/picolena_generator.rb @@ -46,6 +47,7 @@ lib/picolena/templates/config/initializers/005_load_plain_text_extractors.rb lib/picolena/templates/config/initializers/006_load_custom_title_and_names_and_links.rb lib/picolena/templates/config/initializers/007_load_icons.rb lib/picolena/templates/config/initializers/008_load_performance_tweaks.rb +lib/picolena/templates/config/initializers/009_load_thumbnail_config.rb lib/picolena/templates/config/routes.rb lib/picolena/templates/db/migrate/20090213234937_create_documents.rb lib/picolena/templates/db/schema.rb @@ -71,6 +73,7 @@ lib/picolena/templates/lib/plain_text_extractors/pictures.rb lib/picolena/templates/lib/plain_text_extractors/plain_text.rb lib/picolena/templates/lib/plain_text_extractors/rar.rb lib/picolena/templates/lib/plain_text_extractors/videos.rb +lib/picolena/templates/lib/plain_text_extractors/win.exe.todo lib/picolena/templates/lib/plain_text_extractors/zip.rb lib/picolena/templates/lib/tasks/annotations.rake lib/picolena/templates/lib/tasks/extract.rake Manifest.txt @@ -7,6 +7,7 @@ lib/picolena/templates/config/custom/white_list_ip.yml lib/picolena/templates/config/custom/title_and_names_and_links.yml lib/picolena/templates/config/custom/icons_and_filetypes.yml lib/picolena/templates/config/custom/indexing_performance.yml +lib/picolena/templates/config/custom/thumbnails.yml lib/picolena/templates/config/database.yml lib/picolena/templates/config/development.sphinx.conf lib/picolena/templates/config/test.sphinx.conf config/files_to_clean @@ -70,6 +70,7 @@ class PicolenaGenerator < RubiGen::Base #:nodoc: m.file '../config/icons_and_filetypes.yml', 'config/custom/icons_and_filetypes.yml' m.file '../config/indexing_performance.yml', 'config/custom/indexing_performance.yml' m.template '../config/database.yml', 'config/database.yml', :assigns => {:user => ENV['USER']} + m.template '../config/thumbnails.yml', 'config/custom/thumbnails.yml' # README, License & Rakefile m.file 'MIT-LICENSE', 'LICENSE' lib/picolena/picolena_generator.rb @@ -49,7 +49,7 @@ class Document < ActiveRecord::Base def extract_doc_info!(truncate=false) self.cache_content, self.language = extract_content_and_language(truncate) - extract_thumbnail + extract_thumbnail if Picolena::Thumbnail::Extract self.cache_mtime = mtime end lib/picolena/templates/app/models/document.rb @@ -129,7 +129,8 @@ class PlainTextExtractor # Replaces generic command with specific source and thumbnail (if specified) files def specific_thumbnail_command - thumbnail_command.sub('SOURCE','"'<<source<<'"').sub('THUMBNAIL','"'<<File.thumbnail_path(source)<<'"') + #TODO: DRY! + thumbnail_command.sub('SOURCE','"'<<source<<'"').sub('THUMBNAIL','"'<<File.thumbnail_path(source)<<'"').sub('QUALITY','"'<<Picolena::Thumbnail::Quality<<'"').sub('WIDTH','"'<<Picolena::Thumbnail::Width<<'"').sub('HEIGHT','"'<<Picolena::Thumbnail::Height<<'"') end end lib/picolena/templates/app/models/plain_text_extractor.rb @@ -5,7 +5,7 @@ PlainTextExtractor.new { #NOTE: PSD gets its own Extractor since convert method is different from one-layer pictures # and needs -flatten option - extract_thumbnail_with 'convert SOURCE -flatten -thumbnail 80x80 -quality 50 THUMBNAIL' + extract_thumbnail_with 'convert SOURCE -flatten -thumbnail WIDTHxHEIGHT -quality QUALITY THUMBNAIL' extract_content_with 'exiftool SOURCE' which_should_for_example_extract '"Adobe Photoshop CS2 Windows" 584x150', :from => 'picolena.psd' lib/picolena/templates/lib/plain_text_extractors/adobe.photoshop.rb @@ -14,7 +14,7 @@ PlainTextExtractor.new { extract_thumbnail_with {|source, destination| wmf_pics_inside_rtf=Dir.glob("#{RAILS_ROOT}/pict*.wmf") unless wmf_pics_inside_rtf.empty? - silently_execute("convert -quality 50 -thumbnail 80x80 #{wmf_pics_inside_rtf.first} #{destination}") + silently_execute("convert -quality #{Picolena::Thumbnail::Quality} -thumbnail #{Picolena::Thumbnail::Width}x#{Picolena::Thumbnail::Height} #{wmf_pics_inside_rtf.first} #{destination}") wmf_pics_inside_rtf.each{|f| FileUtils.rm f} end } lib/picolena/templates/lib/plain_text_extractors/ms.rtf.rb @@ -3,7 +3,7 @@ PlainTextExtractor.new { as "image/*" aka "some picture" - extract_thumbnail_with 'convert -quality 50 -thumbnail 80x80 SOURCE THUMBNAIL' + extract_thumbnail_with 'convert -quality QUALITY -thumbnail WIDTHxHEIGHT SOURCE THUMBNAIL' extract_content_with 'exiftool SOURCE' which_should_for_example_extract 'Eric Duminil Nikon D90' , :from => 'crow.jpg' lib/picolena/templates/lib/plain_text_extractors/pictures.rb @@ -6,7 +6,7 @@ PlainTextExtractor.new { as "video/*" aka "some video" - extract_thumbnail_with 'ffmpegthumbnailer -i SOURCE -o THUMBNAIL' + extract_thumbnail_with 'ffmpegthumbnailer -s WIDTH -i SOURCE -o THUMBNAIL' extract_content_with 'exiftool SOURCE' which_should_for_example_extract '(1.96s OR (1.96 s)) AND 320x200 AND Duration AND Image Size', :from => 'badminton.avi' lib/picolena/templates/lib/plain_text_extractors/videos.rb @@ -145,7 +145,7 @@ describe Document do doc=Document["spec/test_dirs/indexed/media/badminton.avi"] doc.icon_path.should_not be_nil doc.icon_path.should == "thumbnails/#{doc.probably_unique_id}.jpg" - end + end if Picolena::Thumbnail::Extract it "should know its icon_path if an icon if available for its mimetype" do doc=Document["spec/test_dirs/indexed/others/xor.vee"] lib/picolena/templates/spec/models/document_spec.rb @@ -27,7 +27,7 @@ describe "PlainTextExtractors" do end end - if extractor.thumbnail_command then + if Picolena::Thumbnail::Extract && extractor.thumbnail_command then doc=Document.find_by_extension(ext) if doc then it should_extract_thumbnail do lib/picolena/templates/spec/models/plain_text_extractor_spec.rb bd37d7de88305f26754ac904cc31516c310d6fbc Eric Duminil eric.duminil@gmail.com http://github.com/EricDuminil/picolena/commit/93c91558641a5f43be899c9f16ef720ac5d9f5b8 93c91558641a5f43be899c9f16ef720ac5d9f5b8 2009-03-27T09:24:32-07:00 2009-03-27T09:24:32-07:00 Thumbnail size & quality as parameter in config/custom/thumbnails.yml 87532020a8dc0c7c74de72586908e930acb6dfee Eric Duminil eric.duminil@gmail.com