Piggy 0.5.0.0 → 0.5.1.2

data/CHANGES.txt

@@ -1,3 +1,34 @@
+Changes in 0.5.1-2
+- Save/load album list with comment and rotations
+- Separate width option for widescreen images
+  (ignored when image processing is done by nconvert)
+- Slideshow startable from any image page
+- Bugfix: JavaFX version info in about dialog
+- New style: snowwoman
+- New style: cappuccinoheart
+
+Changes in 0.5.1-1
+- Bugfix: browsers located in C:\Program Files (x86)\...
+- Logging times
+- New style: glitter balls
+- New style: snowman
+- New style: candle
+- New style: snow
+Changes in 0.5.1-0
+- Sort by time of photo creation before generation
+  (includes workaround for missing time information)
+- Support different naming patterns (different cameras)
+- Added slideshow version info
+- Updated to JavaFX 1.3
+- Revert to using doubleclick for directory changes
+- Bugfix: Encoding error for rotation info
+- Bugfix: Exception in FTP-browser (sending #mtime to nil)
+- Bugfix: Open file dialog (fxruby api change)
+- Bugfix: Directories with special characters (in FTP browser)
+- New style "qualle"
+- New style "feuerzangenbowle"
+- Completed options dialog
+
 Changes in 0.5.0-0
 - Ftp: Abort upload
 - Ftp: Delete directories (if empty)

data/README.txt

@@ -19,9 +19,8 @@ Piggy uses exif metainfo to guess initial rotations and comments.
 Limitations
 -----------
 
-Piggy is currently developed under Windows Vista.
-Additional tests include Windows XP and Linux.
-It is not tested on Mac.
+Piggy is currently developed under Windows 7.
+It is not properly tested on other platforms
 
 Piggy is not meant as general purpose tool for image manipulations:
 - Image rotation reduces the quality of the image
@@ -36,7 +35,6 @@ for more information on this topic.)
 
 Piggy output optionally contains Javascript and Java FX Script.
 Note that JavaFX is relatively new technology with several bugs.
-For example Version 1.2 seems to prevent the Opera browser from shutting
-down the opera process.
+
 
 

data/lib/piggy-core/album.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+#$Id: options_persistence.rb 161 2006-12-23 15:41:01Z Sascha $
+
+# Album information containing file list, comments and rotations
+
+class Album
+   attr_accessor(:path, :file_infos)
+end

data/lib/piggy-core/exifr_adapter.rb

@@ -17,7 +17,10 @@ class ExifrAdapter
   def comment
     return '' unless @exif
     c = @exif.comment.class == String ? @exif.comment : @exif.comment.to_s
-    return c.gsub(/\0/, '')
+	  c = c.gsub(/\0/, '')
+	  # m = @exif.make.class == String ? @exif.make : @exif.make.to_s
+	  # m = m.gsub(/\0/, '')
+	  # return "#{c} Made with #{m}"
   end
 
   def to_s
@@ -27,7 +30,7 @@ class ExifrAdapter
     desc += "\twidth: #{@exif.width.to_s}\n"
     desc += "\tbits: #{@exif.bits.to_s}\n"
     if @exif.comment.class == String
-      desc += "\tcomment: #{@exif.comment}\n"
+      desc += "\tcomment: #{comment}\n"
     elsif @exif.comment.class == Array
       desc += "\tcomments: "
       @exif.comment.each { |c|
@@ -50,6 +53,11 @@ class ExifrAdapter
     return image_mock.degree
   end
 
+  def date_time
+    return nil unless exif?
+    @exif.date_time_original
+  end
+  
   def width
     exif? ? @exif.width : 0
   end

data/lib/piggy-core/file_info.rb

@@ -126,15 +126,20 @@ class FileInfo < FileName
 end
 
 class CommentedFile < FileInfo
-  attr_accessor(:comment, :rotation, :width, :height)
+  attr_accessor(:comment, :rotation, :width, :height, :date_time)
 
   def initialize(the_name, the_path = '', the_comment = '')
     super(the_name, the_path)
     @comment = the_comment
+    @date_time = nil
     @rotation = 0
     @width = 0
     @height = 0
   end
+  
+  def time
+    @date_time.nil? ? @ctime : @date_time
+  end
 
   def rotate?
     @rotation && @rotation != 0

data/lib/piggy-core/options.rb

@@ -7,7 +7,8 @@ require 'piggy-core/winshell'
 class PiggyOptions
   attr_accessor(:usePreview, :useLog, 
     :thumbWidth, :thumbHeight, :imageWidth, :imageHeight,
-    :generateFramePage, :useTable,
+    :widescreenWidth,
+    :generateFramePage, :useTable, :sortOrder,
     :localDestinationPath, :remoteDestinationPath,
     :ftpUser, :ftpHost, :ftpHasLocaltime,
     :ftpConnectionTimeout, :ftpTransferTimeout,
@@ -16,14 +17,18 @@ class PiggyOptions
 		:slideshowDelay, 
 		:style, :stylesSample, :skipImageProcessing,
 		:browser,
-    :excludeFilters,
+    :useExifComments, :excludeFilters, :namingPatterns,
     :debug)
   
   # possible values for @image_processor
   ProcessorNconvert = 'nconvert'
   ProcessorFxruby = 'fxruby'
   ProcessorRmagick = 'rmagick'
-  
+
+  # possible values for @sort_order
+  SortByTime = 'time'
+  SortByName = 'name'
+
   def initialize
     @usePreview = nil
     @useLog = nil
@@ -32,6 +37,7 @@ class PiggyOptions
     @thumbWidth = nil
     @thumbHeight = nil
     @imageWidth = nil
+    @widescreenWidth = nil
     @imageHeight = nil
     @generateFramePage = nil
     @useTable = nil
@@ -51,7 +57,10 @@ class PiggyOptions
     @debug = nil
     @browser = nil
     @stylesSample = nil
+    @useExifComments = nil
     @excludeFilters = nil
+    @namingPatterns = nil
+    @sortOrder = nil
     initialize_nils_with_default
   end
   
@@ -67,6 +76,7 @@ class PiggyOptions
     @thumbWidth = 100 if @thumbWidth.nil?
     @thumbHeight = 100 if @thumbHeight.nil?
     @imageWidth = 600 if @imageWidth.nil?
+    @widescreenWidth = 700 if @widescreenWidth.nil?
     @imageHeight = 520 if @imageHeight.nil?
     @generateFramePage = false if @generateFramePage.nil?
     @useTable = generateFramePage? if @uosPathseTable.nil?
@@ -86,7 +96,10 @@ class PiggyOptions
     @debug = false if @debug.nil?
     @browser = '' if @browser.nil?
     @stylesSample = false if @stylesSample.nil?
+    @useExifComments = false if @useExifComments.nil?
     @excludeFilters = ['~$', '#$', '^\.'] if @excludeFilters.nil?
+    @namingPatterns = ['IMG_.*', 'DSC.*'] if @namingPatterns.nil?
+    @sortOrder = SortByName if @sortOrder.nil?
   end
   
   def use_fxruby!
@@ -116,6 +129,10 @@ class PiggyOptions
   def browser?
     !@browser.nil? && !@browser.empty?
   end
+
+  def sort_by_time?
+    @sortOrder == SortByTime
+  end
     
   alias :usePreview? :usePreview
   alias :useLog? :useLog
@@ -129,5 +146,6 @@ class PiggyOptions
   alias :debug? :debug
   alias :stylesSample? :stylesSample
   alias :initializeNilsWithDefault :initialize_nils_with_default
+  alias :useExifComments? :useExifComments
 end
 

data/lib/piggy-core/rmagick_thumbnail_page_generator.rb

@@ -2,16 +2,17 @@ require 'RMagick'
 
 class RmagickThumbnailPageGenerator < ThumbnailPageGenerator
   
-  def resize_file(file_info, width, height, prefix)
+  def resize_file(file_info, widescreen_width, width, height, prefix)
     img = Magick::Image.read(file_info.name_with_path)[0]
+    if(file_info.rotate?)
+      img = img.rotate!(file_info.rotation)
+    end
     img_width = img.columns.to_f
     img_height = img.rows.to_f
-    scale_x = img_width > width ? width/img_width : 1
+    used_width = (img_height > 0 and img_width/img_height > 1.6) ? widescreen_width : width
+    scale_x = img_width > used_width ? used_width/img_width : 1
     scale_y = img_height > height ? height/img_height : 1
     scale = scale_x < scale_y ? scale_x : scale_y
-    if(file_info.rotate?)
-      img = img.rotate!(file_info.rotation)
-    end
     img = img.resize!(scale)
     img.write(File.join(imageOutputPath,prefix + file_info.name))
   end
@@ -23,8 +24,8 @@ class RmagickThumbnailPageGenerator < ThumbnailPageGenerator
     @inputFilenames.each {
       |info|
       progress.set_progress(info.name, 1)
-      resize_file(info, @options.thumbWidth, @options.thumbHeight, 't_')
-      resize_file(info, @options.imageWidth, @options.imageHeight, '')
+      resize_file(info, @options.thumbWidth, @options.thumbWidth, @options.thumbHeight, 't_')
+      resize_file(info, @options.widescreenWidth, @options.imageWidth, @options.imageHeight, '')
     }
   end
 end

data/lib/piggy-core/thumbnail_generator.rb

@@ -40,7 +40,7 @@ class ThumbnailGenerator
       if(info.rotate?)
         @imageProcessor.rotate_image(img, info.rotation)
       end
-      @imageProcessor.fit_image(img, @options.imageWidth, @options.imageHeight)
+      @imageProcessor.fit_image(img, @options.imageWidth, @options.imageHeight, 1, @options.widescreenWidth)
       @imageProcessor.save_image(img, outname_big(inputFile))
       @imageProcessor.fit_image(img, @options.thumbWidth, @options.thumbHeight)
       @imageProcessor.save_image(img, outname_small(inputFile))

data/lib/piggy-core/thumbnail_page_generator.rb

@@ -113,7 +113,7 @@ class ThumbnailPageGenerator < HtmlGenerator
   def main_index_with_path
     return main_index_path + sep + indexName
   end
-  
+
   def get_backlink_string
     @options.generateFramePage? ? back + subDir + HtmlExt : indexName
   end
@@ -189,6 +189,13 @@ class ThumbnailPageGenerator < HtmlGenerator
                         add('overview')
                       }
                     }
+                    if(@options.addSlideshow?)
+                      span {
+                        a({"HREF" => escape_html(SlideshowName + HtmlExt + "?" + image_name(currentInfo)) }) {
+                          add('slideshow')
+                        }
+                      }
+                    end
                     span {
                       a({"HREF" => escape_html(succ) + HtmlExt}) {
                         add(i == max_ind ? 'first' : 'next')
@@ -240,7 +247,8 @@ class ThumbnailPageGenerator < HtmlGenerator
           tag('layout', {}) {
             add("<imageSize width=\"#{@options.imageWidth}\" height=\"#{@options.imageHeight}\"/>")
           }
-      end
    end
+      end
+    end
     write_file(File.join(imageOutputPath, 'config.xml'), get_page)
   end
     
@@ -256,7 +264,7 @@ class ThumbnailPageGenerator < HtmlGenerator
       fp.print(")\n")
     }
     unless @inputFilenames.empty?
-      update_slideshow_template(slideshow_image(@inputFilenames[1]))
+      update_slideshow_template(@inputFilenames[1])
     end
   end
 
@@ -273,7 +281,7 @@ class ThumbnailPageGenerator < HtmlGenerator
     backlink = "href=\"#{get_backlink_string}\""
     File.open(file, 'w') { |fp|
       lines.each { |line|
-        line = line.gsub('PLACEHOLDER_FOR_IMAGE_NAME', imageFile)
+        line = line.gsub('PLACEHOLDER_FOR_IMAGE_NAME', image_name(imageFile))
         line = line.gsub('href="index.htm"', backlink)
         fp.print(line)
       }

data/lib/piggy-core/version.rb

@@ -4,10 +4,10 @@
 # Provide release information for Piggy.
 module PiggyVersion
   def PiggyVersion.version_string
-    '0.5.0-0'
+    '0.5.1-2'
   end
   def PiggyVersion.copyright_string
-    'Copyright (C) 2009 Sascha D�rdelmann'
+    'Copyright (C) 2010 Sascha D�rdelmann'
   end
   def PiggyVersion.development_status
     'beta'

data/lib/piggy-gui/directory_diff_widget.rb

@@ -198,11 +198,11 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   
   def dir_changed(side)
     if(side == 'right')
-      set_right_path(@rightPathField.getText)
+      set_right_path(ruby_path(@rightPathField.getText))
       update_right_list
       update_status_icons
     else
-      set_left_path(@leftPathField.getText)
+      set_left_path(ruby_path(@leftPathField.getText))
       update_left_list
       update_status_icons
     end
@@ -228,12 +228,16 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
       method(:on_menu_right_list))
   end
 
-  def fox_pah(ruby_path)
+  def fox_path(ruby_path)
     ruby_2_fox(WinShell.instance.os_path(ruby_path))
   end
+  
+  def ruby_path(fox_path)
+    WinShell.instance.ruby_path(fox_2_ruby(fox_path))
+  end
 
   def set_defaults
-    p = fox_pah(@options.localDestinationPath)
+    p = fox_path(@options.localDestinationPath)
     @rightPathField.setText(@options.localDestinationPath)
     @leftPathField.setText(@options.localDestinationPath)
   end
@@ -246,7 +250,7 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   
   def set_right_path(p)
     @options.localDestinationPath = FilePath.intern_path(p)
-    @rightPathField.setText(p) # fixme winpath
+    @rightPathField.setText(fox_path(p))
   end
   
   def left_path
@@ -254,7 +258,7 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   end
   
   def set_left_path(p)
-    @leftPathField.setText(p) # fixme winpath
+    @leftPathField.setText(fox_path(p))
   end
   
   def selection_in_list(list)
@@ -389,7 +393,7 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   end
   
   def on_doubleclick_left_file_list(sender, sel, index)
-    file_or_folder = @leftFileList.getItemText(index)
+    file_or_folder = ruby_path(@leftFileList.getItemText(index))
     file = file_or_folder.split(Regexp.compile("\t"))[0]
     info = @leftContents[file]
     return false unless info && info.directory?
@@ -401,7 +405,7 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   end
   
   def on_doubleclick_right_file_list(sender, sel, index)
-    file_or_folder = @rightFileList.getItemText(index)
+    file_or_folder = ruby_path(@rightFileList.getItemText(index))
     file = file_or_folder.split(Regexp.compile("\t"))[0]
     info = @rightContents[file]
     return false unless info && info.directory?

data/lib/piggy-gui/filtered_file_list.rb

@@ -83,10 +83,15 @@ class FilteredFileList < Fox::FXFileList
     end
     return selected_files
   end
-  
+
+  def choose(file)
+    @chosenFiles.add(@shell.os_path(file))
+  end
+
   def add_selected_files
     get_selected_image_files(true, 'add').each { |file|
       @chosenFiles.add(file)
+      puts(file)
     }
   end
   

data/lib/piggy-gui/ftp_browser_widget.rb

@@ -162,7 +162,7 @@ class FtpBrowserWidget < DirectoryDiffWidget
   def set_defaults
     @serverField.setText(ruby_2_fox(@options.ftpHost))
     @userField.setText(ruby_2_fox(@options.ftpUser))
-    @rightPathField.setText(fox_pah(@options.localDestinationPath))
+    @rightPathField.setText(fox_path(@options.localDestinationPath))
     @leftPathField.setText(ruby_2_fox(@options.remoteDestinationPath))
   end
   
@@ -220,7 +220,7 @@ class FtpBrowserWidget < DirectoryDiffWidget
       icon = if myInfo.directory?
         otherInfo ? @dirIcon : @moveRightDirIcon
       else
-        if otherInfo
+        if otherInfo and otherInfo.mtime
           otherInfo.mtime < myInfo.mtime ? @newerFileIcon : @fileIcon
         else
           @moveRightFileIcon
@@ -284,7 +284,8 @@ class FtpBrowserWidget < DirectoryDiffWidget
     update_list(@ftpAdapter.nlst, @leftFileList, @leftContents) do
       |file, path|
       @ftpAdapter.info(file, path)
-    end
  end
+    end
+  end
   
   def update_ftp_list
     ftp_do {} # every ftp action includes an update :-)

data/lib/piggy-gui/html_generation_dialog.rb

@@ -29,11 +29,13 @@ class HtmlGenerationDialog < ModalDialog
     labels = Array.new
     labels.push(FXLabel.new(contents, "Title:"))
     @titleField = FXTextField.new(contents, 32)
+    @titleField.setText("Styles sample") if(@options.stylesSample?)
     @titleField.connect(SEL_COMMAND) { |sender, sel, new_txt|
       on_title_changed(fox_2_ruby(new_txt)) if (new_txt)
     }
     labels.push(FXLabel.new(contents, "Subdirectory:"))
     @subdirField = FXTextField.new(contents, 32)
+    @subdirField.setText("basic") if(@options.stylesSample?)
     labels.each { |label| label.setLayoutHints LAYOUT_CENTER_Y }
     contents.init_gui
     add_ok_cancel_buttons_to(frame)