Piggy 0.5.0.0 → 0.5.1.2

data/lib/piggy-gui/html_options_widget.rb

@@ -59,10 +59,10 @@ class HtmlOptionsWidget < Fox::FXMatrix
       @options.addSlideshow = ptr
     }
     add_label_to(self, ""); # TODO empty cell in matrix layout
-        add_slideshow_check = FXCheckButton.new(self, 'Add JavaFX slideshow')
-        add_slideshow_check.setCheck(@options.addJavaFxSlideshow?)
-        add_slideshow_check.connect(SEL_COMMAND) { |sender, sel, ptr|
-          @options.addJavaFxSlideshow = ptr
+    add_slideshow_check = FXCheckButton.new(self, 'Add JavaFX slideshow')
+    add_slideshow_check.setCheck(@options.addJavaFxSlideshow?)
+    add_slideshow_check.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.addJavaFxSlideshow = ptr
     }
     add_label_to(self, "Style:")
     style_text_field = new_combobox(self, 32,
@@ -78,6 +78,19 @@ class HtmlOptionsWidget < Fox::FXMatrix
     style_text_field.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.style = ptr
     }
+    add_label_to(self, "Sort order")
+    sort_order_text_field = new_combobox(self, 32,
+      2,
+      nil, 0, COMBOBOX_INSERT_LAST)
+    sort_order_text_field.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
+    sort_order_text_field.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    sort_order_text_field.clearItems
+    sort_order_text_field.appendItem(PiggyOptions::SortByName)
+    sort_order_text_field.appendItem(PiggyOptions::SortByTime)
+    sort_order_text_field.setText(@options.sortOrder)
+    sort_order_text_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.sortOrder = ptr
+    }
     add_label_to(self, "Image size:")
     size_frame = FXHorizontalFrame.new(self, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0)
     image_width_field = FXTextField.new(size_frame, 4)
@@ -99,5 +112,15 @@ class HtmlOptionsWidget < Fox::FXMatrix
         image_height_field.setText(ruby_2_fox(@options.imageHeight.to_s))
       end
     }
+    add_label_to(self, "Widescreen image width:")
+    w_image_width_field = FXTextField.new(self, 4)
+    w_image_width_field.setText(ruby_2_fox(@options.widescreenWidth.to_s))
+    w_image_width_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.widescreenWidth = fox_2_ruby(w_image_width_field.getText).to_i
+      rescue StandardError => ex
+        w_image_width_field.setText(ruby_2_fox(@options.widescreenWidth.to_s))
+      end
+    }
   end
 end

data/lib/piggy-gui/image_processor.rb

@@ -63,11 +63,12 @@ class ImageProcessor
     GC.start
   end
   
-  def fit_image(img, maxW, maxH, quality = 1)
+  def fit_image(img, maxW, maxH, quality = 1, widescreen_w = -1)
     w = img.getWidth
     h = img.getHeight
+    used_width = (widescreen_w > 0 and h.to_f > 0 and w.to_f/h.to_f > 1.6) ? widescreen_w : maxW
     ratios = Array.new(2)
-    ratios[0] = maxW.to_f / w.to_f
+    ratios[0] = used_width.to_f / w.to_f
     ratios[1] = maxH.to_f / h.to_f
     ratio = ratios.min
     new_w = (w * ratio).to_i

data/lib/piggy-gui/options_dialog.rb

@@ -118,34 +118,34 @@ class OptionsDialog < ModalDialog
 
   def add_tab_ftp_to(tabs)
     tab = add_tab(tabs, "Upload")
-    frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
-    add_label_to(frame, "FTP server:")
-    server_field = FXTextField.new(frame, 32)
+    expert_settings_frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
+    add_label_to(expert_settings_frame, "FTP server:")
+    server_field = FXTextField.new(expert_settings_frame, 32)
     server_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     server_field.setText(ruby_2_fox(@options.ftpHost))
     server_field.connect(SEL_COMMAND) {
       @options.ftpHost = fox_2_ruby(server_field.getText)
     }
-    add_label_to(frame, "User:")
-    user_field = FXTextField.new(frame, 32)
+    add_label_to(expert_settings_frame, "User:")
+    user_field = FXTextField.new(expert_settings_frame, 32)
     user_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     user_field.setText(@options.ftpUser)
     user_field.connect(SEL_COMMAND) {
       @options.ftpUser = fox_2_ruby(user_field.getText)
     }
-    add_label_to(frame, "Remote path:")
-    remote_path_field = FXTextField.new(frame, 32)
+    add_label_to(expert_settings_frame, "Remote path:")
+    remote_path_field = FXTextField.new(expert_settings_frame, 32)
     remote_path_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     remote_path_field.setText(@options.remoteDestinationPath)
     remote_path_field.connect(SEL_COMMAND) {
       @options.remoteDestinationPath = fox_2_ruby(remote_path_field.getText)
     }
 
-    frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
-    add_txt_to(frame, "Expert settings")
-    add_txt_to(frame, "")
-    add_label_to(frame, "Exclude filters:")
-    filters_field = FXTextField.new(frame, 32)
+    expert_settings_frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
+    add_txt_to(expert_settings_frame, "Expert settings")
+    add_txt_to(expert_settings_frame, "")
+    add_label_to(expert_settings_frame, "Exclude filters:")
+    filters_field = FXTextField.new(expert_settings_frame, 32)
     filters_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     filters_field.setText(@options.excludeFilters.join(','))
     filters_field.connect(SEL_COMMAND) {
@@ -154,6 +154,28 @@ class OptionsDialog < ModalDialog
         collect { |s| s.strip }.
         reject { |s| s.length == 0 }
     }
+    add_label_to(expert_settings_frame, "Timeouts:")
+    timeouts_frame = FXHorizontalFrame.new(expert_settings_frame, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0)
+    add_label_to(timeouts_frame, "Connection:")
+    connection_timeout_field = FXTextField.new(timeouts_frame, 5)
+    connection_timeout_field.setText(ruby_2_fox(@options.ftpConnectionTimeout.to_s))
+    connection_timeout_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.ftpConnectionTimeout = fox_2_ruby(connection_timeout_field.getText).to_i
+      rescue StandardError => ex
+        connection_timeout_field.setText(ruby_2_fox(@options.ftpConnectionTimeout.to_s))
+      end
+    }
+    add_label_to(timeouts_frame, "Transfer:")
+    transfer_timeout_field = FXTextField.new(timeouts_frame, 5)
+    transfer_timeout_field.setText(ruby_2_fox(@options.ftpTransferTimeout.to_s))
+    transfer_timeout_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.ftpTransferTimeout = fox_2_ruby(transfer_timeout_field.getText).to_i
+      rescue StandardError => ex
+        transfer_timeout_field.setText(ruby_2_fox(@options.ftpTransferTimeout.to_s))
+      end
+    }
   end
 
   def add_tab_experimental_to(tabs)
@@ -182,6 +204,13 @@ class OptionsDialog < ModalDialog
     cb.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.useTable = ptr
     }
+    cb = FXCheckButton.new(tab,
+      'Use Exif comments',
+      nil, 0, cb_flags)
+    cb.setCheck(@options.useExifComments)
+    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.useExifComments = ptr
+    }
     cb = FXCheckButton.new(tab,
       'Styles sample',
       nil, 0, cb_flags)
@@ -211,6 +240,16 @@ class OptionsDialog < ModalDialog
         thumb_height_field.setText(ruby_2_fox(@options.thumbHeight.to_s))
       end
     }
+    add_label_to(tab, "Cameras naming patterns:")
+    naming_field = FXTextField.new(tab, 32)
+    naming_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    naming_field.setText(@options.namingPatterns.join(','))
+    naming_field.connect(SEL_COMMAND) {
+      naming_txt = fox_2_ruby(naming_field.getText)
+      @options.namingPatterns = naming_txt.split(',').
+        collect { |s| s.strip }.
+        reject { |s| s.length == 0 }
+    }
   end
 
   def browser_changed
@@ -225,7 +264,7 @@ class OptionsDialog < ModalDialog
   
   def validate
     if @options.browser?
-      return warn("Browser not found", "Warning") unless File.exists?(@options.browser)
+      return warn("Warning", "Browser not found") unless File.exists?(@options.browser)
     end
     true
   end

data/lib/piggy-gui/piggy_image_browser.rb

@@ -4,10 +4,12 @@
 # piggy.rb allows you to view image files, choose some and generate a new
 # page for an internet picture album.
 
+require 'yaml'
 require 'piggy-core/version'
 require 'piggy-core/environment'
 require 'piggy-core/debug'
 require 'piggy-core/options_persistence'
+require 'piggy-core/album'
 require 'piggy-core/winshell'
 require 'piggy-core/exifr_adapter'
 require 'piggy-core/nconvert_thumbsgen'
@@ -138,10 +140,16 @@ class PiggyImageBrowser < Fox::FXMainWindow
     
     # File menu entries
     tmp = FXMenuCommand.new(menus['file'],
-      "&Open...\tCtl-O\tOpen image file.")
+      "Open &album...\tCtl-a\tOpen album list file.")
+    tmp.connect(SEL_COMMAND, method(:on_cmd_open_album))
+    tmp = FXMenuCommand.new(menus['file'],
+      "Sa&ve album...\tCtl-v\tSave album list file.")
+    tmp.connect(SEL_COMMAND, method(:on_cmd_save_album))
+    tmp = FXMenuCommand.new(menus['file'],
+      "&Open image...\tCtl-o\tOpen image file.")
     tmp.connect(SEL_COMMAND, method(:on_cmd_open))
     tmp = FXMenuCommand.new(menus['file'],
-      "B&ack\t\tBack in history",
+      "&Back\t\tBack in history",
       @backIcon)
     tmp.connect(SEL_COMMAND, method(:on_cmd_back))
     tmp = FXMenuCommand.new(menus['file'],
@@ -194,8 +202,8 @@ class PiggyImageBrowser < Fox::FXMainWindow
     msg += "- Ruby #{RUBY_VERSION} (released #{RUBY_RELEASE_DATE})\n"
     msg += "- FXRuby #{Fox.fxrubyversion}\n"
     msg += "- FOX Toolkit #{Fox.fxversion}\n"
-    msg += "- Javascript slideshow no version information availiable\n"
-    msg += "- JavaFX animation uses JavaFX Script Version 1.2 which runs on top of Java 6\n"
+    msg += "- BarelyFitz Javascript slideshow 1.16\n"
+    msg += "- JavaFX animation uses JavaFX Script 1.3 which runs on top of Java 6\n"
     msg += "- Piggy #{PiggyVersion.display_string}\n"
     about_title = "About Piggy"
     tmp = FXMenuCommand.new(menus['help'], "&About Piggy...")
@@ -295,6 +303,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     @filelist.choosable = proc { |filename| supports(filename) }
     @filelist.setLayoutHints(fill_mode)
     @filelist.connect(SEL_COMMAND, method(:on_cmd_file_list_selection))
+    @filelist.connect(SEL_DOUBLECLICKED, method(:on_cmd_file_list_doubleclicked))
     @imageview = if UseImageView
       FXImageView.new(@imageviewframe)
     else
@@ -358,7 +367,10 @@ class PiggyImageBrowser < Fox::FXMainWindow
   end
 
   def log(msg)
-    @pipeLog.appendText("#{msg}\n")
+    time = Time.new.strftime("%H:%M:%S")
+    log_msg = "#{time}> #{msg}\n"
+    puts(log_msg)
+    @pipeLog.appendText(log_msg)
   end
   
   def load_image(file)
@@ -442,7 +454,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     return FoxThumbnailPageGenerator
   end
   
-  def set_directory(dirname)
+  def set_directory(dirname, preselect = true)
     if @historyPos < @history.size
       @history.pop
     else
@@ -450,7 +462,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
       @historyPos = @history.size
     end
     @filelist.go_to_directory(dirname)
-    if(@options.preselectDirectories?)
+    if(preselect and @options.preselectDirectories?)
       @filelist.choose_all_in_filelist
       next_image
     end
@@ -480,11 +492,14 @@ class PiggyImageBrowser < Fox::FXMainWindow
     path_string = @shell.ruby_path(osPathString)
     @exif = ExifrAdapter.new(path_string)
     info = CommentedFile.new(File.basename(path_string), File.dirname(path_string))
+    info.ctime = File.ctime(info.name_with_path)
+    info.mtime = File.mtime(info.name_with_path)
+    info.date_time = @exif.date_time
     if @fileInfos.has_key?(info)
       info = @fileInfos[info]
     else
       info.rotation = @exif.view_degrees
-      info.comment = @exif.comment
+      info.comment = @exif.comment if @options.useExifComments?
       @fileInfos[info] = info
     end
     return info
@@ -544,7 +559,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     if @currentRotation >= 360
       @currentRotation = @currentRotation - 360
     end
-    @orientationStatus.setText(ruby_2_fox(@currentRotation.to_s + '�'))
+    @orientationStatus.setText(ruby_2_fox(@currentRotation.to_s + '�'))
     current_file_info.rotation = @currentRotation
   end
 
@@ -580,6 +595,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     begin
       if(@options.browser?)
         cmd = @options.browser
+        cmd = "\"#{cmd}\"" if PLATFORM =~ /mswin/ and cmd.size > 0 and cmd[0] != "\""[0]
         @pipeLog.run_command(cmd + ' ' + url, working_dir, true)
       else
         if PLATFORM =~ /mswin/
@@ -632,22 +648,75 @@ class PiggyImageBrowser < Fox::FXMainWindow
   
   def open_system_file_chooser
     open_dialog = FXFileDialog.new(self, "Open Image")
-    #openDialog.filename = @filename
-    open_dialog.set_directory(@filelist.get_current_directory)
+    open_dialog.directory = @filelist.get_current_directory
     patterns = ["All Files (*)" ] + @supportedImageTypes.values
     open_dialog.patternList = patterns
     open_dialog.currentPattern = @preferredFileFilter
     if open_dialog.execute
       @preferredFileFilter = open_dialog.currentPattern
-      filename = open_dialog.filename
-      set_directory(open_dialog.getDirectory)
+      filename = fox_2_ruby(open_dialog.filename)
+      set_directory(fox_2_ruby(open_dialog.getDirectory))
       open_file_or_link(filename)
     end
   end
+
+  def on_cmd_open_album(sender, sel, ptr)
+    open_dialog = FXFileDialog.new(self, "Open album list file")
+    open_dialog.directory = @filelist.get_current_directory
+    patterns = ["All Files (*)" , "Yaml Files (*.yaml)"]
+    open_dialog.patternList = patterns
+    open_dialog.currentPattern = 1
+    if open_dialog.execute
+      filename = fox_2_ruby(open_dialog.filename)
+      return unless File.exists?(filename)
+      begin
+        album = File.open(filename) { |io| YAML.load(io) }
+        return unless album.class == Album
+        set_directory(album.path, false) unless (album.path.nil?)
+        unless(album.file_infos.nil?)
+          album.file_infos.each { |info|
+            @fileInfos[info] = info
+            @filelist.choose(info.name_with_path)
+            @filelist.update_file_list
+          }
+          next_image
+        end
+      rescue StandardError => ex
+        puts('Not an album file: ' + ex.message)
+      end
+    end
+  end
+
+  def on_cmd_save_album(sender, sel, ptr)
+    open_dialog = FXFileDialog.new(self, "Save album list file")
+    open_dialog.directory = @filelist.get_current_directory
+    patterns = ["All Files (*)" , "Yaml Files (*.yaml)"]
+    open_dialog.patternList = patterns
+    open_dialog.currentPattern = 1
+    if open_dialog.execute
+      filename = fox_2_ruby(open_dialog.filename)
+      filename = filename + ".yaml"unless(filename.split('.')[-1] == "yaml")
+      begin
+        album = Album.new
+        album.path = @filelist.get_current_directory
+        album.file_infos = chosen_sequence.collect { |f| info_for_file(f) }
+        File.open(filename, 'w') { |out|
+          YAML.dump(album, out)
+        }
+        puts "Album saved to #{filename}"
+      rescue StandardError => ex
+        puts "Album could not be saved to #{filename}: " + ex.message
+      end
+    end
+  end
   
   # Command message from the file list
   
   def on_cmd_file_list_selection(sender, dummy, index)
+    select_index(index) unless @filelist.isItemDirectory(index)
+  end
+  
+  def on_cmd_file_list_doubleclicked(sender, dummy, index)
     select_index(index)
   end
   
@@ -778,7 +847,20 @@ class PiggyImageBrowser < Fox::FXMainWindow
     generator.set_title(title)
     generator.set_output_directory(output_dir)
     generator.client = @pipeLog
-    generator.set_files(chosen_sequence.collect { |f| info_for_file(f) })
+    info_sequence = chosen_sequence.collect { |f| info_for_file(f) }
+    info_sequence.sort! { |x, y| x.name <=> y.name }
+    if(@options.sort_by_time?)
+      guess_missing_times(info_sequence)
+      info_sequence.sort! { |x, y|
+        begin
+          c1 = x.date_time <=> y.date_time
+        rescue Exception
+          c1 = 0
+        end
+        c1 == 0 ? x.name <=> y.name : c1
+      }
+    end
+    generator.set_files(info_sequence)
     getApp.beginWaitCursor
     progress = ProgressWithDialog.new(self)
     progress.set_task('Generating', @filelist.num_files_chosen)
@@ -787,6 +869,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     begin
       if(@options.stylesSample?)
         actual_options = @options.clone
+        success = true
         begin
           get_style_list.each { |style|
             @options.style = style
@@ -811,12 +894,48 @@ class PiggyImageBrowser < Fox::FXMainWindow
     end
     if(success)
       open_html_browser_on_result(generator)
+      log("Done!")
     else
-      @pipeLog.appendText('Error')
+      log('Error')
       error("Error in html generation!")
     end
     return success
   end
+
+  # Call this if some files have an exif date_time and some don't.
+  # Assume that the given ordering for each naming pattern
+  # is correct and simply take the time from the predecessor in
+  # the subsequence corresponding to a naming pattern.
+  def guess_missing_times(info_sequence)
+    done = Set.new
+    (@options.namingPatterns + ['.*']).collect { |p| Regexp.new(p) }.each do
+      |pattern|
+      subsequence = info_sequence.select {
+        |info|
+        info.name =~ pattern and not done.include?(info.name_with_path)
+      }
+      subsequence.each { |info| done.add(info.name_with_path) }
+      guess_missing_times_for_subsequence(subsequence)
+    end
+  end
+
+  def guess_missing_times_for_subsequence(info_sequence)
+    first_with_time = info_sequence.detect{
+      |info|
+      puts "#{info.name} - #{info.date_time}"
+      not info.date_time.nil?
+    }
+    return if first_with_time.nil?
+    time = first_with_time.date_time
+    info_sequence.each do
+      |info|
+      if(info.date_time.nil?)
+        info.date_time = time
+      else
+        time = info.date_time
+      end
+    end
+  end
   
   def on_ftp_browser_dialog_closed(sender, sel, ptr)
     # get options?